From b98bb5a14531d68e3ee1a483a79899de0de47704 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 17:26:06 +0800
Subject: [PATCH] 优化质量模块
---
src/views/quality/processInspect/processInspect-form.vue | 198 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 174 insertions(+), 24 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 59e0cf4..7980cef 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -288,6 +288,54 @@
</el-table-column>
</el-table>
</el-tab-pane>
+ <el-tab-pane label="闄勪欢">
+ <el-table :data="configFileTableData" height="400px">
+ <el-table-column
+ prop="orderNumber"
+ align="center"
+ label="璁㈠崟鍙�"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column
+ prop="originalFileName"
+ align="center"
+ label="鍘熸枃浠跺悕"
+ width="200"
+ >
+ </el-table-column>
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
+ </el-table-column>
+ <el-table-column prop="createUser" align="center" label="涓婁紶浜�">
+ </el-table-column>
+ <el-table-column
+ prop="createTime"
+ align="center"
+ label="涓婁紶鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column prop="updateUser" align="center" label="鏇存柊浜�">
+ </el-table-column>
+ <el-table-column
+ prop="updateTime"
+ align="center"
+ label="鏇存柊鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column fixed="right" align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button
+ @click="downloadProcessConfigFiles(scope.row)"
+ type="text"
+ size="small"
+ >涓嬭浇</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
</el-tabs>
</div>
<div class="finishedProduct-result">
@@ -343,6 +391,27 @@
<el-button type="primary" @click="deviceCode = false">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <el-dialog
+ title="涓嶅悎鏍间俊鎭�"
+ :visible.sync="unqualified"
+ width="30%">
+ <div style="height: 30vh;width: 100%;">
+ <el-form :model="ruleForm" :rules="unqualifiedRules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+ <el-form-item label="涓嶅悎鏍兼暟閲�" prop="number">
+ <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%;" :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>
+ </el-form>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="unqualified = false">鍙� 娑�</el-button>
+ <el-button type="primary" :loading="loading" @click="handleSubmit">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<processPart :paramObj="paramObj" :currshowlist.sync="workshop" />
</div>
</template>
@@ -356,23 +425,43 @@
updateProcessInsProduct,
updateProcessInsProduct2,
updateProcessInspectsById,
+ selOutBatchNo,
} from '@/api/quality/processInspect'
import {
getProcessConfigFiles,
deleteProcessConfigFile,
downloadProcessConfigFile
} from '@/api/quality/attachment'
+import { getProcessConfigFile } from '@/api/plan/manufacturingorder'
import processPart from '@/views/common/processinspect-part'
import { selectDevice } from '@/api/quality/processInspect'
import qrCodeApp from '@/views/common/qrCodeApp'
import { validatePositiveInteger } from '@/util/validate'
import { getStore } from '@/util/store'
+import * as customerorder from '@/api/plan/customerorder'
export default {
components:{
qrCodeApp,processPart
},
data() {
return {
+ outBatchNoList:[],
+ unqualifiedInfo:null,
+ loading:false,
+ ruleForm:{
+ number:'',
+ outBatchNo:[]
+ },
+ unqualifiedRules:{
+ number: [
+ { required: true, message: '璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', trigger: 'blur' },
+ { pattern: /^\d+$/, message: '璇疯緭鍏ユ暟瀛�', trigger: 'blur' }
+ ],
+ outBatchNo: [
+ { required: true, message: '璇烽�夋嫨鎵规鍙�', trigger: 'change' },
+ ],
+ },
+ unqualified:false,
progrecessFileLoading: false,
processConfigFileTableData: [],
headers: {
@@ -426,6 +515,8 @@
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
+ configFileTableData:[],
+ dataForm:null
}
},
watch: {
@@ -446,8 +537,29 @@
val == undefined ? this.resultVal = null : this.resultVal = val
}
this.init()
+ this.selOutBatchNo()
},
methods: {
+ selOutBatchNo(){
+ selOutBatchNo({id:this.$route.query.id}).then((res)=>{
+ this.outBatchNoList = res.data.data
+ })
+ },
+ getProcessConfigFile(){
+ getProcessConfigFile({
+ orderNumber: this.dataForm.orderNumber,
+ lineNumber: this.dataForm.customerNo
+ }).then((res)=>{
+ this.configFileTableData = res.data.data
+ })
+ },
+ downloadProcessConfigFiles(row){
+ customerorder.downloadProcessConfigFile(
+ row.fileName,
+ row.bucketName,
+ row.originalFileName
+ )
+ },
saveTable(){
let processInsProduct = [];
this.inspectionItems.forEach((item) => {
@@ -584,27 +696,30 @@
number: 0,
result: this.inspectionResultForm[0].result
}
+ this.unqualifiedInfo = obj;
if (pro > 0) {
- this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- inputPattern: /^\d+$/,
- inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
- }).then(({ value }) => {
- obj.number = value
- updateProcessInspectsById(obj).then(res => {
- let data = res.data.data
- if (data) {
- if (data.indexOf("鎴愬姛") > 0) {
- this.$message.success(data);
- this.checkTestState()
- } else {
- this.$message.warning(data);
- }
- return
- }
- });
- }).catch(() => { });
+ this.unqualified = true;
+ this.$refs.ruleForm.resetFields();
+ // this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // inputPattern: /^\d+$/,
+ // inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+ // }).then(({ value }) => {
+ // obj.number = value
+ // updateProcessInspectsById(obj).then(res => {
+ // let data = res.data.data
+ // if (data) {
+ // if (data.indexOf("鎴愬姛") > 0) {
+ // this.$message.success(data);
+ // this.checkTestState()
+ // } else {
+ // this.$message.warning(data);
+ // }
+ // return
+ // }
+ // });
+ // }).catch(() => { });
} else {
updateProcessInspectsById(obj).then(res => {
let data = res.data.data
@@ -620,6 +735,36 @@
});
}
this.init()
+ },
+ 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 => {
+ let data = res.data.data
+ if (data) {
+ if (data.indexOf("鎴愬姛") > 0) {
+ this.$message.success(data);
+ this.$refs.ruleForm.resetFields();
+ this.unqualified = false;
+ this.checkTestState()
+ this.init()
+ } else {
+ this.$message.warning(data);
+ }
+ return
+ }
+ this.loading = false;
+ });
+ } else {
+ return false;
+ }
+ });
},
checkTestState() {
let resultVal = '1'
@@ -642,6 +787,7 @@
queryById(id).then(res => {
let result = res.data.data
this.processInspectVo.moNo = result.moNo
+ this.dataForm = result;
this.processInspectVo.operationTaskId = result.technologyOperationName
this.processInspectVo.proInsNo = result.proInsNo
this.processInspectVo.projectName = result.projectName
@@ -666,9 +812,11 @@
if (obj.inspectionValue) {
arr = obj.inspectionValue.split(",")
}
- obj.empiricalValueAddss = arr
+ 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
@@ -699,6 +847,7 @@
userName: Array.from(new Set(userList)).join(","),
result: this.resultVal == null ? rVal : this.resultVal,
}]
+ this.getProcessConfigFile()
}).catch(error => {
console.log(error)
})
@@ -810,6 +959,7 @@
this.processInspectVo.orderNumber = data.orderNumber
this.processInspectVo.projectName = data.projectName
this.processInspectVo.customerName = data.customerName
+ this.processInspectVo.customerNo = data.customerNo
this.processInspectVo.material = data.material
this.processInspectVo.specs = data.specs
this.processInspectVo.unit = data.unit
@@ -857,8 +1007,7 @@
} else {
if (_than.empiricalValueAddMaxNumber != _than.empiricalValueAdd - 1) {
_than.empiricalValueAdd = _than.empiricalValueAdd - 1;
- // _than.changeRowResult()
- _than.saveTable();
+ _than.changeRowResult()
_than.inspectionItems.forEach(i => {
if(i.children){
i.children.forEach(ele=>{
@@ -866,6 +1015,7 @@
})
}
});
+ _than.saveTable();
}
}
},
--
Gitblit v1.9.3