Finish Hotfix-zh-208

# Conflicts:
#	src/views/supply/implement/implement_total_list.vue

src/views/basic_data/material/price_list.vue

@@ -163,8 +163,9 @@
           border
           fit
           stripe
-             @select-all="hanleSelectAll"
-            @select="hanleSelectAll"
+          @select-all="hanleSelectAll"
+          @select="hanleSelectAll"
+          :row-style="rowClass"
         >
            <el-table-column
               type="selection"
@@ -484,6 +485,12 @@ export default {
         this.$successMsg('操作成功')
         this.getList()
       })
+    },
+    rowClass({ row, rowIndex }) {
+      if (this.ids.includes(row.id)) {
+        console.log(row);
+        return { 'background-color': '#ecf5ff' }
+      }
     }
   }
 }

src/views/supply/apply/components/design/panel.js

@@ -168,7 +168,7 @@ export default {
             "title": "数量",
             "field": "refundableQty",
             "width": 23,
-            "align": "right",
+            "align": "center",
             "colspan": 1,
             "rowspan": 1,
             "fontSize": 13,
@@ -251,9 +251,9 @@ export default {
         "height": 13,
         "width": 218,
         "fontSize": 13,
-        "title": "提单",
+        "title": "车辆",
         "fontFamily": '黑体',
-        "field": "takerDa",
+        "field": "pickCar",
         "testData": "",
         "color": "#000",
         "textAlign": "left"
@@ -281,9 +281,9 @@ export default {
         "height": 13,
         "width": 218,
         "fontSize": 13,
-        "title": "车辆",
+        "title": "提单",
         "fontFamily": '黑体',
-        "field": "pickCar",
+        "field": "takerDa",
         "testData": "",
         "color": "#000",
         "textAlign": "left"

src/views/supply/apply/components/design/print-data.js

@@ -36,7 +36,7 @@ function getDetail(id) {
               });
             }
             detailArr.push({
-              pageNumber:`${len}/${index+1}`,
+              pageNumber:`${len}-${index+1}`,
               type: item.type,
               tiTui:item.type === 2 ? `退货人` : `提货人`,
               takerPhone:item.takerPhone || '',

src/views/supply/deliver/components/design/panel.js

@@ -168,7 +168,7 @@ export default {
             "title": "数量",
             "field": "refundableQty",
             "width": 23,
-            "align": "right",
+            "align": "center",
             "colspan": 1,
             "rowspan": 1,
             "fontSize": 13,
@@ -251,9 +251,9 @@ export default {
         "height": 13,
         "width": 218,
         "fontSize": 13,
-        "title": "提单",
+        "title": "车辆",
         "fontFamily": '黑体',
-        "field": "takerDa",
+        "field": "pickCar",
         "testData": "",
         "color": "#000",
         "textAlign": "left"
@@ -281,9 +281,9 @@ export default {
         "height": 13,
         "width": 218,
         "fontSize": 13,
-        "title": "车辆",
+        "title": "提单",
         "fontFamily": '黑体',
-        "field": "pickCar",
+        "field": "takerDa",
         "testData": "",
         "color": "#000",
         "textAlign": "left"

src/views/supply/deliver/components/design/print-data.js

@@ -51,7 +51,7 @@ function getDetail(ids,nickName) {
             });
           }
           detailArr.push({
-            pageNumber:`${len}/${index+1}`,
+            pageNumber:`${len}-${index+1}`,
             type: item.type,
             tiTui:item.type === 2 ? `退货人` : `提货人`,
             takerPhone:item.takerPhone || '',

src/views/supply/implement/implement_list.vue

@@ -50,12 +50,12 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货类别" prop="k3CategoryNumber">
-                <el-select v-model="screenForm.k3CategoryNumber" filterable clearable placeholder="请选择">
+                <el-select v-model="screenForm.k3CategoryNumber" filterable clearable multiple  placeholder="请选择">
                   <el-option
                     v-for="item in categoryList"
-                    :key="item.id"
+                    :key="item.number"
                     :label="item.name"
-                    :value="item.id">
+                    :value="item.number">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -273,7 +273,7 @@ export default {
         newServiceName: '',
         enginName: '',
         loginNum: '',
-        k3CategoryNumber: '',
+        k3CategoryNumber: [],
         policyCode: '',
         policyRemark: '',
         isOver: '',
@@ -304,7 +304,7 @@ export default {
         itemServiceName:this.screenForm.itemServiceName,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
-        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver,
@@ -342,7 +342,7 @@ export default {
         itemServiceName: this.screenForm.itemServiceName,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
-        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver,

src/views/supply/implement/implement_total_list.vue

@@ -50,11 +50,12 @@
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货类别" prop="k3CategoryNumber">
                 <el-select v-model="screenForm.k3CategoryNumber" filterable clearable multiple collapse-tags placeholder="请选择">
+
                   <el-option
                     v-for="item in categoryList"
-                    :key="item.id"
+                    :key="item.number"
                     :label="item.name"
-                    :value="item.id">
+                    :value="item.number">
                   </el-option>
                 </el-select>
               </el-form-item>

src/views/supply/pickup/components/design/panel.js

@@ -169,7 +169,7 @@ export default {
             "title": "数量",
             "field": "refundableQty",
             "width": 23,
-            "align": "right",
+            "align": "center",
             "colspan": 1,
             "rowspan": 1,
             "fontSize": 13,
@@ -252,9 +252,9 @@ export default {
         "height": 13,
         "width": 218,
         "fontSize": 13,
-        "title": "提单",
+        "title": "车俩",
         "fontFamily": '黑体',
-        "field": "takerDa",
+        "field": "pickCar",
         "testData": "",
         "color": "#000",
         "textAlign": "left"
@@ -282,9 +282,9 @@ export default {
         "height": 13,
         "width": 218,
         "fontSize": 13,
-        "title": "车辆",
+        "title": "提单",
         "fontFamily": '黑体',
-        "field": "pickCar",
+        "field": "takerDa",
         "testData": "",
         "color": "#000",
         "textAlign": "left"

src/views/supply/pickup/components/design/print-data.js

@@ -52,7 +52,7 @@ function getDetails(ids, nickName) {
           });
         }
         detailArr.push({
-          pageNumber:`${len}/${index+1}`,
+          pageNumber:`${len}-${index+1}`,
           type: item.type,
           tiTui: item.type === 2 ? `退货人` : `提货人`,
           takerPhone: item.takerPhone || '',

src/views/supply/pickup/sum_list.vue

@@ -55,8 +55,15 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="打印时间" prop="printTime">
+              <el-date-picker v-model="screenForm.printTime" type="datetimerange" range-separator="至" style="width: 100%;"
+                value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
-          <el-col :xs="24" :sm="12" :lg="24" class="tr">
+          <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-form-item label="">
               <el-button @click="resetScreenForm">清空</el-button>
               <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -82,11 +89,17 @@
           </el-table-column>
           <el-table-column align="left" label="打单日期" prop="createTime" min-width="160" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
+          <!-- <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.informationKey" />
               <span>{{ scope.row.informationKey }}</span>
             </template>
+          </el-table-column> -->
+          <el-table-column align="left" label="出库单号" prop="salesOrderId" min-width="130" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.salesOrderId" />
+              <span>{{ scope.row.salesOrderId }}</span>
+            </template>
           </el-table-column>
           <el-table-column align="left" label="发货申请单号" prop="invoiceId" min-width="130" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -126,6 +139,8 @@
           </el-table-column>
           <el-table-column align="left" label="提货总数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
           </el-table-column>
+          <el-table-column align="left" label="提货人" prop="takerName" min-width="100" show-overflow-tooltip>
+          </el-table-column>
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
@@ -203,8 +218,11 @@ export default {
         date: '',
         status: '',
         takerPhone: '',
-        takerId: ''
+        takerId: '',
+        printTime:'',
+        salesOrderId:''
       },
+      pickupManList:''
     }
   },
 
@@ -219,7 +237,10 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         status: this.screenForm.status,
         takerPhone: this.screenForm.takerPhone,
-        takerId: this.screenForm.takerId
+        takerId: this.screenForm.takerId,
+        printStartTime:this.screenForm.printTime[0],
+        printEndTime:this.screenForm.printTime[1],
+        salesOrderId:this.screenForm.salesOrderId
       }
     },
   },
@@ -253,7 +274,10 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         status: this.screenForm.status,
         takerPhone: this.screenForm.takerPhone,
-        takerId: this.screenForm.takerId
+        takerId: this.screenForm.takerId,
+        printStartTime:this.screenForm.printTime[0],
+        printEndTime:this.screenForm.printTime[1],
+        salesOrderId:this.screenForm.salesOrderId
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;