Merge remote-tracking branch 'origin/test' into test

src/views/GATHER/index.vue

@@ -483,7 +483,7 @@
             >
               <!-- :key="index + listIndex + listItem.normId" -->
               <!-- :rules="rules" ref="form" -->
-              
+
                 <el-col :span="12" >
                   <el-form-item
                     :label="
@@ -502,7 +502,7 @@
               </el-col >
 
             </el-form>
-            
+
           </template>
         </el-row>
           <!-- 这里是第二种写法 -->
@@ -625,7 +625,7 @@
           :rules="rules"
           :key="listItem.normfeeId"
         >
-          <!-- :rules="rules" ref="form" -->
+          <!-- :rules="rules" ref="form" -->z
           <el-form-item
             :label="
               listItem.normfeeName + '（' + listItem.funit_dictText + '）'
@@ -1034,7 +1034,8 @@ export default {
         }
       });
     },
-    handleCheck(val) {
+    handleCheck(val,value) {
+      // console.log(value)
       let data = {
         gatherId: this.dataId,
         type: 1,
@@ -1042,6 +1043,7 @@ export default {
       let audit = {
         gatherId: this.dataId,
         auditType: 2,
+        remark: value,
       };
       if (val == 1) {
         approve(data).then((res) => {
@@ -1052,6 +1054,7 @@ export default {
           }
         });
       } else {
+        // console.log('aude',audit)
         bsqAudit(audit).then((res) => {
           if (res.code == 200) {
             this.$modal.msgSuccess("驳回成功");
@@ -1064,14 +1067,14 @@ export default {
 
     // 驳回处理
     handleReject() {
-      this.$prompt("请驳回理由：", "提示", {
+      this.$prompt("请输入驳回理由：", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         inputType: "textarea",
       })
         .then(({ value }) => {
-          // console.log(value);
-          this.handleCheck(2);
+          // console.log(666,value);
+          this.handleCheck(2,value);
           // this.$message({
           //   type: 'success',
           //   message: '你的邮箱是: ' + value
@@ -1299,7 +1302,7 @@ export default {
             }
           });
         });
-      
+
       });
       Promise.all(p)
         .then(() => {

src/views/norm/quotaBonded.vue

@@ -11,12 +11,20 @@
         <el-input v-model="queryParams.quotaName"></el-input>
       </el-form-item>
       <el-form-item label="保税区名称" prop="bondedName">
-        <el-select v-model="queryParams.bondedName" placeholder="请选择保税区" clearable filterable @change="selectBondedChange" style="width:100%">
+        <el-select
+          v-model="queryParams.bondedName"
+          placeholder="请选择保税区"
+          clearable
+          filterable
+          @change="selectBondedChange"
+          style="width: 100%"
+        >
           <el-option
             v-for="item in deptList"
             :key="item.deptId"
             :label="item.deptName"
-            :value="item.deptName">
+            :value="item.deptName"
+          >
           </el-option>
         </el-select>
       </el-form-item>
@@ -101,7 +109,11 @@
       ></el-table-column>
       <el-table-column label="附件" align="center" prop="fileNames" width="80">
         <template slot-scope="scope">
-          <el-link style="text-decoration: underline;color: #36aafd" @click="download(scope.row.fileNames)">{{scope.row.fileNames}}</el-link>
+          <el-link
+            style="text-decoration: underline; color: #36aafd"
+            @click="download(scope.row.fileNames)"
+            >{{ scope.row.fileNames }}</el-link
+          >
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="180">
@@ -129,7 +141,10 @@
           >
 
           <el-button
-            v-if="scope.row.approvalStatus == 1 && (scope.row.reportStatus == 0 || scope.row.reportStatus == null)"
+            v-if="
+              scope.row.approvalStatus == 1 &&
+              (scope.row.reportStatus == 0 || scope.row.reportStatus == null)
+            "
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -167,7 +182,13 @@
     />
 
     <!-- 添加或修改辅助指标-综保区对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="900px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="900px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules">
         <el-form-item label-width="100px" label="保税区" prop="bondedName">
           <el-select
@@ -301,9 +322,8 @@ import {
   setAdminReport,
 } from "@/api/norm/QUOTABONDED";
 
-
 import { listQUOTAFEERole } from "@/api/norm/QUOTAFEE";
-import { listBONDED } from "@/api/portal/BONDED/BONDED.js";
+import { listAllBONDED } from "@/api/portal/BONDED/BONDED.js";
 import { uploadFiles, downloadFiles } from "@/api/common";
 import { listDept } from "@/api/system/dept";
 
@@ -380,12 +400,11 @@ export default {
       });
       this.QUOTAFEEList = response.data;
     });
-    listBONDED().then((response) => {
+    listAllBONDED().then((response) => {
       this.BONDEDList = response.rows;
     });
     this.getList();
     this.getDeptList();
-
   },
   methods: {
     // 获取保税区列表
@@ -494,7 +513,7 @@ export default {
             this.$message.error("得分必须为整数");
             return;
           }
-          if (this.form.enterType == '文字说明' && this.form.remark == null) {
+          if (this.form.enterType == "文字说明" && this.form.remark == null) {
             this.$message.error("请录入文字说明");
             return;
           }
@@ -513,60 +532,67 @@ export default {
             return;
           }
           if (this.form.id != null) {
-            if (this.form.enterType == '附件') {
-              if(this.fileList.length < 1) {
+            if (this.form.enterType == "附件") {
+              if (this.fileList.length < 1) {
                 this.$message.error("请选择文件传输！");
                 return;
               } else {
-                let formData = new FormData()
-                this.fileList.forEach((item) => {
-                  formData.append("file", item.raw);
-                });
-                uploadFiles(formData).then(res=>{
-                  if(res.code == 200){
-                    this.form.linkUrls = res.fileNames;
-                    this.form.fileNames = res.newFileNames;
-
-                    updateQUOTABONDED(this.form).then(response => {
-                      this.$modal.msgSuccess("修改成功");
-                      this.open = false;
-                      this.getList();
-                    });
-                  }
-                })
+                if (this.fileList[0].url == undefined) {
+                  let formData = new FormData();
+                  this.fileList.forEach((item) => {
+                    formData.append("file", item.raw);
+                  });
+                  uploadFiles(formData).then((res) => {
+                    if (res.code == 200) {
+                      this.form.linkUrls = res.fileNames;
+                      this.form.fileNames = res.newFileNames;
+                      updateQUOTABONDED(this.form).then((response) => {
+                        this.$modal.msgSuccess("修改成功");
+                        this.open = false;
+                        this.getList();
+                      });
+                    }
+                  });
+                } else {
+                  updateQUOTABONDED(this.form).then((response) => {
+                    this.$modal.msgSuccess("修改成功");
+                    this.open = false;
+                    this.getList();
+                  });
+                }
               }
             } else {
-              updateQUOTABONDED(this.form).then(response => {
+              updateQUOTABONDED(this.form).then((response) => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               });
             }
           } else {
-            if (this.form.enterType == '附件') {
-              if(this.fileList.length < 1) {
+            if (this.form.enterType == "附件") {
+              if (this.fileList.length < 1) {
                 this.$message.error("请选择文件传输！");
                 return;
               } else {
-                let formData = new FormData()
+                let formData = new FormData();
                 this.fileList.forEach((item) => {
                   formData.append("file", item.raw);
                 });
-                uploadFiles(formData).then(res=>{
-                  if(res.code == 200){
+                uploadFiles(formData).then((res) => {
+                  if (res.code == 200) {
                     this.form.linkUrls = res.fileNames;
                     this.form.fileNames = res.newFileNames;
 
-                    addQUOTABONDED(this.form).then(response => {
+                    addQUOTABONDED(this.form).then((response) => {
                       this.$modal.msgSuccess("新增成功");
                       this.open = false;
                       this.getList();
                     });
                   }
-                })
+                });
               }
             } else {
-              addQUOTABONDED(this.form).then(response => {
+              addQUOTABONDED(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
@@ -584,13 +610,15 @@ export default {
       } else {
         val = 2;
       }
-      setAdminApprove({ quotoBondedId: this.form.id, type: val }).then((res) => {
-        if (res.code == 200) {
-          this.$message.success(val == 1 ? "审核成功":"驳回成功");
-          this.getList();
-          this.open = false;
+      setAdminApprove({ quotoBondedId: this.form.id, type: val }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.$message.success(val == 1 ? "审核成功" : "驳回成功");
+            this.getList();
+            this.open = false;
+          }
         }
-      });
+      );
     },
 
     /** 删除按钮操作 */
@@ -662,11 +690,11 @@ export default {
       this.fileList = fileList;
     },
     download(resource) {
-      let fileNames = resource.split(',');
-      fileNames.forEach(item => {
-         downloadFiles('/profile/upload/' +item);
-      })
-    }
-  }
+      let fileNames = resource.split(",");
+      fileNames.forEach((item) => {
+        downloadFiles("/profile/upload/" + item);
+      });
+    },
+  },
 };
 </script>