zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0615

This commit is contained in:
shijing 2022-06-15 11:35:03 +08:00
parent 4e685f3f94
commit a14967dcde
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hb_client/src/components/customForm/index.vue
View File

@ -160,7 +160,7 @@
</el-form-item>
<el-col :span="12">
<el-form-item label="编号">
<el-input v-model="number" @input="checkValue" placeholder="编号"/>
<el-input v-model="numbers" @input="checkValue" placeholder="编号"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -211,7 +211,7 @@
type: Boolean,
default: false
},
number: {
numbers: {
type: String,
default: ''
},
@ -307,7 +307,7 @@
},
methods: {
checkValue() {
this.number = this.number.replace(/[^0-9a-zA-Z]/g, '');
this.numbers = this.numbers.replace(/[^0-9a-zA-Z]/g, '');
},
filterBlock(rule, index, field_key) {
let that = this;
@ -740,7 +740,7 @@
that.testrecord.record_data = that.field;//检查项列表
that.testrecord.is_testok = that.is_testok;//检查表检查结果
that.testrecord.id = that.recordId;//记录id
that.testrecord.number = that.number;//编号
that.testrecord.number = that.numbers;//编号
that.testrecord.remark = that.remark;//备注
if (that.index === '2') {//提交
this.$emit('recordSubmit', that.testrecord);

34
hb_client/src/views/wpm/need.vue
View File

@ -521,7 +521,7 @@
:formID="recordform"
:wproduct="wproduct"
:remark="remark"
:number="number"
:numbers="numbers"
:recordId="recordId"
:isDisabled="isDisabled"
:isMidTesting="is_midtesting"
@ -939,7 +939,7 @@
{text: '镀膜', value: '镀膜'}, {text: '断膜', value: '断膜'}, {text: '汇流条制备', value: '汇流条制备'},
{text: '夹层', value: '夹层'}, {text: '包边', value: '包边'}],
remark:'',
number:'',
numbers:'',
};
},
computed: {},
@ -1285,8 +1285,8 @@
that.recordVisible = false;
that.recordId = scope.row.id;
that.recordform = scope.row.form;
that.number = scope.row.number;
that.remark = scope.row.remark;
that.numbers = scope.row.number?scope.row.number:'';
that.remark = scope.row.remark?scope.row.remark:'';
that.formName = scope.row.form_.name;
if (that.innerIndex !== '2') {//非复检
getrffieldList({form: this.recordform, enabled: true, page: 1, page_size: 100}).then((response) => {
@ -1370,8 +1370,8 @@
that.recordFinishedVisible = true;
that.formName = res.data.form_.name;
that.fieldList = res.data.record_data;
that.number = res.data.number;
that.remark = res.data.remark;
that.numbers = res.data.number?res.data.number:'';
that.remark = res.data.remark?res.data.remark:'';
}
})
},
@ -1507,8 +1507,12 @@
let params = {};
params.record_data = value.record_data;
params.is_testok = value.is_testok;
params.number = value.number;
if(value.numbers){
params.number = value.numbers;
}
if(value.remark){
params.remark = value.remark;
}
putTestRecordItem(id, params).then((res) => {
if (res.code >= 200) {
that.recordVisible = false;
@ -1533,18 +1537,30 @@
params.id = value.id;
params.is_testok = value.is_testok;
params.record_data = value.record_data;
params.number = value.number;
debugger;
if(value.numbers){
params.number = value.numbers;
}
if(value.remark){
params.remark = value.remark;
}
that.params = params;
that.limitedPhoto = true;
},
checkSubmit(data) {
debugger;
let that = this;
let id = that.params.id;
let params = new Object();
params.is_testok = that.params.is_testok;
params.record_data = that.params.record_data;
debugger;
if(this.params.numbers){
params.number = this.params.numbers;
}
if(this.params.remark){
params.remark = this.params.remark;
}
params.token = data.token;
let text = '确定以操作员'+data.name+'身份提交？';
if (data.token !== '' && data.token !== null && data.token !== undefined) {