From d1b46161801b8b4641bdec066796d75d80eebb2f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 13:36:17 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-ins-order/add.vue | 120 ++++++++++++++++++++++++++++++---------
src/components/do/b1-inspect-order-plan/Inspection.vue | 9 +++
src/components/view/b1-inspect-order-plan.vue | 4
src/components/do/b1-ins-order/fiberoptic-config.vue | 6 +-
src/App.vue | 2
5 files changed, 108 insertions(+), 33 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index b35af6c..4d4f6fb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -103,6 +103,8 @@
min-width: 0;
border-radius: 6px;
z-index: 9999999999 !important;
+ max-height: 80vh;
+ overflow-y: auto;
}
table {
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index f1cfa3f..1d19dd8 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -107,7 +107,8 @@
<el-button size="medium" @click="templateDia=true" v-show="active==1">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
- <el-button size="medium" type="primary" @click="openConfig">鍏夌氦閰嶇疆</el-button>
+ <el-button size="medium" type="primary" @click="openConfig"
+ v-if="this.addObj.sampleType==='鍏夌紗'">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
<!-- 瀹℃牳 -->
<el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -137,7 +138,7 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>濮旀墭瀹㈡埛锛�</div>
+ <div class="search_label"><span class="required-span">* </span>濮旀墭浜猴細</div>
<div class="search_input">
<el-input readonly size="small" v-model="addObj.custom">
<template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
@@ -148,7 +149,7 @@
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>濮旀墭鍗曚綅锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="閫夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input>
+ <el-input size="small" placeholder="鈫愰�夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -174,12 +175,12 @@
</el-input>
</div>
</el-col>
- <el-col class="search_thing" :span="6">
+ <!-- <el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鏍峰搧绫诲瀷锛�</div>
<div class="search_input">
<el-input size="small" clearable disabled v-model="addObj.sampleType"></el-input>
</div>
- </el-col>
+ </el-col> -->
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鏍峰搧鏁伴噺锛�</div>
<div class="search_input">
@@ -324,21 +325,6 @@
</el-select>
</template>
</el-table-column>
- <!-- <el-table-column prop="unit" label="鍗曚綅" align="center" min-width="100">
- <template slot-scope="scope">
- <el-select v-model="scope.row.unit" clearable size="small" style="width: 100%;" :disabled="active>1">
- <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
- </el-select>
- </template>
- </el-table-column> -->
- <!-- <el-table-column prop="isLeave" label="鏄惁鐣欐牱" align="center" min-width="100">
- <template slot-scope="scope">
- <el-select v-model="scope.row.isLeave" size="small" :disabled="active>1">
- <el-option label="鐣欐牱" :value="1"></el-option>
- <el-option label="涓嶇暀鏍�" :value="0"></el-option>
- </el-select>
- </template>
- </el-table-column> -->
<el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" width="140" align="center" v-if="addObj.mating==1">
<template slot-scope="scope">
<el-input size="small" type="textarea" :autosize="{ minRows: 1, maxRows: 1}"
@@ -365,16 +351,16 @@
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
show-overflow-tooltip></el-table-column>
- <el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip :filters="filters"
+ <el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" min-width="130" show-overflow-tooltip :filters="filters"
:filter-method="filterHandler"></el-table-column>
<el-table-column prop="methodS" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="鍗曚环" width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="100" show-overflow-tooltip></el-table-column>
+ <!-- <el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
+ <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="鍖洪棿" 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">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
@@ -395,7 +381,7 @@
</span>
</el-dialog>
<el-dialog title="閫夋嫨鏍峰搧" :visible.sync="selectStandardTree" width="400px">
- <div class="body" style="height: 60vh;overflow-y: auto;" v-if="selectStandardTree">
+ <div class="body" style="height: 60vh;overflow-y: auto;user-select: none;" v-if="selectStandardTree">
<el-row>
<el-col :span="24">
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" suffix-icon="el-icon-search" v-model="search" size="small"
@@ -405,7 +391,7 @@
</el-row>
<el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }" node-key="label"
:filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
- @node-collapse="nodeClose" :default-expanded-keys="expandedKeys">
+ @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" @dblclick.native="activeStandardTree">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row>
<el-col :span="24">
@@ -482,6 +468,28 @@
</span>
</el-dialog>
<fiberOpticConfig :currentId="currentId" v-if="configShow" :active="active" />
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" width="500px" :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">
+ <div class="search_label"><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"></el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label">瑕佹眰鍊硷細</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" :label="a">{{JSON.parse(bsmRow.ask)[ai]}}</el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -615,7 +623,11 @@
configShow: false,
currentMethod: null,
isAskOnlyRead: false,
- sampleId: null
+ sampleId: null,
+ bsmRow: null,
+ bsm1: false,
+ bsm1Val: null,
+ bsm1Dia: false
}
},
watch: {
@@ -812,6 +824,8 @@
this.addObj.code = selects.code
this.addObj.phone = selects.phone
this.addObj.companyId = selects.departId
+ this.addObj.production = '/'
+ this.addObj.productionEn = '/'
})
},
searchFilter() {
@@ -823,7 +837,7 @@
nodeClose(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
},
- handleNodeClick(val, node, el) { //鏍戠殑鍊�
+ handleNodeClick(val, node, el) {
this.selectTree = ''
this.models = val.children
this.getNodeParent(node)
@@ -970,6 +984,15 @@
},
upProductSelect(selection, row) {
row.state = row.state == 1 ? 0 : 1
+ if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
+ if(row.section.indexOf('[') > -1){
+ this.bsmRow = this.HaveJson(row)
+ }
+ this.bsm1 = true
+ this.bsm1Dia = true
+ } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
+ this.bsm1 = false
+ }
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
item.insProduct.map(m => {
@@ -1167,6 +1190,17 @@
return m
})
}
+ this.productList.forEach(p=>{
+ if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
+ if(p.section.indexOf('[') > -1){
+ this.bsmRow = this.HaveJson(p)
+ }
+ this.bsm1 = true
+ this.bsm1Dia = true
+ } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
+ this.bsm1 = false
+ }
+ })
if (e.length > 0) {
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
@@ -1260,6 +1294,36 @@
this.configShow = true
})
}
+ },
+ upBsm1(val) {
+ let sections = JSON.parse(this.bsmRow.section);
+ let asks = JSON.parse(this.bsmRow.ask);
+ let tells = JSON.parse(this.bsmRow.tell);
+ let manHours = JSON.parse(this.bsmRow.manHour);
+ let prices = JSON.parse(this.bsmRow.price);
+ for (var a in sections) {
+ if(val === sections[a]){
+ this.productList.forEach(p=>{
+ if(p.id === this.bsmRow.id){
+ p.section = sections[a]
+ p.ask = asks[a]
+ p.tell = tells[a]
+ p.manHour = manHours[a]
+ p.price = prices[a]
+ }
+ })
+ break
+ }
+ }
+ },
+ beforeClose(done){
+ if(this.bsm1){
+ if(this.bsm1Val===null || this.bsm1Val === ''){
+ this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ return
+ }
+ }
+ done()
}
}
}
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 359d6f1..859813e 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -91,8 +91,8 @@
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" width="70" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="manDay" label="棰勮鏃堕棿" width="90" show-overflow-tooltip>
- </el-table-column>
+ <!-- <el-table-column prop="manDay" label="棰勮鏃堕棿" width="90" show-overflow-tooltip>
+ </el-table-column> -->
<el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px">
<template slot-scope="scope">
<el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input>
@@ -289,7 +289,7 @@
}
})
this.models = this.models.replace(',', '')
- this.packageInfo.ismiers = this.models.split(',').every(e=>e.indexOf('d')>-1)
+ this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')))
if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){
this.bushing = []
}else{
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index f0d7503..b3ed844 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1025,6 +1025,15 @@
return res < m.split('<')[1]
}else if (m.includes('>')) {
return res > m.split('>')[1]
+ }else if (m.includes('~')) {
+ let k = m.split('~')
+ return res >= k[0] && res <= k[1]
+ }else if(m.includes('-')){
+ let k = m.split('-')
+ return res >= k[0] && res <= k[1]
+ }else if(m.includes('卤')){
+ let k = m.split('卤')
+ return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
}
})
if(this.getInspectionValueType(item.i)==1){
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 14cd472..b9cb529 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -250,9 +250,9 @@
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
- disabFun: (row, index) => {
+ /* disabFun: (row, index) => {
return row.userId == null || row.insState != 3 || row.verifyUser != 1
- }
+ } */
}, {
id: '',
font: '璁ら',
--
Gitblit v1.9.3