From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 68 +++++++++++++++++++++++++++++++++-
src/main.js | 4 +-
static/js/menu.js | 2
3 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index d3e75ff..ffa7fc9 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -303,6 +303,33 @@
</el-row>
</div>
<div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
+ <div class="search" v-if="active==1" style="display: flex;background: transparent;">
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鍨嬪彿锛�</div>
+ <div class="search_input">
+ <el-select v-model="model" placeholder="璇烽�夋嫨" filterable allow-create default-first-option size="small" @change="changeModel">
+ <el-option
+ v-for="item in models"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">妫�楠屾爣鍑嗭細</div>
+ <div class="search_input">
+ <el-select v-model="standardMethodListId" placeholder="璇烽�夋嫨" size="small" @focus="methodFocus"
+ :loading="methodLoad" @change="changeStandardMethodListId">
+ <el-option
+ v-for="item in methods"
+ :key="item.id" :label="item.code" :value="item.id" >
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </div>
<el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
<el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column>
@@ -362,6 +389,7 @@
:controls="false" style="width: 80%;"></el-input-number>
</template>
</el-table-column>
+ <el-table-column prop="proNum" label="妫�楠岄」璁℃暟" width="120" align="center" ></el-table-column>
</el-table>
<el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
@selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
@@ -587,6 +615,7 @@
import fiberOpticConfig from './fiberoptic-config.vue'
import equipConfig from './equip-config.vue'
import cableConfig from './cable-config.vue'
+ import Vue from 'vue'
export default {
components: {
ValueTable,
@@ -733,7 +762,9 @@
bsm3Dia:false,
total: 0,
RTS: '',
- totalArr: []
+ totalArr: [],
+ model:null,
+ standardMethodListId:null,
}
},
watch: {
@@ -763,7 +794,15 @@
handler(val) {
this.getTotal()
}
- }
+ },
+ 'addObj.sample'(val){
+ this.model = null
+ this.standardMethodListId = null
+ },
+ 'addObj.sampleNum'(val){
+ this.model = null
+ this.standardMethodListId = null
+ },
},
mounted() {
this.selectEnumByCategoryForType()
@@ -787,6 +826,7 @@
};
this.addObj.type = String(this.addObj.type)
this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.getProNum()
this.addObj.sampleNum = this.sampleList.length
this.$nextTick(() => {
this.$refs.sampleTable.doLayout()
@@ -1050,6 +1090,12 @@
this.addObj.productionEn = '/'
})
},
+ getProNum(){
+ this.sampleList.forEach((m,i)=>{
+ Vue.set(this.sampleList[i],'proNum',m.insProduct.filter(a=>a.state==1).length)
+ })
+ this.$refs.sampleTable.doLayout()
+ },
searchFilter() {
this.$refs.tree.filter(this.search)
},
@@ -1212,6 +1258,7 @@
},
upProductSelect(selection, row) {
row.state = row.state == 1 ? 0 : 1
+ this.getProNum()
if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
if (row.section.indexOf('[') > -1) {
this.bsmRow = this.HaveJson(row)
@@ -1418,6 +1465,22 @@
}, 200)
})
},
+ changeModel(){
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if(obj){
+ a.model = this.model
+ }
+ })
+ },
+ changeStandardMethodListId(){
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if(obj){
+ a.standardMethodListId = this.standardMethodListId
+ }
+ })
+ },
methodFocus() {
this.selectsStandardMethodByFLSSM()
},
@@ -1469,6 +1532,7 @@
return m
})
}
+ this.getProNum()
this.bsmRow3 = [];
this.productList.forEach(p => {
if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
diff --git a/src/main.js b/src/main.js
index c2ad3a4..c48e4e1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,11 +19,11 @@
// const javaApi = 'http://192.168.11.249:8001';//寮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
// const javaApi = 'http://127.0.0.1:8001';//鏅�
-// const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
+const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
// const javaApi = 'http://122.114.52.69:8001';
-const javaApi = 'http://10.1.200.86:8001';//姝ｅ紡鏈�
+// const javaApi = 'http://10.1.200.86:8001';//姝ｅ紡鏈�
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
diff --git a/static/js/menu.js b/static/js/menu.js
index 024fc74..661aeff 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -80,7 +80,7 @@
}, {
v: "浜哄憳鑰冭瘎",
i: "font icon-erjidaohang",
- u: "",
+ u: "b3-personnel-evaluation",
p: ""
}, {
v: "浜哄憳鑰冩牳",
--
Gitblit v1.9.3