【修改】bug

src/api/supply/sales.js

@@ -18,6 +18,16 @@ export function getDetail(params) {
   })
 }
 
+
+// 获取发货单列表
+export function getListOrderNo(params) {
+  return request({
+    url: '/sale/order/listOrderNo',
+    method: 'get',
+    params
+  })
+}
+
 // 审批
 export function examineData(params) {
   return request({

src/main.js

@@ -1,6 +1,4 @@
 import Vue from 'vue'
-// import {hiPrintPlugin} from 'vue-plugin-hiprint'
-// hiPrintPlugin.disAutoConnect();
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 // import './plugins/jquery.hiwprint.js'
 import ElementUI from 'element-ui'
@@ -58,7 +56,6 @@ if (process.env.NODE_ENV === 'production') {
 // Vue.use(ElementUI, { locale })
 // 如果想要中文版 element-ui，按如下方式声明
 Vue.use(ElementUI)
-// Vue.use(hiPrintPlugin)
 // register global utility filters
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])
@@ -66,7 +63,7 @@ Object.keys(filters).forEach(key => {
 
 Vue.config.productionTip = false
 
-new Vue({
+ new Vue({
   el: '#app',
   router,
   store,

src/views/basic_data/stock/product_list.vue

@@ -46,7 +46,7 @@
 
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="correspondId">
-              <el-select v-model="screenForm.correspondId" style="width: 100%" placeholder="请选择仓库" size="mini" filterable clearable>
+              <el-select v-model="screenForm.correspondId" multiple  style="width: 100%" placeholder="请选择仓库" size="mini" filterable clearable>
                 <el-option v-for="(item, index) in warehouseList" :key="index" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -205,7 +205,7 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: {
         categoryId: '',
-        correspondId: '',
+        correspondId: [],
         materialName: '',
         materialNumber: '',
         materialOldNumber: '',
@@ -221,7 +221,7 @@ export default {
     exParams() {
       return {
         categoryId: this.screenForm.categoryId,
-        correspondId: this.screenForm.correspondId,
+        correspondId: this.screenForm.correspondId.join(','),
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
         materialOldNumber: this.screenForm.materialOldNumber,
@@ -239,7 +239,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         categoryId: this.screenForm.categoryId,
-        correspondId: this.screenForm.correspondId,
+        correspondId: this.screenForm.correspondId.join(','),
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
         materialOldNumber: this.screenForm.materialOldNumber,

src/views/finance/components/design/panel.js

@@ -4,7 +4,7 @@ export default {
     "index": 0,
     "height": 140,
     "width": 241,
-    "paperCount": 222,
+    "paperCount":222,
     "printElements": [{
       "options": {
         "left": 0,
@@ -18,65 +18,202 @@ export default {
         "textAlign": "center",
         "lineHeight": 26
       }, "printElementType": { "title": "", "type": "text" }
+    }, {
+      "options": {
+        "left": 40,
+        "top": 50,
+        "height": 13,
+        "width": 328,
+        "fontSize": 13,
+        "title": "经销商编码",
+        "fontFamily": '黑体',
+        "field": "customerNumber",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    }, {
+      "options": {
+        "left": 348,
+        "top": 50,
+        "height": 13,
+        "width": 328,
+        "fontSize": 13,
+        "title": "打印日期",
+        "fontFamily": '黑体',
+        "field": "nowDate",
+        "testData": "",
+        "color": "#000",
+
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+      , {
+      "options": {
+        "left": 40,
+        "top": 70,
+        "height": 13,
+        "width": 328,
+        "fontSize": 13,
+        "title": "经销商",
+        "fontFamily": '黑体',
+        "field": "customerName",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    }, {
+      "options": {
+        "left": 348,
+        "top": 70,
+        "height": 13,
+        "width": 328,
+        "fontSize": 13,
+        "title": "仓库",
+        "fontFamily": '黑体',
+        "field": "correspondName",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    , {
+      "options": {
+        "left": 40,
+        "top": 90,
+        "height": 13,
+        "width": 328,
+        "fontSize": 13,
+        "title": "备注",
+        "fontFamily": '黑体',
+        "field": "headerRemark",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
     },
     {
       "options": {
-        "left": 25,
-        "top": 80,
-        "height": 56,
+        "left": 23,
+        "top": 115,
+        "height": 381,
         "width": 633,
+        "fontSize": 13,
         "field": "table",
+        "fontFamily": '黑体',
+        "lineHeight": 16,
         "tableFooterRepeat": "",
-        "tableHeaderRepeat": "none",
-        "rows": [[
-       
-        {
-          "field": "gender",
-          "width": 85.25,
-          "colspan": 1,
-          "rowspan": 1,
-          "checked": false
-        }, {
+        "columns": [[
+          {
+            "title": "出库单号",
+            "field": "salesId",
+            "width": 40,
+            "align": "left",
+            "colspan": 1,
+            "rowspan": 1,
+            "fontSize": 13,
+
+          }, {
+            "title": "发货单号",
+            "field": "invoiceId",
+            "width": 47,
+            "align": "left",
+            "colspan": 1,
+            "rowspan": 1,
+            "fontSize": 13,
+            
 
-          "field": "name",
-          "width": 85.25,
-          "align": "center",
-          "colspan": 4,
-          "rowspan": 2,
-         
-        }, {
+          }
+          , {
+            "title": "发货日期",
+            "field": "createTime",
+            "width": 25,
+            "align": "left",
+            "colspan": 1,
+            "rowspan": 1,
+            "fontSize": 13,
+           
 
-          "field": "count",
-          "width": 85.25,
-          "align": "center",
-          "colspan": 1,
-          "rowspan": 1,
-       
-        }, {
-          "width": 85.25,
-          "colspan": 1,
-          "rowspan": 1,
-          "checked": true
-        },
-       { "width": 85.25, "colspan": 1, "rowspan": 1, "checked": true }
-      ]]
+          }
+          , {
+            "title": "订单号",
+            "field": "enginOrderType",
+            "width": 40,
+            "align": "left",
+            "colspan": 1,
+            "rowspan": 1,
+            "fontSize": 13,
+            
+          }
+          , {
+            "title": "存货名称",
+            "field": "materialName",
+            "width": 40,
+            "align": "left",
+            "colspan": 1,
+            "rowspan": 1,
+            "fontSize": 13,
+
+
+          }, {
+            "title": "规格型号",
+            "field": "specification",
+            "width": 120,
+            "align": "left",
+            "colspan": 1,
+            "rowspan": 1,
+            "fontSize": 13,
+
+
+          }
+          , {
+             "title": "数量",
+            "field": "refundableQty",
+            "width": 23,
+            "align": "center",
+            "colspan": 1,
+            "rowspan": 1,
+            "fontSize": 13,
+            "tableSummary": "sum"
+
+          }
+          // , {
+          //   "title": "订单备注",
+          //   "field": "headerRemark",
+          //   "width": 40,
+          //   "align": "center",
+          //   "colspan": 1,
+          //   "rowspan": 1,
+          //   "fontSize": 13,
+          // }
+          
+          , 
+          
+          {
+            "title": "备注说明",
+            "field": "pjxh1Text",
+            "width": 40,
+            "align": "left",
+            "colspan": 2,
+            "rowspan": 1,
+            "fontSize": 13,
+          }]]
       }, "printElementType": {
         "title": "表格", "type": "table",
         editable: true,
-            columnDisplayEditable: true,//列显示是否能编辑
-            columnDisplayIndexEditable: true,//列顺序显示是否能编辑
-            columnTitleEditable: true,//列标题是否能编辑
-            columnResizable: true, //列宽是否能调整
-            columnAlignEditable: true,//列对齐是否调整
-            isEnableEditField: true, //编辑字段
-            isEnableContextMenu: true, //开启右键菜单 默认true
-            isEnableInsertRow: true, //插入行
-            isEnableDeleteRow: true, //删除行
-            isEnableInsertColumn: true, //插入列
-            isEnableDeleteColumn: true, //删除列
-            isEnableMergeCell: true, //合并单元格
+        columnDisplayEditable: true,//列显示是否能编辑
+        columnDisplayIndexEditable: true,//列顺序显示是否能编辑
+        columnTitleEditable: true,//列标题是否能编辑
+        columnResizable: true, //列宽是否能调整
+        columnAlignEditable: true,//列对齐是否调整
+        isEnableEditField: true, //编辑字段
+        isEnableContextMenu: true, //开启右键菜单 默认true
+        isEnableInsertRow: true, //插入行
+        isEnableDeleteRow: true, //删除行
+        isEnableInsertColumn: true, //插入列
+        isEnableDeleteColumn: true, //删除列
+        isEnableMergeCell: true, //合并单元格
       }
-    }
+
+    },
       , {
       "options": {
         "left": 40,
@@ -84,66 +221,105 @@ export default {
         "height": 13,
         "width": 218,
         "fontSize": 13,
-        "title": "打印",
+        "title": "",
         "fontFamily": '黑体',
         "field": "takerName",
         "testData": "",
         "color": "#000",
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        
+        "left": 40,
+        "top": 381,
+        "height": 13,
+        "width": 218,
+        "fontSize": 13,
+        "title": "打单",
+        "fontFamily": '黑体',
+        "field": "createBy",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 238,
+        "top": 381,
+        "height": 13,
+        "width": 218,
+        "fontSize": 13,
+        "title": "车辆",
+        "fontFamily": '黑体',
+        "field": "pickCar",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 238,
+        "top": 360,
+        "height": 13,
+        "width": 218,
+        "fontSize": 13,
+        "title": "联系方式",
+        "fontFamily": '黑体',
+        "field": "takerPhone",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 463,
+        "top": 360,
+        "height": 13,
+        "width": 218,
+        "fontSize": 13,
+        "title": "提单",
+        "fontFamily": '黑体',
+        "field": "takerDa",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 463,
+        "top": 381,
+        "height": 13,
+        "width": 218,
+        "fontSize": 13,
+        "title": "仓库",
+        "fontFamily": '黑体',
+        "field": "correspondNames",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 650,
+        "top": 381,
+        "height": 13,
+        "width": 218,
+        "fontSize": 16,
+        "title": "",
+        "fontFamily": '黑体',
+        "field": "pageNumber",
+        "testData": "",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
     }],
     "paperNumberDisabled": true
   }]
 }
-
-
-
-
-// {
-//   "options": {"left": 23, "top": 80, "height": 10, "width": 633},
-//   "printElementType": {"title": "", "type": "hline"}
-// },
-// {
-//   "options": {"left": 23, "top": 80+62.5, "height": 10, "width": 633},
-//   "printElementType": {"title": "", "type": "hline"}
-// },
-// {
-//   "options": {"left": 23, "top": 80+(62.5*2), "height": 10, "width": 633},
-//   "printElementType": {"title": "", "type": "hline"}
-// },
-// {
-//   "options": {"left": 23, "top":80+(62.5*3), "height": 10, "width": 633},
-//   "printElementType": {"title": "", "type": "hline"}
-// },
-// {
-//   "options": {"left": 23, "top": 80, "height": 250, "width": 10},
-//   "printElementType": {"title": "", "type": "vline"}
-// },
-// {
-//   "options": {"left": 23+105.5, "top": 80, "height": 250, "width": 10},
-//   "printElementType": {"title": "", "type": "vline"}
-// },
-// {
-//   "options": {"left": 23+(105.5*2), "top": 80, "height": 250, "width": 10},
-//   "printElementType": {"title": "", "type": "vline"}
-// },
-// {
-//   "options": {"left": 23+(105.5*3), "top": 80, "height": 250, "width": 10},
-//   "printElementType": {"title": "", "type": "vline"}
-// },
-// {
-//   "options": {"left": 23+(105.5*4), "top": 80, "height": 250, "width": 10},
-//   "printElementType": {"title": "", "type": "vline"}
-// },
-// {
-//   "options": {"left": 23+(105.5*5), "top": 80, "height": 250, "width": 10},
-//   "printElementType": {"title": "", "type": "vline"}
-// },
-// {
-//   "options": {"left": 23, "top": 330, "height": 10, "width": 633},
-//   "printElementType": {"title": "", "type": "hline"}
-// },
-// {
-//   "options": {"left": 656, "top": 80, "height": 250, "width": 10},
-//   "printElementType": {"title": "", "type": "vline"}
-// },

src/views/finance/components/design/print-data.js

@@ -1,104 +1,78 @@
-import { getK3ReceiptDetail } from "@/api/finance/receipt_list";
-
+import { getDeliverDetail } from '@/api/supply/deliver'
 import { addPrints } from '@/api/supply/pickup'
 import { getCompanyList } from '@/api/user'
 let detailArr = []
-let detailData = []
+    let detailData = []
 let cids = []
 let company = ''
 // 获取详情
 getCompanyLists()
-function getDetail(ids, nickName) {
+function getDetail(ids,nickName) {
 
-  let invoicePickBeans = []
-  let start = 0
-  let end = 5
-  detailArr = []
-  const table = []
+  let  invoicePickBeans = []
+  let  start = 0
+  let  end = 5
+    detailArr = []
   // detailData = ids 
   let newIds = []
-  newIds = ids
-  cids = JSON.parse(JSON.stringify(ids))
-  let filterId = []
-  if (newIds instanceof Array) {
-    filterId = newIds.map(k => {
-      return k.id
-    })
-  } else {
-    filterId = [newIds]
-  }
-  filterId = [...new Set(filterId)]
+      newIds = ids
+      cids = JSON.parse(JSON.stringify(ids))
+  let  filterId =[]
+      filterId = newIds.map(k=>{
+              return k.id
+            })
+        filterId = [...new Set(filterId)]    
   for (let i = 0; i < filterId.length; i++) {
-    getK3ReceiptDetail({ id: filterId[i] }).then(res => {
+    getDeliverDetail({ id: filterId[i] }).then(res => {
       const item = res.data
-      console.log(item, '887899');
-
-      table.push({
-        billNo:item.billNo,
-        theTime:item.theTime,
-        walletName:item.walletName,
-        customerName:item.customerName,
-        remark:item.remark,
-        amount:item.amount,
-        nowDate: nowDate(),
-      })
-      detailArr.push({
-        company:`${company}其他收款单`,
-        table: [
-          {id: '1', name: '王小可', gender: '单据编号', count: '120', amount: '9089元'},
-          {id: '2', name: '梦之遥', gender: '付款单位', count: '20', amount: '89元'},
-          {id: '3', name: '梦之遥', gender: '钱包', count: '720', amount: '29089元'},
-          {id: '3', name: '梦之遥', gender: '备注', count: '720', amount: '29089元'},
-        ]
-      })
-
-      return
+      console.log(item,'887899');
       detailData.push(JSON.parse(JSON.stringify(item)))
+ 
       invoicePickBeans = item.invoicePickBeans
-      let len = Math.ceil(invoicePickBeans.length / 5)
-      console.log(len, '长度');
-      for (let index = 0; index < len; index++) {
-        const table = []
-        if (invoicePickBeans.length) {
-          invoicePickBeans.splice(0, 5).forEach(e => {
-            table.push({
-              salesId: e.salesOrderId,
-              invoiceId: e.invoiceId,
-              id: e.id,
-              createTime: e.id ? dateToDayFilter(item.createTime) : '',
-              enginOrderType: e.orderType == 'HOME' || e.orderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
-              materialName: e.materialName || '',
-              specification: e.specification || '',
-              refundableQty: e.refundableQty || 0,
-              // headerRemark:e.headerRemark,
-              pjxh1Text: e.pjxh1Text || ''
-            })
-
-          });
+      let len =Math.ceil(invoicePickBeans.length / 5) 
+        console.log(len,'长度');
+        for (let index = 0; index < len; index++) {
+          const table = []
+          if (invoicePickBeans.length) {
+              invoicePickBeans.splice(0,5).forEach(e => {
+                  table.push({
+                    salesId: e.salesOrderId,
+                    invoiceId: e.invoiceId,
+                    id: e.id,
+                    createTime: e.id ? dateToDayFilter(item.createTime) : '',
+                    enginOrderType: e.orderType == 'HOME' || e.orderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
+                    materialName: e.materialName || '',
+                    specification: e.specification || '',
+                    refundableQty: e.refundableQty || 0,
+                    // headerRemark:e.headerRemark,
+                    pjxh1Text: e.pjxh1Text || ''
+                  }) 
+                
+            });
+          }
+          detailArr.push({
+            pageNumber:`${len}-${index+1}`,
+            type: item.type,
+            tiTui:item.type === 2 ? `退货人` : `提货人`,
+            takerPhone:item.takerPhone || '',
+            headerRemark:item.remark,
+            total_num: item.total_num,
+            company: item.type === 2 ? `${company}销售退货单` : `${company}销售发货单`,
+            pickOrderWater: item.pickOrderWater,
+            customerNumber: item.customerNumber,
+            takerDa:'',
+            nowDate: nowDate(),
+            takerName:item.type === 2 ? `退货人：${item.takerName || ''}` : `提货人：${item.takerName || ''}` ,
+            customerName: item.customerName || '',
+            correspondName: item.correspondName,
+            correspondNames:'',
+            pickCar:item.pickCar || '',
+            createBy: JSON.parse(
+              localStorage.getItem("supply_user")
+            ).nickName,
+            table
+          })
         }
-        detailArr.push({
-          pageNumber: `${len}-${index + 1}`,
-          type: item.type,
-          tiTui: item.type === 2 ? `退货人` : `提货人`,
-          takerPhone: item.takerPhone || '',
-          headerRemark: item.remark,
-          total_num: item.total_num,
-          company: item.type === 2 ? `${company}销售退货单` : `${company}销售发货单`,
-          pickOrderWater: item.pickOrderWater,
-          customerNumber: item.customerNumber,
-          takerDa: '',
-          nowDate: nowDate(),
-          takerName: item.type === 2 ? `退货人：${item.takerName || ''}` : `提货人：${item.takerName || ''}`,
-          customerName: item.customerName || '',
-          correspondName: item.correspondName,
-          correspondNames: '',
-          pickCar: item.pickCar || '',
-          createBy: JSON.parse(
-            localStorage.getItem("supply_user")
-          ).nickName,
-          table
-        })
-      }
     })
   }
 }
@@ -134,29 +108,29 @@ function getCompanyLists() {
 
 // 添加次数
 function addPrint() {
-  let ids = []
-  detailData.map(item => {
-    console.log(detailData, '3223');
+  let ids =[]
+   detailData.map(item => {
+        console.log(detailData,'3223');
     if (item.invoicePickBeans && item.invoicePickBeans.length) {
       for (let index = 0; index < item.invoicePickBeans.length; index++) {
         const element = item.invoicePickBeans[index];
-        console.log(element.id, 'element.id ');
+            console.log(element.id ,'element.id ');
         // return  element.id 
-        ids.push(element.id)
+        ids.push(element.id )
       }
     } else {
       // console.log(item.invoiceOrderId ,'item.invoiceOrderId ');
       return item.invoiceOrderId || item.id
     }
-
+  
   })
-
+  
   // console.log(document.execCommand('print'),'4545');
   addPrints({ ids: ids.join(',') }).then(res => {
-    console.log('chenggong ');
+      console.log('chenggong ');
     // this.$successMsg('提交成功');
     // this.$parent.getList()
-
+ 
   })
 }
 

src/views/finance/receipt_list.vue

@@ -3,29 +3,52 @@
     <div v-if="showDetail == 1">
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+        <el-form
+          ref="searchForm"
+          :model="searchForm"
+          label-width="100px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据类型" prop="billType">
                 <!-- <el-input v-model="searchForm.billType" placeholder="请输入"></el-input> -->
-                <el-select v-model="searchForm.billType" class="selectStyle" placeholder="请选择" filterable>
+                <el-select
+                  v-model="searchForm.billType"
+                  class="selectStyle"
+                  placeholder="请选择"
+                  filterable
+                >
                   <el-option label="收款单" value="1"> </el-option>
                   <el-option label="付款单" value="3"> </el-option>
                   <el-option label="退款单" value="2"> </el-option>
-
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据编号" prop="billNo">
-                <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
+                <el-input
+                  v-model="searchForm.billNo"
+                  placeholder="请输入"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="往来单位" prop="wlCompanyType">
                 <!-- <el-input v-model="searchForm.wlCompanyType" placeholder="请输入"></el-input> -->
-                <el-select class="selectStyle" v-model="searchForm.wlCompanyType" placeholder="请选择" filterable>
-                  <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.name">
+                <el-select
+                  class="selectStyle"
+                  v-model="searchForm.wlCompanyType"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="(v, i) in customerList"
+                    :key="i"
+                    :label="v.name"
+                    :value="v.name"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -33,15 +56,28 @@
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="付款单位" prop="customerName">
                 <!-- <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input> -->
-                <el-select class="selectStyle" v-model="searchForm.customerName" placeholder="请选择" filterable>
-                  <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.name">
+                <el-select
+                  class="selectStyle"
+                  v-model="searchForm.customerName"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="(v, i) in customerList"
+                    :key="i"
+                    :label="v.name"
+                    :value="v.name"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结算方式" prop="settleType">
-                <el-input v-model="searchForm.settleType" placeholder="请输入"></el-input>
+                <el-input
+                  v-model="searchForm.settleType"
+                  placeholder="请输入"
+                ></el-input>
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -51,15 +87,27 @@
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始时间" prop="startTime">
-                <el-date-picker class="selectStyle" v-model="searchForm.startTime" type="datetime" placeholder="选择日期时间"
-                  default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+                <el-date-picker
+                  class="selectStyle"
+                  v-model="searchForm.startTime"
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  default-time="00:00:00"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束时间" prop="endTime">
-                <el-date-picker class="selectStyle" v-model="searchForm.endTime" type="datetime" placeholder="选择日期时间"
-                  default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+                <el-date-picker
+                  class="selectStyle"
+                  v-model="searchForm.endTime"
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  default-time="00:00:00"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -67,7 +115,9 @@
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="" class="fr">
                 <el-button size="mini" @click="cancelFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+                <el-button size="mini" type="primary" @click="searchFn"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -80,36 +130,70 @@
           </el-button> -->
         </div>
         <div class="fr">
-
           <!-- <ExportButton :exUrl="'/k3/receipt/export'" :exParams="exParams" class="exportClass" /> -->
         </div>
       </div>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table ref="table" v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit
-            highlight-current-row stripe show-summary :summary-method="getSummaries" @select="handleSelect"
-            @select-all="handleSelectAll">
-            <el-table-column align="center" type="selection" width="55"></el-table-column>
+          <el-table
+            ref="table"
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="getSummaries"
+            @select="handleSelect"
+            @select-all="handleSelectAll"
+          >
+            <el-table-column
+              align="center"
+              type="selection"
+              width="55"
+            ></el-table-column>
 
-            <el-table-column align="left" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单据类型"
+              prop="billType"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{
-                    scope.row.billType == 1
-                      ? "收款单"
-                      : scope.row.billType == 2
-                        ? "退款单"
-                        : scope.row.billType == 3 ? '付款单' : ''
+                  scope.row.billType == 1
+                    ? "收款单"
+                    : scope.row.billType == 2
+                    ? "退款单"
+                    : scope.row.billType == 3
+                    ? "付款单"
+                    : ""
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单据编码" prop="billNo" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单据编码"
+              prop="billNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.billNo" />
                 <span>{{ scope.row.billNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="业务日期" prop="theTime" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="业务日期"
+              prop="theTime"
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
             <!-- <el-table-column
               align="left"
@@ -118,32 +202,84 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column> -->
-            <el-table-column align="left" label="单据状态" prop="status" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单据状态"
+              prop="status"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag size="mini" v-show="scope.row.status == 'A'">保存</el-tag>
-                <el-tag size="mini" v-show="scope.row.status == 'B'" type="info">审核中</el-tag>
-                <el-tag size="mini" v-show="scope.row.status == 'C'" type="success">已审核</el-tag>
-                <el-tag size="mini" v-show="scope.row.status == 'D'" type="warning">重新审核</el-tag>
+                <el-tag size="mini" v-show="scope.row.status == 'A'"
+                  >保存</el-tag
+                >
+                <el-tag size="mini" v-show="scope.row.status == 'B'" type="info"
+                  >审核中</el-tag
+                >
+                <el-tag
+                  size="mini"
+                  v-show="scope.row.status == 'C'"
+                  type="success"
+                  >已审核</el-tag
+                >
+                <el-tag
+                  size="mini"
+                  v-show="scope.row.status == 'D'"
+                  type="warning"
+                  >重新审核</el-tag
+                >
               </template>
             </el-table-column>
-            <el-table-column align="left" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="钱包"
+              prop="walletName"
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
-            <el-table-column align="right" label="表头·应收金额" prop="" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="表头·应收金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
-            <el-table-column align="left" label="往来单位" prop="wlCompanyName" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="往来单位"
+              prop="wlCompanyName"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.wlCompanyName" />
                 <span>{{ scope.row.wlCompanyName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="表头·实收金额" prop="amount" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="表头·实收金额"
+              prop="amount"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ (scope.row.billType == 3 || scope.row.billType == 2) ? -scope.row.amount : scope.row.amount |
-                    numToFixed
+                {{
+                  scope.row.billType == 3 || scope.row.billType == 2
+                    ? -scope.row.amount
+                    : scope.row.amount | numToFixed
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="收款金额" prop="" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column
+              align="right"
+              label="收款金额"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
             <!-- <el-table-column
               align="center"
               label="结算方式"
@@ -158,57 +294,116 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column> -->
-            <el-table-column align="left" label="付款单位" prop="customerName" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="付款单位"
+              prop="customerName"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="表体·实收金额" prop="amount" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="表体·实收金额"
+              prop="amount"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ (scope.row.billType == 3 || scope.row.billType == 2) ? -scope.row.amount : scope.row.amount |
-                    numToFixed
+                {{
+                  scope.row.billType == 3 || scope.row.billType == 2
+                    ? -scope.row.amount
+                    : scope.row.amount | numToFixed
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="勾对" prop="" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column
+              align="left"
+              label="勾对"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
 
-            <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="备注"
+              prop="remark"
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
-            <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
+            <el-table-column
+              align="center"
+              label="操作"
+              min-width="160"
+              show-overflow-tooltip
+              fixed="right"
+            >
               <template slot-scope="scope">
-                <el-button type="text" class="textColor" v-if="
-                  $checkBtnRole('examine', $route.meta.roles) &&
-                  scope.row.status == 'C'
-                " @click="NoExamineFn(scope.row.id)">弃审</el-button>
-                <el-button type="text" class="textColor" @click="seeFn(scope.row.id)">查看</el-button>
-                <!-- <el-button type="text" class="textColor" @click="toPrint(scope.row, 2)">打印</el-button> -->
+                <el-button
+                  type="text"
+                  class="textColor"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    scope.row.status == 'C'
+                  "
+                  @click="NoExamineFn(scope.row.id)"
+                  >弃审</el-button
+                >
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="seeFn(scope.row.id)"
+                  >查看</el-button
+                >
+                <!-- <el-button
+                  type="text"
+                  class="textColor"
+                  @click="toPrint(scope.row, 2)"
+                  >打印</el-button
+                > -->
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10"
-            layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
 
-    <ReceiptPrint :listItem="queryItem" v-else-if="showDetail == 2" @backListFormDetail="backList" />
+    <ReceiptPrint
+      :listItem="queryItem"
+      v-else-if="showDetail == 2"
+      @backListFormDetail="backList"
+    />
     <ReceiptListDetail :detailId="detailId" v-else />
-    <!-- <print-preview ref="preView" /> -->
-
+    <print-preview ref="preView" />
   </div>
 </template>
 
 <script>
-
-// import panel from './components/design/panel'
-// import { getDetail, detailArr } from './components/design/print-data'
-// import printPreview from './components/design/preview.vue'
+import {
+  disAutoConnect,
+  hiprint,
+} from "vue-plugin-hiprint";
+disAutoConnect();
+import printPreview from './components/design/preview.vue'
 import { getCustomerList } from "@/api/finance/wallet";
 import {
   getK3ReceiptList,
@@ -221,8 +416,8 @@ import { numToFixed } from "@/filters";
 export default {
   components: {
     ReceiptPrint,
+    printPreview,
     ReceiptListDetail,
-
   },
   data() {
     return {
@@ -245,6 +440,8 @@ export default {
       detailId: null,
       queryItem: {},
       tableSelection: [],
+      panel:'',
+      hiprintTemplate:''
     };
   },
   computed: {
@@ -252,17 +449,14 @@ export default {
       return {
         ...this.searchForm,
       };
-    }
+    },
   },
   created() {
     this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
     this.getCustomerDataList();
   },
   mounted() {
-    console.log(this.$app,'888');
-    // this.hiPrintPlugin.init()
-    var hiprintTemplate = new this.hiPrintPlugin.PrintTemplate();
-      var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 });
+
   },
   methods: {
     //获取经销商列表
@@ -370,17 +564,26 @@ export default {
 
     // 点击打印
     toPrint(row, type) {
+      hiprint.init();
+      this.hiprintTemplate = new hiprint.PrintTemplate();
+       this.panel = this.hiprintTemplate.addPrintPanel({
+        width: 100,
+        height: 130,
+        paperFooter: 340,
+        paperHeader: 10,
+        paperNumberDisabled: true,
+      });
 
-      panel.addPrintText({ options: { width: 140, height: 15, top: 20, left: 20, title: 'hiprint插件手动添加text', textAlign: 'center' } });
+      //打印
       // this.tableSelection = this.$refs.table.selection;
       if (!type) {
-        getDetail(this.tableSelection)
+        // getDetail(this.tableSelection);
       } else {
         this.queryItem = row;
-        getDetail(row.id)
+        // getDetail(row.id)
       }
-      hiprintTemplate.print({});
-      // this.$refs.preView.show(this.hiprintTemplate, detailArr)
+      this.$refs.preView.show(this.hiprintTemplate,this.panel)
+
 
     },
   },

src/views/supply/deliver/sum_list.vue

@@ -70,6 +70,13 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="仓库" prop="correspondId">
+              <el-select v-model="screenForm.correspondId" multiple  style="width: 100%" placeholder="请选择仓库" size="mini" filterable clearable>
+                <el-option v-for="(item, index) in warehouseList" :key="index" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="表头业务员" prop="k3ServiceId">
                 <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" clearable filterable
                   style="width: 100%">
@@ -96,7 +103,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="24" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -346,6 +353,7 @@ disAutoConnect();
 
 import panel from './components/design/panel'
 import { getDetail, detailArr } from './components/design/print-data'
+import { getWarehouseList } from '@/api/supply/apply'
 
 import printPreview from './components/design/preview.vue'
 export default {
@@ -387,6 +395,7 @@ export default {
         model: '',
         createDate: '',
         deliverDate: '',
+        correspondId:[],
         jxsNum: '',
         jxsName: '',
         orderNum: '',
@@ -444,6 +453,7 @@ export default {
         createMan: "",
         createDate: "",
       },
+      warehouseList:[],
       dialogFormRules: {
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
@@ -472,6 +482,7 @@ export default {
         mainOrderId: this.screenForm.mainOrderId,
         approvalEndTime: this.screenForm.approvaTime ? this.screenForm.approvaTime[1] : '',
         approvalStartTime: this.screenForm.approvaTime ? this.screenForm.approvaTime[0] : '',
+        correspondId: this.screenForm.correspondId.join(','),
       }
     },
     comRefundableQty() {
@@ -521,6 +532,7 @@ export default {
     this.getSalesmanList();
     this.getCategoryList();
     this.getList();
+    this.getWarehouseList()
   },
   // activated() {
   //   this.initPrint()
@@ -584,7 +596,15 @@ export default {
         this.categoryList = res.data.records;
       })
     },
-
+ // 获取仓库列表
+ getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1
+      }).then((res) => {
+        this.warehouseList = res.data.records
+      })
+    },
     // 查询列表
     getList() {
 
@@ -609,6 +629,7 @@ export default {
         mainOrderId: this.screenForm.mainOrderId,
         approvalEndTime: this.screenForm.approvaTime ? this.screenForm.approvaTime[1] : '',
         approvalStartTime: this.screenForm.approvaTime ? this.screenForm.approvaTime[0] : '',
+        correspondId: this.screenForm.correspondId.join(','),
       };
 
 
@@ -644,6 +665,7 @@ export default {
         mainOrderId: this.screenForm.mainOrderId,
         approvalEndTime: this.screenForm.approvaTime ? this.screenForm.approvaTime[1] : '',
         approvalStartTime: this.screenForm.approvaTime ? this.screenForm.approvaTime[0] : '',
+        correspondId: this.screenForm.correspondId.join(','),
       };
       getListInvoiceNumber(params).then(res => {
         // console.log(res,'ii');

src/views/supply/sales/sales_list.vue

@@ -26,12 +26,18 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="发货单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号（多个单号请用逗号隔开）"></el-input>
+                <el-input
+                  v-model="screenForm.orderNum"
+                  placeholder="请输入发货单号（多个单号请用逗号隔开）"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="订单号" prop="mainOrderId">
-                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
+                <el-input
+                  v-model="screenForm.mainOrderId"
+                  placeholder="请输入订单号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -76,8 +82,21 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="仓库" prop="warehouse">
-                <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" filterable clearable multiple collapse-tags style="width: 100%">
-                  <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+                <el-select
+                  v-model="screenForm.warehouse"
+                  placeholder="请选择仓库"
+                  filterable
+                  clearable
+                  multiple
+                  collapse-tags
+                  style="width: 100%"
+                >
+                  <el-option
+                    :label="item.name"
+                    :value="item.id"
+                    v-for="(item, index) in warehouseList"
+                    :key="index"
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -111,7 +130,10 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="出库单号" prop="id">
-                <el-input v-model="screenForm.id" placeholder="请输入出库单号（多个单号请用逗号隔开）"></el-input>
+                <el-input
+                  v-model="screenForm.id"
+                  placeholder="请输入出库单号（多个单号请用逗号隔开）"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
@@ -146,7 +168,6 @@
               v-if="$checkBtnRole('examine', $route.meta.roles)"
               >批量审批</el-button
             >
-
           </div>
           <div class="fr">
             <ExportButton :exUrl="'sale/order/export'" :exParams="exParams" />
@@ -215,16 +236,39 @@
                 <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="发货单号"
+              prop="orderNo"
+              min-width="130"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.orderNo" />
-                <span>{{scope.row.orderNo}}</span>
+                <span>{{ scope.row.orderNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="订单号"
+              prop="orderNo"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
-                <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
+                <CopyButton
+                  :copyText="
+                    scope.row.orderType === 'TRADE'
+                      ? scope.row.enginOrderNo
+                      : scope.row.mainOrderId
+                  "
+                />
+                <span>{{
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME"
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -347,8 +391,12 @@
                 <el-button type="text" @click="toDetail(scope.row)"
                   >详情</el-button
                 >
-                <el-button type="text" v-if="scope.row.type ===2 &&  scope.row.examineStatus!=='OK'"
-                @click="toDetail(scope.row),edit = true"
+                <el-button
+                  type="text"
+                  v-if="
+                    scope.row.type === 2 && scope.row.examineStatus !== 'OK'
+                  "
+                  @click="toDetail(scope.row), (edit = true)"
                   >编辑</el-button
                 >
                 <el-button
@@ -399,7 +447,7 @@
 
     <SalesDetail
       :listItem="queryItem"
-      :edit ='edit'
+      :edit="edit"
       v-if="isShowDetail"
       @backListFormDetail="backList"
     />
@@ -423,6 +471,7 @@ import {
   examineJudge,
   getList,
   getWarehouseList,
+  getListOrderNo,
 } from "@/api/supply/sales";
 import SalesDetail from "@/views/supply/sales/components/sales_detail";
 import SalesExamine from "@/views/supply/sales/components/sales_examine";
@@ -473,8 +522,8 @@ export default {
         date: "",
         status: "",
         mainOrderId: "",
-        approval:'',
-        id:'',
+        approval: "",
+        id: "",
       },
       statusList: [
         { label: "已保存", value: "SAVE" },
@@ -483,29 +532,29 @@ export default {
         // { label: '审核驳回', value: 'FAIL' },,
       ],
       orderTypeList: [
-        { label: '商用', value: 'TRADE' },
-        { label: '家用', value: 'HOME' },
-        { label: '零售单', value: 'RETAIL' },
-        { label: '销售政策单', value: 'RETAIL_POLICY' },
-        { label: '置换单家用', value: 'PERMU_HOME' },
-        { label: '置换商用', value: 'PERMU_TRADE' },
-        { label: '置换零售', value: 'PERMU_RETAIL' },
-        { label: '置换销售政策单', value: 'PERMU_RETAIL_POLICY' },
-        { label: '调拨单零售', value: 'REQUISITION_RETAIL' },
-        { label: '调拨单销售政策', value: 'REQUISITION_RETAIL_POLICY' },
-        { label: '调拨单商用', value: 'REQUISITION_TRADE' },
-        { label: '调拨单家用', value: 'REQUISITION_HOME' },
+        { label: "商用", value: "TRADE" },
+        { label: "家用", value: "HOME" },
+        { label: "零售单", value: "RETAIL" },
+        { label: "销售政策单", value: "RETAIL_POLICY" },
+        { label: "置换单家用", value: "PERMU_HOME" },
+        { label: "置换商用", value: "PERMU_TRADE" },
+        { label: "置换零售", value: "PERMU_RETAIL" },
+        { label: "置换销售政策单", value: "PERMU_RETAIL_POLICY" },
+        { label: "调拨单零售", value: "REQUISITION_RETAIL" },
+        { label: "调拨单销售政策", value: "REQUISITION_RETAIL_POLICY" },
+        { label: "调拨单商用", value: "REQUISITION_TRADE" },
+        { label: "调拨单家用", value: "REQUISITION_HOME" },
       ],
       warehouseList: [],
-      centerDialogVisible:false,
-      cid:'',
+      centerDialogVisible: false,
+      cid: "",
       queryItem: {},
       isShowDetail: false,
       isShowExamine: false,
       isShowReturnForm: false,
       value1: "",
-      qty:'',
-      edit:false,
+      qty: "",
+      edit: false,
       choiceDate: "",
       selectRow: [],
       multipleSelection: [],
@@ -535,32 +584,37 @@ export default {
     exParams() {
       return {
         examineStatus: this.screenForm.status,
-        orderNo: this.screenForm.orderNum.replace(/，/ig,','),
+        orderNo: this.screenForm.orderNum.replace(/，/gi, ","),
         customerName: this.screenForm.jxsName,
         customerNumber: this.screenForm.jxsNum,
         materialName: this.screenForm.chName,
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
-        correspondId: this.screenForm.warehouse.join(','),
+        correspondId: this.screenForm.warehouse.join(","),
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
-        approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
-        approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
+        approvalStartTime: this.screenForm.approval
+          ? this.screenForm.approval[0]
+          : "",
+        approvalEndTime: this.screenForm.approval
+          ? this.screenForm.approval[1]
+          : "",
         mainOrderId: this.screenForm.mainOrderId,
-        id: this.screenForm.id.replace(/，/ig,',')
+        id: this.screenForm.id.replace(/，/gi, ","),
       };
     },
   },
 
   watch: {
-    multipleSelection(data) { // 监听选中状态
-      this.selectRow = []
+    multipleSelection(data) {
+      // 监听选中状态
+      this.selectRow = [];
       if (data.length > 0) {
         data.forEach((item, index) => {
-          this.selectRow.push(item.id)
-        })
+          this.selectRow.push(item.id);
+        });
       }
-    }
+    },
   },
 
   beforeCreate() {
@@ -580,19 +634,23 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         examineStatus: this.screenForm.status,
-        orderNo: this.screenForm.orderNum.replace(/，/ig,','),
+        orderNo: this.screenForm.orderNum.replace(/，/gi, ","),
         customerName: this.screenForm.jxsName,
         customerNumber: this.screenForm.jxsNum,
         materialName: this.screenForm.chName,
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
-        correspondId: this.screenForm.warehouse.join(','),
+        correspondId: this.screenForm.warehouse.join(","),
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
-        approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
-        approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
+        approvalStartTime: this.screenForm.approval
+          ? this.screenForm.approval[0]
+          : "",
+        approvalEndTime: this.screenForm.approval
+          ? this.screenForm.approval[1]
+          : "",
         mainOrderId: this.screenForm.mainOrderId,
-        id: this.screenForm.id.replace(/，/ig,',')
+        id: this.screenForm.id.replace(/，/gi, ","),
       };
       getList(params).then((res) => {
         res.data.records.forEach((item) => {
@@ -609,17 +667,16 @@ export default {
     getWarehouseList() {
       getWarehouseList({
         pageNum: 1,
-        pageSize: -1
+        pageSize: -1,
       }).then((res) => {
         this.warehouseList = res.data.records;
-      })
+      });
     },
 
     updateReceipt() {
-
       if (!this.value1) {
-        this.$errorMsg('请选择时间')
-        return
+        this.$errorMsg("请选择时间");
+        return;
       }
       // updateReceipt({
       // startTime:this.value1[0],
@@ -629,12 +686,23 @@ export default {
       //   this.$successMsg("已更新");
       //    this.value1 = ''
       // })
-
     },
     // 提交筛选表单
     submitScreenForm() {
       this.currentPage = 1;
       this.getList();
+      if (this.screenForm.orderNum) {
+        getListOrderNo({
+          orderNo: this.screenForm.orderNum.replace(/，/gi, ","),
+        }).then((res) => {
+          if (res.data) {
+            this.$confirm(res.data, "提示", {
+              confirmButtonText: "确定",
+              showCancelButton:false
+            });
+          }
+        });
+      }
     },
 
     // 重置筛选表单
@@ -703,16 +771,16 @@ export default {
 
     handleSelectionChange(val) {
       this.multipleSelection = val;
-      if(val) {
+      if (val) {
         this.selections = val;
-      }else {
+      } else {
         this.selections = [];
       }
     },
 
     rowClass({ row, rowIndex }) {
       if (this.selectRow.includes(row.id)) {
-        return { 'background-color': '#ecf5ff' }
+        return { "background-color": "#ecf5ff" };
       }
     },
 
@@ -748,4 +816,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>