From 6e6395dc056bde6211234008d5fca89f3937b609 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 31 五月 2024 16:00:03 +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 | 35 +++++++++++++++--
src/components/do/b1-ins-order/fiberoptic-config.vue | 45 +++++++++++++---------
src/components/view/person-manage.vue | 27 -------------
src/assets/api/controller.js | 9 +++-
4 files changed, 64 insertions(+), 52 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a03208f..f2d1feb 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -29,6 +29,7 @@
auxiliaryOutputWorkingHours,
auxiliaryWorkingHoursDay,
auxiliaryCorrectionHours,
+ insBushing
}
}
@@ -158,8 +159,8 @@
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
- updateStatus:"/insOrder/updateStatus",//灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
- updateInspected:"/insOrder/updateInspected",//灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
+ updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
+ updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
}
const sampleOrder = {
@@ -329,3 +330,7 @@
selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //鏌ヨ淇宸ユ椂
upload: "/auxiliaryCorrectionHours/upload", //瀵煎叆
}
+
+const insBushing = {
+ selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //閫氳繃鏍峰搧id鑾峰彇鏍峰搧涓嬪厜绾ら厤缃唴瀹�
+}
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 9ca4c9d..78cbd51 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -674,7 +674,8 @@
formType: [],
configShow: false,
currentMethod: null,
- isAskOnlyRead:false
+ isAskOnlyRead:false,
+ sampleId: null
}
},
watch: {
@@ -873,6 +874,7 @@
this.addObj.custom = selects.name
this.addObj.code = selects.code
this.addObj.phone = selects.phone
+ this.addObj.companyId = selects.departId
})
},
searchFilter() {
@@ -1061,6 +1063,11 @@
this.isAskOnlyRead = true
}else{
this.isAskOnlyRead = false
+ }
+ this.sampleId = row.id
+ if(this.active!==1){
+ this.sampleIds = []
+ this.sampleIds.push(row.id)
}
this.productList = row.insProduct
setTimeout(() => {
@@ -1337,11 +1344,29 @@
return row[property] === value;
},
openConfig(){
- if(this.sampleIds.length===0){
- this.$message.error("鏈�夋嫨鏍峰搧")
- return
+ if(this.active===1){
+ if(this.sampleIds.length===0){
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ return
+ }
+ this.configShow = true
+ }else{
+ if(this.sampleId === null){
+ this.$message.error('鏈�変腑鏍峰搧')
+ return
+ }
+ this.$axios.post(this.$api.insBushing.selectBushingBySampleId,{
+ sampleId: this.sampleId
+ }).then(res=>{
+ for(var i in this.sampleList){
+ if(this.sampleList[i].id = this.sampleId){
+ this.sampleList[i].bushing = res.data
+ break
+ }
+ }
+ this.configShow = true
+ })
}
- this.configShow = true
}
}
}
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 6b301fa..6dc61c9 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -35,11 +35,11 @@
</div>
<div class="search-item" style="margin-right: 10px;">
<label style="width: 70px;">鏍囧噯閲�</label>
- <el-input v-model="packageInfo.num2" placeholder="璇疯緭鍏�" size="small" @change="upNum"></el-input>
+ <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @change="upNum"></el-input>
</div>
<div class="search-item">
<label style="width: 70px;">妫�娴嬮噺</label>
- <el-input v-model="packageInfo.num3" placeholder="璇疯緭鍏�" size="small" @change="upNum"
+ <el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @change="upNum"
:disabled="packageInfo.radio===0"></el-input>
</div>
</div>
@@ -55,9 +55,9 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="num2" label="鏍囬噺" show-overflow-tooltip align="center">
+ <el-table-column prop="standNum" label="鏍囬噺" show-overflow-tooltip align="center">
</el-table-column>
- <el-table-column prop="num3" label="娴嬭瘯閲�" show-overflow-tooltip align="center">
+ <el-table-column prop="testNum" label="娴嬭瘯閲�" show-overflow-tooltip align="center">
</el-table-column>
</el-table>
</div>
@@ -200,8 +200,8 @@
packageInfo: {
radio: 1,
num1: null,
- num2: null,
- num3: null,
+ standNum: null,
+ testNum: null,
ismiers: false
},
tableData: [],
@@ -275,9 +275,11 @@
}else{
this.bushing = this.HaveJson(this.sample[0].bushing)
this.packageInfo.num1 = this.sample[0].bushing.length
- this.packageInfo.num2 = this.sample[0].bushing[0].num2
- this.packageInfo.num3 = this.sample[0].bushing[0].num3
+ this.packageInfo.standNum = this.sample[0].bushing[0].standNum
+ this.packageInfo.testNum = this.sample[0].bushing[0].testNum
this.bushing.forEach(a=>{
+ if(a.fibers===null)a.fibers=[]
+ if(a.fiber===null)a.fiber=[]
if(this.packageInfo.ismiers){
a.fibers.forEach(b=>{
this.fibersList.push(b)
@@ -323,14 +325,14 @@
this.fibersList = []
this.detectionItems = []
if (this.packageInfo.radio === 0) {
- this.packageInfo.num3 = this.packageInfo.num2
+ this.packageInfo.testNum = this.packageInfo.standNum
}
- if (parseInt(this.packageInfo.num2) < parseInt(this.packageInfo.num3)) {
- this.packageInfo.num3 = this.packageInfo.num2
+ if (parseInt(this.packageInfo.standNum) < parseInt(this.packageInfo.testNum)) {
+ this.packageInfo.testNum = this.packageInfo.standNum
}
if (this.packageInfo.num1 !== null && this.packageInfo.num1 !== '' &&
- this.packageInfo.num2 !== null && this.packageInfo.num2 !== '' &&
- this.packageInfo.num3 != null && this.packageInfo.num3 !== '') {
+ this.packageInfo.standNum !== null && this.packageInfo.standNum !== '' &&
+ this.packageInfo.testNum != null && this.packageInfo.testNum !== '') {
let colors2 = []
if (this.packageInfo.num1 / this.colors.length > 1) {
let num = this.packageInfo.num1 / this.colors.length
@@ -345,8 +347,8 @@
for (var i = 0; i < this.packageInfo.num1; i++) {
let bushing = {
color: colors2[i].label,
- num2: this.packageInfo.num2,
- num3: this.packageInfo.num3,
+ standNum: this.packageInfo.standNum,
+ testNum: this.packageInfo.testNum,
fibers: [],
fiber: []
}
@@ -482,7 +484,7 @@
} else {
this.selectBushing.forEach(a => {
a.fiber = []
- for (var i = 0; i < parseInt(a.num3); i++) {
+ for (var i = 0; i < parseInt(a.testNum); i++) {
let fiber = {
bushColor: a.color,
color: colors2[i].label,
@@ -508,13 +510,13 @@
this.selectBushing.forEach(a => {
a.fiber = []
a.fibers = []
- for (var i = 0; i < parseInt(a.num3); i++) {
+ for (var i = 0; i < parseInt(a.testNum); i++) {
let fibers = {
code: null,
color: a.color,
model: this.miresModel,
standard: standard,
- num: a.num3,
+ num: a.testNum,
productList: this.HaveJson(this.productList2),
fiber: []
}
@@ -526,6 +528,7 @@
rowClickFiber(row, column, event){
this.currentDetectionItems = row
this.detectionItems = row.productList
+ if(this.detectionItems === null) return
setTimeout(() => {
this.detectionItems.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
@@ -625,6 +628,10 @@
})
},
save(){
+ if(this.bushing.length === 0){
+ this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
+ return
+ }
for(let a in this.bushing){
if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
this.$message.error(this.bushing[a].color+'绠¤壊鏍囧绠＄己灏戦厤缃棤娉曚繚瀛�')
@@ -635,7 +642,7 @@
a.bushing = this.bushing
})
this.$message.success('宸蹭繚瀛�')
- console.log(11111111,this.bushing)
+ console.log(this.bushing);
}
}
}
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 780fe23..e74603e 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -289,7 +289,7 @@
type: 'text',
method: 'doDiy',
field: ['roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
- '濮撳悕EN=nameEn', '骞撮緞=age', '閭=email', '鍗曚綅=company', '绛惧悕=pictureUrl', '鏈汉鐓�=signatureUrl'
+ '濮撳悕EN=nameEn', '骞撮緞=age', '閭=email', '鍗曚綅=company', '绛惧悕=pictureUrl', '涓汉鐓х墖=signatureUrl'
]
}],
tagField: {
@@ -322,20 +322,8 @@
},
company: {select: []}
},
- /* cascaderField:{
- departId:{
- tree:[]
- },
- // 瀛楁閰嶇疆
- props:{
- value:'id',
- label:'name',
- checkStrictly: true
- }
- }, */
requiredAdd: ['account', 'name', 'state', 'roleId', 'password', 'nameEn', 'phone'],
requiredUp: ['account', 'name', 'state', 'roleId', 'nameEn', 'phone'],
- // disabledUp:['departId'],
addUpload: ['pictureUrl', 'signatureUrl'],
addUploadConfig: {
accept: '.png, .jpg, .jpeg, .gif',
@@ -360,7 +348,6 @@
addLoad: false,
personList: [],
personListCopy: [],
- treeLoad: false,
personLoad: false,
search2: '',
multipleSelection: [],
@@ -425,12 +412,6 @@
opeaAdd() {
this.$refs.ValueTable.openAddDia(this.$api.user.addUser);
this.$refs['ValueTable'].upData.departId = this.selectTree
- },
- selectTreeList() {
- /* this.$axios.get(this.$api.department.selectDepartment).then(res => {
- this.componentData.cascaderField.departId.tree = this.handleTree(res.data[0].children)
- }) */
- this.$refs.ValueTable.selectList()
},
handleTree(arr) {
arr.forEach(a => {
@@ -508,12 +489,6 @@
},
nodeClose(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
- },
- getNodeParent(val) {
- if (val.parent != null) {
- this.selectTree += ' - ' + val.label
- this.getNodeParent(val.parent)
- }
},
remove(node, data) {
this.$confirm("鏄惁鍒犻櫎璇ュ眰绾�", "鎻愮ず", {
--
Gitblit v1.9.3