From e59a71579f6afd21c76f9d45c3b3f09c28d03c41 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:37:22 +0800
Subject: [PATCH] 合并冲突
---
src/view/notice.vue | 2
src/components/view/a6-personnel-detail.vue | 12 ++++-
src/components/view/b1-inspection-order.vue | 32 ++++++++++++---
src/components/view/person-manage.vue | 25 ++++++------
src/assets/api/controller.js | 2 +
5 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 01d3ac1..39f4fb4 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -153,6 +153,8 @@
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
+ updateStatus:"/insOrder/updateStatus",//灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
+ updateInspected:"/insOrder/updateInspected",//灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
}
const sampleOrder = {
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 9ec2650..21598f0 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -160,7 +160,7 @@
<span class="required-span">* </span>鏋舵瀯鍚嶇О锛�
</el-col>
<el-col :span="16" :offset="1">
- <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
+ <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small" @keyup.enter.native="addStandardTree"></el-input>
</el-col>
</el-row>
</div>
@@ -279,6 +279,7 @@
selectField: {},
upUserDepardLimsIdPower: true
},
+ currentCompaniesList: []
}
},
mounted() {
@@ -312,11 +313,12 @@
}
this.selectTree = data2.replace(' - ', '')
this.addOb.fatherId = val.id;
- this.componentData.entity.departLimsId = val.id;
+ this.componentData.entity.departLimsId = val.id+',';
this.refreshTable()
},
getNodeParent(val) {
if (val.parent != null) {
+ this.currentCompaniesList[val.level-1] = val.data.id
this.selectTree += ' - ' + val.label
this.getNodeParent(val.parent)
}
@@ -431,10 +433,14 @@
selects.forEach(a=>{
ids.push(a.id)
})
+ let str = ''
+ this.currentCompaniesList.forEach(a=>{
+ str+=(a+',')
+ })
this.selectUserDia = false
this.$axios.post(this.$api.user.upUserDepardLimsId,{
ids: JSON.stringify(ids),
- id: this.componentData.entity.departLimsId
+ id: str
}).then(res=>{
if (res.code === 201) {
return
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 069c75a..6bd3db9 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -171,7 +171,7 @@
<!-- 鎾ら攢 -->
<el-dialog title="涓嬪崟鎾ら攢" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose">
<p style="font-size:16px;color:#333333" v-if="!isQuash">濮旀墭缂栧彿<span
- style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚︽挙閿�</p>
+ style="color:#34BD66">{{this.insOrderRow.entrustCode}}</span>鐨勪俊鎭槸鍚︽挙閿�</p>
<el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
<el-form-item label="璇疯緭鍏ユ挙閿�鍘熷洜锛�">
<el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input>
@@ -226,8 +226,7 @@
</el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" v-if="active<4" />
- <fiberOpticConfig :currentId="currentId" v-if="active==4" />
+ <Add :active="active" :currentId="currentId" />
</div>
</div>
</template>
@@ -235,12 +234,10 @@
<script>
import ValueTable from '../tool/value-table.vue'
import Add from '../do/b1-ins-order/add.vue'
- import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
export default {
components: {
ValueTable,
- Add,
- fiberOpticConfig
+ Add
},
data() {
return {
@@ -456,7 +453,8 @@
tabIndex: 0,
active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
currentId: null,
- more:false
+ more:false,
+ insOrderRow:{}
}
},
mounted() {
@@ -557,6 +555,7 @@
// 鎾ら攢
handlEquash(row) {
this.quashDialogVisible = true;
+ this.insOrderRow=row
},
// 涓嬪彂
handleIssued(row) {
@@ -601,6 +600,25 @@
},
submitForm() {
this.upLoad = true;
+ if (this.tabIndex==1){
+ this.axios.put(this.$api.insOrder.updateInspected+"?id="+this.insOrderRow.id).then(res=>{
+ if (res.code===200){
+ this.upLoad=false
+ this.quashDialogVisible=false
+ this.refreshTable()
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }else{
+ this.axios.put(this.$api.insOrder.updateStatus+"?id="+this.insOrderRow.id).then(res=>{
+ if (res.code===200){
+ this.upLoad = false
+ this.quashDialogVisible = false
+ this.refreshTable()
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }
let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
delete this.formData.createTime
delete this.formData.updateTime
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index acac893..5938846 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -524,7 +524,7 @@
}
this.selectTree = data2.replace(' - ', '')
this.addOb.fatherId = val.id;
- this.componentData.entity.departId = val.id;
+ this.componentData.entity.departId = val.id + ',';
this.refreshTable()
},
nodeOpen(data, node, el) {
@@ -600,7 +600,7 @@
})
},
nodeClick2(ob, node, el) {
- this.currentCompaniesList[node.level-1] = ob.id
+ this.getNodeParent(node)
if (ob.id !== 'SC21') {
this.personLoad = true
this.$axios.post(this.$api.companies.selectSimpleList, {
@@ -613,6 +613,12 @@
})
}
},
+ getNodeParent(val){
+ this.currentCompaniesList[val.level-1] = val.data.id
+ if(val.parent!=null){
+ this.getNodeParent(val.parent)
+ }
+ },
handleSelectionChange(val) {
this.multipleSelection = val;
},
@@ -623,24 +629,17 @@
if(this.currentCompaniesList.length === 0){
return this.$message.error('璇烽�夋嫨缁勭粐')
}
- for (let index = this.currentCompaniesList.length-1; index >1; index--) {
+ /* for (let index = this.currentCompaniesList.length-1; index >1; index--) {
let obj = this.multipleSelection.find(a=>a.companyId==this.currentCompaniesList[index])
if(!obj){
this.currentCompaniesList.splice(index,1)
- }else{
- return
}
- }
+ } */
let arr = []
this.currentCompaniesList.forEach(b=>{
- /* this.companiesList.forEach(a=>{
- if(a.companyId===b){
- console.log(a)
- }
- }) */
let obj = this.companiesList.find(a=>a.companyId==b)
arr.push(obj)
- })
+ })
this.addLoad = true
this.$axios.post(this.$api.companies.addPersonUser, {
company: arr,
@@ -661,7 +660,7 @@
this.addLoad = false
this.personList = []
this.userSearch2 = ''
- this.refresh()
+ this.selectTreeList()
}).catch(e => {
this.addthirdParty = false
this.addLoad = false
diff --git a/src/view/notice.vue b/src/view/notice.vue
index 99f4985..bc84174 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -4,7 +4,7 @@
title="娑堟伅閫氱煡"
:visible.sync="drawer"
:direction="direction"
- :before-close="handleClose" style="height: 100vh;z-index: 9999999;">
+ :before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
<div class="head">
<div class="head-search">
<label>娑堟伅绫诲瀷锛�</label>
--
Gitblit v1.9.3