Commit d4cefe65 authored by 张海景's avatar 张海景

update:修改检测人员人名

parent ce3a4b8b
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
查看 查看
</button> </button>
<!-- 首检按钮判断FIRST结束 --> <!-- 首检按钮判断FIRST结束 -->
<button class="uni-button" size="mini" type="primary" v-if="curQcType === 'SJQR'" @click="qcLineClick(scope.row,true, 'sjqrFinish')">查看确认</button> <button class="uni-button" size="mini" type="primary" v-if="curQcType === 'SJQR'" @click="qcLineClick(scope.row, true, 'sjqrFinish')">查看确认</button>
<!-- <button class="uni-button" size="mini" type="primary" v-if="scope.row.ipqcType === 'SJQR'" @click="firstCONFIRMED(scope.row)"> <!-- <button class="uni-button" size="mini" type="primary" v-if="scope.row.ipqcType === 'SJQR'" @click="firstCONFIRMED(scope.row)">
确认 确认
</button> --> </button> -->
...@@ -112,10 +112,10 @@ ...@@ -112,10 +112,10 @@
</u-row> </u-row>
<u-row> <u-row>
<u-col span="4"> <u-col span="4">
<u-form-item label="检测人员" prop="inspectorName"> <u-form-item label="检测人员" prop="inspectorNickName">
<!-- <u-input v-model="qcForm.inspector"></u-input>--> <!-- <u-input v-model="qcForm.inspector"></u-input>-->
<!-- <zxz-uni-data-select v-model="qcForm.inspector" filterable multiple dataKey="label" dataValue="value" :localdata="qcUserList" @change="change"></zxz-uni-data-select> --> <!-- <zxz-uni-data-select v-model="qcForm.inspector" filterable multiple dataKey="label" dataValue="value" :localdata="qcUserList" @change="change"></zxz-uni-data-select> -->
<u-input readonly v-model="qcForm.inspectorName"></u-input> <u-input readonly v-model="qcForm.inspectorNickName"></u-input>
<u-button @tap="userTempVisible = true" type="success" size="mini">选择人员</u-button> <u-button @tap="userTempVisible = true" type="success" size="mini">选择人员</u-button>
</u-form-item> </u-form-item>
</u-col> </u-col>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
title="缺陷登记" title="缺陷登记"
> >
<u-button @click="addQcdeffect">新增</u-button> <u-button @click="addQcdeffect">新增</u-button>
<uni-card v-for="(item,index) in defectrecordList" :key="index"> <uni-card v-for="(item, index) in defectrecordList" :key="index">
<u-form label-width="100px"> <u-form label-width="100px">
<u-row> <u-row>
<u-col> <u-col>
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
import SearchInput from '@/components/ScanInput/index.vue'; import SearchInput from '@/components/ScanInput/index.vue';
import UButton from '../../../uview-ui/components/u-button/u-button.vue'; import UButton from '../../../uview-ui/components/u-button/u-button.vue';
import UniEasyinput from '../../../uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue'; import UniEasyinput from '../../../uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue';
import User from '@/components/User/User.vue' import User from '@/components/User/User.vue';
export default { export default {
name: 'QcContent', name: 'QcContent',
...@@ -312,9 +312,9 @@ export default { ...@@ -312,9 +312,9 @@ export default {
computed: { computed: {
tableColumn() { tableColumn() {
if (this.curQcType === 'FIRST' || this.curQcType === 'SJQR') { if (this.curQcType === 'FIRST' || this.curQcType === 'SJQR') {
return this.tableSjColumn return this.tableSjColumn;
} else { } else {
return this.tableDefaultColumn return this.tableDefaultColumn;
} }
} }
}, },
...@@ -343,7 +343,7 @@ export default { ...@@ -343,7 +343,7 @@ export default {
name: 'checkResult', name: 'checkResult',
label: '检测结果', label: '检测结果',
align: 'center', align: 'center',
type:'slot', type: 'slot',
slot: 'checkResult', slot: 'checkResult',
width: 150 width: 150
}, },
...@@ -354,7 +354,7 @@ export default { ...@@ -354,7 +354,7 @@ export default {
width: 80 width: 80
}, },
{ {
name: 'inspector', name: 'inspectorNickName',
label: '检测人员', label: '检测人员',
align: 'center', align: 'center',
width: 100 width: 100
...@@ -416,7 +416,7 @@ export default { ...@@ -416,7 +416,7 @@ export default {
name: 'checkResult', name: 'checkResult',
label: '检测结果', label: '检测结果',
align: 'center', align: 'center',
type:'slot', type: 'slot',
slot: 'checkResult', slot: 'checkResult',
width: 80 width: 80
}, },
...@@ -427,7 +427,7 @@ export default { ...@@ -427,7 +427,7 @@ export default {
width: 80 width: 80
}, },
{ {
name: 'inspector', name: 'inspectorNickName',
label: '检测人员', label: '检测人员',
align: 'center', align: 'center',
width: 100 width: 100
...@@ -518,7 +518,7 @@ export default { ...@@ -518,7 +518,7 @@ export default {
}, },
userDetermine() { userDetermine() {
console.log(this.$refs.userRef.tableSelectData, 'this.$refs.userRef.tableSelectData'); console.log(this.$refs.userRef.tableSelectData, 'this.$refs.userRef.tableSelectData');
this.qcForm.inspectorName = this.$refs.userRef.tableSelectData[0]?.nickName; this.qcForm.inspectorNickName = this.$refs.userRef.tableSelectData[0]?.nickName;
this.qcForm.inspector = this.$refs.userRef.tableSelectData[0]?.userName; this.qcForm.inspector = this.$refs.userRef.tableSelectData[0]?.userName;
}, },
async getIpqcList(type) { async getIpqcList(type) {
...@@ -670,18 +670,18 @@ export default { ...@@ -670,18 +670,18 @@ export default {
}; };
this.qcModalFlag = true; this.qcModalFlag = true;
if (this.curQcType === 'FIRST') { if (this.curQcType === 'FIRST') {
this.setDefaultQcForm() this.setDefaultQcForm();
} }
}, },
setDefaultQcForm() { setDefaultQcForm() {
this.qcForm.checkResult = "REJECT" this.qcForm.checkResult = 'REJECT';
this.qcForm.quantityCheck = 1 this.qcForm.quantityCheck = 1;
this.qcForm.quantityQualified = 1 this.qcForm.quantityQualified = 1;
this.qcForm.quantityUnqualified = 0 this.qcForm.quantityUnqualified = 0;
}, },
handleChangeQuantityCheck() { handleChangeQuantityCheck() {
const sum = this.qcForm.quantityQualified + this.qcForm.quantityUnqualified const sum = this.qcForm.quantityQualified + this.qcForm.quantityUnqualified;
this.$set(this.qcForm, 'quantityCheck', sum) this.$set(this.qcForm, 'quantityCheck', sum);
}, },
getAddShow() { getAddShow() {
const type = this.curQcType; const type = this.curQcType;
...@@ -714,17 +714,17 @@ export default { ...@@ -714,17 +714,17 @@ export default {
}, },
qcLineClick(item, flag, btnType) { qcLineClick(item, flag, btnType) {
this.qcModalFlag = true; this.qcModalFlag = true;
this.qcForm = Object.assign({},item) this.qcForm = Object.assign({}, item);
console.log(item,' itme33344') console.log(item, ' itme33344');
if (btnType === 'firstEdit'|| btnType === 'sjqrFinish') { if (btnType === 'firstEdit' || btnType === 'sjqrFinish') {
this.qcForm.inspector = this.vuex_user.userName this.qcForm.inspector = this.vuex_user.userName;
this.qcForm.inspectorName = this.vuex_user.nickName this.qcForm.inspectorNickName = this.vuex_user.nickName;
} }
if (btnType === 'firstEdit') { if (btnType === 'firstEdit') {
this.qcForm.checkResult = this.qcForm.checkResult? this.qcForm.checkResult: "REJECT" this.qcForm.checkResult = this.qcForm.checkResult ? this.qcForm.checkResult : 'REJECT';
this.qcForm.quantityCheck = this.qcForm.quantityCheck? this.qcForm.quantityCheck: 1 this.qcForm.quantityCheck = this.qcForm.quantityCheck ? this.qcForm.quantityCheck : 1;
this.qcForm.quantityQualified = this.qcForm.quantityQualified? this.qcForm.quantityQualified: 1 this.qcForm.quantityQualified = this.qcForm.quantityQualified ? this.qcForm.quantityQualified : 1;
this.qcForm.quantityUnqualified = this.qcForm.quantityUnqualified? this.qcForm.quantityUnqualified: 0 this.qcForm.quantityUnqualified = this.qcForm.quantityUnqualified ? this.qcForm.quantityUnqualified : 0;
} }
this.showIpqcConfirmButton = flag === false ? false : true; this.showIpqcConfirmButton = flag === false ? false : true;
this.getTemplateLineList(); this.getTemplateLineList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment