1

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -12,6 +12,7 @@
           <van-cell v-if="reportForm.plan_type == 0" title="工序" :value="reportForm.procedure_name" />
           <van-cell v-else title="任务变更通知号" :value="reportForm.task_change_notice_num" />
           <van-cell title="钢印号">
+            <van-field v-model="inputSteelNum" type="digit" @blur="steelNumFilter()"/>
             <template>
               <div style="float:right;" v-if="reportForm.planSteelStampNumberList&&reportForm.planSteelStampNumberList.length>0">
                 <van-checkbox-group v-model="reportForm.checkedSteelNum" direction="horizontal">
@@ -76,9 +77,9 @@ export default {
       checkTypeTxt: ['自检', '互检', '专检'],
       reportForm: {
         progress: 10,
-
-
       },
+      inputSteelNum:null,
+      oldPlanSteelStampNumberList:[]
     };
   },
   computed: {},
@@ -149,10 +150,11 @@ export default {
       console.log(this.reportForm.checkedSteelNum);
     },
     getMyPlanProcedureList() {
-      this.$axios.post("/plan-procedure-total/getFillProcedureDetail", { id: this.$route.query.id })
+      this.$axios.post("/plan-procedure-total/getFillProcedureDetail", { id: this.$route.query.id,inputSteelNum:this.inputSteelNum})
         .then(res => {
           if (res.code == "ok") {
             this.reportForm = res.data;
+            this.oldPlanSteelStampNumberList=this.reportForm.planSteelStampNumberList
             this.reportForm.checkedSteelNum = JSON.parse(this.reportForm.steel_num_array);
             if (this.reportForm.check_type == 0) {
               //自检
@@ -163,6 +165,9 @@ export default {
           }
         }).catch(err => { this.$toast.clear(); });
     },
+    steelNumFilter(){
+      this.reportForm.planSteelStampNumberList=this.oldPlanSteelStampNumberList.filter(item => item.includes(this.inputSteelNum));
+    },
 
     //打开报工页面
     reportItem(item) {

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/orderInsert.vue

@@ -316,7 +316,7 @@ export default {
         moneyOfJob: [{ required: true, message: "工钱", trigger: "blur" }],
         stationId: [{ required: true, message: "工位", trigger: "blur" }],
         startDate: [{ required: true, message: "开工时间", trigger: "blur" }],
-        endDate: [{ required: true, message: "完工时间", trigger: "blur" }],
+        // endDate: [{ required: true, message: "完工时间", trigger: "blur" }],
       },
       taskTypeFormrules: {
         taskTypeName: [

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -327,7 +327,7 @@ export default {
         progress: [{ required: true, message: "进度", trigger: "blur" }],
         stationId: [{ required: true, message: "工位", trigger: "blur" }],
         startDate: [{ required: true, message: "开工时间", trigger: "blur" }],
-        endDate: [{ required: true, message: "完工时间", trigger: "blur" }],
+        // endDate: [{ required: true, message: "完工时间", trigger: "blur" }],
       },
     };
   },