Merge branch 'test' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into test

src/views/BONDEDUPPLY/index.vue

@@ -1,65 +1,27 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="录单单位名称">
         <el-input v-model="queryParams.lddwmc"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['business:BONDEDUPPLY:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['business:BONDEDUPPLY:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['business:BONDEDUPPLY:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['business:BONDEDUPPLY:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['business:BONDEDUPPLY:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['business:BONDEDUPPLY:remove']">删除</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -72,10 +34,7 @@
           >导出</el-button
         >
       </el-col> -->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table :data="BONDEDUPPLYList" @selection-change="handleSelectionChange">
@@ -118,50 +77,21 @@
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime">
       </el-table-column>
-      <el-table-column
-        fixed="right"
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="120px"
-      >
+      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="120px">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:BONDEDUPPLY:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:BONDEDUPPLY:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:BONDEDUPPLY:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['business:BONDEDUPPLY:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改保税区供应链数据对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      :close-on-click-modal="false"
-      width="65%"
-      append-to-body
-    >
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="65%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-row>
           <el-col :span="12">
@@ -179,13 +109,8 @@
           <el-col :span="12">
             <el-form-item label="进出口日期" prop="jckrq">
               <!-- <el-input v-model="form.jckrq"></el-input> -->
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.jckrq"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              >
+              <el-date-picker style="width: 100%" v-model="form.jckrq" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -235,13 +160,8 @@
           <el-col :span="12">
             <el-form-item label="卸毕日期   " prop="xbrq">
               <!--              <el-input v-model="form.xbrq"></el-input>-->
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.xbrq"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              >
+              <el-date-picker style="width: 100%" v-model="form.xbrq" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -249,13 +169,8 @@
           <el-col :span="12">
             <el-form-item label="启运日期  " prop="qyrq">
               <!-- <el-input v-model="form.qyrq"></el-input> -->
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.qyrq"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              >
+              <el-date-picker style="width: 100%" v-model="form.qyrq" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -375,17 +290,41 @@ export default {
         jckrq: [
           { required: true, message: "进出口日期 不能为空", trigger: "blur" },
         ],
-        jz: [{ required: true, message: "净重 不能为空", trigger: "blur" }],
+        jz: [
+          { required: true, message: "净重 不能为空", trigger: "blur" },
+          {
+            pattern: /^[1-9]\d*$/,
+            message: "请输入正整数",
+            trigger: "blur"
+          }
+        ],
         jingzhi: [
           { required: true, message: "净值 不能为空", trigger: "blur" },
+          {
+            pattern: /^[1-9]\d*$/,
+            message: "请输入正整数",
+            trigger: "blur"
+          }
+        ],
+        js: [
+          { required: true, message: "件数 不能为空", trigger: "blur" },
+          {
+            pattern: /^[1-9]\d*$/,
+            message: "请输入正整数",
+            trigger: "blur"
+          }
         ],
-        js: [{ required: true, message: "件数 不能为空", trigger: "blur" }],
         jnsfhrbh: [
           {
             required: true,
             message: "境内收发货人编号 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[1-9]\d*$/,
+            message: "请输入正整数",
+            trigger: "blur"
+          }
         ],
         jnsfhrmc: [
           {
@@ -422,10 +361,10 @@ export default {
           { required: true, message: "卸毕日期 不能为空", trigger: "blur" },
         ],
         id: [
-          { required: true, message: "供应链主键不能为空", trigger: "blur" },
+          { required: true, message: "供应链不能为空", trigger: "blur" },
         ],
         deptId: [
-          { required: true, message: "保税区主键不能为空", trigger: "blur" },
+          { required: true, message: "保税区不能为空", trigger: "blur" },
         ],
         bgdbztj: [
           {
@@ -433,6 +372,11 @@ export default {
             message: "报关单币种统计 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[1-9]\d*$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         sbdwmc: [
           { required: true, message: "申报单位名称 不能为空", trigger: "blur" },
@@ -572,7 +516,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -1,11 +1,17 @@
 <template>
   <div class="app-container">
-    <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="部门" prop="deptName">
+        <el-select v-model="form.deptName" @change="deptSelect" placeholder="请选择">
+          <el-option v-for="(item, index) in deptList" :key="index" :label="item.deptName" :value="index">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form> -->
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -321,13 +327,22 @@ export default {
             message: "规模以上工业产值不能为空",
             trigger: "blur",
           },
-
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         deptName: [
           { required: true, message: "部门信息不能为空", trigger: "blur" },
         ],
         gdzctz: [
           { required: true, message: "固定资产投资不能为空", trigger: "blur" },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         zcfl: [
           { required: true, message: "资产分类 不能为空", trigger: "blur" },
@@ -340,12 +355,27 @@ export default {
         ],
         jckzz: [
           { required: true, message: "进、出口总值不能为空", trigger: "blur" },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         jkzz: [
           { required: true, message: "进口总值不能为空", trigger: "blur" },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         ckzz: [
           { required: true, message: "出口总值不能为空", trigger: "blur" },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         jgmyjckz: [
           {
@@ -353,6 +383,11 @@ export default {
             message: "加工贸易进出口值 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         wlhwjckz: [
           {
@@ -360,6 +395,11 @@ export default {
             message: "物流货物进出口值 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         ybmyjckz: [
           {
@@ -367,12 +407,27 @@ export default {
             message: "一般贸易进出口值 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         hgss: [
           { required: true, message: "海关税收不能为空", trigger: "blur" },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         swbmss: [
           { required: true, message: "税务部门税收不能为空", trigger: "blur" },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         qmqycyry: [
           {
@@ -387,6 +442,11 @@ export default {
             message: "实际使用外资金额不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         wxyejckz: [
           {
@@ -394,6 +454,11 @@ export default {
             message: "维修业务进出口值 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         yfywjckz: [
           {
@@ -401,6 +466,11 @@ export default {
             message: "研发业务进出口值 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         zlmyjckz: [
           {
@@ -408,6 +478,11 @@ export default {
             message: "租赁贸易进出口值 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         kjdsywjckz: [
           {
@@ -415,6 +490,11 @@ export default {
             message: "跨境电商业务进出口值 不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
       },
     };
@@ -486,8 +566,8 @@ export default {
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
-    changeDate(val){
-      this.form.year = this.form.dateValue.slice(0,4)
+    changeDate(val) {
+      this.form.year = this.form.dateValue.slice(0, 4)
       this.form.month = this.form.dateValue.slice(5)
     },
     /** 新增按钮操作 */
@@ -503,7 +583,7 @@ export default {
       const id = row.id || this.ids;
       getENTERPRISETRADEPERFORMANCE(id).then((response) => {
         this.form = response.data;
-        this.form.dateValue = this.form.year + '-' +this.form.month
+        this.form.dateValue = this.form.year + '-' + this.form.month
         this.open = true;
         this.title = "修改企业贸易绩效数据（每个月填报）";
       });

src/views/GARDENBASEDATA/index.vue

@@ -594,6 +594,11 @@ export default {
         ],
         zczj: [
           { required: true, message: "注册资金不能为空", trigger: "blur" },
+          {
+            pattern: /^[+]?(?:\d+(?:\.\d*)?|\.\d+)$/,
+            message: "不能为负数",
+            trigger: "blur"
+          }
         ],
         hydl: [
           { required: true, message: "行业大类 不能为空", trigger: "blur" },
@@ -622,6 +627,11 @@ export default {
         ],
         rygm: [
           { required: true, message: "人员规模不能为空", trigger: "blur" },
+          {
+            pattern: /^[1-9]\d*$/,
+            message: "请输入正整数",
+            trigger: "blur"
+          }
         ],
         clrq: [
           { required: true, message: "成立日期 不能为空", trigger: "blur" },

src/views/GARDENDATA/index.vue

@@ -118,6 +118,13 @@
            </el-option>
          </el-select>
        </el-form-item>
+        <el-form-item prop="year" label="年份">
+          <el-date-picker
+            v-model="form.year"
+            type="year"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
 
         <el-form-item label="数值类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择数值类型" filterable>
@@ -129,10 +136,7 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="value" label="数值">
-          <el-input  v-model="form.value" placeholder="请输入数值" ></el-input>
-        </el-form-item>
-        <el-form-item prop="year" label="年份">
-          <el-input  v-model="form.year" placeholder="请输入年份" ></el-input>
+          <el-input type="number"  v-model="form.value" placeholder="请输入数值" ></el-input>
         </el-form-item>
       </el-form>