From b48ae202df66d4a2bf923f53893f9c12e9e1c92e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 05 八月 2024 19:37:20 +0800
Subject: [PATCH] 修改数采
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 104 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 626fe2a..a8be03c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -22,7 +22,7 @@
.search .form-inline {
padding-top: 20px;
- padding-left: 50px;
+ padding-left: 0px;
}
.center {
@@ -259,13 +259,13 @@
<el-input clearable v-model="insOrder.entrustCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧缂栧彿:">
- <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�" style="width: 100px;"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О:">
<el-input clearable v-model="currentSample.sample" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧鏁伴噺:">
- <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�" style="width: 70px;"></el-input>
</el-form-item>
<el-form-item label="涓嬪彂鏃堕棿:">
<el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
@@ -274,10 +274,14 @@
<el-input clearable v-model="insOrder.typeName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="绾﹀畾鏃堕棿:">
- <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�" style="width: 100px;"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鏍峰搧浣嶆暟:">
<el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>
+ </el-form-item>
+ <el-form-item label="澶囨敞:">
+ <span style="color:red">{{ insOrder.remark?insOrder.remark:'-' }}</span>
+ <!-- <el-tag v-if="currentKey">{{ insOrder.remark }}</el-tag> -->
</el-form-item>
</el-form>
</div>
@@ -1513,6 +1517,23 @@
]
obj.value0 = insValue[0].v
obj.value1 = insValue[1].v
+ }else if(insValue&&insValue.length==1){
+ this.param[obj.id].insValue = [
+ {
+ i:obj.id,
+ v:{
+ v:insValue[0].v
+ }
+ },
+ {
+ i:obj.id,
+ v:{
+ v:''
+ }
+ }
+ ]
+ obj.value0 = insValue[0].v
+ obj.value1 = ''
}
break;
case 'comValue':
@@ -2542,33 +2563,33 @@
this.handleExcelMethod()
},
changeInput(m, code, n) {
- let str = code.split('-')
- let pId = str[3]
- if(!this.param[pId].equipValue||this.param[pId].equipValue.length==0||!this.param[pId].equipValue[0].v.v){
- let inspectionItem = ''
- let idS = []
- let child = 0
- for (let i in this.currentSample.insProduct) {
- if(this.currentSample.insProduct[i].id==pId){
- inspectionItem = this.currentSample.insProduct[i].inspectionItem
- }
- }
- for (let i in this.currentSample.insProduct) {
- if(this.currentSample.insProduct[i].inspectionItem==inspectionItem&&this.currentSample.insProduct[i].id!=pId){
- idS.push(this.currentSample.insProduct[i].id)
- }
- }
- for (let i = 0;i<idS.length;i++) {
- if(this.param[idS[i]].equipValue&&this.param[idS[i]].equipValue.length>0&&this.param[idS[i]].equipValue[0].v.v){
- child++
- }
- }
- if(child==0){
- n.v.v = null
- this.$message.error('璇峰厛濉啓璁惧淇℃伅')
- return
- }
- }
+ // let str = code.split('-')
+ // let pId = str[3]
+ // if(!this.param[pId].equipValue||this.param[pId].equipValue.length==0||!this.param[pId].equipValue[0].v.v){
+ // let inspectionItem = ''
+ // let idS = []
+ // let child = 0
+ // for (let i in this.currentSample.insProduct) {
+ // if(this.currentSample.insProduct[i].id==pId){
+ // inspectionItem = this.currentSample.insProduct[i].inspectionItem
+ // }
+ // }
+ // for (let i in this.currentSample.insProduct) {
+ // if(this.currentSample.insProduct[i].inspectionItem==inspectionItem&&this.currentSample.insProduct[i].id!=pId){
+ // idS.push(this.currentSample.insProduct[i].id)
+ // }
+ // }
+ // for (let i = 0;i<idS.length;i++) {
+ // if(this.param[idS[i]].equipValue&&this.param[idS[i]].equipValue.length>0&&this.param[idS[i]].equipValue[0].v.v){
+ // child++
+ // }
+ // }
+ // if(child==0){
+ // n.v.v = null
+ // this.$message.error('璇峰厛濉啓璁惧淇℃伅')
+ // return
+ // }
+ // }
if (n) {
// if (this.PROJECT === '瑁呭鐢电紗') {
// let num2 = new this.$Big(n.v.v)
@@ -2618,18 +2639,6 @@
}
}
}
- // let obj = this.param[code.split('-')[3]]
- // this.tableList[0].arr.forEach(item=>{
- // item.forEach(m=>{
- // if(obj&&obj.insResult&&m.c==obj.insResult.c&&m.r==obj.insResult.r){
- // m.v.v = obj.insResult.v.v
- // }
- // if(obj&&obj.resValue&&m.c==obj.resValue.c&&m.r==obj.resValue.r){
- // m.v.v = obj.resValue.v.v
- // }
- // })
- // })
- // console.log(this.tableList,this.param)
this.saveInsContext()
})
break;
@@ -3076,13 +3085,20 @@
}
}
for (let i in this.equipOptions) {
- if (this.equipOptions[i].value === val) {
+ if (this.equipOptions[i].value == val) {
for (let i1 in this.param[n.i].equipName) {
if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
this.$delete(this.param[n.i].equipValue[i1].v,'v')
this.$set(this.param[n.i].equipValue[i1].v,'v',val)
this.$delete(this.param[n.i].equipName[i1].v,'v')
this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
+ this.tableList[0].arr.forEach((item,index)=>{
+ item.forEach((m)=>{
+ if(m.i==n.i&&m.v.ps&&m.v.ps.value=='璁惧鍚嶇О'){
+ this.$set(m.v,'v',this.equipOptions[i].label)
+ }
+ })
+ })
}
}
}
--
Gitblit v1.9.3