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

src/views/GARDENTRADEDATA/edit.vue

@@ -3,6 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="200px">
       <el-form-item label="企业出口退税额" prop="companyDrawback">
         <el-input
+          type="number"
           v-model="form.companyDrawback"
           placeholder="请输入企业出口退税额"
         ></el-input>
@@ -10,6 +11,7 @@
 
       <el-form-item label="园区出口退税总额" prop="gardenDrawback">
         <el-input
+          type="number"
           v-model="form.gardenDrawback"
           placeholder="请输入园区出口退税总额"
         ></el-input>
@@ -17,6 +19,7 @@
 
       <el-form-item label="园区运营单位缴税总额" prop="gardenTax">
         <el-input
+          type="number"
           v-model="form.gardenTax"
           placeholder="请输入园区运营单位缴税总额"
         ></el-input>
@@ -24,6 +27,7 @@
 
       <el-form-item label="企业承接单量" prop="companyLists">
         <el-input
+          type="number"
           v-model="form.companyLists"
           placeholder="请输入企业承接单量"
         ></el-input>
@@ -31,6 +35,7 @@
 
       <el-form-item label="园区承接单总量" prop="gardenLits">
         <el-input
+          type="number"
           v-model="form.gardenLits"
           placeholder="请输入园区承接单总量"
         ></el-input>
@@ -38,6 +43,7 @@
 
       <el-form-item label="企业创新获奖量" prop="companyInnovative">
         <el-input
+          type="number"
           v-model="form.companyInnovative"
           placeholder="请输入企业创新获奖量"
         ></el-input>
@@ -45,6 +51,7 @@
 
       <el-form-item label="园区内创新获奖总量" prop="gardenInnovative">
         <el-input
+          type="number"
           v-model="form.gardenInnovative"
           placeholder="请输入园区内创新获奖总量"
         ></el-input>
@@ -52,6 +59,7 @@
 
       <el-form-item label="企业工业用水、用电量" prop="companyWaterElectric">
         <el-input
+          type="number"
           v-model="form.companyWaterElectric"
           placeholder="请输入企业工业用水、用电量"
         ></el-input>
@@ -59,6 +67,7 @@
 
       <el-form-item label="园区工业用水、用电总量" prop="gardenWaterElectric">
         <el-input
+          type="number"
           v-model="form.gardenWaterElectric"
           placeholder="请输入园区工业用水、用电总量"
         ></el-input>
@@ -94,72 +103,40 @@ export default {
           { required: true, message: "保税区ID不能为空", trigger: "blur" },
         ],
         companyDrawback: [
-          {
-            required: true,
-            message: "企业出口退税额 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "企业出口退税额年龄必须为数字值" },
+          { required: true, message: "企业出口退税额 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "企业出口退税额年龄必须为整数值" },
         ],
         gardenDrawback: [
-          {
-            required: true,
-            message: "园区出口退税总额 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "园区出口退税总额必须为数字值" },
+          { required: true, message: "园区出口退税总额 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "园区出口退税总额必须为整数值" },
         ],
         gardenTax: [
-          {
-            required: true,
-            message: "园区运营单位缴税总额 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "园区运营单位缴税总额必须为数字值" },
+          { required: true, message: "园区运营单位缴税总额 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "园区运营单位缴税总额必须为整数值" },
         ],
         companyLists: [
           { required: true, message: "企业承接单量 不能为空", trigger: "blur" },
-          { type: "number", message: "企业承接单量必须为数字值" },
+          { pattern: /^[1-9]\d*$/, message: "企业承接单量必须为整数值" },
         ],
         gardenLits: [
-          {
-            required: true,
-            message: "园区承接单总量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "园区承接单总量年龄必须为数字值" },
+          { required: true, message: "园区承接单总量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "园区承接单总量年龄必须为整数值" },
         ],
         companyInnovative: [
-          {
-            required: true,
-            message: "企业创新获奖量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "企业创新获奖量必须为数字值" },
+          { required: true, message: "企业创新获奖量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "企业创新获奖量必须为整数值" },
         ],
         gardenInnovative: [
-          {
-            required: true,
-            message: "园区内创新获奖总量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "园区内创新获奖总量必须为数字值" },
+          { required: true, message: "园区内创新获奖总量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "园区内创新获奖总量必须为整数值" },
         ],
         companyWaterElectric: [
-          {
-            required: true,
-            message: "企业工业用水、用电量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "必须为数字值" },
+          { required: true, message: "企业工业用水、用电量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "必须为整数值" },
         ],
         gardenWaterElectric: [
-          {
-            required: true,
-            message: "园区工业用水、用电总量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "必须为数字值" },
+          { required: true, message: "园区工业用水、用电总量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "必须为整数值" },
         ],
       },
     };

src/views/GATHER/importFile.vue

@@ -1,13 +1,14 @@
 <template>
+  <div>
+    <template>
+      <div class="tips-text">
+        <span class="tit">提示</span>
+        <p>1.请检查保税区名称是否一致或者统一！</p>
+        <p>2.上传前，请先检查excel文件内容的严谨性！</p>
+      </div>
+    </template>
     <div class="cmain" style="display: flex;justify-content: center;align-items: center;">
-      <el-upload
-        class="upload-demo"
-        drag
-        action="#"
-        :http-request="AvatarUpload"
-        multiple
-        :auto-upload="true"
-      >
+      <el-upload class="upload-demo" drag action="#" :http-request="AvatarUpload" multiple :auto-upload="true">
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       </el-upload>
@@ -15,43 +16,43 @@
         <el-button @click="$layer.close(layerid)">取 消</el-button>
       </div>
     </div>
-  </template>
+  </div>
+</template>
   
-  <script>
-  import { importUpload } from "@/api/portal/GARDENTRADEDATA/GARDENTRADEDATA.js";
-  export default {
-    data() {
-      return {};
+<script>
+import { importUpload } from "@/api/portal/GARDENTRADEDATA/GARDENTRADEDATA.js";
+export default {
+  data() {
+    return {};
+  },
+  props: {
+    layerid: {
+      type: String
     },
-    props:{
-      layerid: {
-        type: String
-      },
-      param: {
+    param: {
       type: Object,
       default: () => {
         return {};
       },
     },
+  },
+  methods: {
+    AvatarUpload(file) {
+      let formData = new FormData()
+      formData.append('file', file.file)
+      Object.keys(this.param).forEach(item => {
+        formData.append(item, this.param[item])
+      });
+      importUpload(formData).then(res => {
+        if (res.code == 200) {
+          this.$modal.msgSuccess(res.msg);
+          this.$parent.getList();
+          this.$layer.close(this.layerid);
+        }
+      })
     },
-    methods: {
-      AvatarUpload(file) {
-          let formData = new FormData()
-          formData.append('file',file.file)
-          Object.keys(this.param).forEach(item => {
-            formData.append(item, this.param[item])
-          });
-          importUpload(formData).then(res=>{
-              if(res.code == 200){
-                this.$modal.msgSuccess(res.msg);
-                this.$parent.getList();
-                this.$layer.close(this.layerid);
-              }
-          })
-      },
-    },
-  };
-  </script>
+  },
+};
+</script>
   
-  <style>
-  </style>
+<style></style>

src/views/JOINTCONFERENCE/add.vue

@@ -18,7 +18,7 @@
       </el-form-item>
 
       <el-form-item label="协作单位" prop="dept">
-        <!-- <el-select 
+        <!-- <el-select
           v-model="deptId"
           multiple
           placeholder="请选择协作单位"
@@ -213,7 +213,8 @@ export default {
             //   }
             // }
             //俊豪像甲方一样，老是让我改传参
-            this.form.cooperativeUnitId = this.deptId;
+            //↑好家伙你还改错了，是seleValue不是deptId
+            this.form.cooperativeUnitId = this.seleValue;
             this.form.deptNum = this.form.cooperativeUnitId.length;
             addJOINTCONFERENCE(this.form).then((response) => {
               this.$modal.msgSuccess("发布成功");

src/views/norm/dataSubmission.vue

@@ -147,6 +147,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      fnames: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -279,6 +280,8 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id);
+      this.fnames = selection.map(item => item.fname);
+
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -292,6 +295,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
+
       getGIVE(id).then(response => {
         this.form = response.data;
         this.open = true;
@@ -351,9 +355,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
+      const fname = row.fname || this.fnames;
+      
       this.$modal
         // .confirm('是否确认删除报送数据项配置编号为"' + ids + '"的数据项？')
-        .confirm(`是否确认删除报送数据项配置编号为【${ids}】;报送参数名称为【${row.fname}】的数据项？`)
+        .confirm(`是否确认删除报送数据项配置编号为【${ids}】;报送参数名称为【${fname}】的数据项？`)
         .then(function () {
           return delGIVE(ids);
         })