修改入库

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -29,7 +29,7 @@
               placeholder="请输入关键词"
               style="width: 80%"
               @change="changefStltype"
-              :disabled="detailList.length>0"
+              :disabled="detailList.length > 0"
             >
               <el-option
                 v-for="(item, index) in fMblnoOptions"
@@ -62,7 +62,9 @@
           <el-form-item label="提单号" prop="fMblno">
             <el-input
               v-model="form.fMblno"
-              :disabled="browseStatus || formBrowseStatus||detailList.length>0"
+              :disabled="
+                browseStatus || formBrowseStatus || detailList.length > 0
+              "
               style="width: 80%"
               placeholder="请输入提单号"
             />
@@ -119,7 +121,9 @@
               filterable
               v-model="form.fGoodsid"
               style="width: 80%"
-              :disabled="browseStatus || formBrowseStatus||detailList.length>0"
+              :disabled="
+                browseStatus || formBrowseStatus || detailList.length > 0
+              "
               placeholder="请选择品名"
             >
               <el-option
@@ -136,7 +140,9 @@
             <el-select
               v-model="form.fWarehouseid"
               filterable
-              :disabled="browseStatus || formBrowseStatus||detailList.length>0"
+              :disabled="
+                browseStatus || formBrowseStatus || detailList.length > 0
+              "
               style="width: 80%"
               placeholder="请选择"
             >
@@ -214,7 +220,7 @@
               v-model="form.fBusinessType"
               filterable
               @change="educationChange"
-              :disabled="contrOl || browseStatus"
+              :disabled="contrOl || browseStatus||warehouseDrList.length>0||warehouseCrList.length>0"
             >
               <el-option
                 v-for="(item, index) in businessTypeOption"
@@ -233,6 +239,7 @@
               clearable
               filterable
               placeholder="请输入关键词"
+              :disabled="contrOl || browseStatus"
             >
               <el-option
                 v-for="(item, index) in fCompanyOptIons"
@@ -727,7 +734,7 @@
                 :disabled="browseStatus"
                 size="small"
                 @click="addRelevant"
-                >新行
+                >录 入
               </el-button>
               <el-button
                 :disabled="browseStatus"
@@ -1207,6 +1214,7 @@
                 filterable
                 clearable
                 placeholder="客户名称"
+                :disabled="browseStatus"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1229,6 +1237,7 @@
                 v-model="scope.row.fFeeid"
                 clearable
                 placeholder="费用名称"
+                :disabled="browseStatus"
               >
                 <el-option
                   v-for="(item, index) in fDNameOptions"
@@ -1562,6 +1571,7 @@
             align="center"
             width="180px"
             label="客户名称"
+            :disabled="browseStatus"
           >
             <template slot-scope="scope">
               <el-select
@@ -1593,6 +1603,7 @@
                 v-model="scope.row.fFeeid"
                 clearable
                 placeholder="费用名称"
+                :disabled="browseStatus"
               >
                 <el-option
                   v-for="(item, index) in fCNameOptions"
@@ -2929,6 +2940,30 @@
       </div>
     </el-dialog>
     <div style="display: flex; justify-content: flex-end; margin-top: 10px">
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
+      <approval-comments
+        v-if="addOrUpdateVisib"
+        ref="ApprovalComments"
+        @refreshDataList="returnData"
+      ></approval-comments>
+      <el-button
+        type="primary"
+        :disabled="approvalStatus"
+        v-if="form.fBillstatus > 3"
+        @click="addOrUpdateHandle(form)"
+        >查看审批</el-button
+      >
+      <el-button
+        type="primary"
+        v-if="approVal === true"
+        @click="addOrUpdateHand(form)"
+        >审批</el-button
+      >
       <el-button
         :disabled="browseStatus"
         type="success"
@@ -2960,16 +2995,16 @@
         @click="submitForm()"
         >请核</el-button
       >
-      <!-- <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
-          >撤销请核</el-button
-        > -->
-      <!-- <el-button
-          type="danger"
-          v-if="form.fBillstatus === 4 && current == before"
-          :disabled="doNot"
-          @click="revokeTwo"
-          >撤销审批</el-button
-        > -->
+      <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
+        >撤销请核</el-button
+      >
+      <el-button
+        type="danger"
+        v-if="form.fBillstatus === 4 && current == before"
+        :disabled="doNot"
+        @click="revokeTwo"
+        >撤销审批</el-button
+      >
       <el-button @click="cancel">取 消</el-button>
     </div>
   </div>
@@ -3026,6 +3061,8 @@ export default {
   components: {
     UploadFile,
     Treeselect,
+    AddOrUpdate,
+    ApprovalComments,
   },
   data() {
     return {
@@ -3143,6 +3180,11 @@ export default {
       fCntqty: 0,
       activeIndex: "1",
       ifCntrnoStatus: null,
+      addOrUpdateVisible: false,
+      addOrUpdateVisib: false,
+      approVal: false,
+      approvalStatus: false,
+      doNot: false,
     };
   },
   created() {
@@ -3262,6 +3304,42 @@ export default {
         remark: null,
       };
     },
+    //撤销审批
+    revokeTwo() {
+      let data = {
+        actId: 110,
+        billId: this.form.fId,
+        id: this.form.fId,
+      };
+      revokeTwo(data).then((data) => {
+        if (data.code === 200) {
+          this.browseStatus=false;
+          this.msgSuccess("撤销成功");
+        }
+      });
+    },
+    // 查看审批流
+    getDataList() {
+      this.addOrUpdateVisible = false;
+    },
+    returnData() {
+      this.addOrUpdateVisib = false;
+      this.open = false;
+      this.cancelTwo();
+    },
+    addOrUpdateHandle(form) {
+      this.addOrUpdateVisible = true;
+      let actId = "110";
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(form.fId, actId);
+      });
+    },
+    addOrUpdateHand(form) {
+      this.addOrUpdateVisib = true;
+      this.$nextTick(() => {
+        this.$refs.ApprovalComments.init(form.fId, 110);
+      });
+    },
     changefStltype(row) {
       this.fMblnoOptions.map((e) => {
         if (row == e.fId) {
@@ -3272,7 +3350,6 @@ export default {
     changeGoods(row) {
       this.goodsOptions.map((e) => {
         if (row == e.fId) {
-          console.log(e);
           if (e.ifCntrno == "1") {
             this.ifCntrnoStatus = 1;
           } else {
@@ -3365,7 +3442,7 @@ export default {
               });
             });
             this.msgSuccess("卸货成功");
-            this.$set(this.form,"fItemsStatus", 3);
+            this.$set(this.form, "fItemsStatus", 3);
           }
         });
       } else {
@@ -3456,7 +3533,7 @@ export default {
             });
           });
           this.msgSuccess("入库成功");
-          this.$set(this.form,"fItemsStatus", 4);
+          this.$set(this.form, "fItemsStatus", 4);
         }
       });
     },
@@ -3546,7 +3623,7 @@ export default {
           });
         });
         this.msgSuccess("撤回成功");
-        this.$set(this.form,"fItemsStatus", 1);
+        this.$set(this.form, "fItemsStatus", 1);
       });
     },
     fStorageTypeFormat(row) {
@@ -3587,6 +3664,13 @@ export default {
     getForm() {
       getWarehousebills(this.chiId).then((response) => {
         this.form = response.data.warehousebills;
+        if (this.form.fBillstatus > 2) {
+          this.approvalStatus = false;
+          this.browseStatus = true;
+        } else {
+          this.approvalStatus = true;
+          this.browseStatus = false;
+        }
         this.$set(this.form, "fEta", Date.parse(this.form.fEta));
         this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
         this.$set(this.form, "fBstime", Date.parse(this.form.fBstime));
@@ -3627,7 +3711,11 @@ export default {
             }
           });
           this.warehouseDrList = response.data.warehousebillsfeesDr;
-          this.CntrTable = response.data.tCntrList;
+          if(response.data.tCntrList){
+            this.CntrTable = response.data.tCntrList;
+          }else{
+            this.CntrTable =[]
+          }
           if (response.data.enclosures) {
             this.relevantAttachments = response.data.enclosures;
           }
@@ -4076,7 +4164,8 @@ export default {
     },
     playcomputer() {
       let Num1 = Number(this.form.fPlannetweight) / Number(this.form.fPlanqty);
-      let Num2 = Number(this.form.fPlangrossweight) / Number(this.form.fPlanqty);
+      let Num2 =
+        Number(this.form.fPlangrossweight) / Number(this.form.fPlanqty);
       this.importList.fNetweight = Number(
         (this.importList.fQty * Num1).toFixed(2)
       );
@@ -4315,7 +4404,7 @@ export default {
         this.fWarehouseidOptions = response.data;
       });
       // console.log(row)
-      this.allfPlanqty+=row.fQty
+      this.allfPlanqty += row.fQty;
       row.fBsdate = new Date(row.fBsdate).getTime();
       row.fBusinessType = row.fBusinessType.toString();
       row.fCntrtype = Number(row.fCntrtype);
@@ -4659,7 +4748,7 @@ export default {
                 }
               });
             });
-            this.$set(this.form,"fItemsStatus", 2);
+            this.$set(this.form, "fItemsStatus", 2);
           }
         });
       }