Explorar o código

Merge remote-tracking branch 'origin/master'

FengChaoYu %!s(int64=2) %!d(string=hai) anos
pai
achega
ebd30b3838
Modificáronse 30 ficheiros con 2438 adicións e 1147 borrados
  1. 0 1
      src/layout/components/AppMain.vue
  2. 29 22
      src/mixin/print.js
  3. 14 1
      src/styles/index.scss
  4. 424 340
      src/utils/panel.js
  5. 7 1
      src/views/deposit_commerce/components/deposit-apply-surrender.vue
  6. 7 1
      src/views/deposit_commerce/components/deposit_list-detail.vue
  7. 5 0
      src/views/deposit_commerce/components/refund_list-detail.vue
  8. 7 1
      src/views/deposit_home/components/deposit-apply-surrender.vue
  9. 7 1
      src/views/deposit_home/components/deposit_list-detail.vue
  10. 5 0
      src/views/deposit_home/components/refund_list-detail.vue
  11. 4 4
      src/views/finance/receipt_list.vue
  12. 16 6
      src/views/supply/apply/apply_list.vue
  13. 1 1
      src/views/supply/apply/components/apply_form.vue
  14. 1 1
      src/views/supply/apply/components/engin_form.vue
  15. 24 3
      src/views/supply/apply/engin_list.vue
  16. 11 2
      src/views/supply/deliver/commerce_list.vue
  17. 12 2
      src/views/supply/deliver/home_list.vue
  18. 8 1
      src/views/supply/direct/components/direct_detail.vue
  19. 8 1
      src/views/supply/direct/components/direct_examine.vue
  20. 339 103
      src/views/supply/direct/direct_list.vue
  21. 1 1
      src/views/supply/engin/components/home_detail.vue
  22. 374 168
      src/views/supply/implement/nsales_list.vue
  23. 18 18
      src/views/supply/pickup/check.vue
  24. 295 129
      src/views/supply/pickup/components/pickup_form.vue
  25. 328 107
      src/views/supply/pickup/pickup_list.vue
  26. 6 0
      src/views/supply/policy/components/retail_examine.vue
  27. 249 104
      src/views/supply/policy/components/retail_return.vue
  28. 169 89
      src/views/supply/sales/components/sales_detail.vue
  29. 5 0
      src/views/supply/sales/components/sales_examine.vue
  30. 64 39
      src/views/supply/sales/sales_list.vue

+ 0 - 1
src/layout/components/AppMain.vue

@@ -2,7 +2,6 @@
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
     <router-view />
-    
     </transition>
   </section>
 </template>

+ 29 - 22
src/mixin/print.js

@@ -141,8 +141,8 @@ export default {
           const { data } = await getDtailPrintDis(requestParams);
           loadingLen = data.length;
           for (let i = data.length; i > 0; i--) {
-              const newData = data[i - 1];
-              await this.setPrintData(newData);
+            const newData = data[i - 1];
+            await this.setPrintData(newData);
             loadingLen--;
           }
         } catch (error) {
@@ -154,16 +154,16 @@ export default {
         formatting = [...new Set(formatting)];
         loadingLen = formatting.length;
         for (let i = formatting.length; i > 0; i--) {
-            const requestParams = {
-              id: formatting[i - 1],
-            };
-            try {
-              const { data } = await getDeliverDetail(requestParams);
-              this.setPrintData(data);
-            } catch (error) {
-              this.$endLoading();
-              console.error("获取打印数据失败");
-            }
+          const requestParams = {
+            id: formatting[i - 1],
+          };
+          try {
+            const { data } = await getDeliverDetail(requestParams);
+            this.setPrintData(data);
+          } catch (error) {
+            this.$endLoading();
+            console.error("获取打印数据失败");
+          }
           loadingLen--;
         }
       }
@@ -234,6 +234,8 @@ export default {
           funcType = addPrints;
         }
         await funcType(requestParams);
+        //清空当前克隆数据,避免重复添加次数
+        this.clonelData = []
       } catch (error) {
         console.error("添加打印次数失败");
       }
@@ -271,9 +273,12 @@ export default {
      * this.outputData 打印数据
      */
     setPrintData(data) {
-      let salesOrderId , invoiceId
-      salesOrderId=data.invoicePickBeans[0].salesOrderId
-      invoiceId=data.invoicePickBeans[0].invoiceId
+      let salesOrderId, invoiceId; //出库单号,发货单号 默认数据中的第一个
+      salesOrderId = data.invoicePickBeans[0].salesOrderId;
+      invoiceId = data.invoicePickBeans[0].invoiceId;
+      let tuiHuoRen = data.createBy
+      // 数量合计
+      let total = 0
       // 初始化打印次数
       let printNum = 0;
       //避免数据发生改变
@@ -291,16 +296,16 @@ export default {
           const newInvoicePickBeans = invoicePickBeans.splice(0, 5);
           for (let e = newInvoicePickBeans.length; e > 0; e--) {
             const tempData = newInvoicePickBeans[e - 1];
-
+            total += +tempData.refundableQty
             //添加表格数据
             table.push({
-
               id: tempData.id,
               createTime: tempData.id
                 ? this.dateToDayFilter(data.createTime)
                 : "",
               enginOrderType:
-                tempData.orderType == "HOME" || tempData.orderType == "TRADE"
+                tempData.orderType == "HOME" || tempData.orderType == "TRADE" || tempData.orderType === "REQUISITION_TRADE" ||
+                tempData.orderType === "REQUISITION_HOME"
                   ? tempData.enginOrderNo
                   : tempData.mainOrderId,
               materialName: tempData.materialName,
@@ -310,18 +315,20 @@ export default {
             });
           }
         }
-
         // 添加print输出数据
         this.outputData.push({
           pageNumber: `${len}-${index + 1}`,
-          printNum:printNum + 1,
+          printNum: printNum + 1,
           salesId: salesOrderId,
           invoiceId: invoiceId,
+          refUseUnit:data.refUseUnit||'',
+          refEnginRecordNo:data.refEnginRecordNo||'',
           type: data.type,
-          tiTui: data.type === 2 ? `退货人:${data.createBy}` : `提货人`,
+          tiTui: data.type === 2 ? `退货人` : `提货人`,
           takerPhone: data.takerPhone || "",
           headerRemark: data.remark,
           total_num: data.total_num,
+          total:total,
           company:
             data.type === 2
               ? `${this.company}销售退货单`
@@ -332,7 +339,7 @@ export default {
           nowDate: this.nowDate(),
           takerName:
             data.type === 2
-              ? `退货人:${data.takerName || ""}`
+              ? `退货人:${tuiHuoRen|| ""}`
               : `提货人:${data.takerName || ""}`,
           customerName: data.customerName || "",
           correspondName: data.correspondName,

+ 14 - 1
src/styles/index.scss

@@ -454,4 +454,17 @@ input[type=number]::-webkit-inner-spin-button, input[type=number]::-webkit-outer
     font-weight: 600;
     padding-left: 10px;
   }
-}
+}
+.hiprint-printElement-text-content{
+  white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+@media print {
+  .hiprint-printElement-text-content{
+    white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+  }
+}

+ 424 - 340
src/utils/panel.js

@@ -1,348 +1,432 @@
-
 export default {
-  "panels": [{
-    "index": 0,
-    "height": 150,
-    "width": 241,
-    "paperCount": 222,
-    "printElements": [{
-      "options": {
-        "left": 0,
-        "top": 25,
-        "height": 27,
-        "width": 656,
-        "field": "company",
-        "fontSize": 19,
-        "fontWeight": "600",
-        "fontFamily": '黑体',
-        "textAlign": "center",
-        "lineHeight": 26
-      }, "printElementType": { "title": "", "type": "text" }
-    }, {
-      "options": {
-        "left": 40,
-        "top": 50,
-        "height": 13,
-        "width": 328,
-        "fontSize": 11,
-        "title": "经销商编码",
-        "fontFamily": '黑体',
-        "field": "customerNumber",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 550,
-        "top": 50,
-        "height": 13,
-        "width": 328,
-        "fontSize": 11,
-        "title": "打印次数",
-        "fontFamily": '黑体',
-        "field": "printNum",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    }, {
-      "options": {
-        "left": 348,
-        "top": 50,
-        "height": 13,
-        "width": 328,
-        "fontSize": 11,
-        "title": "打印日期",
-        "fontFamily": '黑体',
-        "field": "nowDate",
-        "testData": "",
-        "color": "#000",
-
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    }
-      , {
-      "options": {
-        "left": 40,
-        "top": 70,
-        "height": 13,
-        "width": 328,
-        "fontSize": 11,
-        "title": "经销商",
-        "fontFamily": '黑体',
-        "field": "customerName",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    }, {
-      "options": {
-        "left": 348,
-        "top": 70,
-        "height": 13,
-        "width": 328,
-        "fontSize": 11,
-        "title": "仓库",
-        "fontFamily": '黑体',
-        "field": "correspondName",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-
-    , {
-      "options": {
-        "left": 40,
-        "top": 90,
-        "height": 13,
-        "width": 328,
-        "fontSize": 11,
-        "title": "出库单号",
-        "fontFamily": '黑体',
-        "field": "salesId",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 348,
-        "top": 90,
-        "height": 13,
-        "width": 328,
-        "fontSize": 11,
-        "title": "发货单号",
-        "fontFamily": '黑体',
-        "field": "invoiceId",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 40,
-        "top": 110,
-        "height": 13,
-        "width": 633,
-        "fontSize": 11,
-        "title": "备注",
-        "fontFamily": '黑体',
-        "field": "headerRemark",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" ,"fontSize": 8,}
-    },
+  panels: [
     {
-      "options": {
-        "left": 23,
-        "top": 125,
-        "height": 410,
-        "width": 633,
-        "fontSize": 11,
-        "field": "table",
-        "fontFamily": '黑体',
-        "lineHeight": 16,
-        "tableFooterRepeat": "",
-        "columns": [[
-         {
-            "title": "订单号",
-            "field": "enginOrderType",
-            "width": 60,
-            "align": "left",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 11,
-
-          } , {
-            "title": "发货日期",
-            "field": "createTime",
-            "width": 50,
-            "align": "left",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 11,
-
-
-          }
-
-          , {
-            "title": "存货名称",
-            "field": "materialName",
-            "width": 100,
-            "align": "left",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 11,
-
+      index: 0,
+      height: 150,
+      width: 241,
+      paperCount: 222,
+      printElements: [
+        {
+          options: {
+            left: 0,
+            top: 5,
+            height: 27,
+            lineHeight: 27,
+            width: 656,
+            field: "company",
+            fontSize: 19,
+            fontWeight: "600",
+            fontFamily: "黑体,宋体,微软雅黑",
+            textAlign: "center",
+            lineHeight: 26,
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 40,
+            top: 14,
+            height: 13,
+            lineHeight: 13,
+            width: 328,
+            fontSize: 12.5,
+            title: "打印日期",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "nowDate",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 590,
+            top: 14,
+            height: 13,
+            lineHeight: 13,
+            width: 328,
+            fontSize: 12.5,
+            title: "打印次数",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "printNum",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        // {
+        //   "options": {
+        //     "left": 40,
+        //     "top": 35,
+        //     "height": 13,
+        //     "lineHeight": 13,
+        //     "width": 328,
+        //     "fontSize": 12.5,
+        //     "title": "经销商编码",
+        //     "fontFamily": '黑体,宋体,微软雅黑',
+        //     "field": "customerNumber",
+        //     "color": "#000",
+        //     "textAlign": "left"
+        //   }, "printElementType": { "title": "", "type": "text" }
+        // },
 
-          }, {
-            "title": "规格型号",
-            "field": "specification",
-            "width": 140,
-            "align": "left",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 11,
+        {
+          options: {
+            left: 40,
+            top: 35,
+            height: 13,
+            lineHeight: 13,
+            width: 280,
+            fontSize: 12.5,
+            title: "经销商",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "customerName",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
 
+        ,
+        {
+          options: {
+            left: 250,
+            top: 35,
+            height: 13,
+            lineHeight: 13,
+            width: 200,
+            fontSize: 12.5,
+            title: "出库单号",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "salesId",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 450,
+            top: 35,
+            height: 13,
+            lineHeight: 13,
+            width: 200,
+            fontSize: 12.5,
+            title: "发货单号",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "invoiceId",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
 
-          }
-          , {
-            "title": "数量",
-            "field": "refundableQty",
-            "width": 23,
-            "align": "center",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 11,
-            "tableSummary": "sum"
+        {
+          options: {
+            left: 585,
+            top: 35,
+            height: 13,
+            lineHeight: 13,
+            width: 300,
+            fontSize: 12.5,
+            title: "仓库",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "correspondName",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 40,
+            top: 55,
+            height: 13,
+            lineHeight: 13,
+            width: 328,
+            fontSize: 12.5,
+            title: "工程登录编号",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "refEnginRecordNo",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 250,
+            top: 55,
+            height: 13,
+            lineHeight: 13,
+            width: 410,
+            fontSize: 12.5,
+            title: "使用单位",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "refUseUnit",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 40,
+            top: 75,
+            height: 13,
+            lineHeight: 13,
+            width: 633,
+            fontSize: 12.5,
+            title: "备注",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "headerRemark",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text", fontSize: 8 },
+        },
+        {
+          options: {
+            left: 23,
+            top: 95,
+            height: 410,
+            width: 633,
+            fontSize: 12.5,
+            field: "table",
+            fontFamily: "黑体,宋体,微软雅黑",
+            lineHeight: 16,
+            tableFooterRepeat: "",
+            columns: [
+              [
+                {
+                  title: "订单号",
+                  field: "enginOrderType",
+                  width: 60,
+                  align: "left",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
+                {
+                  title: "发货日期",
+                  field: "createTime",
+                  width: 50,
+                  align: "left",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
 
-          }
-          // , {
-          //   "title": "订单备注",
-          //   "field": "headerRemark",
-          //   "width": 40,
-          //   "align": "center",
-          //   "colspan": 1,
-          //   "rowspan": 1,
-          //   "fontSize": 11,
-          // }
+                {
+                  title: "存货名称",
+                  field: "materialName",
+                  width: 100,
+                  align: "left",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
+                {
+                  title: "规格型号",
+                  field: "specification",
+                  width: 140,
+                  align: "left",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
+                {
+                  title: "数量",
+                  field: "refundableQty",
+                  width: 23,
+                  align: "center",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                  tableSummary: "sum",
+                },
+                // , {
+                //   "title": "订单备注",
+                //   "field": "headerRemark",
+                //   "width": 40,
+                //   "align": "center",
+                //   "colspan": 1,
+                //   "rowspan": 1,
+                //   "fontSize": 12.5,
+                // }
 
-          ,
-
-          {
-            "title": "备注说明",
-            "field": "pjxh1Text",
-            "width": 40,
-            "align": "left",
-            "colspan": 2,
-            "rowspan": 1,
-            "fontSize": 11,
-          }]]
-      }, "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, //合并单元格
-      }
-
-    },
-      , {
-      "options": {
-        "left": 40,
-        "top": 390,
-        "height": 13,
-        "width": 218,
-        "fontSize": 11,
-        "title": "",
-        "fontFamily": '黑体',
-        "field": "takerName",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-
-        "left": 40,
-        "top": 410,
-        "height": 13,
-        "width": 218,
-        "fontSize": 11,
-        "title": "打单",
-        "fontFamily": '黑体',
-        "field": "createBy",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 238,
-        "top": 410,
-        "height": 13,
-        "width": 218,
-        "fontSize": 11,
-        "title": "车辆",
-        "fontFamily": '黑体',
-        "field": "pickCar",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
+                {
+                  title: "备注说明",
+                  field: "pjxh1Text",
+                  width: 40,
+                  align: "left",
+                  colspan: 2,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
+              ],
+            ],
+          },
+          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, //合并单元格
+          },
+        },
+        ,
+        {
+          options: {
+            left: 40,
+            top: 390,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "takerName",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 40,
+            top: 410,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "打单",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "createBy",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 238,
+            top: 410,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "提单",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "takerDa",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 238,
+            top: 390,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "联系方式",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "takerPhone",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 463,
+            top: 390,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "车辆",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "pickCar",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 463,
+            top: 410,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "仓库",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "correspondNames",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 600,
+            top: 390,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "合计",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "total",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        // {
+        //   options: {
+        //     left: 650,
+        //     top: 410,
+        //     height: 13,
+        //     lineHeight: 13,
+        //     width: 218,
+        //     fontSize: 16,
+        //     title: "",
+        //     fontFamily: "黑体,宋体,微软雅黑",
+        //     field: "pageNumber",
+        //     testData: "",
+        //     color: "#000",
+        //     textAlign: "left",
+        //   },
+        //   printElementType: { title: "", type: "text" },
+        // },
+      ],
+      paperNumberDisabled: true,
     },
-    {
-      "options": {
-        "left": 238,
-        "top": 390,
-        "height": 13,
-        "width": 218,
-        "fontSize": 11,
-        "title": "联系方式",
-        "fontFamily": '黑体',
-        "field": "takerPhone",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 463,
-        "top": 390,
-        "height": 13,
-        "width": 218,
-        "fontSize": 11,
-        "title": "提单",
-        "fontFamily": '黑体',
-        "field": "takerDa",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 463,
-        "top": 410,
-        "height": 13,
-        "width": 218,
-        "fontSize": 11,
-        "title": "仓库",
-        "fontFamily": '黑体',
-        "field": "correspondNames",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 650,
-        "top": 410,
-        "height": 13,
-        "width": 218,
-        "fontSize": 16,
-        "title": "",
-        "fontFamily": '黑体',
-        "field": "pageNumber",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    }],
-    "paperNumberDisabled": true
-  }]
-}
+  ],
+};

+ 7 - 1
src/views/deposit_commerce/components/deposit-apply-surrender.vue

@@ -434,12 +434,18 @@ export default {
   created() {
     this.imageURL = this.$imageUrl
     geDetail({ id: this.$parent.depositManageId }).then((res) => {
-      this.details = res.data
+      let arr = []
       res.data.items.forEach((item) => {
+        if (Number(item.qty)>0) {
+              arr.push(item)
+            }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ['hasSendQty', 'dataQty', 'qty']
         item.sums2 = ['totalAmount', 'diffAmount', 'price']
       })
+      res.data.items = arr
+      this.details = res.data
+
     })
   },
   methods: {

+ 7 - 1
src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -897,17 +897,23 @@ export default {
 
       if (this.engineering == '工程押金信息') {
         geDetail({ id: this.$parent.depositManageId }).then((res) => {
-          this.details = res.data
           if (res.data.dataList.length == 0) {
             this.isDis = true
           } else {
             this.isDis = false
           }
+          let arr = []
           res.data.items.forEach((item) => {
+            if (Number(item.qty)>0) {
+              arr.push(item)
+            }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
             item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
             item.sums2 = ['totalAmount', 'diffAmount', 'price']
           })
+          res.data.items = arr
+          this.details = res.data
+
         })
       } else if (this.engineering == '工程订单信息') {
         geOrderInfo({

+ 5 - 0
src/views/deposit_commerce/components/refund_list-detail.vue

@@ -730,11 +730,16 @@ export default {
       } else {
         this.isDis = false;
       }
+      let arr = []
       res.data.items.forEach((item) => {
+        if (Number(item.qty)>0) {
+              arr.push(item)
+            }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
         item.sums2 = ["totalAmount", "diffAmount", "price"];
       });
+      res.data.items = arr
       this.detailList = res.data;
       if (
         res.data.examineStatus == "SAVE" ||

+ 7 - 1
src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -449,12 +449,18 @@ export default {
   created() {
     this.imageURL = this.$imageUrl
     geDetail({ id: this.$parent.depositManageId }).then((res) => {
-      this.details = res.data
+      let arr = []
       res.data.items.forEach((item) => {
+        if (Number(item.qty)>0) {
+              arr.push(item)
+            }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
         item.sums2 = ['totalAmount', 'diffAmount', 'price']
       })
+      res.data.items = arr
+      this.details = res.data
+
     })
   },
   methods: {

+ 7 - 1
src/views/deposit_home/components/deposit_list-detail.vue

@@ -914,17 +914,23 @@ export default {
 
       if (this.engineering == '工程押金信息') {
         geDetail({id: this.$parent.depositManageId}).then((res) => {
-          this.details = res.data
+
           if (res.data.dataList.length == 0) {
             this.isDis = true
           } else {
             this.isDis = false
           }
+          let arr = []
           res.data.items.forEach((item) => {
+            if (Number(item.qty)>0) {
+              arr.push(item)
+            }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
             item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
             item.sums2 = ['totalAmount', 'diffAmount', 'price']
           })
+          res.data.items = arr
+          this.details = res.data
         })
       } else if (this.engineering == '工程订单信息') {
         geOrderInfo({

+ 5 - 0
src/views/deposit_home/components/refund_list-detail.vue

@@ -739,11 +739,16 @@ export default {
       } else {
         this.isDis = false;
       }
+      let arr = []
       res.data.items.forEach((item) => {
+        if (Number(item.qty)>0) {
+              arr.push(item)
+            }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
         item.sums2 = ["totalAmount", "diffAmount", "price"];
       });
+      res.data.items = arr
       this.detailList = res.data;
       if (
         res.data.examineStatus == "SAVE" ||

+ 4 - 4
src/views/finance/receipt_list.vue

@@ -126,14 +126,14 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button
+          <!-- <el-button
             type="primary"
             size="mini"
             v-if="$checkBtnRole('print', $route.meta.roles)"
             @click="toPrint"
             :disabled="tableSelection.length < 1"
             >打印发货单
-          </el-button>
+          </el-button> -->
         </div>
         <div class="fr">
           <!-- <ExportButton :exUrl="'/k3/receipt/export'" :exParams="exParams" class="exportClass" /> -->
@@ -367,13 +367,13 @@
                   @click="seeFn(scope.row.id)"
                   >查看</el-button
                 >
-                <el-button
+                <!-- <el-button
                   type="text"
                   class="textColor"
                   v-if="$checkBtnRole('print', $route.meta.roles)"
                   @click="toPrint(scope.row, 2)"
                   >打印</el-button
-                >
+                > -->
               </template>
             </el-table-column>
           </el-table>

+ 16 - 6
src/views/supply/apply/apply_list.vue

@@ -70,7 +70,7 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="表体业务员" prop="serviceId">
-                <el-select v-model="screenForm.serviceId" placeholder="选择表体业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.serviceId" placeholder="选择表体业务员" size="mini" clearable filterable style="width: 100%">
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
@@ -104,6 +104,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核人" prop="approvalName">
+                <el-input v-model="screenForm.approvalName" placeholder="请输入审核人"></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -377,7 +383,8 @@ export default {
         mainOrderId: '',
         k3ServiceId:'',
         serviceId:'',
-        categoryId: ''
+        categoryId: '',
+        approvalName:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -426,11 +433,12 @@ export default {
         serviceId:this.screenForm.serviceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
-        categoryId: this.screenForm.categoryId
+        categoryId: this.screenForm.categoryId,
+        approvalName:this.screenForm.approvalName
       }
     },
   },
-  
+
   watch: {
     multipleSelection(data) { // 监听选中状态
       this.selectRow = []
@@ -499,7 +507,9 @@ export default {
         type: this.screenForm.orderType,
         k3ServiceId:this.screenForm.k3ServiceId,
         mainOrderId: this.screenForm.mainOrderId,
-        categoryId: this.screenForm.categoryId
+        categoryId: this.screenForm.categoryId,
+        approvalName:this.screenForm.approvalName
+
       };
       getApplyList(params).then((res) => {
         res.data.records.forEach(item => {
@@ -563,7 +573,7 @@ export default {
       this.$nextTick(()=>{
         this.$refs.refDetail.initPrint()
       })
-      
+
       // this.$refs.refDetail.initPrint()
     },
 

+ 1 - 1
src/views/supply/apply/components/apply_form.vue

@@ -478,7 +478,7 @@ export default {
             return this.$errorMsg('请添加引用');
           }
           for(let i=0; i<this.goodsList.length; i++) {
-            if(!this.goodsList[i].invoiceNum) {
+            if(!Number(this.goodsList[i].invoiceNum)) {
               this.$errorMsg('请输入申请数量');
               return;
             }

+ 1 - 1
src/views/supply/apply/components/engin_form.vue

@@ -715,7 +715,7 @@ export default {
             return this.$errorMsg('请添加引用');
           }
           for(let i=0; i<this.goodsList.length; i++) {
-            if(!this.goodsList[i].invoiceNum) {
+            if(!Number(this.goodsList[i].invoiceNum)) {
               this.$errorMsg('请输入申请数量');
               return;
             }

+ 24 - 3
src/views/supply/apply/engin_list.vue

@@ -115,6 +115,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核人" prop="approvalName">
+                <el-input v-model="screenForm.approvalName" placeholder="请输入审核人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refRegionWork">
+                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -252,7 +262,10 @@
             <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></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="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -392,7 +405,9 @@ export default {
         refEnginRecordNo: '',
         refUseUnit: '',
         k3ServiceId:'',
-        categoryId: ''
+        categoryId: '',
+        approvalName:'',
+        refRegionWork:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -444,7 +459,9 @@ export default {
         mainOrderId: this.screenForm.mainOrderId,
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
         refUseUnit: this.screenForm.refUseUnit,
-        categoryId: this.screenForm.categoryId
+        categoryId: this.screenForm.categoryId,
+        approvalName:this.screenForm.approvalName,
+        refRegionWork:this.screenForm.refRegionWork
       }
     },
   },
@@ -517,7 +534,11 @@ export default {
         mainOrderId: this.screenForm.mainOrderId,
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
         refUseUnit: this.screenForm.refUseUnit,
-        categoryId: this.screenForm.categoryId
+        categoryId: this.screenForm.categoryId,
+        approvalName:this.screenForm.approvalName,
+        refRegionWork:this.screenForm.refRegionWork
+
+
       };
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {

+ 11 - 2
src/views/supply/deliver/commerce_list.vue

@@ -85,8 +85,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
-            <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refRegionWork">
+                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+              </el-form-item>
+            </el-col>
+            <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>
@@ -212,6 +216,8 @@
             <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></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="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
@@ -311,6 +317,7 @@ export default {
         jxsNum: '',
         status: '',
         salesMan: '',
+        refRegionWork:''
       },
       categoryList: [],
       salesmanList: [],
@@ -339,6 +346,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        refRegionWork:this.screenForm.refRegionWork,
         serviceId: this.screenForm.salesMan,
         orderType: 3, // 2家用工程 3商用工程
       }
@@ -398,6 +406,7 @@ export default {
         customerName: this.screenForm.jxsName,
         materialName: this.screenForm.chName,
         specification: this.screenForm.model,
+        refRegionWork:this.screenForm.refRegionWork,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,

+ 12 - 2
src/views/supply/deliver/home_list.vue

@@ -80,8 +80,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refRegionWork">
+                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+              </el-form-item>
+            </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -162,6 +167,8 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
@@ -280,6 +287,7 @@ export default {
         jxsNum: '',
         status: '',
         salesMan: '',
+        refRegionWork:''
       },
       salesmanList: [],
       categoryList: [],
@@ -309,6 +317,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
+        refRegionWork:this.screenForm.refRegionWork,
         orderType: 2, // 2家用工程 3商用工程
       }
     },
@@ -367,6 +376,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
+        refRegionWork:this.screenForm.refRegionWork,
         serviceId: this.screenForm.salesMan,
         orderType: 2, // 2家用工程 3商用工程
       };
@@ -414,7 +424,7 @@ export default {
       this.$nextTick(()=>{
         this.$refs.refDetail.initPrint()
       })
-      
+
     },
 
     backList() {

+ 8 - 1
src/views/supply/direct/components/direct_detail.vue

@@ -30,7 +30,14 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">销售订单号</div>
-          <div class="value">{{detailData.orderNo}}</div>
+          <div class="value">{{
+            detailData.orderType === "TRADE" ||
+                  detailData.orderType === "HOME" ||
+                  detailData.orderType === "REQUISITION_TRADE" ||
+                  detailData.orderType === "REQUISITION_HOME"
+                    ? detailData.enginOrderNo
+                    : detailData.mainOrderId
+         }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">销售单类型</div>

+ 8 - 1
src/views/supply/direct/components/direct_examine.vue

@@ -30,7 +30,14 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">销售订单号</div>
-          <div class="value">{{detailData.orderNo}}</div>
+          <div class="value">{{
+                 detailData.orderType === "TRADE" ||
+                  detailData.orderType === "HOME" ||
+                  detailData.orderType === "REQUISITION_TRADE" ||
+                  detailData.orderType === "REQUISITION_HOME"
+                    ? detailData.enginOrderNo
+                    : detailData.mainOrderId
+         }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">销售单类型</div>

+ 339 - 103
src/views/supply/direct/direct_list.vue

@@ -3,34 +3,57 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="100px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
                 <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                  <el-radio-button
+                    v-for="(item, index) in statusList"
+                    :key="index"
+                    :label="item.value"
+                    >{{ item.label }}</el-radio-button
+                  >
                 </el-radio-group>
               </el-form-item>
             </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="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
+                <el-input
+                  v-model="screenForm.warehouse"
+                  placeholder="请输入仓库"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编码" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码"></el-input>
+                <el-input
+                  v-model="screenForm.jxsNum"
+                  placeholder="请输入经销商编码"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+                <el-input
+                  v-model="screenForm.jxsName"
+                  placeholder="请输入经销商名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -39,28 +62,37 @@
                   v-model="screenForm.date"
                   type="datetimerange"
                   range-separator="至"
-                  style="width: 100%;"
+                  style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                <el-input
+                  v-model="screenForm.chName"
+                  placeholder="请输入产品名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                <el-input
+                  v-model="screenForm.model"
+                  placeholder="请输入规格型号"
+                ></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
-                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -70,87 +102,278 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-            <el-button size="mini" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-minus"
+              :disabled="multipleSelection.length < 1"
+              @click="batchDelete()"
+              v-if="$checkBtnRole('del', $route.meta.roles)"
+              >批量删除</el-button
+            >
           </div>
           <div class="fr">
             <ExportButton :exUrl="'requisition/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange">
-            <el-table-column align="center" type="selection" width="55"></el-table-column>
-            <el-table-column align="left" label="直接调拨单号" prop="id" min-width="190" show-overflow-tooltip>
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column
+              align="center"
+              type="selection"
+              width="55"
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="直接调拨单号"
+              prop="id"
+              min-width="190"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
-                <span>{{scope.row.id}}</span>
+                <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="订单号"
+              prop="mainOrderId"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderType === 'TRADE' ||scope.row.orderType === 'HOME'  ? 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.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                <span>{{
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="审核状态"
+              prop="examineStatus"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
+                {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单据日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单据日期"
+              prop="orderTime"
+              min-width="160"
+              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" />
-                <span>{{scope.row.customerNumber}}</span>
+                <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商名称"
+              prop="customerName"
+              min-width="250"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="调拨方向" prop="direction" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="调拨方向"
+              prop="direction"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialCode"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
-                <span>{{scope.row.materialCode}}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="350"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调拨数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调出仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调出仓位" prop="stockName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调入仓库" prop="inCorrespondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="调入仓位" prop="inStockName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></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="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="操作" width="180" fixed="right">
+            <el-table-column
+              align="left"
+              label="单位"
+              prop="unit"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调拨数量"
+              prop="qty"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调出仓库"
+              prop="correspondName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调出仓位"
+              prop="stockName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调入仓库"
+              prop="inCorrespondName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="调入仓位"
+              prop="inStockName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="备注信息"
+              prop="remark"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="制单人"
+              prop="createBy"
+              min-width="100"
+              show-overflow-tooltip
+            ></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="approvalName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="审核日期"
+              prop="approvalTime"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              width="180"
+              fixed="right"
+            >
               <template slot-scope="scope">
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
-                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审单</el-button>
-                <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="handleDelete(scope.row.id)" v-if="$checkBtnRole('del', $route.meta.roles)">
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row)"
+                  v-if="
+                    $checkBtnRole('edit', $route.meta.roles) &&
+                    scope.row.examineStatus === 'SAVE'
+                  "
+                  >编辑</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="toExamine(scope.row)"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    scope.row.examineStatus === 'WAIT'
+                  "
+                  >审单</el-button
+                >
+                <el-button type="text" @click="toDetail(scope.row)"
+                  >详情</el-button
+                >
+                <el-popconfirm
+                  style="margin-left: 10px"
+                  title="确定删除吗?"
+                  @onConfirm="handleDelete(scope.row.id)"
+                  v-if="$checkBtnRole('del', $route.meta.roles)"
+                >
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
               </template>
@@ -167,16 +390,28 @@
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal">
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
 
-    <DirectDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
-    <DirectExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
-    <DirectForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
-
+    <DirectDetail
+      :listItem="queryItem"
+      v-if="isShowDetail"
+      @backListFormDetail="backList"
+    />
+    <DirectExamine
+      :listItem="queryItem"
+      v-if="isShowExamine"
+      @backListFormDetail="backList"
+    />
+    <DirectForm
+      :listItem="queryItem"
+      v-if="isShowForm"
+      @backListFormDetail="backList"
+    />
   </div>
 </template>
 
@@ -186,18 +421,18 @@ import DirectDetail from "@/views/supply/direct/components/direct_detail";
 import DirectExamine from "@/views/supply/direct/components/direct_examine";
 import DirectForm from "@/views/supply/direct/components/direct_form";
 
-let that
+let that;
 export default {
   components: {
     DirectDetail,
     DirectExamine,
-    DirectForm
+    DirectForm,
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val);
-      return obj ? obj.label : ''
-    }
+      let obj = that.statusList.find((o) => o.value == val);
+      return obj ? obj.label : "";
+    },
   },
   data() {
     return {
@@ -206,22 +441,23 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        orderNum: '',
-        warehouse: '',
-        jxsNum: '',
-        jxsName: '',
-        date: '',
-        chName: '',
-        model: '',
-        status: '',
+      screenForm: {
+        // 筛选表单数据
+        orderNum: "",
+        warehouse: "",
+        jxsNum: "",
+        jxsName: "",
+        date: "",
+        chName: "",
+        model: "",
+        status: "",
       },
       statusList: [
-        { label: '已保存', value: 'SAVE' },
-        { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' },
+        { label: "已保存", value: "SAVE" },
+        { label: "待审核", value: "WAIT" },
+        { label: "审核通过", value: "OK" },
         //  // { label: '审核驳回', value: 'FAIL' },,
-        { label: '已关闭', value: 'CLOSE' },
+        { label: "已关闭", value: "CLOSE" },
       ],
 
       queryItem: {},
@@ -230,7 +466,7 @@ export default {
       isShowForm: false,
 
       multipleSelection: [],
-    }
+    };
   },
 
   computed: {
@@ -242,10 +478,10 @@ export default {
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         examineStatus: this.screenForm.status,
-      }
+      };
     },
   },
 
@@ -271,15 +507,15 @@ export default {
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         examineStatus: this.screenForm.status,
       };
       getList(params).then((res) => {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      })
+      });
     },
 
     // 提交筛选表单
@@ -335,27 +571,29 @@ export default {
 
     // 删除
     handleDelete(id) {
-      deleteData({ids: id}).then(res => {
+      deleteData({ ids: id }).then((res) => {
         this.$successMsg();
         this.getList();
-      })
+      });
     },
 
-     // 批量删除
+    // 批量删除
     batchDelete() {
-      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let ids = this.multipleSelection.map(item => {
-          return item.id;
-        });
-        deleteData({ids: ids.join(',')}).then(res => {
-          this.$successMsg();
-          this.getList();
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let ids = this.multipleSelection.map((item) => {
+            return item.id;
+          });
+          deleteData({ ids: ids.join(",") }).then((res) => {
+            this.$successMsg();
+            this.getList();
+          });
         })
-      }).catch(() => {});
+        .catch(() => {});
     },
 
     handleSelectionChange(val) {
@@ -364,15 +602,13 @@ export default {
 
     // 申请/撤回
     handleSubmit(id, examineStatus) {
-      submitApply({id, examineStatus}).then(res => {
+      submitApply({ id, examineStatus }).then((res) => {
         this.$successMsg();
         this.getList();
-      })
+      });
     },
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 1 - 1
src/views/supply/engin/components/home_detail.vue

@@ -278,7 +278,7 @@
         <el-table :data="deliverGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>

+ 374 - 168
src/views/supply/implement/nsales_list.vue

@@ -3,57 +3,92 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="85px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="orderNum" label-width="0">
                 <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                  <el-radio-button
+                    v-for="(item, index) in statusList"
+                    :key="index"
+                    :label="item.value"
+                    >{{ item.label }}</el-radio-button
+                  >
                 </el-radio-group>
               </el-form-item>
             </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">
               <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+                <el-input
+                  v-model="screenForm.jxsName"
+                  placeholder="请输入经销商名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编号" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入规格型号"></el-input>
+                <el-input
+                  v-model="screenForm.jxsNum"
+                  placeholder="请输入规格型号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                <el-input
+                  v-model="screenForm.chName"
+                  placeholder="请输入产品名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="物料编码" prop="chNum">
-                <el-input v-model="screenForm.chNum" placeholder="请输入物料编码"></el-input>
+                <el-input
+                  v-model="screenForm.chNum"
+                  placeholder="请输入物料编码"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                <el-input
+                  v-model="screenForm.model"
+                  placeholder="请输入规格型号"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="仓库名称" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库名称"></el-input>
+                <el-input
+                  v-model="screenForm.warehouse"
+                  placeholder="请输入仓库名称"
+                ></el-input>
               </el-form-item>
             </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据日期" prop="date">
                 <el-date-picker
                   v-model="screenForm.date"
@@ -97,17 +132,10 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="打印时间排序" prop="printDesc">
-                  <el-select v-model="screenForm.printDesc"  clearable filterable >
-                    <el-option
-                      label="默认"
-                      :value="null">
-                    </el-option>
-                    <el-option
-                      label="倒叙"
-                      :value="1">
-                    </el-option>
-                  </el-select>
-
+                <el-select v-model="screenForm.printDesc" clearable filterable>
+                  <el-option label="默认" :value="null"> </el-option>
+                  <el-option label="倒叙" :value="1"> </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -121,7 +149,9 @@
             <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>
+                <el-button type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -149,11 +179,18 @@
             stripe
             @selection-change="handleSelectionChange"
             show-summary
-            :summary-method="$getSummaries">
+            :summary-method="$getSummaries"
+          >
             <!-- <el-table-column align="center" type="selection" width="55"></el-table-column>-->
-            <el-table-column align="left" label="状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="状态"
+              prop="examineStatus"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
+                {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
             <el-table-column
@@ -163,7 +200,13 @@
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column align="left" label="订单类型" prop="orderType" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="订单类型"
+              prop="orderType"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.orderType | orderTypeFilter }}
               </template>
@@ -173,84 +216,220 @@
                 {{scope.row.billStatus | billStatusFilter}}
               </template>
             </el-table-column> -->
-            <el-table-column align="left" label="发票号" prop="billReceipt" min-width="250" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="发票号"
+              prop="billReceipt"
+              min-width="250"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{scope.row.billReceipt }}
+                {{ scope.row.billReceipt }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="出库单号" prop="id" min-width="110" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="出库单号"
+              prop="id"
+              min-width="110"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
-                <span>{{scope.row.id}}</span>
+                <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.orderType === 'HOME' ? 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.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                <span>{{
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="仓库"
+              prop="correspondName"
+              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" />
-                <span>{{scope.row.customerNumber}}</span>
+                <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商名称"
+              prop="customerName"
+              min-width="250"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="销售类型"
+              prop="saleTypeName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialCode"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
-                <span>{{scope.row.materialCode}}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="350"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单位"
+              prop="unit"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="right"
+              label="数量"
+              prop="refundableQty"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="right"
+              label="单价"
+              prop="price"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.price | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="订单金额"
+              prop="payAmount"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单备注" prop="headerRemark" 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>
-            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column
+              align="left"
+              label="订单备注"
+              prop="headerRemark"
+              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>
+            <el-table-column
+              align="left"
+              label="表体备注"
+              prop="invoiceRemark"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="业务员"
+              prop="serviceName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="表头业务员"
+              prop="k3ServiceName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
             <!-- <el-table-column align="center" label="操作" width="120" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
@@ -276,29 +455,49 @@
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal">
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
 
-    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
-
-    <SalesDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
-    <SalesExamine :listItem="queryItem" v-if="isShowExamine" @backListFormExamine="backList" />
-    <SalesReturnForm :listItem="queryItem" v-if="isShowReturnForm" @backListFormDetail="backList" />
+    <ExamineDialog
+      :isShow.sync="isShowExamineDialog"
+      :examineForm.sync="examineForm"
+    />
 
+    <SalesDetail
+      :listItem="queryItem"
+      v-if="isShowDetail"
+      @backListFormDetail="backList"
+    />
+    <SalesExamine
+      :listItem="queryItem"
+      v-if="isShowExamine"
+      @backListFormExamine="backList"
+    />
+    <SalesReturnForm
+      :listItem="queryItem"
+      v-if="isShowReturnForm"
+      @backListFormDetail="backList"
+    />
   </div>
 </template>
 
 <script>
-import { abandonData, examineBatch, examineJudge, getList } from '@/api/supply/sales'
-import SalesDetail from '@/views/supply/sales/components/sales_detail'
-import SalesExamine from '@/views/supply/sales/components/sales_examine'
-import SalesReturnForm from '@/views/supply/sales/components/sales_return_form'
-import ExamineDialog from '@/components/Common/examine-dialog'
+import {
+  abandonData,
+  examineBatch,
+  examineJudge,
+  getList,
+} from "@/api/supply/sales";
+import SalesDetail from "@/views/supply/sales/components/sales_detail";
+import SalesExamine from "@/views/supply/sales/components/sales_examine";
+import SalesReturnForm from "@/views/supply/sales/components/sales_return_form";
+import ExamineDialog from "@/components/Common/examine-dialog";
 
-let that
+let that;
 export default {
   components: {
     SalesDetail,
@@ -308,8 +507,8 @@ export default {
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val);
-      return obj ? obj.label : ''
+      let obj = that.statusList.find((o) => o.value == val);
+      return obj ? obj.label : "";
     },
     orderTypeFilter(val) {
       let obj = that.orderTypeList.find((o) => o.value == val);
@@ -317,11 +516,11 @@ export default {
     },
     billStatusFilter(val) {
       const MAP = {
-        1: '已开票',
-        0: '未开票',
-      }
+        1: "已开票",
+        0: "未开票",
+      };
       return MAP[val];
-    }
+    },
   },
   data() {
     return {
@@ -330,56 +529,57 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        orderNum: '',
-        jxsName: '',
-        jxsNum: '',
-        chName: '',
-        chNum: '',
-        model: '',
-        warehouse: '',
-        date: '',
-        status: '',
-        approval:'',
-        printTime:'',
-        mainOrderId: '',
-        printDesc:null,
-        id:''
+      screenForm: {
+        // 筛选表单数据
+        orderNum: "",
+        jxsName: "",
+        jxsNum: "",
+        chName: "",
+        chNum: "",
+        model: "",
+        warehouse: "",
+        date: "",
+        status: "",
+        approval: "",
+        printTime: "",
+        mainOrderId: "",
+        printDesc: null,
+        id: "",
       },
       statusList: [
-        { label: '已保存', value: 'SAVE' },
-        { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' },
-         // { label: '审核驳回', value: 'FAIL' },,
+        { label: "已保存", value: "SAVE" },
+        { label: "待审核", value: "WAIT" },
+        { label: "审核通过", value: "OK" },
+        // { 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" },
       ],
 
       queryItem: {},
       isShowDetail: false,
       isShowExamine: false,
       isShowReturnForm: false,
-  value1: "",
+      value1: "",
       choiceDate: "",
       multipleSelection: [],
       isShowExamineDialog: false,
       examineForm: {
-        status: '',
-        remark: '',
+        status: "",
+        remark: "",
       },
-       setDisabled: {
+      setDisabled: {
         disabledDate: (time) => {
           if (this.choiceDate) {
             const res = 13 * 24 * 3600 * 1000;
@@ -393,7 +593,7 @@ export default {
           if (maxDate) this.choiceDate = "";
         },
       },
-    }
+    };
   },
 
   computed: {
@@ -407,20 +607,24 @@ export default {
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
         correspondName: this.screenForm.warehouse,
-        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] : "",
-          printStartTime:this.screenForm.printTime
+        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]
+          : "",
+        printStartTime: this.screenForm.printTime
           ? this.screenForm.printTime[0]
           : "",
-          printEndtTime:this.screenForm.printTime
+        printEndtTime: this.screenForm.printTime
           ? this.screenForm.printTime[1]
           : "",
         mainOrderId: this.screenForm.mainOrderId,
-        printTimeDesc:this.screenForm.printDesc,
-        id:this.screenForm.id
-      }
+        printTimeDesc: this.screenForm.printDesc,
+        id: this.screenForm.id,
+      };
     },
   },
 
@@ -448,45 +652,47 @@ export default {
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
         correspondName: this.screenForm.warehouse,
-        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] : "",
-          printStartTime:this.screenForm.printTime
+        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]
+          : "",
+        printStartTime: this.screenForm.printTime
           ? this.screenForm.printTime[0]
           : "",
-          printEndtTime:this.screenForm.printTime
+        printEndtTime: this.screenForm.printTime
           ? this.screenForm.printTime[1]
           : "",
-          printTimeDesc:this.screenForm.printDesc,
+        printTimeDesc: this.screenForm.printDesc,
         mainOrderId: this.screenForm.mainOrderId,
-        id:this.screenForm.id
+        id: this.screenForm.id,
       };
       getList(params).then((res) => {
-        res.data.records.forEach(item => {
-          item.sums1 = ['refundableQty'];
-          item.sums2 = ['price', 'payAmount'];
-        })
+        res.data.records.forEach((item) => {
+          item.sums1 = ["refundableQty"];
+          item.sums2 = ["price", "payAmount"];
+        });
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      })
+      });
     },
-  updateReceipt() {
-
-    if (!this.value1) {
-      this.$errorMsg('请选择时间')
-      return
-    }
+    updateReceipt() {
+      if (!this.value1) {
+        this.$errorMsg("请选择时间");
+        return;
+      }
       updateReceipt({
-      startTime:this.value1[0],
-      endTime:this.value1[1]
-      }).then(res=>{
-         this.getList();
+        startTime: this.value1[0],
+        endTime: this.value1[1],
+      }).then((res) => {
+        this.getList();
         this.$successMsg("已更新");
-         this.value1 = ''
-      })
-
+        this.value1 = "";
+      });
     },
     // 提交筛选表单
     submitScreenForm() {
@@ -517,13 +723,15 @@ export default {
     // 判断是否可以审批
     async examineJudge(item) {
       // 获取页面模版
-      const result = await new Promise((resolve, reject)=>{
-        examineJudge({id: item.id}).then(res => {
-          resolve(res.code == 200);
-        }).catch(res => {
-          resolve(0);
-        })
-      })
+      const result = await new Promise((resolve, reject) => {
+        examineJudge({ id: item.id })
+          .then((res) => {
+            resolve(res.code == 200);
+          })
+          .catch((res) => {
+            resolve(0);
+          });
+      });
       return result;
     },
 
@@ -542,7 +750,7 @@ export default {
     // 进入审批
     async toExamine(item) {
       const canExamine = await this.examineJudge(item);
-      if(!canExamine) {
+      if (!canExamine) {
         return false;
       }
       this.queryItem = item;
@@ -567,31 +775,29 @@ export default {
 
     // 提交 批量审批
     submitExamineForm() {
-      let ids = this.multipleSelection.map(item => {
+      let ids = this.multipleSelection.map((item) => {
         return item.id;
       });
       examineBatch({
-        ids: ids.join(','),
+        ids: ids.join(","),
         examineStatus: this.examineForm.status,
         approvalRemark: this.examineForm.remark,
-      }).then(res => {
+      }).then((res) => {
         this.isShowExamineDialog = false;
         this.getList();
-        this.$successMsg('修改成功');
-      })
+        this.$successMsg("修改成功");
+      });
     },
 
     // 弃审
     handleAbandon(id) {
-      abandonData({id}).then(res => {
+      abandonData({ id }).then((res) => {
         this.$successMsg();
         this.getList();
-      })
+      });
     },
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 18 - 18
src/views/supply/pickup/check.vue

@@ -248,17 +248,15 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton
-                  :copyText="
-                    scope.row.orderType == 'HOME' ||
-                    scope.row.orderType == 'TRADE'
-                      ? scope.row.enginOrderNo
-                      : scope.row.mainOrderId
-                  "
-                />
+                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
                 <span>{{
-                  scope.row.orderType == "HOME" ||
-                  scope.row.orderType == "TRADE"
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>
@@ -743,8 +741,8 @@ export default {
           }
         });
       } else {
-        this.getDateil(this.tableSelection, "getDtailPrintDis").then(res=>{
-          this.$endLoading()
+        this.getDateil(this.tableSelection, "getDtailPrintDis").then((res) => {
+          this.$endLoading();
           this.$refs.preView.show(this.hiprintTemplate, this.outputData);
         });
       }
@@ -765,14 +763,14 @@ export default {
             password: this.dialogForm.password,
           };
           checkPassword(params).then((res) => {
-            this.getDateil(this.tableSelection, "getDtailPrintDis").then(res=>{
-              this.$endLoading()
-              this.$refs.preView.show(this.hiprintTemplate, this.outputData);
-
-        });
+            this.getDateil(this.tableSelection, "getDtailPrintDis").then(
+              (res) => {
+                this.$endLoading();
+                this.$refs.preView.show(this.hiprintTemplate, this.outputData);
+              }
+            );
             this.cancelDialogForm();
           });
-
         }
       });
     },
@@ -796,5 +794,7 @@ export default {
 }
 .text {
   word-break: break-all !important;
+  height: 200px;
+  overflow-y: auto;
 }
 </style>

+ 295 - 129
src/views/supply/pickup/components/pickup_form.vue

@@ -1,38 +1,61 @@
 <template>
   <div class="detail-container">
-
-    <el-page-header @back="goBack" :content="listItem ? '编辑':'新增'"></el-page-header>
+    <el-page-header
+      @back="goBack"
+      :content="listItem ? flag?'详情': '编辑' : '新增'"
+    ></el-page-header>
     <el-divider></el-divider>
 
     <div>
-      <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="80px" size="small" label-position="left">
+      <el-form
+        ref="mainForm"
+        :model="mainForm"
+        :rules="mainFormRules"
+        label-width="80px"
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="8">
             <el-form-item label="选择仓库" prop="warehouse">
-              <el-select v-model="mainForm.warehouse" placeholder="请选择仓库" 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="mainForm.warehouse"
+                placeholder="请选择仓库"
+                style="width: 100%"
+                :disabled="flag"
+              >
+                <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>
           <el-col :xs="24" :sm="12" :lg="8">
-            <el-button size="small" type="primary" @click="getDeliverList">确定</el-button>
+            <el-button size="small" type="primary"  v-if="!flag" @click="getDeliverList"
+              >确定</el-button
+            >
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="8" style="height: 51px;">
+          <el-col :xs="24" :sm="12" :lg="8" style="height: 51px">
             <el-form-item label="预约日期" prop="date">
               <el-date-picker
+              :disabled="flag"
                 v-model="mainForm.date"
                 type="date"
                 value-format="yyyy-MM-dd"
-                style="width: 100%;"
-                placeholder="选择日期">
+                style="width: 100%"
+                placeholder="选择日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="12" style="height: 51px;">
+          <el-col :xs="24" :sm="12" :lg="12" style="height: 51px">
             <el-form-item label="预约时段" prop="timeSlot">
-              <el-radio-group v-model="mainForm.timeSlot">
+              <el-radio-group v-model="mainForm.timeSlot" :disabled="flag">
                 <el-radio :label="1">上午</el-radio>
                 <el-radio :label="2">下午</el-radio>
               </el-radio-group>
@@ -42,29 +65,64 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="8">
             <el-form-item label="提货方式" prop="pickupWay">
-              <el-radio-group v-model="mainForm.pickupWay">
-                <el-radio :label="item.dictCode" v-for="(item, index) in pickupWayList" :key="index">{{item.dictValue}}</el-radio>
+              <el-radio-group v-model="mainForm.pickupWay" :disabled="flag">
+                <el-radio
+                  :label="item.dictCode"
+                  v-for="(item, index) in pickupWayList"
+                  :key="index"
+                  >{{ item.dictValue }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8">
             <el-form-item label="提货人" prop="pickupMan">
-              <el-select v-model="mainForm.pickupMan" placeholder="全部" style="width: 100%">
-                <el-option :label="item.takerName" :value="item.id" v-for="(item, index) in pickupManList" :key="index"></el-option>
+              <el-select
+                v-model="mainForm.pickupMan"
+                placeholder="全部"
+                :disabled="flag"
+                style="width: 100%"
+              >
+                <el-option
+                  :label="item.takerName"
+                  :value="item.id"
+                  v-for="(item, index) in pickupManList"
+                  :key="index"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8" v-if="mainForm.pickupWay == '1'">
             <el-form-item label="提货车辆" prop="pickupCar">
-              <el-select v-model="mainForm.pickupCar" placeholder="全部" style="width: 100%">
-                <el-option :label="item.carBrand" :value="item.id" v-for="(item, index) in pickupCarList" :key="index"></el-option>
+              <el-select
+                v-model="mainForm.pickupCar"
+                placeholder="全部"
+                style="width: 100%"
+                :disabled="flag"
+              >
+                <el-option
+                  :label="item.carBrand"
+                  :value="item.id"
+                  v-for="(item, index) in pickupCarList"
+                  :key="index"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8" v-if="mainForm.pickupWay == '2'">
             <el-form-item label="物流公司" prop="company">
-              <el-select v-model="mainForm.company" placeholder="全部" style="width: 100%">
-                <el-option :label="item.logisticsCompany" :value="item.logisticsNumber" v-for="(item, index) in companyList" :key="index"></el-option>
+              <el-select
+                v-model="mainForm.company"
+                placeholder="全部"
+                style="width: 100%"
+                :disabled="flag"
+              >
+                <el-option
+                  :label="item.logisticsCompany"
+                  :value="item.logisticsNumber"
+                  v-for="(item, index) in companyList"
+                  :key="index"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -72,7 +130,11 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="24" :lg="24">
             <el-form-item label="备注内容" prop="remark">
-              <el-input v-model="mainForm.remark" placeholder="请输入备注内容"></el-input>
+              <el-input
+                v-model="mainForm.remark"
+                :disabled="flag"
+                placeholder="请输入备注内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -81,77 +143,177 @@
 
     <div class="mymain-container">
       <div class="table">
-        <el-table ref="table" v-loading="listLoading" :data="deliverList" element-loading-text="Loading" border fit highlight-current-row stripe @select="handleSelect" @select-all="handleSelectAll">
-          <el-table-column align="center" type="selection" width="55"></el-table-column>
-          <el-table-column align="left" label="发货申请单" prop="invoiceId" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="单据日期" prop="orderTime" min-width="120" show-overflow-tooltip>
+        <el-table
+          ref="table"
+          v-loading="listLoading"
+          :data="deliverList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          @select="handleSelect"
+          @select-all="handleSelectAll"
+        >
+          <el-table-column
+            align="center"
+            type="selection"
+            width="55"
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="发货申请单"
+            prop="invoiceId"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="单据日期"
+            prop="orderTime"
+            min-width="120"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
               {{ scope.row.orderTime | dateToDayFilter }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="160" show-overflow-tooltip>
+          <el-table-column
+            align="left"
+            label="销售订单号"
+            prop="mainOrderId"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <CopyButton :copyText="(scope.row.orderType == 'HOME' || scope.row.orderType == 'TRADE') ? scope.row.enginOrderNo: scope.row.mainOrderId" />
-              <span>{{ (scope.row.orderType == 'HOME' || scope.row.orderType == 'TRADE') ? scope.row.enginOrderNo: scope.row.mainOrderId }}</span>
+              <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+              <span>{{
+                scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" ||
+                scope.row.orderType === "REQUISITION_TRADE" ||
+                scope.row.orderType === "REQUISITION_HOME"
+                  ? scope.row.enginOrderNo
+                  : scope.row.mainOrderId
+              }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column> -->
+          <el-table-column
+            align="left"
+            label="销售类型"
+            prop="saleTypeName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="物料编码"
+            prop="materialCode"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="产品名称"
+            prop="materialName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="规格型号"
+            prop="specification"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="单位"
+            prop="unit"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="right"
+            label="数量"
+            prop="refundableQty"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
         </el-table>
       </div>
     </div>
 
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
-        <el-popconfirm title="确定重置吗?" @onConfirm="resetForm" style="margin-left: 10px;" v-if="!listItem">
+        <el-button
+          type="primary"
+          @click="clickSubmitForm"
+          v-if="!flag"
+          :loading="formLoading"
+          >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
+        >
+        <el-popconfirm
+          title="确定重置吗?"
+          @onConfirm="resetForm"
+          style="margin-left: 10px"
+          v-if="!listItem"
+        >
           <el-button slot="reference">重 置</el-button>
         </el-popconfirm>
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
-import { getWarehouseList, getDeliverList, getPickupManList, getPickupCarList, getCompanyList, addPickupBook, editPickupBook, getDetail, checkStock } from "@/api/supply/pickup";
+import {
+  getWarehouseList,
+  getDeliverList,
+  getPickupManList,
+  getPickupCarList,
+  getCompanyList,
+  addPickupBook,
+  editPickupBook,
+  getDetail,
+  checkStock,
+} from "@/api/supply/pickup";
 import { getDictList } from "@/api/common";
 
 export default {
-  name: 'PickupForm',
-  componentName: 'PickupForm',
-  props: ['listItem'],
+  name: "PickupForm",
+  componentName: "PickupForm",
+  props: ["listItem","flag"],
   data() {
     return {
       deliverList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      mainForm: { // 筛选表单数据
-        warehouse: '',
-        date: '',
-        timeSlot: '',
-        pickupWay: '',
-        pickupMan: '',
-        pickupCar: '',
-        company: '',
-        remark: '',
+      mainForm: {
+        // 筛选表单数据
+        warehouse: "",
+        date: "",
+        timeSlot: "",
+        pickupWay: "",
+        pickupMan: "",
+        pickupCar: "",
+        company: "",
+        remark: "",
       },
       mainFormRules: {
         date: [
-          { required: true, message: '请选择预约日期', trigger: 'change' }
+          { required: true, message: "请选择预约日期", trigger: "change" },
         ],
         timeSlot: [
-          { required: true, message: '请选择预约时段', trigger: 'change' }
+          { required: true, message: "请选择预约时段", trigger: "change" },
         ],
         pickupWay: [
-          { required: true, message: '请选择提货方式', trigger: 'change' }
+          { required: true, message: "请选择提货方式", trigger: "change" },
         ],
         pickupMan: [
-          { required: true, message: '请选择提货人', trigger: 'change' }
+          { required: true, message: "请选择提货人", trigger: "change" },
         ],
       },
       formLoading: false,
@@ -161,18 +323,18 @@ export default {
       pickupManList: [],
       pickupCarList: [],
       companyList: [],
-    }
+    };
   },
 
   computed: {
     sidebar() {
-      return this.$store.state.app.sidebar
+      return this.$store.state.app.sidebar;
     },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
+        openSidebar: this.sidebar.opened,
+      };
     },
   },
 
@@ -182,7 +344,7 @@ export default {
     this.getPickupManList();
     this.getPickupCarList();
     this.getCompanyList();
-    if(this.listItem) {
+    if (this.listItem) {
       this.getDetail();
     }
   },
@@ -194,17 +356,17 @@ export default {
       // if(!btnRole) {return true}
       // let index = btnRole.indexOf(value);
       // return index >= 0;
-      return true
+      return true;
     },
 
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail');
+      this.$emit("backListFormDetail");
     },
 
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
+      getDetail({ id: this.listItem.id }).then((res) => {
         let data = res.data;
         this.mainForm.warehouse = data.correspondId;
         this.mainForm.date = data.pickTime.slice(0, 10);
@@ -216,75 +378,75 @@ export default {
         this.mainForm.remark = data.remark;
 
         this.deliverList = data.invoicePickBeans;
-      })
+      });
     },
 
     // 获取仓库列表
     getWarehouseList() {
       getWarehouseList({
         pageNum: 1,
-        pageSize: -1
+        pageSize: -1,
       }).then((res) => {
         this.warehouseList = res.data.records;
-      })
+      });
     },
 
     // 获取提货方式列表
     getPickupWayList() {
-      getDictList({sysDictEnum: 'PICK'}).then(res => {
+      getDictList({ sysDictEnum: "PICK" }).then((res) => {
         this.pickupWayList = res.data;
-      })
+      });
     },
 
     // 获取提货人列表
     getPickupManList() {
       getPickupManList({
         pageNum: 1,
-        pageSize: -1
-      }).then(res => {
+        pageSize: -1,
+      }).then((res) => {
         this.pickupManList = res.data.records;
-      })
+      });
     },
 
     // 获取提货车辆列表
     getPickupCarList() {
       getPickupCarList({
         pageNum: 1,
-        pageSize: -1
-      }).then(res => {
+        pageSize: -1,
+      }).then((res) => {
         this.pickupCarList = res.data.records;
-      })
+      });
     },
 
     // 获取物流公司列表
     getCompanyList() {
       getCompanyList({
         pageNum: 1,
-        pageSize: -1
-      }).then(res => {
+        pageSize: -1,
+      }).then((res) => {
         this.companyList = res.data.records;
-      })
+      });
     },
 
     // 查询列表
     getDeliverList() {
-      if(!this.mainForm.warehouse) {
-        return this.$errorMsg('请选择仓库');
+      if (!this.mainForm.warehouse) {
+        return this.$errorMsg("请选择仓库");
       }
       this.listLoading = true;
-      getDeliverList({correspondId: this.mainForm.warehouse}).then((res) => {
+      getDeliverList({ correspondId: this.mainForm.warehouse }).then((res) => {
         this.deliverList = res.data;
         this.listLoading = false;
-      })
+      });
     },
 
     handleSelect(selection, row) {
       this.$refs.table.toggleRowSelection(row);
-      this.deliverList.forEach(item => {
+      this.deliverList.forEach((item) => {
         if (item.invoiceId === row.invoiceId) {
           this.$refs.table.toggleRowSelection(item);
         }
-      })
+      });
       this.tableSelection = this.$refs.table.selection;
     },
 
@@ -295,81 +457,88 @@ export default {
     clickSubmitForm() {
       this.$refs.mainForm.validate((valid) => {
         if (valid) {
-          if(this.tableSelection.length < 1) {
-            return this.$errorMsg('请选择发货申请单');
+          if (this.tableSelection.length < 1) {
+            return this.$errorMsg("请选择发货申请单");
           }
 
           let orderList = [];
-          this.tableSelection.forEach(item => {
+          this.tableSelection.forEach((item) => {
             orderList.push(item.invoiceOrderId);
           });
           let params = {
             correspondId: this.mainForm.warehouse,
-            pickTime: this.mainForm.date + ' 00:00:00',
-            invoiceOrderIds: orderList.join(','),
-          }
-          checkStock(params).then(res => {
-            if(res.data) {
-              this.$confirm(res.data, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-              }).then(() => {
-                this.submitForm();
-              }).catch(() => {});
-            }else {
+            pickTime: this.mainForm.date + " 00:00:00",
+            invoiceOrderIds: orderList.join(","),
+          };
+          checkStock(params).then((res) => {
+            if (res.data) {
+              this.$confirm(res.data, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              })
+                .then(() => {
+                  this.submitForm();
+                })
+                .catch(() => {});
+            } else {
               this.submitForm();
             }
-          })
-
+          });
         }
-      })
+      });
     },
 
     submitForm() {
       this.formLoading = true;
 
-      let takerName = this.pickupManList.find(o => o.id == this.mainForm.pickupMan).takerName;
+      let takerName = this.pickupManList.find(
+        (o) => o.id == this.mainForm.pickupMan
+      ).takerName;
       // let correspondName = this.warehouseList.find(o => o.id == this.mainForm.warehouse).name;
 
       let orderList = [];
-      this.tableSelection.forEach(item => {
+      this.tableSelection.forEach((item) => {
         orderList.push(item.invoiceOrderId);
       });
       let params = {
         correspondId: this.mainForm.warehouse,
         // correspondName,
-        pickTime: this.mainForm.date + ' 00:00:00',
+        pickTime: this.mainForm.date + " 00:00:00",
         pickStatus: Number(this.mainForm.timeSlot),
         pickType: Number(this.mainForm.pickupWay),
         takerId: this.mainForm.pickupMan,
         takerName,
         remark: this.mainForm.remark,
         invoiceOrderIds: orderList,
-      }
-      if(this.mainForm.pickupWay == '1') {
+      };
+      if (this.mainForm.pickupWay == "1") {
         params.takerCarId = this.mainForm.pickupCar;
       }
-      if(this.mainForm.pickupWay == '2') {
+      if (this.mainForm.pickupWay == "2") {
         params.pickLogistics = this.mainForm.company;
       }
-      if(this.listItem) {
+      if (this.listItem) {
         params.id = this.listItem.id;
-        editPickupBook(params).then(res => {
-          this.$successMsg('提交成功');
-          this.goBack();
-          this.$parent.getList();
-        }).finally(res => {
-          this.formLoading = false;
-        })
-      }else {
-        addPickupBook(params).then(res => {
-          this.$successMsg('提交成功');
-          this.goBack();
-          this.$parent.getList();
-        }).finally(res => {
-          this.formLoading = false;
-        })
+        editPickupBook(params)
+          .then((res) => {
+            this.$successMsg("提交成功");
+            this.goBack();
+            this.$parent.getList();
+          })
+          .finally((res) => {
+            this.formLoading = false;
+          });
+      } else {
+        addPickupBook(params)
+          .then((res) => {
+            this.$successMsg("提交成功");
+            this.goBack();
+            this.$parent.getList();
+          })
+          .finally((res) => {
+            this.formLoading = false;
+          });
       }
     },
 
@@ -377,11 +546,8 @@ export default {
       this.$refs.mainForm.resetFields();
       this.deliverList = [];
     },
-
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 328 - 107
src/views/supply/pickup/pickup_list.vue

@@ -4,147 +4,336 @@
       <!-- 筛选条件 -->
       <div class="screen-container">
         <el-form ref="screenForm" :model="screenForm" 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="orderNum">
-                <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="applyName">
-                <el-input v-model="screenForm.applyName" placeholder="请输入申请人"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="提货仓库" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入提货仓库"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="提货日期" prop="date">
-                <el-date-picker
-                  v-model="screenForm.date"
-                  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-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="申请发货单号" prop="orderNum">
+              <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="jxsName">
+              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编码" prop="jxsNum">
+              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="仓库" prop="warehouse">
+              <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="screenForm.status" placeholder="请选择">
+                <el-option label="未打单" :value="0">
+                </el-option>
+                <el-option label="已打单" :value="1">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="手机号" prop="takerPhone">
+              <el-input type="number" v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="提货人" prop="takerId">
+              <el-select v-model="screenForm.takerId" placeholder="请选择">
+                <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id">
+                </el-option>
 
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="申请日期" prop="date">
+              <el-date-picker v-model="screenForm.date" 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="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="6">
+            <el-form-item label="出库单号" prop="salesOrderId">
+              <el-input type="number" v-model.number="screenForm.salesOrderId" placeholder="请输入出库单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-form-item label="">
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       </div>
 
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              @click="toForm()"
+              v-if="$checkBtnRole('add', $route.meta.roles)"
+              >新增</el-button
+            >
           </div>
           <div class="fr">
             <ExportButton :exUrl="'pick/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-            <el-table-column align="left" label="状态" min-width="80" show-overflow-tooltip>
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+          >
+            <el-table-column
+              align="left"
+              label="状态"
+              min-width="80"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.printNum ? '已打单':'未打单' }}
+                {{ scope.row.printNum ? "已打单" : "未打单" }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="打单日期" prop="printTime" 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="printTime"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <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>
+                <span>{{ scope.row.informationKey }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialCode"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
-                <span>{{scope.row.materialCode}}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="350"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </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="invoiceId" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="提货总数量"
+              prop="refundableQty"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="发货申请单号"
+              prop="invoiceId"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.invoiceId" />
-                <span>{{scope.row.invoiceId}}</span>
+                <span>{{ scope.row.invoiceId }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="销售订单号"
+              prop="mainOrderId"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <CopyButton :copyText="(scope.row.orderType == 'HOME' || scope.row.orderType == 'TRADE') ? scope.row.enginOrderNo: scope.row.mainOrderId" />
-                <span>{{ (scope.row.orderType == 'HOME' || scope.row.orderType == 'TRADE') ? scope.row.enginOrderNo: scope.row.mainOrderId }}</span>
+                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                <span>{{
+                  scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column
+              align="left"
+              label="销售类型"
+              prop="saleTypeName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
 
-            <el-table-column align="left" label="工程订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="工程订单号"
+              prop="enginOrderNo"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginOrderNo" />
-                <span>{{scope.row.enginOrderNo}}</span>
+                <span>{{ scope.row.enginOrderNo }}</span>
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="预约日期" prop="pickTime" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="预约日期"
+              prop="pickTime"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.pickTime | dateToDayFilter }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="提货时段" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="提货时段"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.pickStatus == '1' ? '上午':'下午' }}
+                {{ scope.row.pickStatus == "1" ? "上午" : "下午" }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="提货仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="提货仓库"
+              prop="correspondName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="提货方式"
+              prop="pickType"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.pickType == '1' ? '自提':'物流快递' }}
+                {{ scope.row.pickType == "1" ? "自提" : "物流快递" }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单据日期" prop="theTime" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="单据日期"
+              prop="theTime"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.theTime | dateToDayFilter }}
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="备注" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="操作" width="100" fixed="right">
+            <el-table-column
+              align="left"
+              label="备注"
+              prop="remark"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="操作"
+              width="100"
+              fixed="right"
+            >
               <template slot-scope="scope">
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && !scope.row.printNum">编辑</el-button>
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row,true)"
+                  >详情</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row)"
+                  v-if="
+                    $checkBtnRole('edit', $route.meta.roles) &&
+                    !scope.row.printNum
+                  "
+                  >编辑</el-button
+                >
                 <el-popconfirm
-                  style="margin-left: 10px;"
-                  :title="'确定' + (scope.row.printNum ? '作废' : '取消') +'吗?'"
+                  style="margin-left: 10px"
+                  :title="
+                    '确定' + (scope.row.printNum ? '作废' : '取消') + '吗?'
+                  "
                   @onConfirm="handleCancel(scope.row.id)"
-                  v-if="$checkBtnRole('cancel', $route.meta.roles) && ((isDealer && !scope.row.printNum) || !isDealer)" >
-                  <el-button slot="reference" type="text">{{scope.row.printNum ? '作废' : '取消'}}</el-button>
+                  v-if="
+                    $checkBtnRole('cancel', $route.meta.roles) &&
+                    ((isDealer && !scope.row.printNum) || !isDealer)
+                  "
+                >
+                  <el-button slot="reference" type="text">{{
+                    scope.row.printNum ? "作废" : "取消"
+                  }}</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -160,24 +349,30 @@
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal">
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
 
-    <PickupForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
-
+    <PickupForm
+      :listItem="queryItem"
+      :flag="flag"
+      v-if="isShowForm"
+      @backListFormDetail="backList"
+    />
   </div>
 </template>
 
 <script>
-import { getPickupList, cancelData } from "@/api/supply/pickup";
+import { getPickupList, cancelData,getPickupManList } from "@/api/supply/pickup";
+
 import PickupForm from "@/views/supply/pickup/components/pickup_form";
 
 export default {
   components: {
-    PickupForm
+    PickupForm,
   },
   data() {
     return {
@@ -186,36 +381,52 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        orderNum: '',
-        applyName: '',
-        warehouse: '',
-        date: '',
+      screenForm: {
+        // 筛选表单数据
+        orderNum: "",
+        jxsName: "",
+        jxsNum: "",
+        warehouse: "",
+        date: "",
+        status: "",
+        takerPhone: "",
+        takerId: "",
+        printTime: "",
+        salesOrderId: "",
       },
-
+      pickupManList: "",
+      flag:false,
       queryItem: {},
       isShowForm: false,
-
-    }
+    };
   },
 
   computed: {
     isDealer() {
-      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer;
     },
     exParams() {
       return {
         invoiceId: this.screenForm.orderNum,
-        createBy: this.screenForm.applyName,
+        customerName: this.screenForm.jxsName,
+        customerNumber: this.screenForm.jxsNum,
         stockName: this.screenForm.warehouse,
-        pickStartTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        pickEndTime: this.screenForm.date ? this.screenForm.date[1] : '',
-      }
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        status: this.screenForm.status,
+        takerPhone: this.screenForm.takerPhone,
+        takerId: this.screenForm.takerId,
+        printStartTime: this.screenForm.printTime[0],
+        printEndTime: this.screenForm.printTime[1],
+        salesOrderId: this.screenForm.salesOrderId,
+
+      };
     },
   },
 
   created() {
     this.getList();
+    this.getPickupManList()
   },
 
   methods: {
@@ -225,9 +436,13 @@ export default {
       // if(!btnRole) {return true}
       // let index = btnRole.indexOf(value);
       // return index >= 0;
-      return true
+      return true;
+    },
+    getPickupManList() {
+      getPickupManList({ pageNum: 1, pageSize: -1 }).then((res) => {
+        this.pickupManList = res.data.records;
+      });
     },
-
     // 查询列表
     getList() {
       this.listLoading = true;
@@ -236,16 +451,23 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         invoiceId: this.screenForm.orderNum,
-        createBy: this.screenForm.applyName,
+        customerName: this.screenForm.jxsName,
+        customerNumber: this.screenForm.jxsNum,
         stockName: this.screenForm.warehouse,
-        pickStartTime: this.screenForm.date ? this.screenForm.date[0] : '',
-        pickEndTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        status: this.screenForm.status,
+        takerPhone: this.screenForm.takerPhone,
+        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;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      })
+      });
     },
 
     // 提交筛选表单
@@ -275,7 +497,8 @@ export default {
     },
 
     // 进入表单
-    toForm(item) {
+    toForm(item,flag =false) {
+      this.flag = flag  // 详情 flag 为 details
       this.queryItem = item;
       this.isShowForm = true;
     },
@@ -287,15 +510,13 @@ export default {
 
     // 取消/作废
     handleCancel(id) {
-      cancelData({id}).then(res => {
+      cancelData({ id }).then((res) => {
         this.$successMsg();
         this.getList();
-      })
+      });
     },
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 6 - 0
src/views/supply/policy/components/retail_examine.vue

@@ -86,6 +86,8 @@
         highlight-current-row
         stripe
         max-height="400"
+        show-summary
+        :summary-method="$getSummaries"
       >
         <el-table-column
           align="center"
@@ -374,6 +376,10 @@ export default {
     // 获取详情
     getDetail() {
       getDetail({ id: this.listItem.id }).then((res) => {
+        res.data.retailOrderItemList.forEach(item => {
+            item.sums1 = ['directTransferQty', 'qty', 'refundableQty', 'oldQty', 'tdQty'];
+            item.sums2 = ['totalAmount', 'payAmount', 'price', 'discAmount', 'totalDiscAmount', 'rebateAmount'];
+          })
         this.detailData = res.data;
       });
       getUserList({

+ 249 - 104
src/views/supply/policy/components/retail_return.vue

@@ -10,35 +10,35 @@
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">订单号</div>
-          <div class="value">{{detailData.id}}</div>
+          <div class="value">{{ detailData.id }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>
-          <div class="value">{{detailData.theTime}}</div>
+          <div class="value">{{ detailData.theTime }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">单据状态</div>
-          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+          <div class="value">{{ detailData.examineStatus | statusFilter }}</div>
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">备注</div>
-          <div class="value">{{detailData.remark}}</div>
+          <div class="value">{{ detailData.remark }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
-          <div class="value">{{detailData.serviceName}}</div>
+          <div class="value">{{ detailData.serviceName }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createName}}</div>
+          <div class="value">{{ detailData.createName }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">审核人</div>
-          <div class="value">{{detailData.examineName}}</div>
+          <div class="value">{{ detailData.examineName }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeName}}</div>
+          <div class="value">{{ detailData.closeName }}</div>
         </el-col>
       </el-row>
     </div>
@@ -48,32 +48,115 @@
     </div>
 
     <div class="table" style="margin-top: 20px">
-      <el-table :data="detailData.retailOrderItemList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
-        <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column
+      <el-table
+        :data="detailData.retailOrderItemList || []"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+        max-height="400"
+        show-summary
+        :summary-method="$getSummaries"
+      >
+        <el-table-column
+          align="center"
+          label="序号"
+          type="index"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="销售类型"
+          prop="saleTypeName"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="物料编码"
+          prop="materialCode"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="产品名称"
+          prop="materialName"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="规格型号"
+          prop="specification"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="单位"
+          prop="unit"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="单价"
+          prop="price"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="数量"
+          prop="qty"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="订单金额"
+          prop="totalAmount"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
           align="center"
           label="返利钱包(类型)"
           prop="rebateWallets"
           min-width="100"
           show-overflow-tooltip
         >
-        <template slot-scope="scope">
-          <el-tag type="success" size="small" v-for="item in scope.row.rebateWallets">
-          {{item.name}}
-          </el-tag>
-
-        </template>
-        </el-table-column>        <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column
+          <template slot-scope="scope">
+            <template
+              v-if="scope.row.rebateWallets && scope.row.rebateWallets.length"
+            >
+              <el-tag
+                type="success"
+                size="small"
+                v-for="item in scope.row.rebateWallets"
+              >
+                {{ item.name }}
+              </el-tag>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="返利金额"
+          prop="rebateAmount"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="格力折扣"
+          prop="totalDiscAmount"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
           align="center"
           label="现金钱包"
           prop="wallets"
@@ -81,26 +164,78 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-          <el-tag type="success" size="small" v-for="item in scope.row.wallets">
-          {{item.name}}
-          </el-tag>
-
-        </template>
-        </el-table-column>        <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+            <template v-if="scope.row.wallets && scope.row.wallets.length">
+              <el-tag
+                type="success"
+                size="small"
+                v-for="item in scope.row.wallets"
+              >
+                {{ item.name }}
+              </el-tag>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="实付金额"
+          prop="payAmount"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="是否直调"
+          prop="isDirectTransfer"
+          min-width="100"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            {{scope.row.isDirectTransfer ? '是':'否'}}
+            {{ scope.row.isDirectTransfer ? "是" : "否" }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="可退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
+        <el-table-column
+          align="center"
+          label="直调数量"
+          prop="directTransferQty"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="可退数量"
+          prop="refundableQty"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="退订数量"
+          prop="tdQty"
+          min-width="100"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tdQty" size="small" type="number"></el-input>
+            <el-input
+              v-model="scope.row.tdQty"
+              size="small"
+              type="number"
+            ></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          align="center"
+          label="备注"
+          prop="remark"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="税率"
+          prop="tax"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
       </el-table>
     </div>
 
@@ -111,11 +246,11 @@
       <el-row :gutter="0">
         <el-col :span="12" class="item">
           <div class="label">操作人</div>
-          <div class="value">{{userName}}</div>
+          <div class="value">{{ userName }}</div>
         </el-col>
         <el-col :span="12" class="item">
           <div class="label">退订日期</div>
-          <div class="value">{{nowDate}}</div>
+          <div class="value">{{ nowDate }}</div>
         </el-col>
         <!-- <el-col :span="24" class="item">
           <div class="label">退订说明</div>
@@ -126,32 +261,36 @@
 
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
+        <el-button
+          type="primary"
+          @click="clickSubmitForm"
+          :loading="formLoading"
+          >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
+        >
         <el-button @click="goBack">关 闭</el-button>
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
-import { getDetail, returnData } from '@/api/supply/retail'
+import { getDetail, returnData } from "@/api/supply/retail";
 
 export default {
-  name: 'RetailReturn',
-  componentName: 'RetailReturn',
-  props: ['listItem'],
+  name: "RetailReturn",
+  componentName: "RetailReturn",
+  props: ["listItem"],
   filters: {
     statusFilter(val) {
       const statusList = [
-        { label: '已保存', value: 'SAVE' },
-        { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' },
-         // { label: '审核驳回', value: 'FAIL' },,
+        { label: "已保存", value: "SAVE" },
+        { label: "待审核", value: "WAIT" },
+        { label: "审核通过", value: "OK" },
+        // { label: '审核驳回', value: 'FAIL' },,
       ];
-      let obj = statusList.find(o => o.value == val);
-      return obj ? obj.label : ''
-    }
+      let obj = statusList.find((o) => o.value == val);
+      return obj ? (obj.label||'') : "";
+    },
   },
   data() {
     return {
@@ -160,20 +299,20 @@ export default {
 
       formLoading: false,
       mainForm: {
-        remark: '',
-      }
-    }
+        remark: "",
+      },
+    };
   },
 
   computed: {
     sidebar() {
-      return this.$store.state.app.sidebar
+      return this.$store.state.app.sidebar;
     },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
+        openSidebar: this.sidebar.opened,
+      };
     },
     nowDate() {
       var date = new Date();
@@ -182,14 +321,14 @@ export default {
       var month = date.getMonth() + 1;
       var strDate = date.getDate();
       if (month >= 1 && month <= 9) {
-          month = "0" + month;
+        month = "0" + month;
       }
       if (strDate >= 0 && strDate <= 9) {
-          strDate = "0" + strDate;
+        strDate = "0" + strDate;
       }
       var currentdate = year + seperator1 + month + seperator1 + strDate;
       return currentdate;
-    }
+    },
   },
 
   created() {
@@ -199,31 +338,36 @@ export default {
   methods: {
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail');
+      this.$emit("backListFormDetail");
     },
 
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
+      getDetail({ id: this.listItem.id }).then((res) => {
+        res.data.retailOrderItemList.forEach(item => {
+            item.sums1 = ['directTransferQty', 'qty', 'refundableQty', 'oldQty', 'tdQty'];
+            item.sums2 = ['totalAmount', 'payAmount', 'price', 'discAmount', 'totalDiscAmount', 'rebateAmount'];
+          })
         this.detailData = res.data;
-      })
+      });
     },
 
     // 提交
     clickSubmitForm() {
-        let tip = 0
-      for(let i=0; i<this.detailData.retailOrderItemList.length; i++) {
-        if(this.detailData.retailOrderItemList[i].tdQty) {
-              tip+=1
+
+      let tip = 0;
+      for (let i = 0; i < this.detailData.retailOrderItemList.length; i++) {
+        if (this.detailData.retailOrderItemList[i].tdQty) {
+          tip += 1;
         }
-        if(Number(this.detailData.retailOrderItemList[i].tdQty) < 0) {
-          this.$errorMsg('退订数量不可为负数');
+        if (Number(this.detailData.retailOrderItemList[i].tdQty) < 0) {
+          this.$errorMsg("退订数量不可为负数");
           return;
         }
       }
       if (tip == 0) {
-          this.$errorMsg('请填写退订数量');
-          return
+        this.$errorMsg("请填写退订数量");
+        return;
       }
 
       this.formLoading = true;
@@ -232,37 +376,38 @@ export default {
         type: 1, // 1:普通零售单,2:政策零售单
         // examineRemark: this.mainForm.remark,
         theTime: this.detailData.theTime,
-        retailOrderItemList: this.detailData.retailOrderItemList
-      }).then(res => {
-        this.$successMsg('退订成功');
-        this.goBack();
-        this.$parent.getList();
-      }).finally(res => {
-        this.formLoading = false;
+        retailOrderItemList: this.detailData.retailOrderItemList,
       })
+        .then((res) => {
+          this.$successMsg("退订成功");
+          this.goBack();
+          this.$parent.getList();
+        })
+        .finally((res) => {
+          this.formLoading = false;
+        });
     },
-
-  }
-}
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .detail-container {
-    width: 100%;
-    height: 100%;
-  }
-  .main-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 20px;
-    height: 60px;
-    border-bottom: 1px solid #DCDFE6;
-    margin-bottom: 20px;
-    .title {
-      font-size: 16px;
-      font-weight: 600;
-      padding-left: 10px;
-    }
+.detail-container {
+  width: 100%;
+  height: 100%;
+}
+.main-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20px;
+  height: 60px;
+  border-bottom: 1px solid #dcdfe6;
+  margin-bottom: 20px;
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+    padding-left: 10px;
   }
+}
 </style>

+ 169 - 89
src/views/supply/sales/components/sales_detail.vue

@@ -10,31 +10,33 @@
         <el-row :gutter="0">
           <el-col :span="8" class="item">
             <div class="label">出库单号</div>
-            <div class="value">{{detailData.id}}</div>
+            <div class="value">{{ detailData.id }}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">单据日期</div>
-            <div class="value">{{detailData.orderTime}}</div>
+            <div class="value">{{ detailData.orderTime }}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">单据状态</div>
-          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+            <div class="value">
+              {{ detailData.examineStatus | statusFilter }}
+            </div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">发货单号</div>
-            <div class="value">{{detailData.orderNo}}</div>
+            <div class="value">{{ detailData.orderNo }}</div>
           </el-col>
           <el-col :span="16" class="item">
             <div class="label">经销商</div>
-            <div class="value">{{detailData.customerName}}</div>
+            <div class="value">{{ detailData.customerName }}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">仓库</div>
-            <div class="value">{{detailData.correspondName}}</div>
+            <div class="value">{{ detailData.correspondName }}</div>
           </el-col>
           <el-col :span="16" class="item">
             <div class="label">备注</div>
-            <div class="value">{{detailData.remark}}</div>
+            <div class="value">{{ detailData.remark }}</div>
           </el-col>
         </el-row>
       </div>
@@ -52,34 +54,87 @@
           stripe
           max-height="400"
           show-summary
-          :summary-method="$getSummaries">
-          <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
+          :summary-method="$getSummaries"
+        >
+          <el-table-column
+            align="center"
+            label="序号"
+            type="index"
+            width="50"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="销售订单号"
+            prop="mainOrderId"
+            min-width="180"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              {{ (scope.row.orderType == 'TRADE' || scope.row.orderType == 'HOME') ? scope.row.enginOrderNo : scope.row.mainOrderId }}
+              {{
+                scope.row.orderType === "TRADE" ||
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+              }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
-
+          <el-table-column
+            align="center"
+            label="物料编码"
+            prop="materialCode"
+            min-width="120"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="产品编码"
+            prop="materialOldNumber"
+            min-width="120"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="产品名称"
+            prop="materialName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="规格型号"
+            prop="specification"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="单位"
+            prop="unit"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="right"
+            label="数量"
+            prop="refundableQty"
+            min-width="100"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-                  <template v-if="edit">
-                   <el-input
-                        size="mini"
-                    class="input"
-                    v-model="scope.row.refundableQty"
-                      placeholder="请输入数量"
-              ></el-input>
+              <template v-if="edit">
+                <el-input
+                  size="mini"
+                  class="input"
+                  v-model="scope.row.refundableQty"
+                  placeholder="请输入数量"
+                ></el-input>
+              </template>
+              <template v-else>
+                {{ scope.row.refundableQty }}
               </template>
-                 <template v-else>
-                  {{scope.row.refundableQty}}
-                 </template>
             </template>
-
           </el-table-column>
           <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -91,13 +146,37 @@
               {{ scope.row.payAmount | numToFixed }}
             </template>
           </el-table-column> -->
-          <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            align="left"
+            label="表头备注"
+            prop="headerRemark"
+            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> -->
-          <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            align="left"
+            label="表体备注"
+            prop="invoiceRemark"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
 
-                  <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            align="left"
+            label="表头业务员"
+            prop="k3ServiceName"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
 
-         <el-table-column align="left" label="表体业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            align="left"
+            label="表体业务员"
+            prop="serviceName"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
         </el-table>
       </div>
 
@@ -106,62 +185,68 @@
       </div>
       <div class="diy-table-1">
         <el-row :gutter="0">
-          <el-col :xs="12" :sm="8" :lg="8" class="item">
+          <el-col :xs="12" :sm="12" :lg="12" class="item">
             <div class="label">审批人</div>
-            <div class="value">{{detailData.approvalName}}</div>
+            <div class="value">{{ detailData.approvalName }}</div>
           </el-col>
-          <el-col :xs="12" :sm="8" :lg="8" class="item">
+          <el-col :xs="12" :sm="12" :lg="12" class="item">
+            <div class="label">制单人</div>
+            <div class="value">{{ detailData.createBy }}</div>
+          </el-col>
+          <el-col :xs="12" :sm="12" :lg="12" class="item">
             <div class="label">审批结果</div>
-            <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+            <div class="value">
+              {{ detailData.examineStatus | statusFilter }}
+            </div>
           </el-col>
-          <el-col :xs="12" :sm="8" :lg="8" class="item">
+          <el-col :xs="12" :sm="12" :lg="12" class="item">
             <div class="label">审批时间</div>
-            <div class="value">{{detailData.approvalTime}}</div>
+            <div class="value">{{ detailData.approvalTime }}</div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="24" class="item">
             <div class="label">审批说明</div>
-            <div class="value">{{detailData.approvalRemark}}</div>
+            <div class="value">{{ detailData.approvalRemark }}</div>
           </el-col>
         </el-row>
       </div>
     </div>
 
-    <div style="margin:10px" v-if="edit">
-    <el-button type="primary" @click="updateNum">保存</el-button>
-</div>
+    <div style="margin: 10px" v-if="edit">
+      <el-button type="primary" @click="updateNum">保存</el-button>
+    </div>
   </div>
 </template>
 
 <script>
-import print from 'vue-print-nb'
-import { getDetail ,updateNum} from "@/api/supply/sales";
+import print from "vue-print-nb";
+import { getDetail, updateNum } from "@/api/supply/sales";
 
 export default {
-  name: 'SalesDetail',
-  componentName: 'SalesDetail',
-  props: ['listItem','edit'],
+  name: "SalesDetail",
+  componentName: "SalesDetail",
+  props: ["listItem", "edit"],
   directives: {
-    print
+    print,
   },
   filters: {
     statusFilter(val) {
       const statusList = [
-        { label: '已保存', value: 'SAVE' },
-        { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' },
-         // { label: '审核驳回', value: 'FAIL' },,
+        { label: "已保存", value: "SAVE" },
+        { label: "待审核", value: "WAIT" },
+        { label: "审核通过", value: "OK" },
+        // { label: '审核驳回', value: 'FAIL' },,
       ];
-      let obj = statusList.find(o => o.value == val);
-      return obj ? obj.label : ''
-    }
+      let obj = statusList.find((o) => o.value == val);
+      return obj ? obj.label : "";
+    },
   },
   data() {
     return {
       printObj: {
-        id: 'printMe'
+        id: "printMe",
       },
       detailData: {},
-    }
+    };
   },
 
   created() {
@@ -171,51 +256,46 @@ export default {
   methods: {
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail');
-       this.$parent.edit = false
+      this.$emit("backListFormDetail");
+      this.$parent.edit = false;
     },
-     updateNum(){
-      this.detailData.saleOrderData.forEach(item => {
-          item.invoiceNum = +item.refundableQty
+    updateNum() {
+      this.detailData.saleOrderData.forEach((item) => {
+        item.invoiceNum = +item.refundableQty;
       });
       updateNum({
-        ...this.detailData
-      }).then(res=>{
+        ...this.detailData,
+      }).then((res) => {
         this.$successMsg("修改成功");
-        this.$parent.edit = false
-         this.goBack();
+        this.$parent.edit = false;
+        this.goBack();
         this.$parent.getList();
-      })
-
-
+      });
     },
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
-        if(res.data.saleOrderData) {
-          res.data.saleOrderData.forEach(item => {
-            item.sums1 = ['refundableQty'];
-            item.sums2 = ['payAmount', 'price'];
-          })
+      getDetail({ id: this.listItem.id }).then((res) => {
+        if (res.data.saleOrderData) {
+          res.data.saleOrderData.forEach((item) => {
+            item.sums1 = ["refundableQty"];
+            item.sums2 = ["payAmount", "price"];
+          });
         }
         this.detailData = res.data;
-      })
+      });
     },
-  }
-}
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .detail-container {
-    width: 100%;
-    height: 100%;
-   .input{
-    ::v-deep .el-input__inner{
- text-align: right !important;
+.detail-container {
+  width: 100%;
+  height: 100%;
+  .input {
+    ::v-deep .el-input__inner {
+      text-align: right !important;
     }
-
-  }
   }
-
-
+}
 </style>

+ 5 - 0
src/views/supply/sales/components/sales_examine.vue

@@ -81,11 +81,16 @@
           <div class="label">审批人</div>
           <div class="value">{{userName}}</div>
         </el-col>
+
         <el-col :span="12" class="item">
           <div class="label">审批日期</div>
           <div class="value">{{getDate()}}</div>
         </el-col>
         <el-col :span="24" class="item">
+            <div class="label">制单人</div>
+            <div class="value">{{detailData.createBy}}</div>
+          </el-col>
+        <el-col :span="24" class="item">
           <div class="label">审批说明</div>
           <div class="value">
             <el-input v-model="examineForm.remark" placeholder="请输入内容"></el-input>

+ 64 - 39
src/views/supply/sales/sales_list.vue

@@ -130,17 +130,10 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="打印时间排序" prop="printDesc">
-                  <el-select v-model="screenForm.printDesc"  clearable filterable >
-                    <el-option
-                      label="默认"
-                      :value="null">
-                    </el-option>
-                    <el-option
-                      label="倒叙"
-                      :value="1">
-                    </el-option>
-                  </el-select>
-
+                <el-select v-model="screenForm.printDesc" clearable filterable>
+                  <el-option label="默认" :value="null"> </el-option>
+                  <el-option label="倒叙" :value="1"> </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -199,7 +192,10 @@
             >
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'sale/order/exportChuku'" :exParams="exParams" />
+            <ExportButton
+              :exUrl="'sale/order/exportChuku'"
+              :exParams="exParams"
+            />
           </div>
         </div>
         <div class="table">
@@ -226,6 +222,7 @@
               prop="examineStatus"
               min-width="100"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 {{ scope.row.examineStatus | statusFilter }}
@@ -237,6 +234,7 @@
               prop="printTime"
               min-width="100"
               show-overflow-tooltip
+              sortable
             ></el-table-column>
             <el-table-column
               align="left"
@@ -244,6 +242,7 @@
               prop="orderType"
               min-width="100"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 {{ scope.row.orderType | orderTypeFilter }}
@@ -255,6 +254,7 @@
               prop="billReceipt"
               min-width="250"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 {{ scope.row.billReceipt }}
@@ -264,8 +264,9 @@
               align="left"
               label="销售出库单号"
               prop="id"
-              min-width="110"
+              min-width="140"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
@@ -278,6 +279,7 @@
               prop="orderNo"
               min-width="130"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.orderNo" />
@@ -290,18 +292,17 @@
               prop="orderNo"
               min-width="140"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
-                <CopyButton
-                  :copyText="
-                    scope.row.orderType === 'TRADE'
-                      ? scope.row.enginOrderNo
-                      : scope.row.mainOrderId
-                  "
-                />
-                <span>{{
+                <CopyButton :copyText='scope.row.orderType === "TRADE" ||
+                scope.row.orderType === "HOME" || scope.row.orderType
+                ==="REQUISITION_TRADE" || scope.row.orderType
+                ==="REQUISITION_HOME"? scope.row.enginOrderNo:scope.row.mainOrderId' />                <span>{{
                   scope.row.orderType === "TRADE" ||
-                  scope.row.orderType === "HOME"
+                  scope.row.orderType === "HOME" ||
+                  scope.row.orderType === "REQUISITION_TRADE" ||
+                  scope.row.orderType === "REQUISITION_HOME"
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>
@@ -313,13 +314,15 @@
               prop="correspondName"
               min-width="100"
               show-overflow-tooltip
+              sortable
             ></el-table-column>
             <el-table-column
               align="left"
               label="经销商编码"
               prop="customerNumber"
-              min-width="100"
+              min-width="120"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
@@ -332,6 +335,7 @@
               prop="customerName"
               min-width="250"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
@@ -344,6 +348,7 @@
               prop="materialCode"
               min-width="120"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
@@ -356,6 +361,7 @@
               prop="materialOldNumber"
               min-width="140"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
@@ -368,6 +374,7 @@
               prop="materialName"
               min-width="160"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
@@ -380,6 +387,7 @@
               prop="specification"
               min-width="350"
               show-overflow-tooltip
+              sortable
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
@@ -392,6 +400,15 @@
               prop="unit"
               min-width="100"
               show-overflow-tooltip
+              sortable
+            ></el-table-column>
+            <el-table-column
+              align="left"
+              label="制单人"
+              prop="createBy"
+              min-width="100"
+              show-overflow-tooltip
+              sortable
             ></el-table-column>
             <el-table-column
               align="right"
@@ -399,23 +416,31 @@
               prop="refundableQty"
               min-width="100"
               show-overflow-tooltip
+              sortable
             ></el-table-column>
 
-            <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+            <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip
+              sortable>
               <template slot-scope="scope">
                 {{ scope.row.price | numToFixed }}
               </template>
             </el-table-column> -->
-            <!-- <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+            <!-- <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip
+              sortable>
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column> -->
-            <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" 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> -->
-            <!-- <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column> -->
-            <!-- <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column> -->
-            <!-- <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column> -->
+            <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip
+              sortable></el-table-column> -->
+            <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip
+              sortable></el-table-column> -->
+            <!-- <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip
+              sortable></el-table-column> -->
+            <!-- <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip
+              sortable></el-table-column> -->
+            <!-- <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip
+              sortable></el-table-column> -->
 
             <el-table-column
               align="center"
@@ -559,8 +584,8 @@ export default {
         status: "",
         mainOrderId: "",
         approval: "",
-        printTime:'',
-        printDesc:null,
+        printTime: "",
+        printDesc: null,
         id: "",
       },
       statusList: [
@@ -637,14 +662,14 @@ export default {
         approvalEndTime: this.screenForm.approval
           ? this.screenForm.approval[1]
           : "",
-          printStartTime:this.screenForm.printTime
+        printStartTime: this.screenForm.printTime
           ? this.screenForm.printTime[0]
           : "",
-          printEndtTime:this.screenForm.printTime
+        printEndtTime: this.screenForm.printTime
           ? this.screenForm.printTime[1]
           : "",
         mainOrderId: this.screenForm.mainOrderId,
-        printTimeDesc:this.screenForm.printDesc,
+        printTimeDesc: this.screenForm.printDesc,
         id: this.screenForm.id.replace(/,/gi, ","),
       };
     },
@@ -695,13 +720,13 @@ export default {
           ? this.screenForm.approval[1]
           : "",
         mainOrderId: this.screenForm.mainOrderId,
-          printStartTime:this.screenForm.printTime
+        printStartTime: this.screenForm.printTime
           ? this.screenForm.printTime[0]
           : "",
-          printEndtTime:this.screenForm.printTime
+        printEndtTime: this.screenForm.printTime
           ? this.screenForm.printTime[1]
           : "",
-          printTimeDesc:this.screenForm.printDesc,
+        printTimeDesc: this.screenForm.printDesc,
         id: this.screenForm.id.replace(/,/gi, ","),
       };
       getList(params).then((res) => {
@@ -750,7 +775,7 @@ export default {
           if (res.data) {
             this.$confirm(res.data, "提示", {
               confirmButtonText: "确定",
-              showCancelButton:false
+              showCancelButton: false,
             });
           }
         });