From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 101 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index fac14da..10b3d7f 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -74,18 +74,18 @@
display: flex;
flex-direction: row;
justify-content: space-between;
- .opticalProject {
- width: 38%;
- }
- .temperatureList {
- width: 60%;
- .temperatureListTitle {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- line-height: 30px;
- }
- }
+ }
+ .opticalProject {
+ width: 38%;
+ }
+ .temperatureList {
+ width: 60%;
+ }
+ .temperatureListTitle {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ line-height: 30px;
}
</style>
<style>
@@ -118,7 +118,7 @@
}
.ins_order_add .el-table .warning-row .cell {
- color: #bababa;
+ color: #3A7BFA;
}
.ins_order_add .el-select .is-disabled {
@@ -481,10 +481,10 @@
<el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="100" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="deviceGroup" label="璁惧缁�" width="120" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="section" label="鍖洪棿" min-width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px">
+ <el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px" v-if="isAskOnlyRead">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
- :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'ask')"
v-if="active==1&&isAskOnlyRead"></el-input>
<span v-else>
<!-- <template v-if="(scope.row.ask.indexOf('D')>-1
@@ -497,6 +497,16 @@
</template>
<template v-else>{{ scope.row.ask }}</template> -->
<template >{{ scope.row.ask }}</template>
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px">
+ <template slot-scope="scope">
+ <el-input size="small" placeholder="瑕佹眰鎻忚堪" v-model="scope.row.tell" clearable type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'tell')"
+ v-if="active==1&&isAskOnlyRead"></el-input>
+ <span v-else>
+ <template >{{ scope.row.tell }}</template>
</span>
</template>
</el-table-column>
@@ -611,20 +621,20 @@
<equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
<cableConfig v-if="cableConfigShow" :active="active" />
<!-- 鍗曢�夌壒娈婂�煎鐞嗘-->
- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" width="500px" :show-close="false"
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" min-width="400px" :show-close="false"
:before-close="beforeClose">
<div class="body" style="max-height: 60vh;">
<el-row v-if="bsm1">
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label"><span class="required-span">* </span>閫夐」锛�</div>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;"><span class="required-span">* </span>閫夐」锛�</div>
<div class="search_input">
<el-radio-group v-model="bsm1Val" @input="upBsm1">
<el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
</el-radio-group>
</div>
</el-col>
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label">瑕佹眰鍊硷細</div>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;">瑕佹眰鍊硷細</div>
<div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
<el-radio-group v-model="bsm1Val" @input="upBsm1">
<el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
@@ -673,20 +683,20 @@
</div>
</el-dialog>
<!-- 鍏ㄩ�夌壒娈婂�煎鐞嗘-->
- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" width="500px" :show-close="false"
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" min-width="400px" :show-close="false"
:before-close="beforeClose">
<div class="body" style="max-height: 60vh;" v-for="(item, index) in bsm1DiaList" :key="index">
<el-row v-if="item.bsm1">
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label"><span class="required-span">* </span>閫夐」锛�</div>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;"><span class="required-span">* </span>閫夐」锛�</div>
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
<el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
</el-radio-group>
</div>
</el-col>
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label">瑕佹眰鍊硷細</div>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;">瑕佹眰鍊硷細</div>
<div class="search_input" v-show="item.bsm1Val!==null&&item.bsm1Val!==''">
<el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
<el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai"
@@ -849,6 +859,7 @@
<el-button type="primary" @click="spliceData">淇濆瓨</el-button>
</span>
</el-dialog>
+ <!-- 鐢靛姏璇曢獙瀹�---娓╁崌璇曢獙/鐑惊鐜� -->
<el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
<div>
<div v-if="isShowInput" style="margin-bottom: 6px">
@@ -1106,7 +1117,7 @@
this.selectEnumByCategoryForType()
this.getUserNow()
this.selectStandardTreeList()
- this.selectInsOrderTemplate()
+ // this.selectInsOrderTemplate()
this.getAuthorizedPerson();
this.selectEnumByCategoryForUnit()
this.selectStandardMethods()
@@ -1402,6 +1413,10 @@
this.addObj.code = selects.code
this.addObj.companyId = selects.id
this.selectUserDia = false
+ if(this.active==1){
+ // TODO
+ this.selectInsOrderTemplate()
+ }
},
containsValue(str) {
if(str){
@@ -1862,6 +1877,9 @@
this.addObj.companyId = selects.departId
this.addObj.production = '/'
this.addObj.productionEn = '/'
+ if(this.active==1){
+ this.selectInsOrderTemplate()
+ }
})
},
getProNum() {
@@ -2045,15 +2063,32 @@
upProductSelect(selection, row) {
this.bsm1DiaList = []
row.state = row.state == 1 ? 0 : 1
- if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
+ let arr = this.productList.filter(m=>m.state==1&&row.section.includes(m.section)&&m.ask&&m.section.indexOf('[')==-1)
+ if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1&&arr.length==0) {
if (row.section.indexOf('[') > -1) {
row.bsmRow = this.HaveJson(row)
}
row.bsm1 = true
this.bsm1DiaList.push(row)
this.bsm1DiaAll = true
- } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
+ } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0&&arr.length==0) {
row.bsm1 = false
+ }else if(arr.length>0){
+ try{
+ row.bsmRow = this.HaveJson(row)
+ let section = arr[0].section
+ let arr0 = JSON.parse(row.section)
+ let arr1 = JSON.parse(row.ask)
+ let arr2 = JSON.parse(row.manHour)
+ let arr3 = JSON.parse(row.price)
+ let arr4 = JSON.parse(row.tell)
+ let index = arr0.indexOf(section)
+ row.section = section
+ row.ask = arr1[index]
+ row.manHour = arr2[index]
+ row.price = arr3[index]
+ row.tell = arr4[index]
+ } catch(e) {}
}
if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
this.bsm2 = true
@@ -2149,12 +2184,12 @@
rowIndex
}) {
if (row.state === 0) {
- return 'warning-row';
+ return '';
}
- return '';
+ return 'warning-row';
},
selectInsOrderTemplate() {
- this.$axios.get(this.$api.insOrder.selectInsOrderTemplate).then(res => {
+ this.$axios.get(this.$api.insOrder.selectInsOrderTemplate+'?company='+this.addObj.company).then(res => {
if (res.code == 201) return
this.templates = res.data
})
@@ -2326,12 +2361,12 @@
}
},
// 瑕佹眰鍊煎彉鍖栨椂
- requestChange(e, row) {
+ requestChange(e, row,type) {
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
item.insProduct.map(m => {
if (m.id == row.id) {
- m.ask = e;
+ m[type] = e;
}
return m;
})
--
Gitblit v1.9.3