修改自提编辑

src/option/distribution/distributionStockArticle.js

@@ -269,6 +269,10 @@ export default {
       prop: 'conditions',
       search: true
     },
+    {
+      label: '包件状态',
+      prop: 'orderPackageStatusName',
+    },
     {
       label: '包条码',
       prop: 'packetBarCode'

src/option/distribution/distrilbutionBillLading.js

@@ -243,7 +243,7 @@ export default {
     },
     {
       label: "可用数量",
-      prop: "quantityStock",
+      prop: "available",
     },
     // {
     //   label: "物流车次",

src/views/basicdata/brand/basicClient.vue

@@ -525,12 +525,7 @@ export default {
   },
   mounted() {
     this.init();
-    getLazyTreeAll().then(res => {
-      if (res.data.success) {
-        this.optioner = res.data.data;
-        this.onLoad(this.page);
-      }
-    });
+
   },
   computed: {
     ...mapGetters(['permission']),
@@ -730,6 +725,12 @@ export default {
 
       // console.log('市111', this.optioner);
       this.height = this.setPx(document.body.clientHeight - 340);
+      getLazyTreeAll().then(res => {
+        if (res.data.success) {
+          this.optioner = res.data.data;
+          this.onLoad(this.page);
+        }
+      });
     },
     searchHide() {
       this.search = !this.search;
@@ -934,6 +935,7 @@ export default {
             a.push(res.data.data.bladeRegionAreaId);
           }
         }
+        console.log("aaa",a);
         this.form.bladeRegionProvinceId = a;
         //处理图片
         if (!!this.form.leaseAccessories) {

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -597,7 +597,7 @@ export default {
         {
           prop: 'orderStateName',
           label: '状态',
-          type: 2,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -766,6 +766,7 @@ export default {
       // 表单列表
       data: [],
       distributionType: [],
+      deliveryOrderStatus: [],
       dialogTableVisible: false,
       dialogFormVisible: false,
       dialogFormCustomer: false, //多选客户弹窗
@@ -917,6 +918,8 @@ export default {
         this.query['freezeStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
+      }else if(row.prop ==='orderStateName'){
+        this.query['state'] = index;
       }else if(row.prop ==='typeName'){
         this.query['typeService'] = index;
       }else{
@@ -1138,6 +1141,21 @@ export default {
           return item
         });
       });
+      getDictionaryBiz('delivery_order_status').then(res => {
+        this.deliveryOrderStatus = res.data.data;
+        this.columnList[24].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('basic_grounding').then(res => {
+        this.columnList[19].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
 
     },
     searchHide () {
@@ -1339,15 +1357,15 @@ export default {
           const nuMap = {
             '-1': "0"
           };
-          const groundingStatusMap = {
-            0: "未上架",
-            1: "部分上架",
-            2: "已上架",
-            3: "已下架",
-            default: "无"
-          };
+          // const groundingStatusMap = {
+          //   0: "未上架",
+          //   1: "部分上架",
+          //   2: "已上架",
+          //   3: "已下架",
+          //   default: "无"
+          // };
           i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
-          i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
+          // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
           i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
           i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
           i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -597,7 +597,7 @@ export default {
         {
           prop: 'orderStateName',
           label: '状态',
-          type: 2,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -913,6 +913,8 @@ export default {
       console.log(index, row);
       if(row.prop ==='freezeStatusName'){
         this.query['freezeStatus'] = index;
+      }else if(row.prop ==='orderStateName'){
+        this.query['state'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
       }else if(row.prop ==='typeName'){
@@ -1135,6 +1137,21 @@ export default {
         //   return item
         // });
       });
+      getDictionaryBiz('delivery_order_status').then(res => {
+        this.deliveryOrderStatus = res.data.data;
+        this.columnList[24].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('basic_grounding').then(res => {
+        this.columnList[19].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
 
     },
     searchHide () {
@@ -1336,15 +1353,15 @@ export default {
           const nuMap = {
             '-1': "0"
           };
-          const groundingStatusMap = {
-            0: "未上架",
-            1: "部分上架",
-            2: "已上架",
-            3: "已下架",
-            default: "无"
-          };
+          // const groundingStatusMap = {
+          //   0: "未上架",
+          //   1: "部分上架",
+          //   2: "已上架",
+          //   3: "已下架",
+          //   default: "无"
+          // };
           i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
-          i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
+          // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
           i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
           i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
           i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;

src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@@ -596,7 +596,7 @@ export default {
         {
           prop: 'orderStateName',
           label: '状态',
-          type: 2,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -912,6 +912,8 @@ export default {
       console.log(index, row);
       if(row.prop ==='freezeStatusName'){
         this.query['freezeStatus'] = index;
+      }else if(row.prop ==='orderStateName'){
+        this.query['state'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
       }else if(row.prop ==='typeName'){
@@ -1135,6 +1137,21 @@ export default {
           return item
         });
       });
+      getDictionaryBiz('delivery_order_status').then(res => {
+        this.deliveryOrderStatus = res.data.data;
+        this.columnList[24].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('basic_grounding').then(res => {
+        this.columnList[19].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
 
     },
     searchHide () {
@@ -1336,15 +1353,15 @@ export default {
           const nuMap = {
             '-1': "0"
           };
-          const groundingStatusMap = {
-            0: "未上架",
-            1: "部分上架",
-            2: "已上架",
-            3: "已下架",
-            default: "无"
-          };
+          // const groundingStatusMap = {
+          //   0: "未上架",
+          //   1: "部分上架",
+          //   2: "已上架",
+          //   3: "已下架",
+          //   default: "无"
+          // };
           i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
-          i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
+          // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
           i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
           i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
           i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -571,23 +571,7 @@ export default {
           type: 3,
           values: '',
           width: '150',
-          checkarr: [
-            {
-              value: '0',
-              label: '未上架',
-            },
-            {
-              value: '1',
-              label: '部分上架',
-            }, {
-              value: '2',
-              label: '已上架',
-            },
-            {
-              value: '3',
-              label: '已下架',
-            },
-          ],
+          checkarr: [],
           fixed: false,
           sortable: true,
         },{
@@ -639,25 +623,12 @@ export default {
           sortable: true,
         },
         {
-          prop: 'stateName',
+          prop: 'orderStateName',
           label: '状态',
           type: 3,
           values: '',
           width: '150',
-          checkarr: [
-            {
-              value: '1',
-              label: '待预约 ',
-            },
-            {
-              value: '2',
-              label: '已预约',
-            }, {
-              value: '7 ',
-              label: '已完成',
-            },
-
-          ],
+          checkarr: [],
           fixed: false,
           sortable: true,
         },
@@ -847,6 +818,7 @@ export default {
       data: [],
       dataHistorical: [],
       distributionType: [],
+      deliveryOrderStatus: [],
       dialogTableVisible: false,
       dialogFormVisible: false,
       dialogFormCustomer: false, //多选客户弹窗
@@ -1009,6 +981,8 @@ export default {
         this.query['freezeStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
+      }else if(row.prop ==='orderStateName'){
+        this.query['state'] = index;
       }else if(row.prop ==='typeName'){
         this.query['typeService'] = index;
       }else{
@@ -1169,11 +1143,24 @@ export default {
         return;
       }
       let st = false;
+      let consigneePerson = '';
+      let consigneeMobile = '';
       this.selectionList.some( i =>{
         if(i.stateName === "已预约"){
           st = true;
           this.$message.warning(i.orderSelfNumbering+"已预约，请勿重复预约！！！");
         }
+        // console.log("IIIIII",i);
+
+        if(!consigneePerson && !consigneeMobile){
+          consigneeMobile = i.consigneeMobile;
+          consigneePerson = i.consigneePerson;
+        }else{
+          if(consigneeMobile != i.consigneeMobile && consigneePerson != i.consigneePerson ){
+            st = true;
+            this.$message.warning("收货人不相同，请选择相同的收货人！！！");
+          }
+        }
       })
       if(st){
         return
@@ -1261,6 +1248,20 @@ export default {
         //   return item
         // });
       });
+      getDictionaryBiz('basic_order_state').then(res => {
+        this.columnList[24].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('basic_grounding').then(res => {
+        this.columnList[19].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
 
     },
     searchHide () {
@@ -1481,12 +1482,12 @@ export default {
             '2': "未通知",
             default: "无"
           };
-          const stateMap = {
-            '1': "待预约",
-            '2': "已预约",
-            '7': " 已完成",
-            default: "无"
-          };
+          // const stateMap = {
+          //   '1': "待预约",
+          //   '2': "已预约",
+          //   '7': " 已完成",
+          //   default: "无"
+          // };
           const freezeStatusMap = {
             0: "未冻结",
             1: "已冻结",
@@ -1495,17 +1496,17 @@ export default {
           const nuMap = {
             '-1': "0"
           };
-          const groundingStatusMap = {
-            0: "未上架",
-            1: "部分上架",
-            2: "已上架",
-            3: "已下架",
-            default: "无"
-          };
-          i.stateName = stateMap[i.state] || stateMap.default;
+          // const groundingStatusMap = {
+          //   0: "未上架",
+          //   1: "部分上架",
+          //   2: "已上架",
+          //   3: "已下架",
+          //   default: "无"
+          // };
+          // i.stateName = stateMap[i.state] || stateMap.default;
           i.notification = notificationMap[i.notification] || notificationMap.default;
           i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
-          i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
+          // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
           i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
           i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
           i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -543,7 +543,7 @@ export default {
     onLoadOwn (page, params = {}) {
       this.loading = true;
       getListOwn(page.currentPage, page.pageSize, {stockArticleId : this.$route.query.id}).then(res => {
-        console.log(">>>><>><",res.data.data);
+        console.log("包件明细》》》》》",res.data.data);
         const data = res.data.data;
         this.page.total = data.total;
         this.dataPare = data.records;

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -537,8 +537,8 @@ export default {
       }
     },
     action() {
-      return '/api/logpm-basicdata/common/uploadFile'
-      // return '/api/blade-resource/oss/endpoint/put-file'
+      // return '/api/logpm-basicdata/common/uploadFile'
+      return '/api/blade-resource/oss/endpoint/put-file'
     }
   },
   methods: {
@@ -565,6 +565,9 @@ export default {
         this.form.totalCost =  s.totalCost.substring(0,s.totalCost.lastIndexOf("."))
         this.dataList = s.stockArticleVOS;
         this.data = s.stockListVOS;
+        this.data.forEach( i =>{
+          i.available = i.quantityStock - i.quantityOccupied;
+        })
         if (!!s.printVOS) {
           let le1 = [];
           let le2 = [];
@@ -643,7 +646,7 @@ export default {
         if(e.target.value) { //如果替换后还有值
           e.target.value = parseInt(e.target.value); //把字符型转成整数型
         }
-        if((e.target.value > row.quantityStock )) {
+        if((e.target.value > row.available )) {
           this.$message.error('数量不能大于可用数量')
           // e.target.value = row.quantityStock;
           return
@@ -988,6 +991,9 @@ export default {
         const dataOwn = res.data.data;
         this.pageStock.total = dataOwn.total;
         this.dataOwn = dataOwn.records;
+        this.dataOwn.forEach( i =>{
+          i.available = i.quantityStock - i.quantityOccupied;
+        })
         this.loading = false;
         this.selectionClear();
       });