添加订单字段回显

src/api/distribution/distributionParcelList.js

@@ -22,6 +22,16 @@ export const getListOwn = (current, size, params) => {
     }
   })
 }
+export const getStockDataBase = ( params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelList/stockDataBase',
+    method: 'get',
+    params: {
+      ...params,
+
+    }
+  })
+}
 export const getParcelListOwn = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/parcelListOwn',

src/option/distribution/distributionStockArticle.js

@@ -107,7 +107,7 @@ export default {
     },
     {
       label: '服务类型',
-      prop: 'typeServerName',
+      prop: 'typeServiceName',
       search: true
     },
     {
@@ -155,8 +155,8 @@ export default {
       search: true
     },
     {
-      label: '冻结数(未)',
-      prop: 'factoryTrain',
+      label: '冻结数',
+      prop: 'frozenQuantity',
       search: true
     },
 

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

@@ -371,7 +371,7 @@ export default {
           head: false,
         },
         {
-          prop: 'waybillNumber ',
+          prop: 'waybillNumber',
           label: '运单号',
           type: 2,
           values: '',
@@ -646,6 +646,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'orderReceiveStatusName',
+          label: '入库状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'completeSetName',
           label: '是否齐套',
@@ -1000,9 +1010,11 @@ export default {
         this.query['stockupStatus'] = index;
       }else if(row.prop ==='orderStatusName'){
         this.query['orderStatus'] = index;
-      }else if(row.prop ==='typeServerName'){
+      }else  if(row.prop ==='typeServerName'){
         this.query['typeService'] = index;
-      }else{
+      } else if(row.prop ==='orderReceiveStatusName'){
+        this.query['orderReceiveStatus'] = index;
+      } else{
         this.query[row.prop] = index;
       }
       this.onLoad(this.page);
@@ -1327,6 +1339,13 @@ export default {
         //   return item
         // });
       });
+      getDictionaryBiz('order_receive_status').then(res => {
+        this.checkcColumnList("orderReceiveStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
 
     },
     checkcColumnList(prop,columnList){

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

@@ -371,7 +371,7 @@ export default {
           head: false,
         },
         {
-          prop: 'waybillNumber ',
+          prop: 'waybillNumber',
           label: '运单号',
           type: 2,
           values: '',

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

@@ -370,7 +370,7 @@ export default {
           head: false,
         },
         {
-          prop: 'waybillNumber ',
+          prop: 'waybillNumber',
           label: '运单号',
           type: 2,
           values: '',
@@ -615,6 +615,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'orderReceiveStatusName',
+          label: '入库状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'completeSetName',
           label: '是否齐套',
@@ -966,7 +976,9 @@ export default {
         this.query['orderStatus'] = index;
       }else if(row.prop ==='typeServerName'){
         this.query['typeService'] = index;
-      }else{
+      } else if(row.prop ==='orderReceiveStatusName'){
+        this.query['orderReceiveStatus'] = index;
+      }  else{
         this.query[row.prop] = index;
       }
       this.onLoad(this.page);
@@ -1264,6 +1276,13 @@ export default {
           return item
         });
       });
+      getDictionaryBiz('order_receive_status').then(res => {
+        this.checkcColumnList("orderReceiveStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
 
     },
     searchHide () {

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

@@ -369,7 +369,7 @@
         </template>
       </el-dialog>
       <!-- 物料选择模块 -->
-      <el-dialog :title="titleMaterial"
+     <!-- <el-dialog :title="titleMaterial"
                  v-model="materialBox"
                  width="40%"
                  :before-close="beforeClose"
@@ -416,7 +416,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="物料单位" prop="orderCode">
-            <!--            <el-input v-model="formMaterial.unit" placeholder="请输入物料单位"/>-->
+            &lt;!&ndash;            <el-input v-model="formMaterial.unit" placeholder="请输入物料单位"/>&ndash;&gt;
             <el-select v-model="formMaterial.unit" clearable placeholder="请选择单位">
               <el-option
                 v-for="item in logpmUnit"
@@ -431,14 +431,14 @@
           </el-form-item>
 
         </el-form>
-        <!-- 表单按钮 -->
+        &lt;!&ndash; 表单按钮 &ndash;&gt;
         <template #footer>
           <span v-if="!view" class="dialog-footer">
             <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
             <el-button icon="el-icon-circle-close" @click="materialBox = false">取 消</el-button>
           </span>
         </template>
-      </el-dialog>
+      </el-dialog>-->
     </div>
   </basic-container>
   <edittablehead
@@ -487,7 +487,7 @@ export default {
           head: false,
         },
         {
-          prop: 'waybillNumber ',
+          prop: 'waybillNumber',
           label: '运单号',
           type: 2,
           values: '',
@@ -746,6 +746,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'orderReceiveStatusName',
+          label: '入库状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'completeSetName',
           label: '是否齐套',
@@ -1185,7 +1195,9 @@ export default {
         this.query['orderStatus'] = index;
       }else if(row.prop ==='typeName'){
         this.query['typeService'] = index;
-      }else{
+      } else if(row.prop ==='orderReceiveStatusName'){
+        this.query['orderReceiveStatus'] = index;
+      } else{
         this.query[row.prop] = index;
       }
       this.onLoad(this.page);
@@ -1545,6 +1557,13 @@ export default {
         //   return item
         // });
       });
+      getDictionaryBiz('order_receive_status').then(res => {
+        this.checkcColumnList("orderReceiveStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
 
     },
     checkcColumnList(prop,columnList){

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -6,7 +6,7 @@
         <el-table
           ref="table"
           v-loading="loading"
-          :data="data"
+          :data="dataBase"
           style="width: 100%"
           :border="option.border"
         >
@@ -113,7 +113,7 @@
         <el-button type="primary" @click="allhandleQRCode">批量查看二维码</el-button>
       </div>
       <el-row>
-        
+
         <!-- 列表模块 -->
         <tablecmt
           :columnList="columnList"
@@ -303,7 +303,7 @@
         </template>
       </el-dialog>
 
-      <el-dialog title="二维码" :visible.sync="dialogVisible" width="730px" v-model="dialogVisible">
+      <el-dialog title="二维码" :visible.sync="dialogVisible" width="800px" v-model="dialogVisible">
         <div>
           <div v-html="html"></div>
 
@@ -347,7 +347,7 @@ import {
   addStock,
   showOrderPackgeCode,
 } from '@/api/distribution/distributionStockArticle';
-import { getListOwn, updateParcelList } from '@/api/distribution/distributionParcelList';
+import { getListOwn, getStockDataBase, updateParcelList } from '@/api/distribution/distributionParcelList';
 import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
 import { addClient } from '@/api/distribution/distributionClientMessage';
 import { addService } from '@/api/distribution/distributionServiceLog';
@@ -402,6 +402,7 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      dataBase: [],
       dataPare: [],
       dataMaterial: false,
       distributionType: [],
@@ -600,6 +601,36 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'sendWarehouseName',
+          label: '发货仓',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'dealerName',
+          label: '经销商名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'dealerCode',
+          label: '经销商编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: '',
           label: '操作',
@@ -1240,7 +1271,7 @@ export default {
         console.log(res.data);
         this.html=''
         this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-        
+
       });
 
       this.dialogVisible = true;
@@ -1259,7 +1290,7 @@ export default {
         console.log(res.data);
         this.html=''
         this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-        
+
       });
 
       this.dialogVisible = true;
@@ -1352,6 +1383,11 @@ export default {
       params = {
         stockArticleId: this.$route.query.id,
       };
+      //查询基础数据
+      getStockDataBase( Object.assign(params, this.queryPage)).then(res =>{
+        console.log("<><><><>数据",res.data.data);
+        this.dataBase = res.data.data;
+      })
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then(
         res => {
           console.log('包件明细》》》》》', res.data.data);
@@ -1359,11 +1395,11 @@ export default {
           this.page.total = data.total;
           this.dataPare = data.records;
           this.dataPare.some(i => {
-            if (i.conditions == '1') {
+          /*  if (i.conditions == '1') {
               i.conditions = '定制品';
             } else {
               i.conditions = '库存品';
-            }
+            }*/
             if (i.materialId == '' || i.materialId == '-1') {
               //有
               this.dataMaterial = true;