Forráskód Böngészése

确认选定行 不需要提示无数据

Qukatie 5 napja
szülő
commit
75c74f8cdc

+ 21 - 30
src/views/iosBasicData/dcOffset/finstlbillsDetails.vue

@@ -397,20 +397,20 @@
                 </el-col>
                 </el-col>
                 <el-col :span="5">
                 <el-col :span="5">
                   <el-form-item label="业务类型" prop="businessTypes">
                   <el-form-item label="业务类型" prop="businessTypes">
-                     <dic-select
-                        v-model="form.businessTypes"
-                        placeholder="业务类型"
-                        key="id"
-                        label="label"
-                        keyValue="value"
-                        :activateCreated="false"
-                        :mockData="businessTypesData"
-                        :filterable="true"
-                        :multiple="true"
-                        :collapseTags="true"
-                        :disabled="editSave"
-                        dataType="string"
-                      ></dic-select>
+                    <dic-select
+                      v-model="form.businessTypes"
+                      placeholder="业务类型"
+                      key="id"
+                      label="label"
+                      keyValue="value"
+                      :activateCreated="false"
+                      :mockData="businessTypesData"
+                      :filterable="true"
+                      :multiple="true"
+                      :collapseTags="true"
+                      :disabled="editSave"
+                      dataType="string"
+                    ></dic-select>
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </el-col>
                 <el-col :span="4">
                 <el-col :span="4">
@@ -1116,19 +1116,10 @@ export default {
             this.saveLoading = false;
             this.saveLoading = false;
           });
           });
       } else if (type == "确认对抵") {
       } else if (type == "确认对抵") {
-        finstlbillsSubmit(this.form)
+        confirmOffset(this.form)
           .then(res => {
           .then(res => {
-            // this.form = res.data.data;
-            // this.finstlbillsConfirmReconciliationfun();
-            confirmOffset(this.form)
-              .then(res => {
-                this.$message.success("操作成功");
-                this.finstlbillsDetailfun(this.form.id);
-              })
-              .catch(() => {
-                this.pageLoading = false;
-                this.saveLoading = false;
-              });
+            this.$message.success("操作成功");
+            this.finstlbillsDetailfun(this.form.id);
           })
           })
           .catch(() => {
           .catch(() => {
             this.pageLoading = false;
             this.pageLoading = false;
@@ -1264,7 +1255,7 @@ export default {
       this.finstlbillslistAccBillV1fun();
       this.finstlbillslistAccBillV1fun();
     },
     },
     // 检索
     // 检索
-    retrievalfun() {
+    retrievalfun(type) {
       // 判断是否有对抵单位
       // 判断是否有对抵单位
       if (!this.form.corpId && (this.form.businessNo || this.form.accountNo || this.form.hblno || this.form.mblno)) {
       if (!this.form.corpId && (this.form.businessNo || this.form.accountNo || this.form.hblno || this.form.mblno)) {
         console.log("新接口");
         console.log("新接口");
@@ -1274,7 +1265,7 @@ export default {
           return this.$message.warning("请填写对抵单位");
           return this.$message.warning("请填写对抵单位");
         }
         }
         console.log("原来的接口");
         console.log("原来的接口");
-        this.finstlbillslistAccBillV1fun();
+        this.finstlbillslistAccBillV1fun("检索");
       }
       }
     },
     },
     // 检索出的弹窗
     // 检索出的弹窗
@@ -1319,7 +1310,7 @@ export default {
       });
       });
     },
     },
     // 检索接口
     // 检索接口
-    finstlbillslistAccBillV1fun() {
+    finstlbillslistAccBillV1fun(type) {
       // delete this.form.id;
       // delete this.form.id;
       // let obj = JSON.parse(JSON.stringify(this.form))
       // let obj = JSON.parse(JSON.stringify(this.form))
       let obj = {};
       let obj = {};
@@ -1384,7 +1375,7 @@ export default {
             this.queryData.push(item);
             this.queryData.push(item);
           }
           }
         }
         }
-        if (this.queryData.length == 0) {
+        if (this.queryData.length == 0 && type == "检索") {
           this.$message.warning("当前检索暂无数据!");
           this.$message.warning("当前检索暂无数据!");
         }
         }
       });
       });

+ 4 - 4
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -1747,7 +1747,7 @@ export default {
         }
         }
       });
       });
       this.retrievePopupsType = false;
       this.retrievePopupsType = false;
-      this.finstlbillslistAccBillV1fun(this.appendType);
+      this.finstlbillslistAccBillV1fun('检索');
     },
     },
     finstlbillslistAccBillByCorpfun() {
     finstlbillslistAccBillByCorpfun() {
       let obj = {};
       let obj = {};
@@ -1774,7 +1774,7 @@ export default {
     retrievalfun(type) {
     retrievalfun(type) {
       this.activeName = "1";
       this.activeName = "1";
       // 判断是否有对账单位
       // 判断是否有对账单位
-      this.finstlbillslistAccBillV1fun(type);
+      this.finstlbillslistAccBillV1fun('检索');
     },
     },
     // 检索
     // 检索
     finstlbillslistAccBillV1fun(type) {
     finstlbillslistAccBillV1fun(type) {
@@ -1868,7 +1868,7 @@ export default {
                 this.queryData.push(item);
                 this.queryData.push(item);
               }
               }
             }
             }
-             if (this.queryData.length == 0) {
+             if (this.queryData.length == 0&&type=='检索') {
               this.$message.warning("当前检索暂无数据!");
               this.$message.warning("当前检索暂无数据!");
             }
             }
           }
           }
@@ -1933,7 +1933,7 @@ export default {
                 this.queryData.push(item);
                 this.queryData.push(item);
               }
               }
             }
             }
-             if (this.queryData.length == 0) {
+             if (this.queryData.length == 0&&type=='检索') {
               this.$message.warning("当前检索暂无数据!");
               this.$message.warning("当前检索暂无数据!");
             }
             }
           }
           }

+ 4 - 4
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -1716,7 +1716,7 @@ export default {
         }
         }
       });
       });
       this.retrievePopupsType = false;
       this.retrievePopupsType = false;
-      this.finstlbillslistAccBillV1fun(this.appendType);
+      this.finstlbillslistAccBillV1fun('检索');
     },
     },
     finstlbillslistAccBillByCorpfun() {
     finstlbillslistAccBillByCorpfun() {
       let obj = {};
       let obj = {};
@@ -1743,7 +1743,7 @@ export default {
     retrievalfun(type) {
     retrievalfun(type) {
       this.activeName = "1";
       this.activeName = "1";
       // 判断是否有对账单位
       // 判断是否有对账单位
-      this.finstlbillslistAccBillV1fun(type);
+      this.finstlbillslistAccBillV1fun('检索');
     },
     },
     // 检索
     // 检索
     finstlbillslistAccBillV1fun(type) {
     finstlbillslistAccBillV1fun(type) {
@@ -1838,7 +1838,7 @@ export default {
                 this.queryData.push(item);
                 this.queryData.push(item);
               }
               }
             }
             }
-            if (this.queryData.length == 0) {
+            if (this.queryData.length == 0&&type=='检索') {
               this.$message.warning("当前检索暂无数据!");
               this.$message.warning("当前检索暂无数据!");
             }
             }
           }
           }
@@ -1905,7 +1905,7 @@ export default {
                 this.queryData.push(item);
                 this.queryData.push(item);
               }
               }
             }
             }
-            if (this.queryData.length == 0) {
+            if (this.queryData.length == 0&&type=='检索') {
               this.$message.warning("当前检索暂无数据!");
               this.$message.warning("当前检索暂无数据!");
             }
             }
           }
           }

+ 6 - 13
src/views/iosBasicData/writeOff/finstlbillsDetails.vue

@@ -28,7 +28,7 @@
           type="success"
           type="success"
           plain
           plain
           :disabled="editPower"
           :disabled="editPower"
-          v-if="form.id &&form.status == 0"
+          v-if="form.id && form.status == 0"
           :loading="saveLoading"
           :loading="saveLoading"
           @click="allClick('确认销账')"
           @click="allClick('确认销账')"
           >提交
           >提交
@@ -1163,20 +1163,13 @@ export default {
         this.saveLoading = true; // 加载动画
         this.saveLoading = true; // 加载动画
         this.pageLoading = true;
         this.pageLoading = true;
         // 判断是单独点击保存还是点击确认销账
         // 判断是单独点击保存还是点击确认销账
-        finstlbillsSubmit(this.form)
+        confirmWriteOff(this.form)
           .then(res => {
           .then(res => {
-            confirmWriteOff(this.form)
-              .then(res => {
-                this.editSave = true;
-                this.$message.success("操作成功");
-                this.finstlbillsDetailfun(this.form.id);
-              })
-              .finally(() => {
-                this.pageLoading = false;
-                this.saveLoading = false;
-              });
+            this.editSave = true;
+            this.$message.success("操作成功");
+            this.finstlbillsDetailfun(this.form.id);
           })
           })
-          .catch(() => {
+          .finally(() => {
             this.pageLoading = false;
             this.pageLoading = false;
             this.saveLoading = false;
             this.saveLoading = false;
           });
           });