1.增加客户库存品列表

2.修改客户订单列表

src/api/distribution/distributionReservation.js

@@ -12,6 +12,7 @@ export const getList = (current, size, params) => {
   })
 }
 
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-distribution/reservation/detail',

src/api/distribution/distributionStockList.js

@@ -23,6 +23,19 @@ export const getStockListOwn = (current, size, params) => {
     }
   })
 }
+
+export const getStockListClient = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockList/listClient',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getListStockList = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionStockList/list',

src/option/distribution/distributionStockArticle.js

@@ -403,7 +403,7 @@ export default {
     },
     {
       label: '物料名称',
-      prop: 'material'
+      prop: 'materialName'
     },
     {
       label: '数量',

src/option/distribution/distributionStockArticleFrom.js

@@ -99,7 +99,7 @@ export default {
     },
     {
       label: "包条码",
-      prop: "packetBarCode",
+      prop: "orderPackageCode",
     },
     {
       label: "货位信息",
@@ -123,7 +123,7 @@ export default {
     },
     {
       label: "物料",
-      prop: "material",
+      prop: "materialName",
     },
     {
       label: "数量",

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

@@ -693,7 +693,7 @@ export default {
         }, {
           prop: 'createTime',
           label: '创建时间',
-          type: 1,
+          type: 4,
           values: '',
           width: '150',
           checkarr: [],
@@ -1137,17 +1137,6 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-     /*   this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });*/
-
-        // this.columnList[26].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('order_package_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
@@ -1156,11 +1145,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // 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.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1168,11 +1153,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[19].checkarr =res.data.data.map(item=>{
+ 
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('freeze_status').then(res => {
         this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1180,11 +1161,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[19].checkarr =res.data.data.map(item=>{
+
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('stockup_status').then(res => {
         this.checkcColumnList("stockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1192,11 +1169,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[36].checkarr =res.data.data.map(item=>{
+    
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('order_reservation_status').then(res => {
         this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1204,18 +1177,13 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[35].checkarr =res.data.data.map(item=>{
+   
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
 
     },
     checkcColumnList(prop,columnList){
       for(var a = 0; a < columnList.length; a++){
         if(columnList[a].prop===prop){
-          console.log("1111111111111",columnList[a]);
           return columnList[a];
         }
       }

src/views/reservation/order_list.vue

@@ -22,13 +22,13 @@
                    </el-form-item>
                    <el-form-item label="服务类型:">
                      <el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
-            </el-form-item>
-            <el-form-item label="类型;1 预约单  2库存单:">
-              <el-input v-model="query.genre" placeholder="请输入类型;1 预约单  2库存单"></el-input>
-            </el-form-item>
-            <el-form-item label="状态;1 配送 2 待配送:">
-              <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>
                    </el-form-item>-->
+          <!--          <el-form-item label="类型;1 预约单  2库存单:">-->
+          <!--            <el-input v-model="query.genre" placeholder="请输入类型;1 预约单  2库存单"></el-input>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="状态;1 配送 2 待配送:">-->
+          <!--            <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
+          <!--          </el-form-item>-->
           <!-- 查询按钮 -->
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@@ -57,10 +57,11 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if = "handler">创建异常</el-button> -->
-              <el-button type="danger" icon="el-icon-delete" @click="handleMoke" v-if = "handler">转预约单</el-button>
+            <el-button type="danger" icon="el-icon-edit" @click="handleMoke" v-if = "handler">转预约单</el-button>
-              <!-- <el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button> -->
+            <el-button type="primary" icon="el-icon-edit" @click="handleStockList" v-if = "handler">转库存品</el-button>
-              <!-- <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button> -->
+            <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button>
-              <!-- <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button> -->
+            <!-- <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button> -->
+            <!--            <el-button type="danger" icon="el-icon-plus"  v-if = "handler">转配送</el-button>-->
 
           </div>
           <!-- <div class="avue-crud__left">
@@ -75,8 +76,6 @@
             <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
           </div>
         </div>
-  
-  
       </el-row>
       <el-row>
         <!-- 列表模块 -->
@@ -401,7 +400,7 @@
         },
         {
           prop: 'warehouse',
-            label: '仓库',
+          label: '所在仓库',
           type: 2,
           values: '',
           width: '180',
@@ -466,19 +465,18 @@
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'availableQuantity',
+          label: '可用数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
-          // {
-          //   prop: 'availableQuantity',
-          //   label: '可用数量',
-          //   type: 2,
-          //   values: '',
-          //   width: '150',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
         {
-            prop: 'handQuantity',
+          prop: 'notReceived',
           label: '未入库数量',
           type: 1,
           values: '',
@@ -523,12 +521,14 @@
           fixed: false,
           sortable: true,
         },{
-            prop: 'handQuantity',
+          prop: 'groundingStatusName',
           label: '上架状态',
-            type: 1,
+          type: 3,
           values: '',
           width: '150',
-            checkarr: [],
+          checkarr: [
+
+          ],
           fixed: false,
           sortable: true,
         },{
@@ -561,9 +561,22 @@
           sortable: true,
         },
         {
-            prop: 'freeze_status',
+          prop: 'freezeStatusName',
           label: '冻结状态',
-            type: 1,
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+
+          ],
+          fixed: false,
+          sortable: true,
+        },
+
+        {
+          prop: 'reservationStatusName',
+          label: '预约状态',
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -571,9 +584,9 @@
           sortable: true,
         },
         {
-            prop: 'state',
+          prop: 'orderStatusName',
-            label: '状态',
+          label: '订单状态',
-            type: 2,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -612,7 +625,7 @@
         // {
         //   prop: 'typeServerName',
         //   label: '服务类型',
-          //   type: 3,
+        //   type: 1,
         //   values: '',
         //   width: '150',
         //   checkarr: [],
@@ -659,7 +672,7 @@
           fixed: false,
           sortable: true,
         }, {
-            prop: 'createUser',
+          prop: 'createUserName',
           label: '创建人',
           type: 1,
           values: '',
@@ -676,25 +689,26 @@
           checkarr: [],
           fixed: false,
           sortable: true,
-          }, {
-            prop: 'inventoryDate',
-            label: '最新盘点时间',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'inventoryPerson',
-            label: '盘点人',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
         },
+        //  {
+        //   prop: 'inventoryDate',
+        //   label: '最新盘点时间',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // }, {
+        //   prop: 'inventoryPerson',
+        //   label: '盘点人',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: '',
           label: '操作',
@@ -850,16 +864,6 @@
     }
   },
   methods: {
-      //通知提货
-      handleCallDeliveryOwn(row){
-        console.log("row",row);
-        this.formCustomer.name = row.row.customerName;
-        this.formCustomer.phone = row.row.customerTelephone;
-        this.formCustomer.address = row.row.customerAddress;
-        this.formCustomer.stockArticleId = row.row.id;
-        this.dialogFormCustomer = true;
-        this.dialogFormCustomerOwn = true;
-      },
     showdrawer(value){
       this.drawerShow=value
     },
@@ -896,13 +900,25 @@
       console.log(index, row);
     },
     selectsc(index, row) {
-        console.log(index, row);
+      if(row.prop ==='freezeStatusName'){
-        if(row.prop ==='completeSetName'){
+        this.query['freezeStatus'] = index;
+      }else if(row.prop ==='orderStatusName'){
+        this.query['orderStatus'] = index;
+      }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
-        }else{
+      }else if(row.prop ==='typeName'){
+        this.query['typeService'] = index;
+      }else if (row.prop ==='groundingStatusName'){
+        this.query['groundingStatus'] = index;
+      }else if (row.prop ==='reservationStatusName'){
+        this.query['reservationStatus'] = index;
+      }
+      else{
         this.query[row.prop] = index;
       }
       this.onLoad(this.page);
+
+
     },
     timesc(index, row) {
       console.log(index, row);
@@ -917,19 +933,24 @@
     },
     inputsc(index, row) {
       console.log(index, row);
+      // console.log(index, row.prop);
       this.query[row.prop] = index;
       this.onLoad(this.page);
     },
     handleMoke(){
-        // if (this.selectionList.length === 0) {
+      if (this.selectionList.length === 0) {
-        //   this.$message.warning("请选择至少一条数据");
+        this.$message.warning("请选择至少一条数据");
-        //   return;
+        return;
-        // }
+      }
       let st = false;
       this.selectionList.some( i =>{
         if(i.stateName === "已预约"){
           st = true;
-            this.$message.warning(i.orderCode+"已预约，请勿重复预约！！！");
+          this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！");
+        }
+        if(i.typeService === 3){
+          st = true;
+          this.$message.warning(i.orderCode+" - 为自提单，无法预约！！！");
         }
       })
       if(st){
@@ -948,17 +969,13 @@
       // 返回false,说明全都相等
       if(!notEqualFlag){
         this.$router.push({
-          path: '/distribution/reservation/order_listFrom',
+          path: '/distribution/reservation/reservationFrom',
           query:{
             id: this.ids,
-            name: '添加预约单'
-  
           }
         });
-  
       }else{
         this.$message.warning("请选择相同收货信息的订单！！！")
-  
       }
 
     },
@@ -966,7 +983,23 @@
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
-        }else if (this.selectionList.length > 1){
+      }else{
+        let st = false;
+        this.selectionList.forEach( i =>{
+
+          if(i.reservationStatusName == "已预约"){
+            st = true;
+            this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
+          }
+        })
+        if(st){
+          return
+        }
+        this.getSock();
+      }
+
+
+      /*else if (this.selectionList.length > 1){
         this.getSock();
       }else if (this.selectionList.length < 2){
         //判断有没有包件
@@ -975,7 +1008,7 @@
         }
 
       let a =  await  getListOwn(this.page.currentPage,this.page.pageSize,params);
-          console.log("aaaaaaa===",a.data.data);
+        // console.log("aaaaaaa===",a.data.data);
         if(a.data.data.records.length > 0){
           this.$router.push({
             path: '/distribution/inventory/distributionStockArticleFrom',
@@ -987,7 +1020,7 @@
         }else{
           this.getSock();
         }
-        }
+      }*/
     },
     getSock(){
       this.$confirm("确定将选择的订单转为库存品吗？", {
@@ -1026,6 +1059,7 @@
         case '2':
           this.formService.stockArticleId = this.ids;
           // console.log("服务类型",this.formService);
+
           addService(this.formService).then(() =>{
             this.$message({
               type: "success",
@@ -1070,6 +1104,16 @@
       });
     },
     //通知提货
+    handleCallDeliveryOwn(row){
+      console.log("row",row);
+      this.formCustomer.name = row.row.customerName;
+      this.formCustomer.phone = row.row.customerTelephone;
+      this.formCustomer.address = row.row.customerAddress;
+      this.formCustomer.stockArticleId = row.row.id;
+      this.dialogFormCustomer = true;
+      this.dialogFormCustomerOwn = true;
+    },
+    //通知提货
     handleCallDelivery(ind){
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
@@ -1085,25 +1129,65 @@
           this.dialogFormVisible = true;
           break;
         case '2':
-  
           this.dialogFormService = true;
           break;
         case '3':
-  
           this.dialogFormCustomer = true;
           break;
       }
 
     },
+    /**
+     * 根据属性找寻数组中对应的元素
+     */
+    checkcColumnList(prop,columnList){
+      for(var a=0;a<columnList.length;a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
+        }
+      }
+    },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        /*  this.columnList[12].checkarr =res.data.data.map(item=>{
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('order_status').then(res => {
+        this.deliveryOrderStatus = res.data.data;
+        this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('basic_grounding').then(res => {
+         this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+
+      getDictionaryBiz('freeze_status').then(res => {
+        this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+
+      getDictionaryBiz('order_reservation_status').then(res => {
+        this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
-          });*/
+        });
       });
 
     },
@@ -1157,22 +1241,7 @@
       // this.handler = true;
       // this.taker = true;
     },
-      //自提
+
-      handlePickUpStore(){
-        this.loading = true;
-        // console.log("this.query",this.query);
-        let params = {};
-        this.query.typeService = '1';
-        getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-          this.handler = false;
-          this.taker = false;
-        });
-      }, //自提的通知
     handleInform(index){
 
       this.loading = true;
@@ -1188,7 +1257,7 @@
           break;
       }
       this.query.typeService = '1';
-        getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
+      getClientList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
@@ -1206,7 +1275,7 @@
     handleEdit (row) {
       this.title = '编辑'
       this.box = true
-        getDetail(row.id).then(res => {
+      getDetail(row.row.id).then(res => {
         this.form = res.data.data;
       });
     },
@@ -1217,11 +1286,12 @@
       // getDetail(row.id).then(res => {
       //   this.form = res.data.data;
       // });
+      // console.log("查看===",row.row);
       this.$router.push({
         path: '/distribution/inventory/distributionStockArticleDetails',
         query: {
           id : row.row.id,
-            name: "详情"+row.row.orderCode
+          name: "详情 - "+row.row.orderCode
         },
       })
 
@@ -1295,10 +1365,38 @@
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
+        this.data = this.data.map(i => {
+          // const freezeStatusMap = {
+          //   0: "未冻结",
+          //   1: "已冻结",
+          //   default: "无"
+          // };
+          const nuMap = {
+            '-1': "0"
+          };
+          // const groundingStatusMap = {
+          //   0: "未上架",
+          //   1: "部分上架",
+          //   2: "已上架",
+          //   3: "已下架",
+          //   default: "无"
+          // };
+          // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.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;
+          i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
+          i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
+          i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
+          i.notReceived = parseInt( i.totalNumber) - parseInt( i.handQuantity);
+          return i;
+        });
         this.loading = false;
         this.selectionClear();
       });
-      }
+    },
+
   }
 };
 </script>
@@ -1316,4 +1414,3 @@
   margin-right: 10px;
 }
 </style>
-