Переглянути джерело

更新抽检模块页面展示的问题

oyq28 3 роки тому
батько
коміт
0518fdd8b9

+ 6 - 6
imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/AddInspection.vue

@@ -9,7 +9,7 @@
   	top="50px"
   >
     <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">      
-      <el-form-item label='选择工序'>
+      <el-form-item label='选择工序' prop="procedureId">
         <template>
           <div v-if="procedureList.length>0">         
             <div v-for="procedure in procedureList" :key="procedure.id">
@@ -55,7 +55,7 @@ export default {
       },
       roles: [],
       rules: {
-        name: [
+        procedureId: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         ]
       }
@@ -127,10 +127,10 @@ export default {
     },
     submitForm () {
       this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.confirmDisabled = true
-          //console.log(this.tenant)
-          this.save()
+        if (valid) {          
+              this.confirmDisabled = true
+              //console.log(this.tenant)
+              this.save()          
         }
       })
     },

+ 2 - 1
imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/MyDraw.vue

@@ -426,7 +426,8 @@ export default {
           //console.log(this.tenant)          
           this.tableData.records = []
           let workpieceIdArr = this.tenant.workpieceIds.split(',')
-          for(let i=0; i<this.tableData.total; i++){
+          //只显示未加工完成的零件
+          for(let i=Number(this.tenant.completeNum); i<this.tableData.total; i++){
             let plan = {bomName:this.tenant.bomDesc, partsNo:this.tenant.partsNo,partsAlias:this.tenant.partsAlias,
                 startTime:this.tenant.startTime, endTime:this.tenant.endTime, id:workpieceIdArr[i], hasChildren:false
             }            

+ 1 - 1
imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/ViewResult.vue

@@ -285,7 +285,7 @@ export default {
           //console.log(this.tenant)          
           this.tableData.records = []
           let workpieceIdArr = this.tenant.workpieceIds.split(',')
-          for(let i=0; i<this.tableData.total; i++){
+          for(let i=Number(this.tenant.completeNum); i<this.tableData.total; i++){
             let plan = {bomName:this.tenant.bomDesc, partsNo:this.tenant.partsNo,partsAlias:this.tenant.partsAlias,
                 startTime:this.tenant.startTime, endTime:this.tenant.endTime, id:workpieceIdArr[i], hasChildren:false
             }