添加fCntval

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1274,7 +1274,7 @@
                 placeholder="请选择计价单位"
                 clearable
                 :disabled="browseStatus"
-                 @change="changeFeeUnit(scope.row)"
+                @change="changeFeeUnit(scope.row)"
               >
                 <el-option
                   v-for="(item, index) in fFeetunitOptions"
@@ -3298,6 +3298,18 @@ export default {
             return this.$message.error("请勿重复卸货");
           }
         }
+        if (this.CntrTable.length > 0) {
+          let arr = [];
+          this.CntrTable.map((e) => {
+            this.cntrList.map((item) => {
+              if (item.fId == e.fCntrid) {
+                arr.push(item.fName + "*" + e.fCntrcount);
+              }
+            });
+          });
+          arr = [...new Set(arr)];
+          this.form.fCntval = arr.join("/");
+        }
         let formData = new window.FormData();
         formData.append("warehouseBills", JSON.stringify(this.form));
         formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
@@ -3343,6 +3355,18 @@ export default {
           return this.$message.error("请存在未卸货的数据");
         }
       }
+      if (this.CntrTable.length > 0) {
+        let arr = [];
+        this.CntrTable.map((e) => {
+          this.cntrList.map((item) => {
+            if (item.fId == e.fCntrid) {
+              arr.push(item.fName + "*" + e.fCntrcount);
+            }
+          });
+        });
+        arr = [...new Set(arr)];
+        this.form.fCntval = arr.join("/");
+      }
       let formData = new window.FormData();
       formData.append("warehouseBills", JSON.stringify(this.form));
       formData.append("warehousebillsitems", JSON.stringify(this.Printinglist));
@@ -3387,6 +3411,18 @@ export default {
           return this.$message.error("请存在未入库的数据");
         }
       }
+      if (this.CntrTable.length > 0) {
+        let arr = [];
+        this.CntrTable.map((e) => {
+          this.cntrList.map((item) => {
+            if (item.fId == e.fCntrid) {
+              arr.push(item.fName + "*" + e.fCntrcount);
+            }
+          });
+        });
+        arr = [...new Set(arr)];
+        this.form.fCntval = arr.join("/");
+      }
       // 撤回入库
       let formData = new window.FormData();
       formData.append("warehouseBills", JSON.stringify(this.form));
@@ -3457,10 +3493,10 @@ export default {
           this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
         }
         if (!this.copyStatus) {
-          if(response.data.warehouseBillsItem){
+          if (response.data.warehouseBillsItem) {
             this.detailList = response.data.warehouseBillsItem;
-          }else{
-            this.detailList = []
+          } else {
+            this.detailList = [];
           }
           response.data.warehousebillsfeesCr.map((e) => {
             if (e.fFeeunitid) {
@@ -3484,7 +3520,7 @@ export default {
           if (response.data.enclosures) {
             this.relevantAttachments = response.data.enclosures;
           }
-        }else{ 
+        } else {
           this.$set(this.form, "fMblno", null);
           this.$set(this.form, "fMarks", null);
           this.$set(this.form, "fProductName", null);
@@ -3559,6 +3595,18 @@ export default {
           let formData = new window.FormData();
           // 附件数据
           this.form.fBillingway = this.form.fFeetunit;
+          if (this.CntrTable.length > 0) {
+            let arr = [];
+            this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                if (item.fId == e.fCntrid) {
+                  arr.push(item.fName + "*" + e.fCntrcount);
+                }
+              });
+            });
+            arr = [...new Set(arr)];
+            this.form.fCntval = arr.join("/");
+          }
           formData.append("tWarehouseBills", JSON.stringify(this.form));
           // 库存明细
           formData.append(
@@ -3599,6 +3647,18 @@ export default {
           let formData = new window.FormData();
           // 附件数据
           this.form.fBillingway = this.form.fFeetunit;
+          if (this.CntrTable.length > 0) {
+            let arr = [];
+            this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                if (item.fId == e.fCntrid) {
+                  arr.push(item.fName + "*" + e.fCntrcount);
+                }
+              });
+            });
+            arr = [...new Set(arr)];
+            this.form.fCntval = arr.join("/");
+          }
           formData.append("tWarehouseBills", JSON.stringify(this.form));
           // 库存明细
           formData.append(
@@ -4295,7 +4355,7 @@ export default {
       }
       this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
     },
-     // 变更计价单位
+    // 变更计价单位
     changeFeeUnit(row) {
       if (!row.fFeeunitid) {
         return false;
@@ -4322,6 +4382,18 @@ export default {
     //打印
     addprint(status) {
       if (status == "zyd") {
+        if (this.CntrTable.length > 0) {
+          let arr = [];
+          this.CntrTable.map((e) => {
+            this.cntrList.map((item) => {
+              if (item.fId == e.fCntrid) {
+                arr.push(item.fName + "*" + e.fCntrcount);
+              }
+            });
+          });
+          arr = [...new Set(arr)];
+          this.form.fCntval = arr.join("/");
+        }
         let formData = new window.FormData();
         formData.append("warehouseBills", JSON.stringify(this.form));
         formData.append(