Browse Source

1.海运进出口 禁用状态 复制以后不能编辑
2.财务管理 付费申请 撤销审核 去掉校验

Qukatie 3 months ago
parent
commit
e2d0d45697

+ 1 - 0
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -2776,6 +2776,7 @@ export default {
         id
       });
       loading.close();
+           this.detailData.seeDisabled = false;
       let types = typeof type == "string" ? type.split(",") : [];
       // if (type == '复制费用' || type == '') {
       //     res.data.data.preContainersList = []

+ 2 - 2
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -1054,7 +1054,7 @@ export default {
           });
         } else {
           this.basicData.column.forEach((item, index) => {
-             if (index == 3) {
+            if (index == 3) {
               item.forEach(row => {
                 if (row.prop == "mblno") {
                   row.disabled = false;
@@ -2835,7 +2835,7 @@ export default {
       let types = typeof type == "string" ? type.split(",") : [];
       console.log(types.indexOf("复制配箱信息", 1));
       let res = await billsCopyBills({ id, containers: types.indexOf("复制配箱信息") != -1 ? 1 : null });
-
+      this.detailData.seeDisabled = false;
       loading.close();
 
       // if (type == '复制费用' || type == '') {

+ 7 - 1
src/views/iosBasicData/boxPlan/boxPlan/detailsPage.vue

@@ -244,7 +244,13 @@ export default {
           },
           {
             label: "等级",
-            prop: "level",
+            prop: "level",         
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=plan_level",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             disabled: false,
           },
           {

+ 28 - 32
src/views/iosBasicData/financialManagement/PaymentApplication/detailsPage.vue

@@ -1167,38 +1167,34 @@ export default {
         });
       }
       if (name == "撤销申请") {
-        this.$refs.form.validate((valid, done) => {
-          done();
-          if (!valid) return;
-          // 付费对象
-          if (!this.form.corpId) {
-            return this.$message.error("请选择付费对象");
-          }
-          this.form.billNoFormat = "FFSQ";
-          this.form.businessTypeCode = "FFSQ";
-          this.form.businessType = "FFSQ";
-          let obj = {
-            ...this.form
-          };
-          this.$confirm("是否撤销申请?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: "加载中",
-              spinner: "el-icon-loading",
-              background: "rgba(255,255,255,0.7)"
-            });
-            srevokeSettlementApproveV1(obj)
-              .then(res => {
-                this.getDetail(res.data.data.id);
-              })
-              .finally(() => {
-                loading.close();
-              });
+        // 付费对象
+        if (!this.form.corpId) {
+          return this.$message.error("请选择付费对象");
+        }
+        this.form.billNoFormat = "FFSQ";
+        this.form.businessTypeCode = "FFSQ";
+        this.form.businessType = "FFSQ";
+        let obj = {
+          ...this.form
+        };
+        this.$confirm("是否撤销申请?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: "加载中",
+            spinner: "el-icon-loading",
+            background: "rgba(255,255,255,0.7)"
           });
+          srevokeSettlementApproveV1(obj)
+            .then(res => {
+              this.getDetail(res.data.data.id);
+            })
+            .finally(() => {
+              loading.close();
+            });
         });
       }
     },
@@ -1248,7 +1244,7 @@ export default {
       }
       if (name == "billDate") {
         await this.checkRate(this.form.curCode, this.form.billDate, null, 2, this.form.branchId);
-        this.$set(this.form, "exrate", this.getExchangeRate(this.form.curCode,"C", 2));
+        this.$set(this.form, "exrate", this.getExchangeRate(this.form.curCode, "C", 2));
       }
       if (name == "curCode") {
         await this.checkRate(row.code, this.form.billDate, null, 2, this.form.branchId);