Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/warehouseBusiness/inStock/index.vue

@@ -2571,6 +2571,8 @@ export default {
       fPlanvolumn: "",
       // 司机电话
       fDriverTel: "",
+      // 品名合计
+      fProductName: '',
       fPlanqty: "",
       fPlangrossweight: "",
       fPlannetweight: "",
@@ -4083,8 +4085,22 @@ export default {
         this.pleaseCheck();
       }
     },
+    // 获取品名字
+    productName() {
+      console.log(!this.dataList)
+       if(this.dataList.length != 0) {
+         let arr = []
+         this.dataList.forEach((item)=>{
+           if(arr.indexOf(item.fGoodsids) == -1){
+             arr.push(item.fGoodsids)
+           }
+         })
+         this.fProductName = arr.toString()
+       }
+    },
     // 提交保存保存成功
     preservation() {
+      this.productName()
       this.$refs["form"].validate((valid) => {
         if (valid) {
           this.form.fBillstatus = status;
@@ -4098,6 +4114,8 @@ export default {
           let formDatae = new window.FormData();
           // 附件数据
           this.form.fBillingway = this.form.fFeetunit;
+          this.form.fProductName = this.fProductName;
+          console.log(this.form.fProductName)
           formDatae.append("tWarehouseBills", JSON.stringify(this.form));
           // 库存明细
           formDatae.append(
@@ -4148,6 +4166,7 @@ export default {
     },
     // 请核成功
     pleaseCheck() {
+      this.productName()
       this.$refs["form"].validate((valid) => {
         if (this.dataList.length === 0) {
           this.$message.error("请新增库存明细!");
@@ -4182,6 +4201,7 @@ export default {
           let formData = new window.FormData();
           // 附件数据
           this.form.fBillingway = this.form.fFeetunit;
+          this.form.fProductName = this.fProductName;
           formData.append("tWarehouseBills", JSON.stringify(this.form));
           // 库存明细
           formData.append(