From b96cda4762b0b98da10ed191377f0c8d443c50e2 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Tue, 12 Apr 2022 19:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/components/ImportExcel-base/index.vue |   11 +-
 vue/src/router/modules/hq_out_order.js        |   95 --
 vue/src/router/modules/vw_menu.js             |   12 +-
 vue/src/router/modules/wms_out_order.js       |   11 +
 .../ux/billManage/IssuedUnsettled/index.vue   |    2 +-
 .../ux/billManage/UnSettledSum/index.vue      |    2 +-
 .../ux/billManage/kanbanOutOrder/detail.vue   |   15 +-
 .../billManage/kanbanWithOutOrder/detail.vue  |   84 +-
 .../billManage/kanbanWithOutOrder/index.vue   |    6 +-
 .../billManage/sparepartOutOrder/detail.vue   |   16 +-
 .../billManage/sparepartOutOrder90/detail.vue |   15 +-
 .../views/ux/billManage/unSparePart/index.vue | 1190 +++++++++++++++++
 .../views/ux/billManage/vwOutOrder/detail.vue |   13 +-
 .../ux/vw/dataInput/hq_h_checkout/detail.vue  |   14 +-
 .../ux/vw/dataInput/hq_h_outorder/detail.vue  |   25 +-
 .../ux/vw/dataInput/hq_kb_output/detail.vue   |   11 +
 .../ux/vw/dataInput/hq_kb_output/index.vue    |    2 +-
 .../ux/vw/dataInput/hq_y_outorder/detail.vue  |   19 +-
 18 files changed, 1343 insertions(+), 200 deletions(-)
 create mode 100644 vue/src/views/ux/billManage/unSparePart/index.vue

diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 68487ce1..4c9318f0 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -284,7 +284,11 @@ export default {
       return this.stepsActive == 1;
     },
     getMoudleDisable() {
-      if (this.crmType == "priceList" || this.crmType == "spareparts" || this.crmType == "wmsOutputSum" ) {
+      if (
+        this.crmType == "priceList" ||
+        this.crmType == "spareparts" ||
+        this.crmType == "wmsOutputSum"
+      ) {
         //只状态可用
         this.isEditYearMont = true;
         this.isEditFactory = true;
@@ -312,6 +316,7 @@ export default {
           sparepartoutorder: "大众备件无单号出库单",
           sparepartoutorder90: "大众备件有单号出库单",
           kanbanoutorder: "大众看板出库单",
+          kanbanwithoutorder: "大众无条码看板出库单",
           HQ_H_OUTORDER: "红旗批量出库单",
           HQ_M_OUTORDER: "红旗M平台出库单",
           HQ_Y_OUTORDER: "一汽轿车平台出库单",
@@ -358,6 +363,8 @@ export default {
           hqYPlatform: "/api/settleaccount/BT_Carlatform/ExcelImport", //一汽轿车平台导入
           vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //准时化出库单导入
           kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //大众看板出库单导入
+          kanbanwithoutorder:
+            "/api/settleaccount/wmskanbanoutputextend/ExcelImportWithOutKanban", //大众看板无单号出库单导入
           HQ_H_OUTORDER: "/api/settleaccount/WmsHQHKanbanoutput/ExcelImport", //红旗H平台出库单导入
           HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入
 
@@ -401,7 +408,7 @@ export default {
             "/api/settleaccount/WmsOneTimeSaleOutput/ExcelImport", //红旗数据调整导入
           wmsOutputSum: "/api/settleaccount/WmsOneTimeSaleOutput/ExcelImport", //WMS未结出库单
           unHQSettle: "/api/settleaccount/UnHQSettle/ExcelImport", //红旗未结明细
-        
+
           //HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入
         }[this.crmType] || ""
       );
diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js
index b9b124b6..8f99582b 100644
--- a/vue/src/router/modules/hq_out_order.js
+++ b/vue/src/router/modules/hq_out_order.js
@@ -37,46 +37,6 @@ const hqOutOrderDataRouter = {
         icon: '结算'
       }
     },
-  //   {
-  //     path: 'hq-m-outorder',
-  //     component: () => import('@/views/ux/vw/dataInput/hq_m_outorder'),
-  //     name: 'SettleAccount',//命名路由
-  //     meta: {
-  //       title: 'M平台出库单',
-  //       roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-  //       icon: '零件'
-  //     }
-  //   },
-  //   {
-  //     path: 'hq-m-checkout',
-  //     component: () => import('@/views/ux/vw/dataInput/hq_m_checkout'),
-  //     name: 'SettleAccount',//命名路由
-  //     meta: {
-  //       title: 'M平台备件出库单',
-  //       roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-  //       icon: '客户'
-  //     }
-  //   },
-	// {
-  //     path: 'hq-f-outorder',
-  //     component: () => import('@/views/ux/vw/dataInput/hq_f_outorder'),
-  //     name: 'SettleAccount',//命名路由
-  //     meta: {
-  //       title: 'F平台出库单',
-  //       roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-  //       icon: '批量'
-  //     }
-  //   },
-  //   {
-  //     path: 'hq-f-outorder-chickout',
-  //     component: () => import('@/views/ux/vw/dataInput/hq_f_outorder_chickout'),
-  //     name: 'SettleAccount',//命名路由
-  //     meta: {
-  //       title: 'F平台备件出库单',
-  //       roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-  //       icon: '器具'
-  //     }
-  //   },
     {
       path: 'hq-y-outorder',
       component: () => import('@/views/ux/vw/dataInput/hq_y_outorder'),
@@ -98,61 +58,6 @@ const hqOutOrderDataRouter = {
       }
     },
 
-    // {
-    //   path: 'onetime-sale-outorder',
-    //   component: () => import('@/views/ux/vw/dataInput/OnetimeSale'),
-    //   name: 'WmsHQKBOutput',//命名路由
-    //   meta: {
-    //     title: '一次性寄售销售结算',
-    //     roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-    //     icon: '客户'
-    //   }
-    // },
-
-
-
-
-    // {
-    //   path: 'hq-y-checkout',
-    //   component: () => import('@/views/ux/vw/dataInput/hq_y_checkout'),
-    //   name: 'SettleAccount',//命名路由
-    //   meta: {
-    //     title: '一汽轿车平台备件出库单',
-    //     roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-    //     icon: '结算'
-    //   }
-    // },
-    // {
-    //   path: 'hq-m-outorder',
-    //   component: () => import('@/views/ux/billManage/kanbanOutOrder/index'),
-    //   name: 'SettleAccount',//命名路由
-    //   meta: {
-    //     title: '大众看板出库单',
-    //     roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-    //     icon: '结算'
-    //   }
-    // },
-    // {
-    //   path: 'hq-f-withoutorder',
-    //   component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'),
-    //   name: 'SettleAccount',//命名路由
-    //   meta: {
-    //     title: '大众无条码看板出库单',
-    //     roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-    //     icon: '结算'
-    //   }
-    // },
-    // {
-    //   path: 'hq-car-outorder',
-    //   component: () => import('@/views/ux/billManage/sparepartOutOrder/index'),
-    //   name: 'Invoices',//命名路由
-    //   meta: {
-    //     title: '大众备件出库单',
-    //     roles: ['SettleAccount.Invoices'],
-    //     icon: '对比'
-    //   }
-    // },
-
   ]
 }
 
diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js
index bf038578..e1ad0c75 100644
--- a/vue/src/router/modules/vw_menu.js
+++ b/vue/src/router/modules/vw_menu.js
@@ -207,6 +207,16 @@ const vwMenudataRouter = {
                         icon: '供货'
                     }
                 },
+                {
+                    path: '/vwunsparepart',
+                    component: () => import('@/views/ux/billManage/unSparePart'),
+                    name: 'unSparePart',//命名路由
+                    meta: {
+                        title: '大众备件未结输出',
+                        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+                        icon: '供货'
+                    }
+                },
                 {
                     path: '/vwsparepart90',
                     component: () => import('@/views/ux/billManage/sparePart90'),
@@ -227,7 +237,7 @@ const vwMenudataRouter = {
                         icon: '看板'
                     }
                 }
-                
+
             ]
         }
     ]
diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js
index 67b7ac33..dc9a3158 100644
--- a/vue/src/router/modules/wms_out_order.js
+++ b/vue/src/router/modules/wms_out_order.js
@@ -80,6 +80,17 @@ const vwsOutOrderDataRouter = {
       }
     },
 
+    // {
+    //   path: '/wms-unSettledSum',
+    //   component: () => import('@/views/ux/billManage/UnSettledSum'),
+    //   name: 'UnSettledSum',//命名路由
+    //   meta: {
+    //     title: '撤销出库清单',
+    //     roles: ['SettleAccount.WMSJIT'],//控制页面角色（可以设置多个角色） 
+    //     icon: '零件'
+    //   }
+    // },
+
 
 
   ]
diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue
index 3b73da7d..5b01c101 100644
--- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue
+++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue
@@ -587,7 +587,7 @@ export default {
       setTimeout(this.getList, 0);
     }, 1000 * 180); //15秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
+    this.$once('hook:beforeDestroy', () => {
       clearInterval(timer);
     });
     //this.disabledDateCp5();
diff --git a/vue/src/views/ux/billManage/UnSettledSum/index.vue b/vue/src/views/ux/billManage/UnSettledSum/index.vue
index ea75f24a..10f1d90c 100644
--- a/vue/src/views/ux/billManage/UnSettledSum/index.vue
+++ b/vue/src/views/ux/billManage/UnSettledSum/index.vue
@@ -626,7 +626,7 @@ export default {
             "结算未结寄售核对表-导出条件：" + JSON.stringify(this.listExportQuery)
           );
           this.$axios
-            .gets(
+            .posts(
               "/api/settleaccount/ReportMakeService/UnSettledSum-Make",
               this.listExportQuery
             )
diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
index 2443b269..431d4428 100644
--- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
@@ -142,10 +142,7 @@
           <el-button type="text" @click="dialogFormVisible = false"
             >取消</el-button
           >
-          <el-button
-            v-loading="formLoading"
-            type="primary"
-            @click="save()"
+          <el-button v-loading="formLoading" type="primary" @click="save()"
             >确认</el-button
           >
         </div>
@@ -241,6 +238,7 @@ export default {
       page: 1,
       JobversionValue: "",
       JobversionValueVerson: "",
+      selectJobVersionValue: "",
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
@@ -364,6 +362,7 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -585,6 +584,14 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
index f27c9f53..18aefe40 100644
--- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
@@ -300,6 +300,7 @@ export default {
       JobversionValue: "",
       PurchaseDateValue: "",
       JobversionValueVerson: "",
+      selectJobVersionValue: "",
       dialogFormVisible: false,
       multipleSelection: [],
       outPutQtylist: {
@@ -420,6 +421,7 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -465,14 +467,15 @@ export default {
     },
 
     save(row) {
+      this.formLoading=true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
         this.saveBills(row);
       }
     },
-   
-     //撤销出库
+
+    //撤销出库
     HandleOutPutCancel() {
       if (this.multipleSelection.length == 0) {
         this.$message({
@@ -526,11 +529,11 @@ export default {
         if (this.accountDatelist != "") {
           this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
         }
-         console.log(
+        console.log(
           "无条码看板-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
         );
 
-            this.$axios
+        this.$axios
           .posts(
             "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass",
             this.listOutPutQuery
@@ -563,7 +566,7 @@ export default {
           });
       }
     },
-     //取消出库单
+    //取消出库单
     CancelBills(row) {
       if (this.accountDatelist.accountDate == "") {
         this.$message({
@@ -616,69 +619,6 @@ export default {
         });
     },
 
-
-
-    // //出库单
-    // save-00(row) {
-    //   this.dialogFormVisible = true;
-    //   this.resultData.errSize == 0; //重新弹窗
-    //   //this.formLoading = true;
-    //   this.listOutPutQuery.guids = [];
-    //   this.listOutPutQuery.version = this.customerInfo.version;
-    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
-    //   if (this.accountDatelist.accountDate == "") {
-    //     this.$message({
-    //       message: "请选择日期！",
-    //       type: "warning",
-    //     });
-    //     this.getList();
-    //     return;
-    //     //this.getList();
-    //   } else {
-    //     if (this.accountDatelist != "") {
-    //       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
-    //     }
-    //     //this.listOutPutQuery.accountDate = this.accountDatelist;
-    //     console.log(
-    //       "无条码看板-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-    //     );
-    //     this.$axios
-    //       .posts(
-    //         "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass-00",
-    //         this.listOutPutQuery
-    //       )
-    //       .then((res) => {
-    //         const index = this.list.indexOf(row);
-    //         if (res === "Success") {
-    //           this.$notify({
-    //             title: "成功",
-    //             message: "确认成功!",
-    //             type: "success",
-    //             duration: 2000,
-    //           });
-    //           this.accountDatelist.accountDate = "";
-    //           this.resultData.errSize = 0;
-    //           this.dialogFormVisible = false;
-    //           this.resultData.successMessage = "出库成功！";
-    //           this.getList();
-    //         } else {
-    //           this.dialogFormVisible = false;
-    //           this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
-    //           this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
-    //           this.resultData.successMessage = "有错误检验信息！";
-    //           //alert(JSON.stringify(this.resultData));
-    //         }
-    //         this.formLoading = false;
-    //       })
-    //       .catch(() => {
-    //         this.formLoading = false;
-    //       });
-    //   }
-    // },
-
-
-
-
     //删除出库单
     handleDelete(row) {
       var params = [];
@@ -806,6 +746,14 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
index 2d0df8f9..a540fd58 100644
--- a/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
+++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
@@ -18,14 +18,14 @@
         @click="handleFilter"
         >搜索
       </el-button>
-      <!-- <el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
         >导入文件（Excel）
-      </el-button> -->
+      </el-button>
       <el-button
         class="filter-item"
         size="mini"
@@ -218,7 +218,7 @@ export default {
   directives: { permission },
   data() {
     return {
-      crmType: "kanbanoutorder",
+      crmType: "kanbanwithoutorder",
       rules: {
         // version: [{ required: true, message: "必须输入！", trigger: "change" }],
         // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
index 8975f9cf..22c4bc81 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
@@ -175,10 +175,7 @@
           <el-button type="text" @click="dialogFormVisible = false"
             >取消</el-button
           >
-          <el-button
-            v-loading="formLoading"
-            type="primary"
-            @click="save()"
+          <el-button v-loading="formLoading" type="primary" @click="save()"
             >确认</el-button
           >
         </div>
@@ -272,6 +269,7 @@ export default {
       },
       page: 1,
       JobversionValue: "",
+      selectJobVersionValue: "",
       PurchaseDateValue: "",
       JobversionValueVerson: "",
       dialogFormVisible: false,
@@ -410,6 +408,7 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -461,6 +460,7 @@ export default {
       }
     },
     save(row) {
+      this.formLoading = true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
@@ -683,6 +683,14 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
index 74ef73a2..12a401d2 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
@@ -243,6 +243,7 @@ export default {
       page: 1,
       JobversionValue: "",
       JobversionValueVerson: "",
+      selectJobVersionValue: "",
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
@@ -366,11 +367,13 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
 
     save(row) {
+      this.formLoading = true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
@@ -423,10 +426,10 @@ export default {
             this.accountDatelist.accountDate = "";
             this.dialogFormVisible = false;
             this.getList();
-            this.listLoading = false;
+            this.formLoading = false;
           })
           .catch(() => {
-            this.listLoading = false;
+            this.formLoading = false;
           });
       }
     },
@@ -594,6 +597,14 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
diff --git a/vue/src/views/ux/billManage/unSparePart/index.vue b/vue/src/views/ux/billManage/unSparePart/index.vue
new file mode 100644
index 00000000..21e30521
--- /dev/null
+++ b/vue/src/views/ux/billManage/unSparePart/index.vue
@@ -0,0 +1,1190 @@
+<!--大众备件未结明细-->
+<template>
+  <div class="cr-body-content">
+    <!--功能栏-->
+    <!-- 搜索 -->
+    <div style="float: left">
+      <flexbox class="content-header">
+        <JobSelectVerson
+          :options="JobVersionList"
+          style="width: 150px; margin-left: -10px"
+          class="search-container"
+          @value-change="JobVersionValue"
+        ></JobSelectVerson>
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleCreate"
+          >统计
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleDelete()"
+          >删除(支持批量)</el-button
+        >
+      </flexbox>
+    </div>
+    <!-- 刷新 -->
+    <div style="float: right">
+      <flexbox class="content-header">
+        <el-tooltip
+          class="item"
+          effect="dark"
+          content="手动刷新"
+          placement="top"
+        >
+          <el-button
+            size="mini"
+            circle
+            icon="el-icon-refresh"
+            @click="refresh()"
+          />
+        </el-tooltip>
+
+        <span style="margin-left: 10px; color: #ff5640; float: right"
+          >说明：每间隔3分钟进行自动刷新！</span
+        >
+      </flexbox>
+    </div>
+
+    <!--主页面表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @row-click="handleRowClick"
+      @selection-change="handleSelectionChange"
+      @filter-change="filterChange"
+      @cell-dblclick="dblhandleCurrentChange"
+    >
+      <el-table-column type="selection" width="44px"></el-table-column>
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+
+      <!-- 在线编辑说明 -->
+      <el-table-column label="说明" width="400" align="center">
+        <template slot-scope="scope">
+          <el-input
+            ref="inputRef"
+            v-if="scope.row.isEditCell"
+            v-model="scope.row.remark"
+            class="el-input"
+            v-focus
+            @blur="cellBlur(scope.row, scope.column)"
+          />
+          <span v-else>{{ scope.row.remark }}</span>
+          <el-button
+            style="margin-left: 5px"
+            v-if="scope.row.isEditCell"
+            type="success"
+            icon="el-icon-check"
+            size="small"
+            circle
+            @click="submitName(scope.row)"
+          ></el-button>
+          <el-button
+            v-show="scope.row.isEditCell"
+            class="cancel-btn"
+            size="mini"
+            icon="el-icon-refresh"
+            type="warning"
+            @click.native.prevent="handleCancel(scope.row)"
+          >
+            cancel
+          </el-button>
+        </template>
+      </el-table-column>
+      <!-- 状态 -->
+      <el-table-column
+        prop="stateName"
+        label="状态(单击箭头过滤)"
+        width="165"
+        column-key="stateName"
+        align="center"
+        :filters="[
+          { text: '执行完成(任务成功)', value: 'Succeeded' },
+          { text: '执行完成(任务失败)', value: 'Failed' },
+          { text: '执行中', value: 'Processing' },
+          { text: '等待执行', value: 'Scheduled' },
+        ]"
+        filter-placement="bottom-end"
+        :filter-method="filterHandler"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            v-for="(item, index) in stateNameCateMap"
+            v-show="scope.row.stateName == item.value"
+            :key="index"
+            :type="item.cssName"
+          >
+            {{ item.label }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <!-- 操作 -->
+      <el-table-column label="操作" align="center" width="250">
+        <template slot-scope="scope">
+          <div align="center">
+            <!-- <el-button
+              v-if="scope.row.actionName == '导出'"
+              size="mini"
+              type="text"
+              @click="handleDownload(scope.row)"
+              icon="el-icon-edit"
+              >下载</el-button
+            > -->
+            <el-button
+              v-if="
+                scope.row.actionName == '导出' &&
+                scope.row.stateName == 'Succeeded' &&
+                scope.row.downFileName != ''
+              "
+              size="mini"
+              type="text"
+              @click="handleDownload(scope.row)"
+              icon="el-icon-edit"
+              >下载</el-button
+            >
+            <el-button
+              v-if="
+                scope.row.actionName == '导出' &&
+                scope.row.error != '' &&
+                scope.row.stateName == 'Succeeded'
+              "
+              size="mini"
+              type="text"
+              @click="handleDownload(scope.row)"
+              icon="el-icon-edit"
+              >检验失败，下载</el-button
+            >
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+    <div class="table-footer">
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+
+    <!--统计功能表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      append-to-body
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="选择版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="versionValue">
+              <el-select
+                v-model="formCount.versionValue"
+                size="medium"
+                clearable
+                style="width: 188px; margin-right: 15px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="采购订单号" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="purchaseOrderNo">
+              <el-input
+                type="textarea"
+                v-model="formCount.purchaseOrderNo"
+                style="width: 450px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="订单日期：" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="startTime"
+                type="datetime"
+                size="small"
+                :picker-options="pickerOptions0"
+                @change="getdateValue"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="endTime"
+                type="datetime"
+                :picker-options="pickerOptions1"
+                size="small"
+                @change="getdateVal"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="厂内零件号" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="sapCode">
+              <el-input
+                v-model="formCount.sapCode"
+                style="width: 450px"
+                type="textarea"
+                :rows="4"
+                placeholder="多个厂内零件号，请以回车换行形式添加！"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        > -->
+        <el-button @click="resetForm('formCount')">重置</el-button>
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <!--统计-备件无条码报表-->
+    <el-dialog
+      :visible.sync="dialogFormNoBillVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      append-to-body
+      width="680px"
+    >
+      <el-form
+        ref="formNoBill"
+        :inline="true"
+        :rules="rulesNoBill"
+        :model="formNoBill"
+        size="mini"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="选择版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="versionValue">
+              <el-select
+                v-model="formNoBill.versionValue"
+                size="medium"
+                clearable
+                style="width: 188px; margin-right: 15px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="查询日期：" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="startTimeNoBill"
+                type="datetime"
+                size="small"
+                :picker-options="pickerOptions4"
+                @change="getdateValue"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="endTimeNoBill"
+                type="datetime"
+                :picker-options="pickerOptions5"
+                size="small"
+                @change="getdateVal"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <!-- <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="materialCode">
+              <el-input
+                v-model="formCount.materialCode"
+                style="width: 170px"
+                type="textarea"
+                :rows="4"
+                placeholder="多个客户零件号，请以回车换行形式添加！"
+              />
+            </el-form-item>
+          </el-col> -->
+          <el-col :md="4" :xs="24">
+            <el-form-item label="厂内零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="sapCode">
+              <el-input
+                v-model="formNoBill.sapCode"
+                style="width: 450px"
+                type="textarea"
+                :rows="4"
+                placeholder="多个厂内零件号，请以回车换行形式添加！"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetNoBillForm('formNoBill')">重置</el-button>
+        <el-button
+          v-loading="formNoBillLoading"
+          type="primary"
+          @click="saveNoBill"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import { downloadFile } from "@/utils/crmindex.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import moment from "moment";
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
+
+export default {
+  name: "SparePartReport",
+  components: { Pagination, CRMTableHead, JobSelectVerson },
+  directives: { permission },
+
+  data() {
+    return {
+      crmType: "backJob",
+      rules: {
+        versionValue: [
+          { required: true, message: "必须输入！", trigger: "change" },
+        ],
+      },
+      rulesNoBill: {
+        versionValue: [
+          { required: true, message: "必须输入！", trigger: "change" },
+        ],
+      },
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+
+      pickerOptions2: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          return time.getTime() > new Date(this.cp5endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions3: {
+        disabledDate: (time) => {
+          return time.getTime() <= new Date(this.cp5startTime).getTime();
+        },
+      },
+
+      pickerOptions4: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          return time.getTime() > new Date(this.endTimeNoBill).getTime();
+          //}
+        },
+      },
+      pickerOptions5: {
+        disabledDate: (time) => {
+          return time.getTime() <= new Date(this.startTimeNoBill).getTime();
+        },
+      },
+      startTime: "",
+      endTime: "",
+      startTimeNoBill: "",
+      endTimeNoBill: "",
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
+      JobVersionList: [],
+      datetime7: [],
+      checkedCities: [0],
+      selectValue: "",
+      selectNameValue: "",
+      radio: "0", //结算状态：0未结 1部分结算
+      versionList: [],
+      materialGroupList: [],
+      getmaterialGroupValue: "",
+      // 是否显示详细弹出层
+      openView: false,
+      versionValue: "",
+      materialGroupValue: "",
+      formTitle: "",
+      timer: null, //定时器名称
+      //当前位置
+      activeIndex: 1,
+      //默认显示基本信息
+      activeName: "first",
+      //步骤条步数
+      stepList: [
+        {
+          title: "等待执行",
+          icon: "el-icon-sort",
+        },
+        {
+          title: "执行中",
+          icon: "el-icon-refresh",
+        },
+        {
+          title: "执行完成",
+          icon: "el-icon-check",
+        },
+      ],
+      customerInfos: "",
+      searchContent: "", // 输入内容
+      form: {},
+      formNoBill: {},
+      formCount: {
+        startTime: "",
+        endTime: "",
+        cp5startTime: "",
+        cp5endTime: "",
+        // name: "未结算对比",
+        // settledate: "",
+        // materialCode: "",
+        // sapMaterialCode: "",
+        // chassisNumber: "",
+        // kennCode: "",
+        version: undefined,
+      },
+      cp5startTime: "",
+      cp5endTime: "",
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      formNoBillLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listExportQuery: {
+        version: "",
+        purchaseOrderNo: undefined,
+        begin: undefined,
+        end: undefined,
+        sapCode: undefined,
+      },
+      listNoBillExportQuery: {
+        version: "",
+        sapCode: undefined,
+      },
+      listQuery: {
+        taskId: "",
+        name: "",
+      },
+      listBillQuery: {
+        version: "",
+        guids: [],
+      },
+      page: 1,
+      dialogFormVisible: false,
+      dialogFormNoBillVisible: false,
+      multipleSelection: [],
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+      menuCateMap: [
+        { label: "导出", value: "导出", cssName: "warning" },
+        { label: "消息", value: "消息", cssName: "info" },
+      ],
+      stateNameCateMap: [
+        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
+        { label: "执行中...", value: "Processing", cssName: "primary" },
+        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
+        { label: "等待执行", value: "Scheduled", cssName: "primary" },
+      ],
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+    this.timer = setInterval(() => {
+      this.listQuery.taskId = "";
+      this.listQuery.stateName = "";
+      setTimeout(this.getList, 0);
+    }, 1000 * 180); //30秒刷新一次页面
+    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(timer);
+    });
+    //this.disabledDateCp5();
+  },
+  created() {
+    this.getAllVersionList();
+    this.getMaterialGroup();
+    this.getList();
+    this.getJobVersionInfo();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+    this.timer = null;
+  },
+  computed: {
+    /* 主表头 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "版本号",
+        prop: "type",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "taskId",
+        width: 140,
+      });
+      // tempsTabs.push({
+      //   label: "模块名称",
+      //   prop: "name",
+      //   width: 170,
+      // });
+      tempsTabs.push({
+        label: "创建人",
+        prop: "email",
+        width: 110,
+      });
+      tempsTabs.push({
+        label: "创建时间",
+        prop: "createdAt",
+        width: 150,
+      });
+
+      tempsTabs.push({
+        label: "审批状态",
+        prop: "fileName",
+        width: 350,
+      });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    dblhandleCurrentChange(row, column, cell, event) {
+      if (column.label === "说明") {
+        row.isEditCell = true;
+        this.$set(row, "isEditCell", true);
+        this.$nextTick(() => {
+          //自动获取焦点 element组件autofocus失效
+          //this.$refs.inputRef.focus();
+          this.$refs["inputRef"].focus();
+        });
+      }
+      this.list = this.list.filter((item) => {
+        return item;
+      });
+    },
+    // 可以编辑框失去焦点
+    cellBlur(row, column) {
+      row.isEditCell = false;
+      this.$set(row, "isEditCell", false);
+    },
+    // 在线编辑中提交
+    submitName(row) {
+      let getguid = row.id;
+      let getremark = row.remark;
+      this.$axios
+        .gets("/api/settleaccount/Job/updateRemark", {
+          p_id: getguid,
+          remark: getremark,
+        })
+        .then((response) => {
+          if (response == true) {
+            this.$notify({
+              title: "成功",
+              message: "更新成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.getList();
+          }
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    // 取消
+    handleCancel(row) {
+      row.isEditCell = false;
+      //row.stockQty = row.originalstockQty;
+      this.$set(row, "isEditCell", false);
+      // this.$message({
+      //   message: "取消后，恢复当前原值！",
+      //   type: "warning",
+      // });
+      this.getList();
+    },
+    //cp5
+    getdateValueCp5(val) {
+      this.cp5startTime = val;
+      //this.getbalanceIndexData();
+    },
+    getdateValCp5(val) {
+      this.cp5endTime = val;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    //批量删除
+    handleDelete(row) {
+      this.isEdit = false;
+      if (this.multipleSelection.length == 0) {
+        this.$message({
+          message: "至少选择一行！",
+          type: "warning",
+        });
+        return;
+      } else {
+        var getbillNum = "";
+        //判断已经生成出库单的不能执行删除操作
+        this.multipleSelection.forEach((element) => {
+          let state = element.fileName;
+          if (state != "" && state != "已确认") {
+            this.isEdit = true;
+            getbillNum += state + ",";
+          }
+        });
+      }
+      if (this.isEdit == true) {
+        this.$message({
+          message:
+            "已经生成出库单的不能删除！单号：" +
+            getbillNum.substr(0, getbillNum.length - 1),
+          type: "warning",
+        });
+        return;
+      } else {
+        var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        this.$confirm("是否删除" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts("/api/settleaccount/Job/delete", params)
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "删除成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+          });
+      }
+    },
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.JobversionValue = params.value;
+      this.getList();
+    },
+    getJobVersionInfo() {
+      //取版本列表信息
+      //this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
+        .then((response) => {
+          let res = response.reverse(); //降序排列
+          this.JobVersionList = [];
+          res.forEach((element, index) => {
+            let options = {};
+            options.value = element;
+            options.label = element;
+            this.JobVersionList.push(options);
+          });
+          if (JSON.stringify(this.JobVersionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.JobversionValue = this.JobVersionList[0].value;
+            this.JobversionValueVerson = this.JobVersionList[0].label;
+            this.getList();
+          }
+        })
+        .catch(() => {
+          //this.listLoading = false;
+        });
+    },
+    getdateValue(val) {
+      this.startTime = val;
+    },
+    getdateVal(val) {
+      this.endTime = val;
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
+    handleCheckedCitiesChange(value) {
+      alert(value);
+    },
+
+    getAllVersionList() {
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.versionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    getMaterialGroup() {
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", {
+          project: "物料组",
+          maxResultCount: 1000,
+          skipCount: 0,
+          sorting: "value ascending",
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.value;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /* 重置 */
+    resetForm(formName) {
+      this.formCount = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
+      this.cp5startTime = "";
+      this.cp5endTime = "";
+    },
+    resetNoBillForm(formName) {
+      this.formNoBill = {};
+      this.startTimeNoBill = "";
+      this.endTimeNoBill = "";
+    },
+    save() {
+      this.$refs.formCount.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          this.listExportQuery.version = this.formCount.versionValue; //版本
+          if (this.formCount.purchaseOrderNo != "") {
+            this.listExportQuery.purchaseOrderNo =
+              this.formCount.purchaseOrderNo; //采购订单号
+          }
+          if (this.formCount.sapCode != "") {
+            this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号
+          }
+          //订单日期起止
+          this.listExportQuery.begin = this.startTime
+            ? this.startTime
+            : undefined;
+          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
+          console.log(
+            "大众备件未结-生成条件：" + JSON.stringify(this.listExportQuery)
+          );
+          this.$axios
+            .gets(
+              "/api/settleaccount/ReportMakeService/UnSettleSparePartExport",
+              this.listExportQuery
+            )
+            .then((res) => {
+              let taskid = res;
+              if (Number.isInteger(taskid)) {
+                this.$notify({
+                  title: "成功",
+                  message: "任务生成成功！任务号:" + taskid,
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.getList();
+              this.formLoading = false;
+              this.dialogFormVisible = false;
+            })
+            .catch(() => {
+              this.formLoading = false;
+              this.dialogFormVisible = false;
+            });
+        }
+      });
+    },
+   
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["formCount"].resetFields();
+      // });
+      if (this.$refs["formCount"] !== undefined) {
+        this.$refs["formCount"].resetFields();
+      }
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.formCount = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
+      this.cp5startTime = "";
+      this.cp5endTime = "";
+      this.dialogFormVisible = true;
+    },
+
+    filterHandler(value, row, column) {
+      const property = column["property"];
+      return row[property] === value;
+    },
+    /* 任务详细信息 */
+    handleView(row) {
+      this.listQuery.taskId = row.taskId;
+      this.$axios
+        .posts("/api/settleaccount/Job/list", this.listQuery)
+        .then((response) => {
+          this.form = response[0];
+          switch (response[0].stateName) {
+            case "Succeeded":
+            case "Failed":
+              this.activeIndex = 3;
+              break;
+            case "Processing":
+              this.activeIndex = 2;
+              break;
+            case "Enqueued":
+              this.activeIndex = 1;
+              break;
+          }
+          this.openView = true;
+        });
+    },
+    /*  刷新  */
+    refresh() {
+      this.list = [];
+      this.listQuery.taskId = "";
+      this.listQuery.name = "";
+      this.getList();
+    },
+    // 监听筛选项的变化
+    filterChange(filterObj) {
+      console.log(filterObj.actionName);
+      if (filterObj.actionName.length > 0) {
+        console.log("点击筛选");
+      } else {
+        console.log("点击重置");
+      }
+    },
+    /* 导出类型的文件 */
+    downloadErrData(param) {
+      this.listLoading = true;
+      let fileNameOfProject = param;
+      this.$axios
+        .BolbGets(
+          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+        )
+        .then((response) => {
+          if (fileNameOfProject.indexOf("_") != -1) {
+            let downName =
+              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+            downloadFile(response, downName);
+            this.$notify({
+              title: "成功",
+              message: "数据-导出中...",
+              type: "success",
+              duration: 2000,
+            });
+          } else {
+            downloadFile(response, fileNameOfProject);
+            this.$notify({
+              title: "成功",
+              message: "数据-导出中...",
+              type: "success",
+              duration: 2000,
+            });
+          }
+          this.listLoading = false;
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
+    },
+    /* 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /* 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "stateName") {
+        return {
+          Succeeded: "执行完成(成功)",
+          Processing: "执行中...",
+          Failed: "执行完成(失败)",
+          Enqueued: "等待执行",
+        }[row[column.property]];
+      }
+      if (column.property == "createdAt") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    handleDownload(row) {
+      if (row.stateName == "Succeeded") {
+        this.downloadErrData(row.downFileName);
+      } else if (row.stateName == "Failed") {
+        this.downloadErrData(row.error);
+      }
+    },
+    getList() {
+      this.listLoading = true;
+      //导入界面中超链接过来的参数
+      this.listQuery.name = "大众备件未结输出";
+      this.listQuery.type = this.JobversionValue;
+      this.$axios
+        .posts("/api/settleaccount/Job/list", this.listQuery)
+        .then((response) => {
+          this.list = response;
+          //动态加一个是否编辑的标识
+          this.list.forEach((element) => {
+            element["isEditCell"] = false;
+          });
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    // fetchData(id) {
+    //   //循环动态，取客户名称
+    //   this.$axios
+    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
+    //     .then((response) => {
+    //       this.form = response;
+    //     });
+    // },
+    resetQuery() {},
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      var item = this.list[rowIndex];
+      if (column.property === "fileName") {
+        if (item.fileName === "已确认") {
+          return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
+        } else {
+          return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
+        }
+      }
+      return { textAlign: "left" };
+      //}
+    },
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "stateName") {
+        return { textAlign: "center" };
+      }
+      return { textAlign: "center" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+@import "../../styles/steps.scss";
+
+/deep/ .el-checkbox input:focus {
+  outline: none !important;
+  border-color: gray;
+  border: 0px;
+  box-shadow: none !important;
+}
+</style>
diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue
index 4c88b6da..f7b8e88b 100644
--- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue
@@ -222,7 +222,7 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
         billNum: "",
-        state:"",
+        state: "",
       },
       listOutPutQuery: {
         version: "",
@@ -236,6 +236,7 @@ export default {
       page: 1,
       JobversionValue: "",
       JobversionValueVerson: "",
+      selectJobVersionValue: "",
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
@@ -318,11 +319,13 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
 
     save(row) {
+      this.formLoading = true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
@@ -684,6 +687,14 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
index 5df742f2..f64824c9 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
@@ -271,6 +271,7 @@ export default {
       },
       page: 1,
       JobversionValue: "",
+      selectJobVersionValue: "",
       JobversionValueVerson: "",
       dialogFormVisible: false,
       multipleSelection: [],
@@ -468,11 +469,13 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
 
     save(row) {
+      this.formLoading = true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
@@ -677,10 +680,10 @@ export default {
             this.accountDatelist.accountDate = "";
             this.dialogFormVisible = false;
             this.getList();
-            this.listLoading = false;
+            this.formLoading = false;
           })
           .catch(() => {
-            this.listLoading = false;
+            this.formLoading = false;
           });
       }
     },
@@ -765,6 +768,13 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
index bf53670e..7b055876 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
@@ -142,10 +142,7 @@
           <el-button type="text" @click="dialogFormVisible = false"
             >取消</el-button
           >
-          <el-button
-            v-loading="formLoading"
-            type="primary"
-            @click="save()"
+          <el-button v-loading="formLoading" type="primary" @click="save()"
             >确认</el-button
           >
         </div>
@@ -238,6 +235,7 @@ export default {
       page: 1,
       JobversionValue: "",
       JobversionValueVerson: "",
+      selectJobVersionValue: "",
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
@@ -373,11 +371,13 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
 
-     save(row) {
+    save(row) {
+      this.formLoading = true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
@@ -415,7 +415,7 @@ export default {
         });
     },
 
-     //取消出库单
+    //取消出库单
     CancelBills(row) {
       if (this.accountDatelist.accountDate == "") {
         this.$message({
@@ -524,7 +524,7 @@ export default {
     //       });
     //     });
     // },
-      //确认出库单
+    //确认出库单
     handleCreateBills() {
       this.dialogFormVisible = true;
       if (this.$refs["accountDatelist"] !== undefined) {
@@ -574,11 +574,11 @@ export default {
             this.accountDatelist.accountDate = "";
             this.dialogFormVisible = false;
             this.getList();
-            this.listLoading = false;
+           this.formLoading = false;
             this.dialogFormVisible = false;
           })
           .catch(() => {
-            this.listLoading = false;
+           this.formLoading = false;
           });
       }
     },
@@ -662,6 +662,13 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
index 9eec20dd..5374a503 100644
--- a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
@@ -228,6 +228,7 @@ export default {
         { value: "3", label: "不能出库" },
         { value: "4", label: "取消出库" },
       ],
+      selectJobVersionValue: "",
       PurchaseDateList: [],
       // 高级搜索
       filterObj: {
@@ -399,6 +400,7 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -449,6 +451,7 @@ export default {
       }
     },
     save(row) {
+      this.formLoading = true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
@@ -671,6 +674,14 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue
index 5d1b409b..cbee8fd2 100644
--- a/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue
@@ -1,4 +1,4 @@
-<!--红旗数据调整出库单-->
+<!--大众看板无单号出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
index 57849e26..fa6b9429 100644
--- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
@@ -168,10 +168,7 @@
           <el-button type="text" @click="dialogFormVisible = false"
             >取消</el-button
           >
-          <el-button
-            v-loading="formLoading"
-            type="primary"
-            @click="save()"
+          <el-button v-loading="formLoading" type="primary" @click="save()"
             >确认</el-button
           >
         </div>
@@ -265,6 +262,7 @@ export default {
       },
       page: 1,
       JobversionValue: "",
+      selectJobVersionValue: "",
       PurchaseDateValue: "",
       JobversionValueVerson: "",
       dialogFormVisible: false,
@@ -397,6 +395,7 @@ export default {
         action: 0,
         value: params.value,
       };
+      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -448,13 +447,14 @@ export default {
       }
     },
     save(row) {
+      this.formLoading = true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
         this.saveBills(row);
       }
     },
-      
+
     //取消出库单
     CancelBills(row) {
       if (this.accountDatelist.accountDate == "") {
@@ -594,7 +594,7 @@ export default {
         });
     },
 
-     //确认出库单
+    //确认出库单
     handleCreateBills() {
       this.dialogFormVisible = true;
       if (this.$refs["accountDatelist"] !== undefined) {
@@ -727,6 +727,13 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+      let filter = {
+        Column: "state",
+        Value: this.selectJobVersionValue,
+        Logic: 0,
+        Action: 0,
+      };
+      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(