提交达沃特

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -1236,7 +1236,9 @@ export default {
           if (typeof this.form.corpsTypeId == "object") {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",");
           }
-          this.form.line = this.form.line.join(",")
+          if (typeof this.form.corpsTypeId == "object"){
+            this.form.line = this.form.line.join(",")
+          }
           this.disabled = true;
 
           if (this.form.belongtoarea) {
@@ -1263,11 +1265,11 @@ export default {
                 message: this.form.id ? "修改成功!" : "新增成功!"
               });
               if (res.data.data.adminProfiles) {
-                res.data.data.adminProfiles = res.data.data.adminProfiles.split(
-                  ","
-                );
+                res.data.data.adminProfiles = res.data.data.adminProfiles.split(",");
+              }
+              if (res.data.data.line){
+                res.data.data.line = res.data.data.line.split(",")
               }
-              this.form.line = this.form.line.split(",")
               this.form = res.data.data;
               this.contactsData = res.data.data.corpsAttnList;
               if (this.form.belongtoarea) {

src/views/businessManagement/deliveryNotice/configuration/mainList.json

@@ -190,15 +190,11 @@
           "value": "录入"
         },
         {
-          "label": "已收货",
+          "label": "确认收货",
           "value": "已收货"
         },
         {
-          "label": "已发货",
-          "value": "已发货"
-        },
-        {
-          "label": "已到货",
+          "label": "确认到货",
           "value": "已到货"
         }
       ],

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2896,6 +2896,7 @@ export default {
           }
           this.$set(list[item], 'cname', list[item].productCategory)
           this.$set(list[item], 'sort', this.maxGoodsNum + 1)
+          console.log(list[item])
           this.$set(list[item], 'purchaseAmount', list[item].purchasePrice)
           // 积分
           this.$set(list[item], 'integralMultiples', 0)
@@ -3154,12 +3155,12 @@ export default {
             if (Number(data[i].orderQuantity) > Number(data[i].storageQuantity)) {
               return this.$message.error('商品信息第' + (Number(i) + 1) + '行订货数量大于库存数量')
             }
-            if (!Number(data[i].purchaseAmount)) {
-              return this.$message.error('商品信息第' + (parseInt(i) + 1) + '行采购价格不能为空')
-            }
             if (Number(data[i].purchaseAmount) === 0) {
               return this.$message.error('商品信息第' + (parseInt(i) + 1) + '行采购价格不能为0')
             }
+            if (!Number(data[i].purchaseAmount)) {
+              return this.$message.error('商品信息第' + (parseInt(i) + 1) + '行采购价格不能为空')
+            }
           }
           let integral = 0;//积分
           if (length1) {

src/views/maintenance/priceManagement/index.vue

@@ -219,6 +219,12 @@ export default {
     },
     rowUpdate(form, index, done) {
       console.log(form)
+      if (!form.salesPrice){
+        return this.$message.error("请输入销售价格")
+      }
+      if (!form.purchasePrice){
+        return this.$message.error("请输入采购价格")
+      }
       typeSave(form).then(res => {
         this.$message({type: "success", message: form.id ? "修改成功!" : "新增成功!"});
         // this.page.currentPage = 1;

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -704,6 +704,7 @@ export default {
     },
     // 确认导入商品
     importGoods() {
+      console.log(this.salesType)
       if (this.reData) {
         if (this.selectionList.length != 1) {
           return this.$message.error("重新选择的时候只能选择一条数据");
@@ -775,8 +776,9 @@ export default {
             });
           });
         } else if (this.salesType == 2) {
-          this.selectionList.forEach(item => {
+          this.selectionList.forEach(async item => {
             this.contactsDataBuyFree.push({
+              purchasePrice: await this.getPurchasePrice(item),
               itemId: item.id,
               code: item.code,
               brand: item.brand,
@@ -785,7 +787,6 @@ export default {
               brandItem: item.brandItem,
               corpName: item.corpName,
               corpId: item.corpId,
-              purchasePrice: "",
               salesPrice: "",
               purchaseAmount: "",
               salesVolume: "",
@@ -941,11 +942,17 @@ export default {
             if (!this.contactsData[item].corpId) {
               return this.$message.error('特价明细第' + (Number(item) + 1) + '行供应商不能为空')
             }
+            if (!this.contactsData[item].salesPrice) {
+              return this.$message.error('特价明细第' + (Number(item) + 1) + '行销售价不能为空')
+            }
           }
           for (let item in this.contactsDataBuyFree) {
             if (!this.contactsDataBuyFree[item].corpId) {
               return this.$message.error('买赠明细第' + (Number(item) + 1) + '行供应商不能为空')
             }
+            if (!this.contactsDataBuyFree[item].salesPrice) {
+              return this.$message.error('买赠明细第' + (Number(item) + 1) + '行销售价不能为空')
+            }
           }
           this.form.corps = this.form.corps.join(",");
           this.form.specialItemList = this.contactsData;