生产工单

src/views/mes/pro/workorder/indexApply.vue

@@ -76,10 +76,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="需求日期">
+      <el-form-item label="工单生成日期">
         <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
+      <el-form-item label="需求日期">
+        <el-date-picker v-model="beginRequestDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索
         </el-button>
@@ -692,7 +696,7 @@ export default {
       currentData: {},
       option: {
         disabledDate:(time)=> {
-            return time.getTime() < Date.now()
+            return time.getTime() < Date.now() -1 * 24 * 3600 * 1000
         }
       },
       //自动生成编码
@@ -744,6 +748,7 @@ export default {
       selectedRows: [],
 
       daterangePurchaseDate: [],
+      beginRequestDate: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -1143,6 +1148,10 @@ export default {
         this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
         this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
       }
+      if (null != this.beginRequestDate && '' != this.beginRequestDate) {
+        this.queryParams.params["beginRequestDate"] = this.beginRequestDate[0];
+        this.queryParams.params["endRequestDate"] = this.beginRequestDate[1];
+      }
       const params = {
         ...this.queryParams,
         workorderCodes: this.queryParams.workorderCodes ? this.queryParams.workorderCodes.split(/[\n,;，、；。]/).filter(item => item) : null,
@@ -1273,6 +1282,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.daterangePurchaseDate = [];
+      this.beginRequestDate = []
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -1643,11 +1653,17 @@ export default {
       }
       const list11 = this.daoConfirmList.filter(v=> v.isBool && v.toolArrivalTime)
       const list1 = list11.map(v => ({toolArrivalTime: v.toolArrivalTime, workorderId: v.workorderId}))
-      tmtoolForcePass(list1).then(response => {
+      if (list1.length > 0) {
+        tmtoolForcePass(list1).then(response => {
           this.$modal.msgSuccess("操作成功");
-          this.daoConfirmVisible = false
-          this.getList();
-      });
+            this.daoConfirmVisible = false
+            this.getList();
+        });
+      } else {
+        this.daoConfirmVisible = false
+        this.getList();
+      }
+      
     },
     handleTurnWorrySubmit() {
       this.$refs["turnWorryFormRef"].validate(valid => {