瀏覽代碼

OW 费用明细审核通过 也允许修改主表信息

Qukatie 2 周之前
父節點
當前提交
a480c302b7

+ 2 - 2
src/views/boxManagement/containerNumber/detailsPage.vue

@@ -190,7 +190,7 @@
               key="id"
               label="dictValue"
               url="/blade-system/dict-biz/dictionary?code=boxCategory"
-              :disabled="editDisabled || form.whetherManuallyCreate == 0"
+              :disabled="editDisabled"
             ></dic-select>
           </tempalte>
           <tempalte slot="cabinTypeData">
@@ -236,7 +236,7 @@
               :controls="false"
               placeholder="请输入 可用"
               style="width: 100%;"
-              :disabled="editDisabled || !(form.srcType == 'OW(拿)' || form.srcType == 'OW(放)')"
+              :disabled="editDisabled"
             ></el-input-number>
           </tempalte>
           <tempalte slot="occupyNum">

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

@@ -2909,7 +2909,7 @@ export default {
       res.data.data.marks = res.data.data.marks ? res.data.data.marks.split("&|&").join("\n") : "";
       res.data.data.commodityDescr = res.data.data.commodityDescr ? res.data.data.commodityDescr.split("&|&").join("\n") : "";
       this.$set(this, "form", res.data.data);
-      this.inLock();
+      // this.inLock();
       //   console.log('form', this.form)
       // console.log(this.$refs)
       if (this.form.id) {

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

@@ -3071,7 +3071,7 @@ export default {
       res.data.data.marks = res.data.data.marks ? res.data.data.marks.split("&|&").join("\n") : "";
       res.data.data.commodityDescr = res.data.data.commodityDescr ? res.data.data.commodityDescr.split("&|&").join("\n") : "";
       this.$set(this, "form", res.data.data);
-      this.inLock();
+      // this.inLock();
       //   console.log('form', this.form)
       // console.log(this.$refs)
       if (this.form.id) {

+ 1 - 1
src/views/iosBasicData/costcenter/coc/detailsPage.vue

@@ -1805,7 +1805,7 @@ export default {
           this.saveLocalCurrency(res.data.data.belongingCompanyId);
           this.checkRate(null, res.data.data.exrateDate, null, 1, res.data.data.belongingCompanyId);
           this.form = res.data.data;
-          this.inLock();
+          // this.inLock();
           if (res.data.data.status != "录入") {
             this.editButton = true;
             this.editDisabled = true;

+ 1 - 1
src/views/iosBasicData/costcenter/soc/detailsPage.vue

@@ -3182,7 +3182,7 @@ export default {
             });
           }
           this.form = res.data.data;
-          this.inLock();
+          // this.inLock();
           if (res.data.data.status != "录入") {
             this.editButton = true;
             this.editDisabled = true;

+ 37 - 16
src/views/ow/owPut/detailsPage.vue

@@ -31,8 +31,20 @@
         </el-button>
         <el-button v-if="form.whetherEnable != '是'" type="info" size="small" @click="allClick('启用')">启用</el-button>
         <el-button v-if="form.whetherEnable == '是'" type="danger" size="small" @click="allClick('撤销启用')">撤销启用</el-button>
-        <el-button v-if="form.whetherEnable == '是'" type="danger" size="small" @click="allClick('修改数据')">修改数据</el-button>
-        <el-button v-if="form.whetherEnable == '是'" type="success" size="small" @click="allClick('提交修改')">提交修改</el-button>
+        <el-button
+          v-if="form.whetherEnable == '是' || form.feeCenterList.filter(item => item.auditStatus > 0).length"
+          type="danger"
+          size="small"
+          @click="allClick('修改数据')"
+          >修改数据</el-button
+        >
+        <el-button
+          v-if="form.whetherEnable == '是' || form.feeCenterList.filter(item => item.auditStatus > 0).length"
+          type="success"
+          size="small"
+          @click="allClick('提交修改')"
+          >提交修改</el-button
+        >
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
         </el-button> -->
@@ -61,7 +73,7 @@
                   label="shortName"
                   res="records"
                   @selectChange="dicChange('purchaseCompanyName', $event)"
-                  :disabled="fixData && form.whetherEnable == '是'"
+                  :disabled="editDisabled ||fixData && form.whetherEnable == '是'"
                   url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东"
                   :filterable="true"
                   :remote="true"
@@ -77,16 +89,16 @@
                   :url="'/blade-los/putbox/selectContainerNumber?boxType=' + (form.boxTypeQuantityOne ? form.boxTypeQuantityOne : '') + '&polId=' + (form.polId ? form.polId : '') + '&podId=' + (form.podId ? form.podId : '') + '&polStationId=' + (form.polStationId ? form.polStationId : '')"
                   :filterable="true" @selectChange="dicChange('containerNumber', $event)">
                 </dic-select> -->
-                       <container-number
+                <container-number
                   ref="containerNumberRef"
-                    v-model="form.containerNumber"
-                    placeholder="放箱号"
-                    label="containerNumber"
-                    url="/blade-los/putbox/selectContainerNumber"
-                    @selectChange="dicChange('containerNumber', $event)"
-                    titleDialog="放箱号"
-                    :disabled="editDisabled || form.whetherEnable == '是'"
-                  ></container-number>
+                  v-model="form.containerNumber"
+                  placeholder="放箱号"
+                  label="containerNumber"
+                  url="/blade-los/putbox/selectContainerNumber"
+                  @selectChange="dicChange('containerNumber', $event)"
+                  titleDialog="放箱号"
+                  :disabled="editDisabled || form.whetherEnable == '是'"
+                ></container-number>
               </tempalte>
               <!-- <tempalte slot="polStationCname">
                 <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
@@ -520,7 +532,7 @@
                 <el-button type="primary" plain size="small" :disabled="selectionfeedList.length == 0" @click="allClick('D费用申请')"
                   >请核费用</el-button
                 >
-                <el-button type="danger" plain size="small" :disabled="disabled || selectionfeecList.length == 0" @click="allClick('D撤销请核')"
+                <el-button type="danger" plain size="small" :disabled="disabled || selectionfeedList.length == 0" @click="allClick('D撤销请核')"
                   >撤销请核</el-button
                 >
                 <!-- <el-button type="primary" plain size="small" :disabled="editDisabled">计算超期箱使费</el-button> -->
@@ -3553,7 +3565,9 @@ export default {
             }
             if (row.auditStatus > 0) {
               this.editDisabled = true;
-              this.optionForm.disabled = true;
+              this.optionForm.column.forEach(e => {
+                e.disabled = true;
+              });
             }
           });
           this.feeCenterListD = res.data.data.feeCenterList.filter(item => item.dc == "D");
@@ -3594,7 +3608,10 @@ export default {
       this.editButton = false;
       if (this.form.status == "录入") {
         this.editDisabled = false;
-        this.optionForm.disabled = false;
+        // this.optionForm.disabled = false;
+        this.optionForm.column.forEach(e => {
+          e.disabled = false;
+        });
       }
     },
     rowDel(row, index) {
@@ -3732,6 +3749,7 @@ export default {
       }
       if (name == "修改数据") {
         this.fixData = false;
+        this.editDisabled = false;
         this.optionForm.column.forEach(e => {
           if (!(e.prop == "internalContainerNumber" || e.prop == "suitcaseNum" || e.prop == "notSuitcaseNum")) {
             e.disabled = false;
@@ -4666,7 +4684,10 @@ export default {
             this.$message.success("撤销请核成功");
             this.getDetail(res.data.data.id);
             this.editDisabled = false;
-            this.optionForm.disabled = false;
+            // this.optionForm.disabled = false;
+            this.optionForm.column.forEach(e => {
+              e.disabled = false;
+            });
           })
           .finally(() => {
             loading.close();

+ 32 - 11
src/views/ow/owTask/detailsPage.vue

@@ -31,8 +31,20 @@
         </el-button>
         <el-button v-if="form.whetherEnable != '是'" type="info" size="small" @click="allClick('启用')">启用</el-button>
         <el-button v-if="form.whetherEnable == '是'" type="danger" size="small" @click="allClick('撤销启用')">撤销启用</el-button>
-        <el-button v-if="form.whetherEnable == '是'" type="danger" size="small" @click="allClick('修改数据')">修改数据</el-button>
-        <el-button v-if="form.whetherEnable == '是'" type="success" size="small" @click="allClick('提交修改')">提交修改</el-button>
+        <el-button
+          v-if="form.whetherEnable == '是' || form.feeCenterList.filter(item => item.auditStatus > 0).length"
+          type="danger"
+          size="small"
+          @click="allClick('修改数据')"
+          >修改数据</el-button
+        >
+        <el-button
+          v-if="form.whetherEnable == '是' || form.feeCenterList.filter(item => item.auditStatus > 0).length"
+          type="success"
+          size="small"
+          @click="allClick('提交修改')"
+          >提交修改</el-button
+        >
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
         </el-button> -->
@@ -143,7 +155,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  :disabled="editDisabled || form.whetherEnable == '是'"
+                  :disabled="editDisabled || form.whetherEnable == '是'|| form.feeCenterList.filter(item => item.auditStatus > 0).length"
                   url="/blade-los/bports/list?status=0&current=1&size=5"
                   :filterable="true"
                   :remote="true"
@@ -213,7 +225,7 @@
                   :collapseTags="true"
                   dataType="string"
                   @selectChange="dicChange('podCname', $event)"
-                  :disabled="editDisabled || form.whetherEnable == '是'"
+                  :disabled="editDisabled || form.whetherEnable == '是'|| form.feeCenterList.filter(item => item.auditStatus > 0).length"
                   :slotRight="true"
                   rightLabel="code"
                 ></dic-select>
@@ -228,7 +240,7 @@
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
-                  :disabled="editDisabled || form.whetherEnable == '是'"
+                  :disabled="editDisabled || form.whetherEnable == '是' || form.feeCenterList.filter(item => item.auditStatus > 0).length"
                 ></dic-select>
               </template>
               <template slot="perDiemAfterFreeDays">
@@ -238,7 +250,7 @@
               <template slot="boxNumber">
                 <el-input-number
                   v-model="form.boxNumber"
-                  :disabled="editDisabled || (fixData && form.whetherEnable == '是') || form.suitcaseNum != 0"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是') || form.suitcaseNum != 0 || form.feeCenterList.filter(item => item.auditStatus > 0).length"
                   :min="1"
                   :controls="false"
                   placeholder="请输入 箱量"
@@ -568,7 +580,7 @@
                 <el-button type="primary" plain size="small" :disabled="selectionfeedList.length == 0" @click="allClick('D费用申请')"
                   >请核费用</el-button
                 >
-                <el-button type="danger" plain size="small" :disabled="disabled || selectionfeecList.length == 0" @click="allClick('D撤销请核')"
+                <el-button type="danger" plain size="small" :disabled="disabled || selectionfeedList.length == 0" @click="allClick('D撤销请核')"
                   >撤销请核</el-button
                 >
                 <!-- <el-button type="primary" plain size="small" :disabled="disabled" @click="allClick('D申请修改')">{{
@@ -3205,7 +3217,7 @@ export default {
     this.saveLocalCurrency(this.deptId);
   },
   computed: {
-     //监听 收费是否允许他人编辑
+    //监听 收费是否允许他人编辑
     isFeedDisabled() {
       if (this.form.id && this.selectionfeedList.filter(e => e.id && e.createUser != this.userId).length > 0) {
         if (this.roleName.includes("允许修改他人费用")) {
@@ -3908,7 +3920,9 @@ export default {
             }
             if (row.auditStatus > 0) {
               this.editDisabled = true;
-              this.optionForm.disabled = true;
+              this.optionForm.column.forEach(e => {
+                e.disabled = true;
+              });
             }
           });
           this.feeCenterListD = res.data.data.feeCenterList.filter(item => item.dc == "D");
@@ -3952,7 +3966,10 @@ export default {
       this.editButton = false;
       if (this.form.status == "录入") {
         this.editDisabled = false;
-        this.optionForm.disabled = false;
+        // this.optionForm.disabled = false;
+        this.optionForm.column.forEach(e => {
+          e.disabled = false;
+        });
       }
     },
     rowDel(row, index) {
@@ -4100,6 +4117,7 @@ export default {
       }
       if (name == "修改数据") {
         this.fixData = false;
+        this.editDisabled = false;
         this.optionForm.column.forEach(e => {
           if (!(e.prop == "containerNumber" || e.prop == "internalContainerNumber" || e.prop == "suitcaseNum" || e.prop == "notSuitcaseNum")) {
             e.disabled = false;
@@ -5097,7 +5115,10 @@ export default {
             this.$message.success("撤销请核成功");
             this.getDetail(res.data.data.id);
             this.editDisabled = false;
-            this.optionForm.disabled = false;
+            // this.optionForm.disabled = false;
+            this.optionForm.column.forEach(e => {
+              e.disabled = false;
+            });
           })
           .finally(() => {
             loading.close();