From 9b18523c852a24806937ebb4de3a231abef9173d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 08 五月 2024 14:56:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/api/quality/unqualifiedprocess.js | 10 +++
src/views/quality/processconfiguration/index.vue | 70 +++++++++++++++++++---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 55 +++++++++++-------
src/views/quality/processInspect/processInspect-form.vue | 14 +++-
4 files changed, 112 insertions(+), 37 deletions(-)
diff --git a/src/api/quality/unqualifiedprocess.js b/src/api/quality/unqualifiedprocess.js
index e3702a0..4c8cb64 100644
--- a/src/api/quality/unqualifiedprocess.js
+++ b/src/api/quality/unqualifiedprocess.js
@@ -216,4 +216,12 @@
responseType : 'blob',
params: query
})
-}
\ No newline at end of file
+}
+
+export function chooseMoRoutingOperation(query) {
+ return request({
+ url: '/mes/qualityInspectUnaccepted/chooseMoRoutingOperation',
+ method: 'get',
+ params: query
+ })
+ }
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index c504af6..e3a41b4 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -620,22 +620,31 @@
result: this.inspectionResultForm[0].result
}
if (pro > 0) {
- this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- inputPattern: /^\d+$/,
- inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
- }).then(({ value }) => {
- obj.number = value
- updateFinishedInspectById(obj).then(res => {
- if(res.data.data.indexOf("鎴愬姛") > 0){
- this.$message.success("涓婃姤鎴愬姛");
- this.checkTestState()
- }else{
- this.$message.warning(res.data.data)
- }
- });
- }).catch(() => {});
+ obj.number = 1;
+ updateFinishedInspectById(obj).then(res => {
+ if(res.data.data.indexOf("鎴愬姛") > 0){
+ this.$message.success("涓婃姤鎴愬姛");
+ this.checkTestState()
+ }else{
+ this.$message.warning(res.data.data)
+ }
+ });
+ // this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // inputPattern: /^\d+$/,
+ // inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+ // }).then(({ value }) => {
+ // obj.number = value
+ // updateFinishedInspectById(obj).then(res => {
+ // if(res.data.data.indexOf("鎴愬姛") > 0){
+ // this.$message.success("涓婃姤鎴愬姛");
+ // this.checkTestState()
+ // }else{
+ // this.$message.warning(res.data.data)
+ // }
+ // });
+ // }).catch(() => {});
}else{
updateFinishedInspectById(obj).then(res => {
if(res.data.data.indexOf("鎴愬姛") > 0){
@@ -696,10 +705,14 @@
if(obj.inspectionValue){
arr = obj.inspectionValue.split(",")
}
- obj.empiricalValueAddss = arr
+ this.$set(obj,'empiricalValueAddss',arr)
+ // obj.empiricalValueAddss = arr
if(obj.note){
- snote=obj.inote
- }
+ // obj.inote=obj.note
+ this.$set(obj,'inote',obj.note)
+ }else{
+ this.$set(obj,'inote',null)
+ }
if(arr.length > this.empiricalValueAdd){
this.empiricalValueAdd = arr.length
}
@@ -864,7 +877,7 @@
arr.splice((arr.length-1),1)
let obj = {
devideId: i.eId,
- fpid: row.iid,
+ fpid: i.iid,
inspectionValue: arr.join(","),
note : i.inote
}
@@ -885,7 +898,7 @@
} else {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
- // this.changeRowResult()
+ this.changeRowResult()
this.inspectionItems.forEach(i => {
i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
});
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index f1fa506..7980cef 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -401,7 +401,7 @@
<el-input v-model="ruleForm.number"></el-input>
</el-form-item>
<el-form-item label="鎵规鍙�" prop="outBatchNo">
- <el-select v-model="ruleForm.outBatchNo" multiple placeholder="璇烽�夋嫨鎵规鍙�" style="width: 100%;">
+ <el-select v-model="ruleForm.outBatchNo" multiple placeholder="璇烽�夋嫨鎵规鍙�" style="width: 100%;" :multiple-limit="Number(ruleForm.number)">
<el-option :label="m" :value="m" v-for="(m,i) in outBatchNoList" :key="i"></el-option>
</el-select>
</el-form-item>
@@ -458,7 +458,7 @@
{ pattern: /^\d+$/, message: '璇疯緭鍏ユ暟瀛�', trigger: 'blur' }
],
outBatchNo: [
- { required: true, message: '璇烽�夋嫨鎵规鍙�', trigger: 'change' }
+ { required: true, message: '璇烽�夋嫨鎵规鍙�', trigger: 'change' },
],
},
unqualified:false,
@@ -739,6 +739,10 @@
handleSubmit(){
this.$refs.ruleForm.validate((valid) => {
if (valid) {
+ if(this.ruleForm.outBatchNo.length!=this.ruleForm.number){
+ this.$message.error(`璇烽�夋嫨${this.ruleForm.number}涓壒娆″彿`)
+ return
+ }
this.loading = true;
let obj = {number:this.ruleForm.number,outBatchNo:this.ruleForm.outBatchNo.join(','),...this.unqualifiedInfo};
updateProcessInspectsById(obj).then(res => {
@@ -809,8 +813,10 @@
arr = obj.inspectionValue.split(",")
}
this.$set(obj, "empiricalValueAddss", arr)
+ this.$set(obj, "inote", obj.inote)
if(!obj.inote){
- obj.inote = null
+ // obj.inote = null
+ this.$set(obj, "inote", null)
}
if (arr.length > this.empiricalValueAdd) {
this.empiricalValueAdd = arr.length
@@ -1001,7 +1007,7 @@
} else {
if (_than.empiricalValueAddMaxNumber != _than.empiricalValueAdd - 1) {
_than.empiricalValueAdd = _than.empiricalValueAdd - 1;
- // _than.changeRowResult()
+ _than.changeRowResult()
_than.inspectionItems.forEach(i => {
if(i.children){
i.children.forEach(ele=>{
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 11b510d..6fff645 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -39,12 +39,30 @@
</div>
<div v-if="type === '浜у搧妫�楠�' ">
<el-radio-group v-model="checkList">
- <el-radio label="杩斾慨">杩斾慨</el-radio>
- <el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
- <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
- <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
- <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ <el-row>
+ <div style="padding: 20px;">
+ <el-radio label="杩斾慨">杩斾慨</el-radio>
+ <el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
+ <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
+ <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ </div>
+ <div style="padding: 20px;">
+ <el-radio label="杩斿伐">杩斿伐</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ </div>
+ </el-row>
</el-radio-group>
+ <div class="search" style="margin-left: 20px;" v-if="checkList=='杩斾慨'">
+ <label style="margin-right: 10px;">宸ュ簭</label>
+ <el-select v-model="moRoutingOperationId" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in listOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </div>
</div>
<div v-if="type === '杩囩▼妫�楠�'">
<el-radio-group v-model="checkList">
@@ -61,6 +79,17 @@
</div>
</el-row>
</el-radio-group>
+ <div class="search" style="margin-left: 20px;" v-if="checkList=='杩斾慨'">
+ <label style="margin-right: 10px;">宸ュ簭</label>
+ <el-select v-model="moRoutingOperationId" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in listOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </div>
</div>
</el-form>
<span slot="footer" >
@@ -77,7 +106,8 @@
UnqualifiedList,
pullInsUnapi,
AuditSuggestion,
- exportData
+ exportData,
+ chooseMoRoutingOperation,
} from '@/api/quality/unqualifiedprocess'
import TableForm from './table-form'
import { mapGetters } from 'vuex'
@@ -89,6 +119,7 @@
return {
queryParam: {},
checkList: "",
+ moRoutingOperationId:"",
// WayIdea:'',
UserId:{},
type:'',
@@ -289,6 +320,7 @@
minWidth: 100
}
},
+ listOptions:[],
materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}],
StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插畬鎴�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
@@ -302,6 +334,13 @@
...mapGetters(['permissions'])
},
+ watch: {
+ checkList(val){
+ if(val!='杩斾慨'){
+ this.moRoutingOperationId = null
+ }
+ }
+ },
created() {
// this.getType()
let arr = []
@@ -311,10 +350,11 @@
type: 'text',
size: 'small',
fun: this.Submitreview,
- show: {
- key: 'state',
- val: [0]
- }
+ // show: {
+ // key: 'state',
+ // val: [0]
+ // },
+ showFun: (row)=>{return row.type == '鍘熸潗鏂欐楠�'&&row.state==0}
})
}
if(this.permissions.quality_processconfiguration_result){
@@ -329,6 +369,11 @@
this.table.operator = arr.length>0 ? arr : null
},
methods: {
+ chooseMoRoutingOperation(id){
+ chooseMoRoutingOperation({id}).then(res =>{
+ this.listOptions = res.data.data
+ })
+ },
getQueryParam(data){
this.queryParam = data
},
@@ -361,17 +406,20 @@
this.UserId = row.id
this.type = row.type
this.dialogVisible = true;
+ this.chooseMoRoutingOperation(row.id)
},
WayCancel(){
this.dialogVisible = false
this.checkList = null
+ this.moRoutingOperationId = null
this.WayIdea = null
},
WaySure(){
- AuditSuggestion({id:this.UserId,way:this.checkList}).then(
+ AuditSuggestion({id:this.UserId,way:this.checkList,moRoutingOperationId:Number(this.moRoutingOperationId)*1}).then(
res =>{
this.checkList = null
+ this.moRoutingOperationId = null
this.WayIdea = null
this.$refs.processconfiguration.refreshData()
;})
--
Gitblit v1.9.3