修改销售订单排序 ---cjh

src/views/salesOrder/list.vue

@@ -325,287 +325,105 @@ export default {
       ],
       tableColumns: [
         {
-          title: "id",
-          align: "center",
-          minWidth: 100,
-          key: "id",
-        },
-        {
-          title: "尺寸确认",
-          align: "center",
-          width: 100,
-          key: "size",
-          is_show: true,
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.size == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
-        },
-        {
-          title: "订单编号",
-          align: "center",
-          width: 100,
-          key: "size",
-          is_show: true,
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.size == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
-        },
-        {
-          title: "工艺",
-          align: "center",
-          width: 80,
-
-          key: "craft",
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.craft == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
-        },
-        {
-          title: "分箱",
-          align: "center",
-          width: 80,
-          key: "binning",
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.binning == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
-        },
-        {
-          title: "已下达",
-          align: "center",
-          width: 90,
-
-          key: "processed",
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.processed == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
-        },
-        {
-          title: "流程卡",
-          align: "center",
-          width: 90,
-          key: "flowCard",
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.flowCard == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
-        },
-        {
-          title: "入库",
-          align: "center",
-          width: 80,
-
-          key: "entry",
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.entry == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
-        },
-        {
-          title: "发货",
+          title: "报表日期",
           align: "center",
-          width: 80,
+          minWidth: 120,
 
-          key: "shipments",
+          key: "reportDate",
           render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.shipments == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
+            const { row } = params;
+            return h("span", {}, this.func.replaceDateNoHMS(row.reportDate));
           },
         },
         {
-          title: "收款",
+          title: "合同编号",
           align: "center",
-          width: 90,
-
-          key: "gathering",
-
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.gathering == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
+          minWidth: 100,
+          key: "contractNumber",
         },
         {
-          title: "套料",
+          title: "客户名称",
           align: "center",
-          width: 90,
-
-          key: "jacking",
-
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.jacking == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
+          minWidth: 100,
+          key: "customerName",
         },
         {
-          title: "价格审核",
+          title: "单据编号",
           align: "center",
-          width: 100,
-
-          key: "priceReview",
-
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.priceReview == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
+          minWidth: 100,
+          key: "receipt_number",
         },
         {
-          title: "外协",
+          title: "工程名称",
           align: "center",
-          width: 90,
-
-          key: "outsource",
-
-          render: (h, params) => {
-            return h("div", [
-              h("Checkbox", {
-                props: {
-                  value: params.row.outsource == 0 ? true : false,
-                  disabled: true,
-                },
-              }),
-            ]);
-          },
+          minWidth: 100,
+          key: "projectName",
         },
         {
-          title: "分厂",
+          title: "对方编号",
           align: "center",
           minWidth: 100,
-          key: "branch",
+          key: "adverseNumber",
         },
         {
-          title: "MES",
+          title: "业务员",
           align: "center",
           minWidth: 100,
-          key: "MSE",
+          key: "salesman",
         },
         {
-          title: "单据状态",
+          title: "联系人",
           align: "center",
-
           minWidth: 100,
-          key: "receiptsState",
-          render: (h, params) => {
-            return h(
-              "span",
-              params.row.receiptsState == 0 ? "未审核" : "已审核"
-            );
-          },
+
+          key: "linkman",
         },
         {
-          title: "客户编号",
-
+          title: "联系电话",
           align: "center",
           minWidth: 100,
 
-          key: "customerId",
+          key: "phone",
         },
         {
-          title: "客户名称",
-
+          title: "送货地址",
           align: "center",
           minWidth: 100,
 
-          key: "customerName",
+          key: "deliveryAddress",
         },
         {
-          title: "地区",
+          title: "加工要求",
           align: "center",
           minWidth: 100,
-          key: "region",
+
+          key: "process",
         },
         {
-          title: "工程ID",
+          title: "特别备注",
           align: "center",
           minWidth: 100,
-          key: "projectId",
+          key: "specialNote",
         },
         {
-          title: "工程名称",
+          title: "订单类型",
           align: "center",
           minWidth: 100,
-          key: "projectName",
+
+          key: "orderType",
         },
         {
-          title: "合同编号",
+          title: "付款条件",
           align: "center",
           minWidth: 100,
-          key: "contractNumber",
+
+          key: "paymentClause",
         },
         {
-          title: "对方编号",
+          title: "铝条方式",
           align: "center",
           minWidth: 100,
-          key: "adverseNumber",
+          key: "aluminiumType",
         },
         {
           title: "包装方式",
@@ -614,49 +432,62 @@ export default {
           key: "mannerPacking",
         },
         {
-          title: "订单类型",
+          title: "总金额",
           align: "center",
           minWidth: 100,
 
-          key: "orderType",
+          key: "totalMoney",
         },
         {
-          title: "铝条方式",
+          title: "收款金额",
           align: "center",
           minWidth: 100,
-          key: "aluminiumType",
+
+          key: "receivableAmount",
         },
         {
-          title: "业务员",
+          title: "交货日期",
           align: "center",
-          minWidth: 100,
+          minWidth: 120,
 
-          key: "salesman",
+          key: "deliveryDate",
+          render: (h, params) => {
+            const { row } = params;
+            return h("span", {}, this.func.replaceDateNoHMS(row.deliveryDate));
+          },
         },
         {
-          title: "联系人",
+          title: "单据状态",
           align: "center",
-          minWidth: 100,
 
-          key: "linkman",
+          minWidth: 100,
+          key: "receiptsState",
+          render: (h, params) => {
+            return h(
+              "span",
+              params.row.receiptsState == 0 ? "未审核" : "已审核"
+            );
+          },
         },
         {
-          title: "联系电话",
+          title: "客户编号",
+
           align: "center",
           minWidth: 100,
 
-          key: "phone",
+          key: "customerId",
         },
         {
-          title: "报表日期",
+          title: "地区",
+          align: "center",
+          minWidth: 100,
+          key: "region",
+        },
+        {
+          title: "工程ID",
           align: "center",
-          minWidth: 120,
-
-          key: "reportDate",
-          render: (h, params) => {
-            const { row } = params;
-            return h("span", {}, this.func.replaceDateNoHMS(row.reportDate));
-          },
+          minWidth: 100,
+          key: "projectId",
         },
         {
           title: "总周长",
@@ -679,20 +510,6 @@ export default {
           key: "settlementArea",
         },
         {
-          title: "总金额",
-          align: "center",
-          minWidth: 100,
-
-          key: "totalMoney",
-        },
-        {
-          title: "收款金额",
-          align: "center",
-          minWidth: 100,
-
-          key: "receivableAmount",
-        },
-        {
           title: "折扣金额",
           align: "center",
           minWidth: 100,
@@ -724,138 +541,253 @@ export default {
           key: "printTime",
         },
         {
-          title: "标签次数",
-          align: "center",
-          minWidth: 100,
-
-          key: "labelTime",
-        },
-        {
-          title: "制单员",
+          title: "审核日期",
           align: "center",
-          minWidth: 100,
+          minWidth: 120,
 
-          key: "makingPart",
+          key: "approvalDate",
+          render: (h, params) => {
+            const { row } = params;
+            return h("span", {}, this.func.replaceDateNoHMS(row.approvalDate));
+          },
         },
         {
-          title: "制单日期",
+          title: "生产交期",
           align: "center",
-
           minWidth: 120,
-          key: "documentationDate",
+
+          key: "producedDate",
           render: (h, params) => {
             const { row } = params;
-            return h(
-              "span",
-              {},
-              this.func.replaceDateNoHMS(row.documentationDate)
-            );
+            return h("span", {}, this.func.replaceDateNoHMS(row.producedDate));
           },
         },
         {
-          title: "审核人",
+          title: "附件",
           align: "center",
           minWidth: 100,
 
-          key: "auditor",
+          key: "accessory",
         },
         {
-          title: "审核日期",
+          title: "结算币种",
           align: "center",
-          minWidth: 120,
+          minWidth: 100,
 
-          key: "approvalDate",
+          key: "settleAccounts",
+        },
+        {
+          title: "CrmId",
+          align: "center",
+          minWidth: 100,
+          key: "crmId",
+        },
+        {
+          title: "来源",
+          align: "center",
+          minWidth: 100,
+          key: "source",
+        },
+        {
+          title: "尺寸确认",
+          align: "center",
+          width: 100,
+          key: "size",
+          is_show: true,
           render: (h, params) => {
-            const { row } = params;
-            return h("span", {}, this.func.replaceDateNoHMS(row.approvalDate));
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.size == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
           },
         },
         {
-          title: "交货日期",
+          title: "工艺",
           align: "center",
-          minWidth: 120,
+          width: 80,
 
-          key: "deliveryDate",
+          key: "craft",
           render: (h, params) => {
-            const { row } = params;
-            return h("span", {}, this.func.replaceDateNoHMS(row.deliveryDate));
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.craft == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
           },
         },
         {
-          title: "生产交期",
+          title: "分箱",
           align: "center",
-          minWidth: 120,
-
-          key: "producedDate",
+          width: 80,
+          key: "binning",
           render: (h, params) => {
-            const { row } = params;
-            return h("span", {}, this.func.replaceDateNoHMS(row.producedDate));
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.binning == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
           },
         },
         {
-          title: "送货地址",
+          title: "已下达",
           align: "center",
-          minWidth: 100,
+          width: 90,
 
-          key: "deliveryAddress",
+          key: "processed",
+          render: (h, params) => {
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.processed == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
+          },
         },
         {
-          title: "附件",
+          title: "流程卡",
           align: "center",
-          minWidth: 100,
-
-          key: "accessory",
+          width: 90,
+          key: "flowCard",
+          render: (h, params) => {
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.flowCard == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
+          },
         },
         {
-          title: "加工要求",
+          title: "入库",
           align: "center",
-          minWidth: 100,
+          width: 80,
 
-          key: "process",
+          key: "entry",
+          render: (h, params) => {
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.entry == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
+          },
         },
         {
-          title: "结算币种",
+          title: "发货",
           align: "center",
-          minWidth: 100,
+          width: 80,
 
-          key: "settleAccounts",
+          key: "shipments",
+          render: (h, params) => {
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.shipments == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
+          },
         },
         {
-          title: "付款条件",
+          title: "收款",
           align: "center",
-          minWidth: 100,
+          width: 90,
 
-          key: "paymentClause",
+          key: "gathering",
+
+          render: (h, params) => {
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.gathering == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
+          },
         },
         {
-          title: "加工要求",
+          title: "套料",
           align: "center",
-          minWidth: 100,
-          key: "process",
+          width: 90,
+
+          key: "jacking",
+
+          render: (h, params) => {
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.jacking == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
+          },
         },
         {
-          title: "特别备注",
+          title: "价格审核",
           align: "center",
-          minWidth: 100,
-          key: "specialNote",
+          width: 100,
+
+          key: "priceReview",
+
+          render: (h, params) => {
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.priceReview == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
+          },
         },
         {
-          title: "备注",
+          title: "外协",
           align: "center",
-          minWidth: 100,
-          key: "remark",
+          width: 90,
+
+          key: "outsource",
+
+          render: (h, params) => {
+            return h("div", [
+              h("Checkbox", {
+                props: {
+                  value: params.row.outsource == 0 ? true : false,
+                  disabled: true,
+                },
+              }),
+            ]);
+          },
         },
         {
-          title: "CrmId",
+          title: "分厂",
           align: "center",
           minWidth: 100,
-          key: "crmId",
+          key: "branch",
         },
         {
-          title: "来源",
+          title: "MES",
           align: "center",
           minWidth: 100,
-          key: "source",
+          key: "MSE",
         },
         {
           title: "操作",
@@ -1130,7 +1062,7 @@ export default {
 
       this.axios.post("/api/curl", params).then((res) => {
         console.log(res.msg.ReturnValue);
-        this.total = res.msg.ReturnValue.length
+        this.total = res.msg.ReturnValue.length;
       });
     },
     //点击栏目设置按钮

src/views/salesOrder/particulars.vue

@@ -6,6 +6,7 @@
     <!-- <TableHeader :tableHeaderList="list" /> -->
     <div style="margin: 20px 0">
       <div style="display: flex; justify-content: space-between">
+       <div><span>报表日期：</span><span>2022.5.26</span></div>
         <div><span>合同编号：</span><span>284134</span></div>
         <div><span>客户名称：</span><span>杨运</span></div>
         <div><span>单据编号：</span><span>84641</span></div>