diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js
index 6a14b0c1..58157598 100644
--- a/vue/src/router/modules/vw_menu.js
+++ b/vue/src/router/modules/vw_menu.js
@@ -217,16 +217,16 @@ const vwMenudataRouter = {
                         icon: '供货'
                     }
                 },
-                {
-                    path: '/vwsparepart90',
-                    component: () => import('@/views/ux/billManage/sparePart90'),
-                    name: 'SparePart90Report',//命名路由
-                    meta: {
-                        title: '大众备件调整输出',
-                        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '工厂'
-                    }
-                }
+                // {
+                //     path: '/vwsparepart90',
+                //     component: () => import('@/views/ux/billManage/sparePart90'),
+                //     name: 'SparePart90Report',//命名路由
+                //     meta: {
+                //         title: '大众备件调整输出',
+                //         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+                //         icon: '工厂'
+                //     }
+                // }
                 // {
                 //     path: '/bom-diffPrice',
                 //     component: () => import('@/views/ux/billManage/BomDiffPrice'),
diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
index d9781d47..5c192ca2 100644
--- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
@@ -131,6 +131,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -157,6 +158,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -173,6 +175,15 @@ export default {
   data() {
     return {
       crmType: "kanbanOutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -422,13 +433,61 @@ export default {
           type: "warning",
         });
         return;
-      } else {
-        if (this.accountDatelist != "") {
-          this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
-        }
-        //this.listOutPutQuery.accountDate = this.accountDatelist;
-        console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
+      }
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+
+      console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
 
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      // console.log(
+      //   "过账日期:" +
+      //     JSON.stringify(getAccountMonth) +
+      //     "当前日期:" +
+      //     JSON.stringify(currentMonth)
+      // );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          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,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
@@ -450,8 +509,55 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   this.listOutPutQuery.guids = [];
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   } 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/wmskanbanoutput/WmsKanbanOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
     //取消出库单
     CancelBills(row) {
       if (this.accountDatelist.accountDate == "") {
@@ -477,33 +583,146 @@ export default {
       this.listOutPutQuery.billNum = this.customerInfo.parentId;
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
 
     //删除出库单
     handleDelete(row) {
diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
index 84f7755f..d51d5fbe 100644
--- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
@@ -185,6 +185,7 @@
           <el-form-item label="日期" prop="accountDate">
             <el-date-picker
               v-model="accountDatelist.accountDate"
+              :picker-options="pickerOptions"
               type="date"
               clearable
               placeholder="选择日期"
@@ -212,6 +213,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -228,6 +230,15 @@ export default {
   data() {
     return {
       crmType: "sparepartOutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -467,7 +478,7 @@ export default {
     },
 
     save(row) {
-      this.formLoading=true;
+      this.formLoading = true;
       if (this.formTitle == "撤销出库") {
         this.CancelBills(row);
       } else if (this.formTitle == "创建出库单") {
@@ -525,14 +536,72 @@ export default {
           type: "warning",
         });
         return;
-      } else {
-        if (this.accountDatelist != "") {
-          this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
-        }
-        console.log(
-          "无条码看板-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
+      }
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
 
+      console.log(
+        "无条码看板-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+      );
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      // console.log(
+      //   "过账日期:" +
+      //     JSON.stringify(getAccountMonth) +
+      //     "当前日期:" +
+      //     JSON.stringify(currentMonth)
+      // );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass",
+                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;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass",
@@ -564,8 +633,69 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+
+    // saveBills(row) {
+    //   this.resultData.errSize == 0; //重新弹窗
+    //   this.listOutPutQuery.guids = [];
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   } else {
+    //     if (this.accountDatelist != "") {
+    //       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //     }
+    //     console.log(
+    //       "无条码看板-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+    //     );
+
+    //     this.$axios
+    //       .posts(
+    //         "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass",
+    //         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;
+    //       });
+    //   }
+    // },
+
     //取消出库单
     CancelBills(row) {
       if (this.accountDatelist.accountDate == "") {
@@ -592,32 +722,140 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
 
     //删除出库单
     handleDelete(row) {
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
index 26c58410..89d9a069 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
@@ -163,6 +163,7 @@
           <el-form-item label="日期" prop="accountDate">
             <el-date-picker
               v-model="accountDatelist.accountDate"
+              :picker-options="pickerOptions"
               type="date"
               clearable
               placeholder="选择日期"
@@ -207,6 +208,15 @@ export default {
   data() {
     return {
       crmType: "sparepartOutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -493,42 +503,37 @@ export default {
           message: "请选择日期！",
           type: "warning",
         });
+        this.formLoading = false;
         return;
-        //this.getList();
-      } else {
-        let myalert = "";
-        var getAccountMonth = moment(this.accountDatelist.accountDate).format(
-          "YYYY-MM"
-        );
-        let date = new Date();
-        let currentMonth = moment(date).format("YYYY-MM");
-        console.log(
-          "过账日期:" +
-            JSON.stringify(getAccountMonth) +
-            "当前日期:" +
-            JSON.stringify(currentMonth)
-        );
-        if (getAccountMonth <= currentMonth) {
-          myalert = "过账日期小于或等于当前月份";
-        } else {
-          this.$message({
-            type: "warning",
-            message: "选择的过账日期不能大于当前月份！",
-          });
-          this.formLoading = false;
-          return;
-        }
-
+      }
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+      console.log(
+        "全部确认出库条件：" +
+          JSON.stringify(this.listOutPutQuery) +
+          "选择日期：" +
+          JSON.stringify(this.accountDatelist.accountDate)
+      );
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      // console.log(
+      //   "过账日期:" +
+      //     JSON.stringify(getAccountMonth) +
+      //     "当前日期:" +
+      //     JSON.stringify(currentMonth)
+      // );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
         this.$confirm("是否确认" + myalert + "?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
         })
           .then(() => {
-            this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
-            console.log(
-              "全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-            );
+            //this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
 
             this.$axios
               .posts(
@@ -557,8 +562,37 @@ export default {
               type: "info",
               message: "已取消操作",
             });
-             this.formLoading = false;
+            this.formLoading = false;
           });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Pass",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "生成成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+          });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
     //撤销出库
@@ -597,6 +631,7 @@ export default {
           message: "请选择日期！",
           type: "warning",
         });
+        this.formLoading = false;
         return;
       }
       var params = [];
@@ -616,31 +651,99 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            //this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+            console.log(
+              "取消出库条件：" + JSON.stringify(this.listOutPutQuery)
+            );
+
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
           });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
+          });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
 
     //删除出库单
diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
index 3059f1ae..b5472b44 100644
--- a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
+++ b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
@@ -139,6 +139,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -165,6 +166,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -181,6 +183,15 @@ export default {
   data() {
     return {
       crmType: "sparepartOutOrder",
+       pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -400,16 +411,57 @@ export default {
           type: "warning",
         });
         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.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+
+      console.log("全部确认出库条件：" + JSON.stringify(this.listOutPutQuery));
 
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios;
         this.$axios
           .posts(
             "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut-Pass",
@@ -431,8 +483,58 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   this.listOutPutQuery.guids = [];
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     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/wmsSharePart90output/WmsSharePartOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
 
     //撤销出库
     HandleOutPutCancel() {
@@ -490,32 +592,146 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            //this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+            console.log(
+              "取消出库条件：" + JSON.stringify(this.listOutPutQuery)
+            );
+
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
           });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
+          });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
 
     //删除出库单
     handleDelete(row) {
diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue
index faee6aaf..7be8b27b 100644
--- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue
@@ -131,6 +131,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -157,6 +158,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -173,6 +175,15 @@ export default {
   data() {
     return {
       crmType: "vwOutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -389,32 +400,146 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
 
     //确认出库单
     handleCreateBills() {
@@ -436,15 +561,55 @@ export default {
         });
         //this.getList();
         return;
-      } else {
-        if (this.accountDatelist != "") {
-          this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
-        }
-        //this.listOutPutQuery.accountDate = this.accountDatelist;
-        console.log(
-          "全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
+      }
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
 
+      console.log("全部确认出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
@@ -466,8 +631,58 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   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;
+    //   } 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/wmsjitoutput/WmsJitOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
     //出库单
     handleCreateBills_old(row) {
       if (this.multipleSelection.length == 0) {
diff --git a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
index 9e77cca6..18c6c58e 100644
--- a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
+++ b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
@@ -1,4 +1,4 @@
-<!--大众看板出库单-->
+<!--自定义发货出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -131,6 +131,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -157,6 +158,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -173,6 +175,15 @@ export default {
   data() {
     return {
       crmType: "kanbanOutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -434,13 +445,54 @@ export default {
           type: "warning",
         });
         return;
-      } else {
-        if (this.accountDatelist != "") {
-          this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
-        }
-        //this.listOutPutQuery.accountDate = this.accountDatelist;
-        console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
+      }
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+      console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
 
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Pass",
@@ -462,8 +514,55 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   this.listOutPutQuery.guids = [];
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   } 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/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
     //取消出库单
     CancelBills(row) {
       if (this.accountDatelist.accountDate == "") {
@@ -490,32 +589,146 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
 
     //删除出库单
     handleDelete(row) {
diff --git a/vue/src/views/ux/billManage/wmsCusomerKanban/index.vue b/vue/src/views/ux/billManage/wmsCusomerKanban/index.vue
index b040373f..ae0544df 100644
--- a/vue/src/views/ux/billManage/wmsCusomerKanban/index.vue
+++ b/vue/src/views/ux/billManage/wmsCusomerKanban/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/OnetimeSale/detail.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
index 16365450..1279a4b6 100644
--- a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
@@ -156,6 +156,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -182,6 +183,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -198,6 +200,15 @@ export default {
   data() {
     return {
       crmType: "sparepartOutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -501,18 +512,58 @@ export default {
           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.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
 
+      console.log(
+        "一次性销售-确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+      );
+
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Pass",
@@ -534,8 +585,59 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   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/WmsOneTimeSaleOutput/WmsKanbanOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
     //取消出库单
     CancelBills(row) {
       if (this.accountDatelist.accountDate == "") {
@@ -562,32 +664,146 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
           });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
+          });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
 
     //删除出库单
     handleDelete(row) {
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 830c5604..9f3d0fd3 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
@@ -1,4 +1,4 @@
-<!--红旗H平台出库单-明细数据-->
+<!--红旗备件出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -164,6 +164,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -207,6 +208,15 @@ export default {
   data() {
     return {
       crmType: "hq-h-OutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -539,32 +549,147 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
           });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
+          });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
     //取消出库单
     // handleCancelBills(row) {
     //   if (this.multipleSelection.length == 0) {
@@ -654,16 +779,56 @@ export default {
           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.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
 
+      console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/WmsHQHSharePartoutput/WmsSharePartOutPut-Pass",
@@ -685,8 +850,58 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   this.listOutPutQuery.guids = [];
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   //debugger
+    //   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/WmsHQHSharePartoutput/WmsSharePartOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
 
     //删除出库单
     handleDelete(row) {
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 b4af41e1..0c4f8f83 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
@@ -1,4 +1,4 @@
-<!--红旗H平台出库单-明细数据-->
+<!--红旗批量出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -131,6 +131,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -157,6 +158,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -173,6 +175,15 @@ export default {
   data() {
     return {
       crmType: "hq-h-OutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -442,32 +453,146 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
     //取消出库单
     // handleCancelBills(row) {
     //   if (this.multipleSelection.length == 0) {
@@ -547,18 +672,59 @@ export default {
           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.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
 
+      console.log(
+        "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+      );
+
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+                this.dialogFormVisible = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass",
@@ -581,8 +747,60 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   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/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //         this.dialogFormVisible = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
     //删除出库单
     handleDelete(row) {
       var params = [];
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 01b4157d..fa8f21b4 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
@@ -1,4 +1,4 @@
-<!---明细数据-->
+<!---红旗一轿手工出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -156,6 +156,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -182,6 +183,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "HQkboutput",
@@ -198,6 +200,15 @@ export default {
   data() {
     return {
       crmType: "hqkboutput",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -521,32 +532,146 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
     //出库单
     saveBills(row) {
       this.listOutPutQuery.guids = [];
@@ -558,13 +683,55 @@ export default {
           type: "warning",
         });
         return;
-      } else {
-        if (this.accountDatelist != "") {
-          this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
-        }
-        //this.listOutPutQuery.accountDate = this.accountDatelist;
-        console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
+      }
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
 
+      console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Pass",
@@ -586,8 +753,55 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   this.listOutPutQuery.guids = [];
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   } 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/WmsHQKBOutput/WmsKanbanOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
     //删除出库单
     handleDelete(row) {
       var params = [];
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 95f82c36..be79aaae 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 b7607058..1661c816 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
@@ -157,6 +157,7 @@
             <el-date-picker
               v-model="accountDatelist.accountDate"
               type="date"
+              :picker-options="pickerOptions"
               clearable
               placeholder="选择日期"
             >
@@ -183,6 +184,7 @@ 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";
+import moment from "moment";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -199,6 +201,15 @@ export default {
   data() {
     return {
       crmType: "sparepartOutOrder",
+      pickerOptions: {
+        //控制当前月之后不能选择
+        disabledDate(time) {
+          let date = new Date();
+          let currentdate = moment(date).format("YYYY-MM");
+          var timedate = moment(time).format("YYYY-MM");
+          return currentdate < timedate;
+        },
+      },
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -481,32 +492,146 @@ export default {
       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$axios
-        .posts(
-          "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Cancel",
-          this.listOutPutQuery
-        )
-        .then((response) => {
-          const index = this.list.indexOf(row);
-          this.$notify({
-            title: "成功",
-            message: "操作成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.accountDatelist.accountDate = "";
-          this.dialogFormVisible = false;
-          this.getList();
-          this.formLoading = false;
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      ); //选择的日期
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM"); //当前月
+      console.log(
+        "过账日期:" +
+          JSON.stringify(getAccountMonth) +
+          "当前日期:" +
+          JSON.stringify(currentMonth)
+      );
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.formLoading = false;
-          this.$message({
-            type: "info",
-            message: "调用服务出错！",
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Cancel",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.$message({
+                  type: "info",
+                  message: "调用服务出错！",
+                });
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
+        this.$axios
+          .posts(
+            "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Cancel",
+            this.listOutPutQuery
+          )
+          .then((response) => {
+            const index = this.list.indexOf(row);
+            this.$notify({
+              title: "成功",
+              message: "操作成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.accountDatelist.accountDate = "";
+            this.dialogFormVisible = false;
+            this.getList();
+            this.formLoading = false;
+          })
+          .catch(() => {
+            this.formLoading = false;
+            this.$message({
+              type: "info",
+              message: "调用服务出错！",
+            });
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
         });
+        this.formLoading = false;
+        return;
+      }
     },
+    // CancelBills(row) {
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     return;
+    //   }
+    //   var params = [];
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //   }
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.guids = params;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //   console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+    //   this.$axios
+    //     .posts(
+    //       "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Cancel",
+    //       this.listOutPutQuery
+    //     )
+    //     .then((response) => {
+    //       const index = this.list.indexOf(row);
+    //       this.$notify({
+    //         title: "成功",
+    //         message: "操作成功",
+    //         type: "success",
+    //         duration: 2000,
+    //       });
+    //       this.accountDatelist.accountDate = "";
+    //       this.dialogFormVisible = false;
+    //       this.getList();
+    //       this.formLoading = false;
+    //     })
+    //     .catch(() => {
+    //       this.formLoading = false;
+    //       this.$message({
+    //         type: "info",
+    //         message: "调用服务出错！",
+    //       });
+    //     });
+    // },
     //取消出库单
     // handleCancelBills(row) {
     //   if (this.multipleSelection.length == 0) {
@@ -612,18 +737,58 @@ export default {
           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.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+
+      console.log(
+        "一汽轿车-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+      );
 
+      let myalert = "";
+      var getAccountMonth = moment(this.accountDatelist.accountDate).format(
+        "YYYY-MM"
+      );
+      let date = new Date();
+      let currentMonth = moment(date).format("YYYY-MM");
+      if (getAccountMonth < currentMonth) {
+        myalert = "过账日期小于当前月份";
+        this.$confirm("是否确认" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$axios
+              .posts(
+                "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.accountDatelist.accountDate = "";
+                this.dialogFormVisible = false;
+                this.getList();
+                this.formLoading = false;
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.formLoading = false;
+          });
+      } else if (getAccountMonth === currentMonth) {
         this.$axios
           .posts(
             "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Pass",
@@ -645,8 +810,59 @@ export default {
           .catch(() => {
             this.formLoading = false;
           });
+      } else {
+        this.$message({
+          type: "warning",
+          message: "选择的过账日期不能大于当前月份！",
+        });
+        this.formLoading = false;
+        return;
       }
     },
+    // saveBills(row) {
+    //   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/WmsHQCaroutput/WmsSharePartOutPut-Pass",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((response) => {
+    //         const index = this.list.indexOf(row);
+    //         this.$notify({
+    //           title: "成功",
+    //           message: "生成成功",
+    //           type: "success",
+    //           duration: 2000,
+    //         });
+    //         this.accountDatelist.accountDate = "";
+    //         this.dialogFormVisible = false;
+    //         this.getList();
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
     //删除出库单
     handleDelete(row) {
       var params = [];
diff --git a/vue/static/config.js b/vue/static/config.js
index 6757964e..b9188ddc 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -37,8 +37,8 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
       
-      //ip: 'http://192.168.0.67',
-      ip: 'http://192.168.0.140',
+      ip: 'http://192.168.0.67',
+      //ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
       //ip: 'http://124.220.28.250',
       //ip: 'http://10.123.148.162',