修改场地直装请核

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -1533,15 +1533,12 @@
 <!--                    @click.native.prevent="fixRow(scope.row, scope.$index)"-->
 <!--                    size="small"-->
 <!--                >修改-->
-<!--                </el-button-->
-                >
+<!--                </el-button>-->
                 <el-button
                     type="text"
                     @click.native.prevent="wDeleteRow(scope.$index, detailList1)"
                     size="small"
-                >移除
-                </el-button
-                >
+                >移除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -2022,7 +2019,7 @@
             >
               <template slot-scope="scope">
                 <el-button
-                    :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                    :disabled="browseStatus"
                     type="text"
                     @click.native.prevent="wDeleteRow(scope.$index, detailList)"
                     size="small"
@@ -5000,6 +4997,7 @@ export default {
     };
   },
   created() {
+    this.$set(this.form, 'fStltypeid', '1')
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.setRowList2 = this.tableDate2;
@@ -5469,7 +5467,7 @@ export default {
     //撤销审批
     revokeTwo(status) {
       let data = {
-        actId: 120,
+        actId: 190,
         billId: this.form.fId,
         id: this.form.fId,
         fidStatus: status,
@@ -5495,13 +5493,13 @@ export default {
     addOrUpdateHandle(form, status) {
       this.addOrUpdateVisible = true;
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(form.fId, 120, status);
+        this.$refs.addOrUpdate.init(form.fId, 190, status);
       });
     },
     addOrUpdateHand(form, status) {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(form.fId, status, 120);
+        this.$refs.ApprovalComments.init(form.fId, status, 190);
       });
     },
     judgmentWarehouse() {
@@ -6510,9 +6508,85 @@ export default {
                     this.mblnoStatus = "";
                     this.form = response.data.warehouseBills;
                     this.form.fStltypeid = (this.form.fStltypeid).toString()
-                    console.log(this.form.fFeetunit)
                     // this.detailList = response.data.warehousebillsitems;
                     this.msgSuccess("保存成功");
+                    getWarehousebills(this.chiId).then((response) => {
+                      this.form = response.data.warehousebills;
+                      if (this.form.fBillstatus > 3) {
+                        this.approvalStatus = false;
+                        this.browseStatus = true;
+                      } else {
+                        this.approvalStatus = true;
+                        this.browseStatus = false;
+                      }
+                      this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
+                      this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
+                      this.$set(this.form, "createTime", Date.parse(this.form.createTime));
+                      this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
+                      this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
+                      this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
+                      if (this.form.fCartype || this.form.fCartype == 0) {
+                        this.$set(this.form, "fCartype", this.form.fCartype.toString());
+                      }
+                      if (this.form.fStltypeid || this.form.fStltypeid == 0) {
+                        this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
+                      }
+                      if (this.form.fTrademodeid) {
+                        this.$set(
+                          this.form,
+                          "fTrademodeid",
+                          this.form.fTrademodeid.toString()
+                        );
+                      }
+                      if (!this.copyStatus) {
+                        if (response.data.warehouseBillsItem) {
+                          response.data.warehouseBillsItem.map((e) => {
+                            e.fBsdate = Date.parse(e.fBsdate);
+                            e.fBusinessType = e.fBusinessType.toString();
+                            e.fLntype = e.fLntype ? e.fLntype.toString() : null;
+                          });
+                          console.log(response.data.warehouseBillsItem)
+                          response.data.warehouseBillsItem.forEach(item => {
+                            item.fCntrtype = parseInt(item.fCntrtype)
+                            item.disabled = true
+                          })
+                          this.detailList1 = response.data.warehouseBillsItem.filter(item=>item.fDc=='D');
+                          this.detailList = response.data.warehouseBillsItem.filter(item=>item.fDc=='C');
+                        } else {
+                          this.detailList = [];
+                        }
+                        response.data.warehousebillsfeesCr.map((e) => {
+                          if (e.fFeeunitid) {
+                            e.fFeeUnitid = e.fFeeunitid.toString();
+                          }
+                          if (e.fStltypeid || e.fStltypeid == 0) {
+                            e.fStltypeid = e.fStltypeid.toString();
+                          }
+                        });
+                        this.warehouseCrList = response.data.warehousebillsfeesCr;
+                        response.data.warehousebillsfeesDr.map((e) => {
+                          if (e.fFeeunitid) {
+                            e.fFeeUnitid = e.fFeeunitid.toString();
+                          }
+                          if (e.fStltypeid || e.fStltypeid == 0) {
+                            e.fStltypeid = e.fStltypeid.toString();
+                          }
+                        });
+                        this.warehouseDrList = response.data.warehousebillsfeesDr;
+                        this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
+                        if (response.data.tCntrList) {
+                          this.CntrTable = response.data.tCntrList;
+                        } else {
+                          this.CntrTable = [];
+                        }
+                        if (response.data.enclosures) {
+                          this.relevantAttachments = response.data.enclosures;
+                        }
+                      }
+                      treeselect(this.form.fWarehouseid).then((response) => {
+                        this.fWarehouseidOptions = response.data;
+                      });
+                    });
                     if (status == "goBack") {
                       this.cancel();
                     }

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -8134,21 +8134,6 @@ export default {
                           this.relevantAttachments = response.data.enclosures;
                         }
                       }
-                      // else {
-                      //   this.approvalStatus = false;
-                      //   this.browseStatus = false;
-                      //   this.$set(this.form, "fId", null);
-                      //   this.$set(this.form, "fMblno", null);
-                      //   this.$set(this.form, "fMarks", null);
-                      //   this.$set(this.form, "fProductName", null);
-                      //   this.$set(this.form, "warehouseStatus", null);
-                      //   this.$set(this.form, "fBillstatus", null);
-                      //   this.$set(this.form, "fItemsStatus", null);
-                      //   this.$set(this.form, "fNetweight", 0);
-                      //   this.$set(this.form, "fPlanvolumn", 0);
-                      //   this.$set(this.form, "fGrossweight", 0);
-                      //   // this.recordStatus = true
-                      // }
                     });
                     if (status == "goBack") {
                       this.cancel();

src/views/index.vue

@@ -201,6 +201,7 @@
                 <div class="home_stock_table">
                   <span v-if="item.refno2 === 'SJRK'">入库</span>
                   <span v-else-if="item.actId === 1000">费用修改</span>
+                  <span v-else-if="item.refno2 === 'CDZZ'">场地直装</span>
                   <span v-else-if="item.refno2 === 'SJCK'">出库</span>
                   <span v-else-if="item.refno2 === 'HQZY'">货转</span>
                   <span v-else-if="item.refno2 === 'CKDB'">调拨</span>
@@ -1177,6 +1178,13 @@ export default {
     approval(row) {
       console.log(row)
       switch (row.refno2) {
+        case "CDZZ": {
+          this.$router.push({
+            path: "/business/inAndOutStock",
+            query: { id: row.billId }
+          })
+          break;
+        }
         case "FYBG": {
           this.$router.push({
             path: "/business/costModify",

src/views/morePage/stock/index.vue

@@ -640,6 +640,10 @@ export default {
                 e.refno2 = "费用变更";
                 break;
               }
+              case "CDZZ": {
+                e.refno2 = "场地直装";
+                break;
+              }
               case "SJRK": {
                 e.refno2 = "入库";
                 break;
@@ -741,6 +745,13 @@ export default {
     },
     approval(row) {
       switch (row.refno4) {
+        case "CDZZ": {
+          this.$router.push({
+            path: "/business/inAndOutStock",
+            query: { id: row.billId }
+          })
+          break;
+        }
         case "FYBG": {
           this.$router.push({
             path: "/business/costModify",