前端代码提交

vue/src/components/ImportExcel-base/index.vue

@@ -301,8 +301,10 @@ export default {
           vWKanBan: "大众看板结算明细",
           scrapClaims: "CP7报废和索赔",
           sparePart: "大众备件结算明细",
-          hqHPlatform: "红旗H平台导入",
+          hqHPlatform: "红旗H平台",
-          hqMPlatform: "红旗M平台导入",
+          hqMPlatform: "红旗M平台",
+          vwoutorder: "准时化出库单",
+          kanbanoutorder: "大众看板出库单",
           bomdatabase: "产品结构BOM",
           prebatch: "预批量",
           secondaryPriceRatio: "二配结算价格比例",
@@ -330,6 +332,8 @@ export default {
           sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入
           hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //红旗H平台导入
           hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //红旗M平台导入
+          vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //准时化出库单导入
+          kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //大众看板出库单导入
           bomdatabase: "/api/settleaccount/bom/ExcelImport",
           prebatch: "/api/settleaccount/Prebatch/ExcelImport",
           secondaryPriceRatio:

vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue

@@ -32,16 +32,17 @@
           type="success"
           icon="el-icon-check"
           size="mini"
-          @click="handleCreateBills()"
+          @click="handleConfirm()"
-          >生成出库单(支持批量)</el-button
+          >已确认(支持批量)</el-button
         >
         <el-button
           class="filter-item"
-          type="success"
+          type="warning"
-          icon="el-icon-check"
+          icon="el-icon-edit"
           size="mini"
-          @click="handleConfirm()"
+          v-loading="formLoading"
-          >已确认</el-button
+          @click="handleCreateBills()"
+          >生成出库单(支持批量)</el-button
         >
       </flexbox>
     </div>
@@ -63,7 +64,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔3分钟进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -106,7 +107,7 @@
       </el-table-column>
 
       <!-- 操作名称 -->
-      <el-table-column
+      <!-- <el-table-column
         prop="actionName"
         label="操作名称(单击箭头过滤)"
         width="165"
@@ -130,7 +131,7 @@
             </el-tag>
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- 状态 -->
       <el-table-column
         prop="stateName"
@@ -816,8 +817,8 @@ export default {
         version: "",
         materialCode: undefined,
         sapCode: undefined,
-        cp7begin: undefined,
+        cp7Begin: undefined,
-        cp7end: undefined,
+        cp7End: undefined,
         kenncode: undefined,
         chassisNumber: undefined,
         materialGroup: undefined,
@@ -862,7 +863,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 180); //30秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -895,15 +896,15 @@ export default {
         prop: "taskId",
         width: 120,
       });
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "模块名称",
+      //   label: "模块名称",
-        prop: "name",
+      //   prop: "name",
-        width: 170,
+      //   width: 180,
-      });
+      // });
       tempsTabs.push({
         label: "创建人",
         prop: "email",
-        width: 110,
+        width: 150,
       });
       tempsTabs.push({
         label: "创建时间",
@@ -913,12 +914,12 @@ export default {
       tempsTabs.push({
         label: "说明",
         prop: "remark",
-        width: 220,
+        width: 350,
       });
       tempsTabs.push({
         label: "审批状态",
         prop: "fileName",
-        width: 150,
+        width: 350,
       });
       return tempsTabs;
     },
@@ -952,16 +953,39 @@ export default {
       this.getList();
     },
     handleSelectionChange(val) {
+      this.isEdit = false;
+      this.multipleSelection = [];
       this.multipleSelection = val;
     },
+    //已确认
     handleConfirm(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) {
@@ -983,7 +1007,10 @@ export default {
         })
           .then(() => {
             this.$axios
-            .posts("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params)
+              .posts(
+                "/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit",
+                params
+              )
               .then((response) => {
                 const index = this.list.indexOf(row);
                 this.$notify({
@@ -1001,16 +1028,37 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
     //出库单
     handleCreateBills(row) {
-      // if (this.multipleSelection.length == 0) {
+      this.isEdit = false;
-      //   this.$message({
+      if (this.multipleSelection.length == 0) {
-      //     message: "至少选择一行！",
+        this.$message({
-      //     type: "warning",
+          message: "至少选择一行！",
-      //   });
+          type: "warning",
-      //   return;
+        });
-      // }
+        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) {
@@ -1034,15 +1082,13 @@ export default {
           type: "warning",
         })
           .then(() => {
+            this.formLoading = true;
             this.$axios
               .posts(
                 "/api/settleaccount/wmsjitoutput/WmsJitOutPut",
                 this.listBillQuery
               )
               .then((response) => {
-              console.log(
-                "检查柱护板-hostCheckQuery" + JSON.stringify(response)
-              );
                 const index = this.list.indexOf(row);
                 this.$notify({
                   title: "成功",
@@ -1052,6 +1098,10 @@ export default {
                 });
 
                 this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
               });
           })
           .catch(() => {
@@ -1060,16 +1110,37 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
     //批量删除
     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) {
@@ -1109,6 +1180,7 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
@@ -1279,7 +1351,7 @@ export default {
           project: "物料组",
           maxResultCount: 1000,
           skipCount: 0,
-          sorting:"value ascending"
+          sorting: "value ascending",
         })
         .then((response) => {
           this.materialGroupList = [];
@@ -1323,10 +1395,10 @@ export default {
           this.listExportQuery.end = this.cp5endTime
             ? this.cp5endTime
             : undefined;
-          this.listExportQuery.cp7begin = this.startTime
+          this.listExportQuery.cp7Begin = this.startTime
             ? this.startTime
             : undefined;
-          this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
+          this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
           if (this.formCount.chassisNumber != "") {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
@@ -1343,7 +1415,7 @@ export default {
               JSON.stringify(this.listExportQuery)
           );
           this.$axios
-            .gets(
+            .posts(
               "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
               this.listExportQuery
             )
@@ -1530,13 +1602,11 @@ export default {
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
       var item = this.list[rowIndex];
-      if (column.property === "stateName") {
+      if (column.property === "fileName") {
-        if (item.stateName === "Succeeded") {
+        if (item.fileName === "已确认") {
-          return { color: "#71d87f", cursor: "pointer" };
+          return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
-        } else if (item.stateName === "Processing") {
+        } else {
-          return { color: "#d87171", cursor: "pointer" };
+          return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
         }
       }
       return { textAlign: "left" };

vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue

@@ -47,7 +47,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔15秒进行自动刷新！</span
+          >说明：每间隔3分钟进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -595,7 +595,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 15); //15秒刷新一次页面
+    }, 1000 * 180); //180秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -989,7 +989,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "发票与结算核对汇总";
+      this.listQuery.name = "发票与结算核对汇总表";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/billManage/IssuedUnsettled/index.vue

@@ -47,7 +47,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔15秒进行自动刷新！</span
+          >说明：每间隔3分钟进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -699,7 +699,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 15); //15秒刷新一次页面
+    }, 1000 * 180); //15秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -732,11 +732,11 @@ export default {
         prop: "taskId",
         width: 130,
       });
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "模块名称",
+      //   label: "模块名称",
-        prop: "name",
+      //   prop: "name",
-        width: 170,
+      //   width: 170,
-      });
+      // });
       tempsTabs.push({
         label: "创建人",
         prop: "email",
@@ -969,7 +969,7 @@ export default {
               JSON.stringify(this.listExportQuery)
           );
           this.$axios
-            .gets(
+            .posts(
               "/api/settleaccount/ReportMakeService/UnsettledDetailReportService-Make",
               this.listExportQuery
             )
@@ -1119,7 +1119,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众准时化未结明细表";
+      this.listQuery.name = "准时化未结明细表";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue

@@ -708,8 +708,8 @@ export default {
       listExportQuery: {
         version: "",
         materialCode: undefined,
-        cp7begin: undefined,
+        cp7Begin: undefined,
-        cp7end: undefined,
+        cp7End: undefined,
         kenncode: undefined,
         chassisNumber: undefined,
         materialGroup: undefined,
@@ -1014,10 +1014,10 @@ export default {
           this.listExportQuery.end = this.cp5endTime
             ? this.cp5endTime
             : undefined;
-          this.listExportQuery.cp7begin = this.startTime
+          this.listExportQuery.cp7Begin = this.startTime
             ? this.startTime
             : undefined;
-          this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
+          this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
           if (this.formCount.chassisNumber != "") {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
@@ -1029,7 +1029,7 @@ export default {
               JSON.stringify(this.listExportQuery)
           );
           this.$axios
-            .gets(
+            .posts(
               "/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make",
               this.listExportQuery
             )
@@ -1181,7 +1181,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "准时化量差输出";
+      this.listQuery.name = "准时化结算数量差异比对输出";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/billManage/UnSettleDiffExport/index.vue

@@ -17,7 +17,7 @@
           size="mini"
           type="primary"
           icon="el-icon-plus"
-          @click="handleCreate"
+          @click="handleCreate()"
           >统计
         </el-button>
         <el-button
@@ -641,6 +641,10 @@ export default {
       formCount: {
         startTime: "",
         endTime: "",
+        materialCode: undefined,
+        kenncode: undefined,
+        chassisNumber: undefined,
+        sapCode: undefined,
         // name: "未结算对比",
         // settledate: "",
         // materialCode: "",
@@ -975,7 +979,7 @@ export default {
               JSON.stringify(this.listExportQuery)
           );
           this.$axios
-            .gets(
+            .posts(
               "/api/settleaccount/ReportMakeService/UnSettleDiffExport-Make",
               this.listExportQuery
             )
@@ -1001,9 +1005,12 @@ export default {
       });
     },
     handleCreate() {
-      this.$nextTick(() => {
+      if (this.$refs["formCount"] !== undefined) {
         this.$refs["formCount"].resetFields();
-      });
+      }
+      // this.$nextTick(() => {
+      //   this.$refs["formCount"].resetFields();
+      // });
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};

vue/src/views/ux/billManage/UnSettledDiff/index.vue

@@ -966,7 +966,7 @@ export default {
               JSON.stringify(this.listExportQuery)
           );
           this.$axios
-            .gets(
+            .posts(
               "/api/settleaccount/ReportMakeService/UnSettledDiff-Make",
               this.listExportQuery
             )
@@ -1116,7 +1116,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "未结算对比";
+      this.listQuery.name = "准时化未结明细表";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/billManage/kanBanWithCode/index.vue

@@ -32,16 +32,17 @@
           type="success"
           icon="el-icon-check"
           size="mini"
-          @click="handleCreateBills()"
+          @click="handleConfirm()"
-          >生成出库单(支持批量)</el-button
+          >已确认(支持批量)</el-button
         >
         <el-button
           class="filter-item"
-          type="success"
+          type="warning"
-          icon="el-icon-check"
+          icon="el-icon-edit"
           size="mini"
-          @click="handleConfirm()"
+          v-loading="formLoading"
-          >已确认</el-button
+          @click="handleCreateBills()"
+          >生成出库单(支持批量)</el-button
         >
       </flexbox>
     </div>
@@ -63,7 +64,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔3分钟进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -105,7 +106,7 @@
       </el-table-column>
 
       <!-- 操作名称 -->
-      <el-table-column
+      <!-- <el-table-column
         prop="actionName"
         label="操作名称(单击箭头过滤)"
         width="165"
@@ -129,7 +130,7 @@
             </el-tag>
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- 状态 -->
       <el-table-column
         prop="stateName"
@@ -707,7 +708,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 180); //30秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -740,11 +741,11 @@ export default {
         prop: "taskId",
         width: 120,
       });
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "模块名称",
+      //   label: "模块名称",
-        prop: "name",
+      //   prop: "name",
-        width: 170,
+      //   width: 170,
-      });
+      // });
       tempsTabs.push({
         label: "创建人",
         prop: "email",
@@ -763,7 +764,7 @@ export default {
       tempsTabs.push({
         label: "审批状态",
         prop: "fileName",
-        width: 150,
+        width: 350,
       });
       return tempsTabs;
     },
@@ -774,13 +775,33 @@ export default {
     },
     //批量删除
     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) {
@@ -820,15 +841,37 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
+    //已确认
     handleConfirm(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) {
@@ -850,12 +893,15 @@ export default {
         })
           .then(() => {
             this.$axios
-            .posts("/api/settleaccount/wms/WmsJitOutPut", params)
+              .posts(
+                "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPutAudit",
+                params
+              )
               .then((response) => {
                 const index = this.list.indexOf(row);
                 this.$notify({
                   title: "成功",
-                message: "生成成功",
+                  message: "操作成功",
                   type: "success",
                   duration: 2000,
                 });
@@ -868,16 +914,37 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
     //出库单
     handleCreateBills(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) {
@@ -892,14 +959,21 @@ export default {
           });
           myalert = "选中项";
         }
+        this.listBillQuery.guids = params;
+        this.listBillQuery.version = this.JobversionValue;
+        console.log("出库单条件：" + JSON.stringify(this.listBillQuery));
         this.$confirm("是否确认出库" + myalert + "?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
         })
           .then(() => {
+            this.formLoading = true;
             this.$axios
-            .posts("/api/settleaccount/wms/WmsJitOutPut", params)
+              .posts(
+                "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut",
+                this.listBillQuery
+              )
               .then((response) => {
                 const index = this.list.indexOf(row);
                 this.$notify({
@@ -908,7 +982,12 @@ export default {
                   type: "success",
                   duration: 2000,
                 });
+
                 this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
               });
           })
           .catch(() => {
@@ -917,6 +996,7 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
     valueChange(data) {
       this.getmaterialGroupValue = "";
@@ -1060,7 +1140,7 @@ export default {
               JSON.stringify(this.listExportQuery)
           );
           this.$axios
-            .gets(
+            .posts(
               "/api/settleaccount/ReportMakeService/SettleKanBan-WithCode",
               this.listExportQuery
             )
@@ -1232,13 +1312,11 @@ export default {
       /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
       var item = this.list[rowIndex];
-      if (column.property === "stateName") {
+      if (column.property === "fileName") {
-        if (item.stateName === "Succeeded") {
+        if (item.fileName === "已确认") {
-          return { color: "#71d87f", cursor: "pointer" };
+          return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
-        } else if (item.stateName === "Processing") {
+        } else {
-          return { color: "#d87171", cursor: "pointer" };
+          return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
         }
       }
       return { textAlign: "left" };

vue/src/views/ux/billManage/kanbanOutOrder/detail.vue

@@ -10,6 +10,12 @@
         @click="handleDownload()"
         >导出全部
       </el-button> -->
+      <JobSelectVerson
+        :options="JobVersionList"
+        style="width: 150px; margin-left: -10px"
+        class="search-container"
+        @value-change="JobVersionValue"
+      ></JobSelectVerson>
       <el-button
         class="filter-item"
         type="success"
@@ -21,7 +27,7 @@
       <el-button
         class="filter-item"
         size="mini"
-        type="info"
+        type="warning"
         icon="el-icon-download"
         @click="handleCancelBills()"
         >取消出库(支持批量)
@@ -106,10 +112,11 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import { downloadFile } from "@/utils/crmindex.js";
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, CRMTableHead },
+  components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
   directives: { permission },
   props: {
     customerInfos: {
@@ -131,6 +138,7 @@ export default {
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
+        version: "",
       },
       form: {
         dicDetailID: "",
@@ -141,6 +149,13 @@ export default {
       totalCount: 0,
       listLoading: true,
       formLoading: false,
+      JobVersionList: [
+        { value: "0", label: "未处理" },
+        { value: "1", label: "申请出库" },
+        { value: "2", label: "确认出库" },
+        { value: "3", label: "不能出库" },
+        { value: "4", label: "取消出库" },
+      ],
       // 高级搜索
       filterObj: {
         type: Object,
@@ -152,27 +167,29 @@ export default {
         Filters: [
           {
             logic: 0,
-            column: "",
+            column: "Enabled",
             action: 0,
-            value: "",
+            value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        ParentId: "",
+        billNum: "",
       },
       listOutPutQuery: {
         version: "",
-        ids: "",
+        guids: "",
+        billNum: "",
       },
       page: 1,
+      JobversionValue: "",
+      JobversionValueVerson: "",
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 230,
       isEdit: false,
     };
   },
@@ -194,6 +211,7 @@ export default {
         } else {
           newVal.forEach((element) => {
             this.customerInfo.parentId = element.ParentId;
+            this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
             this.getList();
@@ -210,20 +228,38 @@ export default {
       tempsTabs.push({
         label: "版本",
         prop: "version",
-        width: 150,
+        width: 110,
       });
       tempsTabs.push({
         label: "零件号",
         prop: "materialCode",
         width: 150,
       });
+      tempsTabs.push({ label: "KEEN号", prop: "kennCode", width: 170 });
+      tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 190 });
       tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
       tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
-      tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 });
+      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
       return tempsTabs;
     },
   },
   methods: {
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.listQuery.Filters = [];
+      var column = "state";
+      let filter = {
+        logic: 0,
+        column: column,
+        action: 0,
+        value: params.value,
+      };
+      this.listQuery.Filters.push(filter);
+      this.getList();
+    },
     //取消出库单
     handleCancelBills(row) {
       if (this.multipleSelection.length == 0) {
@@ -233,8 +269,7 @@ export default {
         });
         return;
       }
-      //var params = [];
+      var params = [];
-      var params = "";
       let myalert = ""; //声明变量，其变量必须在此声明后使用
       if (row) {
         //单行
@@ -244,13 +279,14 @@ export default {
         //多选
         this.multipleSelection.forEach((element) => {
           let id = element.id;
-          //params.push(id);
+          params.push(id);
-          params += id + ",";
         });
         myalert = "选中项";
       }
-      this.listOutPutQuery.version = row.version;
+      this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.ids = params.substr(0, params.length - 1);
+      this.listOutPutQuery.guids = params;
+      this.listOutPutQuery.billNum = this.customerInfo.parentId;
+      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
       this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
         confirmButtonText: "确定",
@@ -260,7 +296,7 @@ export default {
         .then(() => {
           this.$axios
             .posts(
-              "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel",
+              "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
               this.listOutPutQuery
             )
             .then((response) => {
@@ -284,14 +320,46 @@ export default {
     //出库单
     handleCreateBills(row) {
       if (this.multipleSelection.length == 0) {
-        this.$message({
+        this.listLoading = true;
-          message: "至少选择一行！",
+        this.listOutPutQuery.guids = [];
+        this.listOutPutQuery.version = this.customerInfo.version;
+        this.listOutPutQuery.billNum = this.customerInfo.parentId;
+        console.log(
+          "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+        );
+        this.$confirm("是否全部确认出库?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
           type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
                 });
-        return;
+                this.getList();
-      }
+                this.listLoading = false;
-      //var params = [];
+              });
-      var params = "";
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.listLoading = false;
+          });
+      } else {
+        this.listLoading = true;
+        var params = [];
         let myalert = ""; //声明变量，其变量必须在此声明后使用
         if (row) {
           //单行
@@ -301,15 +369,17 @@ export default {
           //多选
           this.multipleSelection.forEach((element) => {
             let id = element.id;
-          //params.push(id);
+            params.push(id);
-          params += id + ",";
           });
           myalert = "选中项";
         }
-      this.listOutPutQuery.version = row.version;
+        this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.ids = params.substr(0, params.length - 1);
+        this.listOutPutQuery.guids = params;
-
+        this.listOutPutQuery.billNum = this.customerInfo.parentId;
-      this.$confirm("是否确认出库" + myalert + "?", "提示", {
+        console.log(
+          "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+        );
+        this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -317,7 +387,7 @@ export default {
           .then(() => {
             this.$axios
               .posts(
-              "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
+                "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
                 this.listOutPutQuery
               )
               .then((response) => {
@@ -329,6 +399,7 @@ export default {
                   duration: 2000,
                 });
                 this.getList();
+                this.listLoading = false;
               });
           })
           .catch(() => {
@@ -336,7 +407,9 @@ export default {
               type: "info",
               message: "已取消操作",
             });
+            this.listLoading = false;
           });
+      }
     },
     /** 刷新列表 */
     handleHandle(data) {
@@ -346,6 +419,15 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
+      if (column.property == "state") {
+        return {
+          0: "未处理",
+          1: "申请出库",
+          2: "确认出库",
+          3: "不能出库",
+          4: "取消出库",
+        }[row[column.property]];
+      }
       return row[column.property] || "--";
     },
     importExcelData() {
@@ -402,18 +484,11 @@ export default {
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
-      let filter = {
+      this.listQuery.billNum = this.customerInfo.parentId;
-        logic: 0,
-        column: "wmsBillNum",
-        action: 6,
-        value: this.customerInfo.parentId,
-      };
-      this.listQuery.Filters.push(filter);
-      //this.listQuery.ParentId = this.customerInfo.parentId;
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
-          "/api/settleaccount/wmsjitoutput/WmsJitDetailList",
+          "/api/settleaccount/wmskanbanoutput/WmsKanbanDetailList",
           this.listQuery
         )
         .then((response) => {

vue/src/views/ux/billManage/kanbanOutOrder/index.vue

@@ -18,6 +18,14 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入文件（Excel）
+      </el-button>
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -78,6 +86,13 @@
         :page.sync="page"
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
+      />
+       <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
       />
       <!-- 抽屉控件 -->
       <el-drawer
@@ -103,15 +118,16 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import Detail from "./detail";
 import moment from "moment";
+import importExcel from "@/components/ImportExcel-base";
 import { formatTimeToTimestamp } from "@/utils/index";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail },
+  components: { Pagination, Detail,importExcel },
   directives: { permission },
   data() {
     return {
-      crmType: "sendUnsettledDiffReport",
+      crmType: "kanbanoutorder",
       rules: {
         // version: [{ required: true, message: "必须输入！", trigger: "change" }],
         // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
@@ -193,6 +209,11 @@ export default {
     },
   },
   methods: {
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
@@ -216,9 +237,11 @@ export default {
     handleDrawerOpen(param) {
       this.drawer = true;
       var parentId = param.billNum; //单据号
+      var version = param.version; //版本
       this.customerInfos = [
         {
           ParentId: parentId,
+          Version: version,
         },
       ];
     },
@@ -234,8 +257,8 @@ export default {
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
-      if (column.property == "documentStatus") {
+      if (column.property == "state") {
-        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+        return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
           row[column.property]
         ];
       }
@@ -254,7 +277,7 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.$axios
-        .posts("/api/settleaccount/wmsjitoutput/WmsJitList", this.listQuery)
+        .posts("/api/settleaccount/wmskanbanoutput/WmsKanbanList", this.listQuery)
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))

vue/src/views/ux/billManage/sparePart/index.vue

@@ -32,16 +32,17 @@
           type="success"
           icon="el-icon-check"
           size="mini"
-          @click="handleCreateBills()"
+          @click="handleConfirm()"
-          >生成出库单(支持批量)</el-button
+          >已确认(支持批量)</el-button
         >
         <el-button
           class="filter-item"
-          type="success"
+          type="warning"
-          icon="el-icon-check"
+          icon="el-icon-edit"
           size="mini"
-          @click="handleConfirm()"
+          v-loading="formLoading"
-          >已确认</el-button
+          @click="handleCreateBills()"
+          >生成出库单(支持批量)</el-button
         >
       </flexbox>
     </div>
@@ -63,7 +64,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔3分钟进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -756,7 +757,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 180); //30秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -832,13 +833,33 @@ export default {
     },
     //批量删除
     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) {
@@ -878,15 +899,37 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
+    //已确认
     handleConfirm(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) {
@@ -908,12 +951,15 @@ export default {
         })
           .then(() => {
             this.$axios
-            .posts("/api/settleaccounWmsJitOutPutt/wms/", params)
+              .posts(
+                "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPutAudit",
+                params
+              )
               .then((response) => {
                 const index = this.list.indexOf(row);
                 this.$notify({
                   title: "成功",
-                message: "生成成功",
+                  message: "操作成功",
                   type: "success",
                   duration: 2000,
                 });
@@ -926,16 +972,37 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
     //出库单
     handleCreateBills(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) {
@@ -950,14 +1017,21 @@ export default {
           });
           myalert = "选中项";
         }
+        this.listBillQuery.guids = params;
+        this.listBillQuery.version = this.JobversionValue;
+        console.log("出库单条件：" + JSON.stringify(this.listBillQuery));
         this.$confirm("是否确认出库" + myalert + "?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
         })
           .then(() => {
+            this.formLoading = true;
             this.$axios
-            .posts("/api/settleaccount/wms/WmsJitOutPut", params)
+              .posts(
+                "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut",
+                this.listBillQuery
+              )
               .then((response) => {
                 const index = this.list.indexOf(row);
                 this.$notify({
@@ -966,7 +1040,12 @@ export default {
                   type: "success",
                   duration: 2000,
                 });
+
                 this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
               });
           })
           .catch(() => {
@@ -975,6 +1054,7 @@ export default {
               message: "已取消操作",
             });
           });
+      }
     },
     valueChange(data) {
       this.getmaterialGroupValue = "";

vue/src/views/ux/billManage/vwOutOrder/index.vue

@@ -18,6 +18,14 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入文件（Excel）
+      </el-button>
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -78,6 +86,13 @@
         :page.sync="page"
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
+      />
+       <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
       />
       <!-- 抽屉控件 -->
       <el-drawer
@@ -103,16 +118,16 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import Detail from "./detail";
 import moment from "moment";
+import importExcel from "@/components/ImportExcel-base";
 import { formatTimeToTimestamp } from "@/utils/index";
 
-
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail},
+  components: { Pagination, Detail,importExcel },
   directives: { permission },
   data() {
     return {
-      crmType: "sendUnsettledDiffReport",
+      crmType: "vwoutorder",
       rules: {
         // version: [{ required: true, message: "必须输入！", trigger: "change" }],
         // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
@@ -194,6 +209,11 @@ export default {
     },
   },
   methods: {
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;