Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!412

src/views/purchase/purchase-order/edit/index.vue

@@ -56,6 +56,25 @@ export default {
       deep: true,
       immediate: true
     },
+    "params.billType":{
+      handler(nVal, oVal){
+
+        if((nVal === '21-Cxx-02' || nVal === '21-Cxx-04'  || nVal === '21-Cxx-10')){
+
+          this.rules.warehouseName = [
+            { required: true, message: "WMS入库仓库不能为空", trigger: "change" },
+          ];
+
+          this.rules.goodsAllocationName = [
+            { required: true, message: "货位不能为空", trigger: "change" },
+          ];
+        }else{
+          this.rules.warehouseName = null;
+          this.rules.goodsAllocationName = null;
+        }
+        this.count++;
+      }
+    },
   },
   methods: {
     setVisible(prop) {

src/views/purchase/task/xie-yi-zhi-cai/index.vue

@@ -65,11 +65,13 @@ export default {
           this.data = data.map((item) => ({
             ...item,
             orderPriceVos: item.orderPriceVos.map((cItem) => ({
-              ...item,
+              // ...item,
               ...cItem,
               purchaseQuantity: item.orderPriceVos.length === 1 ? (item.puQty - item.executeQty) : undefined
             })),
           }));
+
+          console.log(this.data,'this.data');
           return true;
         } else {
           return false;