24-03-05 返工标记和查询

src/views/modules/production/cancelSfdc.vue

@@ -47,6 +47,13 @@
         <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
         <el-input v-model="searchData.resourceId" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="是否返修">
+        <el-select v-model="searchData.repairSOFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="返修" value="Y"></el-option>
+          <el-option label="非返修" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'班次'">
         <el-select v-model="searchData.shiftNo" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -657,6 +664,7 @@
           resourceId:'',
           operationDesc:'',
           shiftNo:'',
+          repairSOFlag:'',
         },
       }
     },

src/views/modules/production/cancelSfdcForWareHouse.vue

@@ -4,7 +4,13 @@
       <el-form-item :label="'派工单号'">
         <el-input v-model="searchData.seqNo" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 130px"></el-input>
       </el-form-item>
-
+      <el-form-item label="是否返修">
+        <el-select v-model="searchData.repairSOFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="返修" value="Y"></el-option>
+          <el-option label="非返修" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="' '">
         <el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
       </el-form-item>
@@ -588,6 +594,7 @@
         tableData: [],
         searchData: {
           seqNo:'',
+          repairSOFlag:'',
         },
       }
     },

src/views/modules/production/closeSchedule.vue

@@ -62,6 +62,13 @@
         <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
         <el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="是否返修">
+        <el-select v-model="searchData.repairSOFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="返修" value="Y"></el-option>
+          <el-option label="非返修" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'班次'">
         <el-select v-model="searchData.sShiftNo" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -470,7 +477,8 @@
           sResourceID:'',
           sShiftNo:'',
           closedFlag:'',
-          userId:this.$store.state.user.name
+          userId:this.$store.state.user.name,
+          repairSOFlag:'',
         },
         photoUrl:'',
         sopData:{

src/views/modules/production/generateReport.vue

@@ -62,6 +62,13 @@
         <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
         <el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="是否返修">
+        <el-select v-model="searchData.repairSOFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="返修" value="Y"></el-option>
+          <el-option label="非返修" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'班次'">
         <el-select v-model="searchData.sShiftNo" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -743,6 +750,7 @@
           sShiftNo:'',
           previousSeqNo:'',
           materSeqNo:'',
+          repairSOFlag:'',
         },
         photoUrl:'',
         sopData:{

src/views/modules/production/scheduleForSOTask.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-    <el-form inline="true"  v-model="searchData">
+    <el-form :inline="true"  v-model="searchData">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
         <el-form-item :label="'工厂编号：'">
           <el-input v-model="searchData.site" style="width: 120px"></el-input>
@@ -345,7 +345,7 @@
         <el-form-item label="派工机台:">
           <el-select v-model="schedulingModalData.resourceId" style="width: 120px"
                      placeholder="请选择">
-            <el-option v-for="item in availableResourceList " :key="index" :label="item.ResourceID+'-'+item.ResouceDesc"
+            <el-option v-for="item in availableResourceList " :key="item.ResourceID" :label="item.ResourceID+'-'+item.ResouceDesc"
                        :value="item.ResourceID">
 
             </el-option>
@@ -470,7 +470,6 @@
                 <el-option label="计件" value="计件"></el-option>
                 <el-option label="计时" value="计时"></el-option>
                 <el-option label="外协" value="外协"></el-option>
-                <el-option label="返工" value="返工"></el-option>
               </el-select>
             </template>
           </el-table-column>
@@ -685,6 +684,7 @@
           shiftNo: '',
           sumQty: 0,
           operatorId: '',
+          repairSOFlag:row.repairSOFlag,
         }
         if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='0'){
           this.weightFactorFlag=true;
@@ -854,6 +854,7 @@
           efficiency:this.schedulingModalData.efficiency,
           orderRef1:this.schedulingModalData.orderRef1,
           remark:this.schedulingModalData.remark,
+          repairSOFlag:this.schedulingModalData.repairSOFlag
         }
         scheduleForSOTask(indata).then(({data}) => {
           if (data && data.code === 0) {

src/views/modules/production/scheduleForShopOrder.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-    <el-form inline="true"  v-model="searchData">
+    <el-form :inline="true"  v-model="searchData">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
         <el-form-item :label="'工厂编码：'">
           <el-input v-model="searchData.site" style="width: 120px"></el-input>
@@ -380,7 +380,7 @@
         <el-form-item label="派工人员:">
           <el-select v-model="schedulingModalData.operatorId" style="width: 120px"
                      placeholder="请选择">
-            <el-option v-for="item in operatorIdList " :key="index" :label="item.operatorName"
+            <el-option v-for="item in operatorIdList" :key="item.operatorID" :label="item.operatorName"
                        :value="item.operatorID">
 
             </el-option>
@@ -499,7 +499,6 @@
                 <el-option label="计件" value="计件"></el-option>
                 <el-option label="计时" value="计时"></el-option>
                 <el-option label="外协" value="外协"></el-option>
-                <el-option label="返工" value="返工"></el-option>
               </el-select>
             </template>
           </el-table-column>
@@ -723,6 +722,7 @@
           lastApproveQty:null,
           qty1:'',
           qtyAssembly:'',
+          repairSOFlag:row.repairSOFlag,
         }
         this.materialWeightFactorFlag=true
         if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='0'){
@@ -937,6 +937,7 @@
           scheduleDetail:this.schedulingModalTableData,
           efficiency:this.schedulingModalData.efficiency,
           remark:this.schedulingModalData.remark,
+          repairSOFlag:this.schedulingModalData.repairSOFlag,
         }
         scheduleForShopOrder(indata).then(({data}) => {
           if (data && data.code === 0) {

src/views/modules/production/searchSfdc.vue

@@ -47,6 +47,13 @@
         <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
         <el-input v-model="searchData.resourceId" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="是否返修">
+        <el-select v-model="searchData.repairSOFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="返修" value="Y"></el-option>
+          <el-option label="非返修" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'班次'">
         <el-select v-model="searchData.shiftNo" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -658,6 +665,7 @@
           resourceId:'',
           operationDesc:'',
           shiftNo:'',
+          repairSOFlag:'',
         },
       }
     },

src/views/modules/production/soscheduleRouting.vue

@@ -62,6 +62,13 @@
         <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
         <el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="是否返修">
+        <el-select v-model="searchData.repairSOFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="返修" value="Y"></el-option>
+          <el-option label="非返修" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'班次'">
         <el-select v-model="searchData.sShiftNo" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -482,6 +489,7 @@
           sResourceID:'',
           sShiftNo:'',
           closedFlag:'',
+          repairSOFlag:'',
         },
         photoUrl:'',
         sopData:{