不合格品

imcs-ui/src/lang/zh/machining.js

@@ -24,7 +24,8 @@ export default {
 			},
 			handleWay: {
 				one: '补单',
-				two: '废品发货'
+				two: '废品发货',
+        three: '返修合格'
 			},
 			handleStatus: {
 				one: '待处理',

imcs-ui/src/views/zuihou/qualityCenter/unqualifiedMgr/components/Edit.vue

@@ -1,11 +1,11 @@
 <template>
-  <el-dialog 
-  	:close-on-click-modal="false" 
-  	:close-on-press-escape="false" 
-  	:title="title" 
+  <el-dialog
+  	:close-on-click-modal="false"
+  	:close-on-press-escape="false"
+  	:title="title"
   	:append-to-body="true"
-  	:visible.sync="isVisible" 
-  	:width="width" 
+  	:visible.sync="isVisible"
+  	:width="width"
   	top="50px"
   >
     <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
@@ -14,15 +14,16 @@
         <template>
 				  <el-radio v-model="tenant.handleWay" label="1" @change="radioChange">{{$t("machining.common.handleWay.one")}}</el-radio>
 				  <el-radio v-model="tenant.handleWay" label="2" @change="radioChange">{{$t("machining.common.handleWay.two")}}</el-radio>
+          <el-radio v-model="tenant.handleWay" label="3" @change="radioChange">{{$t("machining.common.handleWay.three")}}</el-radio>
 				</template>
       </el-form-item>
       <!-- 补单订单 -->
-      <el-form-item v-if="tenant.handleWay == '1'" :label='$t("machining.form.addOrderId")+"："' prop="addOrderId">
-          <el-select 
-          	v-model="tenant.addOrderId" 
-          	clearable 
-          	filterable 
-          	:placeholder='$t("common.pleaseSelect")' 
+      <el-form-item v-if="tenant.handleWay == '1'||tenant.handleWay == '2'" :label='$t("machining.form.addOrderId")+"："' prop="addOrderId">
+          <el-select
+          	v-model="tenant.addOrderId"
+          	clearable
+          	filterable
+          	:placeholder='$t("common.pleaseSelect")'
           	style="width: 50%;"
           >
 				    <el-option
@@ -48,7 +49,7 @@
   </el-dialog>
 </template>
 <script>
-	
+
 // 【不合格产品管理】-API
 import unqualifiedMgrApi from "@/api/machiningClient/unqualifiedMgr"
 // 【订单管理】-API
@@ -117,7 +118,7 @@ export default {
   			this.tenant.addOrderId = "";
   		}
   	},
-  	
+
   	// 初始化，Form表单-函数
     initTenant () {
       return {
@@ -126,7 +127,7 @@ export default {
         handleStatus: ''
       }
     },
-    
+
     // 自适应width-函数
     initWidth () {
       this.screenWidth = document.body.clientWidth
@@ -138,25 +139,25 @@ export default {
         return '800px'
       }
     },
-    
+
     // 传值，设置数据-函数
     setTenant (val) {
     	if(val){
     		this.tenant = { ...val }
     	}
     },
-    
+
     close () {
       this.$emit('close')
     },
-    
+
     reset () {
       // 先清除校验，再清除表单，不然有奇怪的bug
       this.$refs.form.clearValidate()
       this.$refs.form.resetFields()
       this.tenant = this.initTenant()
     },
-    
+
     submitForm () {
       this.$refs.form.validate((valid) => {
         if (valid) {
@@ -171,7 +172,7 @@ export default {
         }
       })
     },
-    
+
     save () {
       unqualifiedMgrApi.noteUnqualifiedBom(this.tenant)
         .then((response) => {
@@ -192,7 +193,7 @@ export default {
           return true
         })
     },
-    
+
     update () {
       unqualifiedMgrApi.noteUnqualifiedBom(this.tenant)
         .then((response) => {
@@ -213,7 +214,7 @@ export default {
           return true
         })
     },
-    
+
     // 【补单订单】下拉数据
   	getOrderList(){
   		orderMgrApi.getList({auditStatus: '2'}).then(res => {