Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/distribution/inventory/distributionStockArticleDetails.vue

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -234,6 +234,17 @@ export default {
           sortable: true,
           // head: true,
         },
+          {
+              prop: 'task_time',
+              label: '配送日期',
+              type: 2,
+              values: '',
+              width: '150',
+              checkarr: [],
+              fixed: true,
+              sortable: true,
+              // head: true,
+          },
         {
           prop: 'warehouseName',
           label: '仓库',

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -105,7 +105,7 @@
       </el-row>
       <h3>包件信息</h3>
       <div style="float: right" v-if="dataMaterial">
-        <el-button type="primary" text icon="el-icon-view" @click="handleMaterialList"
+        <el-button type="primary" text icon="el-icon-view" @click="handleMaterialList()"
           >补充物料信息</el-button
         >
       </div>
@@ -113,7 +113,7 @@
         <el-button type="primary" @click="allhandleQRCode">批量查看二维码</el-button>
       </div>
       <el-row>
-
+        
         <!-- 列表模块 -->
         <tablecmt
           :columnList="columnList"
@@ -146,7 +146,7 @@
               type="primary"
               text
               icon="el-icon-view"
-              v-if="!slotProps.scope.row.materialId"
+              v-if="slotProps.scope.row.materialId == '' || slotProps.scope.row.materialId == '-1'"
               @click="handleMaterial(slotProps.scope.row)"
               >补充物料信息</el-button
             >
@@ -206,7 +206,7 @@
       <el-dialog
         :title="titleMaterial"
         v-model="materialBox"
-        width="30%"
+        width="70%"
         :before-close="beforeClose"
         append-to-body
       >
@@ -303,7 +303,7 @@
         </template>
       </el-dialog>
 
-      <el-dialog title="二维码" :visible.sync="dialogVisible" width="800px" v-model="dialogVisible">
+      <el-dialog title="二维码" :visible.sync="dialogVisible" width="730px" v-model="dialogVisible">
         <div>
           <div v-html="html"></div>
 
@@ -347,7 +347,7 @@ import {
   addStock,
   showOrderPackgeCode,
 } from '@/api/distribution/distributionStockArticle';
-import { getListOwn, getStockDataBase, updateParcelList } from '@/api/distribution/distributionParcelList';
+import { getListOwn, updateParcelList } from '@/api/distribution/distributionParcelList';
 import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
 import { addClient } from '@/api/distribution/distributionClientMessage';
 import { addService } from '@/api/distribution/distributionServiceLog';
@@ -402,7 +402,6 @@ export default {
       option: option,
       // 表单列表
       data: [],
-      dataBase: [],
       dataPare: [],
       dataMaterial: false,
       distributionType: [],
@@ -601,36 +600,6 @@ 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: '操作',
@@ -1271,7 +1240,7 @@ export default {
         console.log(res.data);
         this.html=''
         this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-
+        
       });
 
       this.dialogVisible = true;
@@ -1290,7 +1259,7 @@ export default {
         console.log(res.data);
         this.html=''
         this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-
+        
       });
 
       this.dialogVisible = true;
@@ -1383,11 +1352,6 @@ 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);
@@ -1395,12 +1359,12 @@ 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) {
+            }
+            if (i.materialId == '' || i.materialId == '-1') {
               //有
               this.dataMaterial = true;
             }