From 3ad119ce8540ccd941f97c272d95180618ff0965 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 三月 2024 16:04:01 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/view/b2-standard.vue | 16 ++
src/components/do/b1-ins-order/add.vue | 208 +++++++++++++++++++++++++++++++++-
src/components/view/b1-inspection-order.vue | 72 ++++++++++--
src/view/index.vue | 9 +
src/assets/api/controller.js | 10 +
5 files changed, 282 insertions(+), 33 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a5640ec..b8e2c4b 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -36,6 +36,7 @@
selectCustomPageList: "/user/selectCustomPageList", //鑾峰彇瀹㈡埛鍒楄〃
delCustomById: "/user/delCustomById", //鍒犻櫎瀹㈡埛淇℃伅
addCustom: "/user/addCustom", //鏂板瀹㈡埛淇℃伅
+ getUserNow: "/user/getUserNow", //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�
}
const dataReporting = {
@@ -105,14 +106,15 @@
addDeviceParameter: "/deviceScope/addDeviceParameter", //娣诲姞璁惧璇︽儏鍙傛暟
delDeviceParameter: "/deviceScope/delDeviceParameter", //鍒犻櫎璁惧璇︽儏鍙傛暟
upDeviceParameter: "/deviceScope/upDeviceParameter", //淇敼璁惧璇︽儏鍙傛暟
- authorizedPerson: "/user/getDeviceManager", //鑾峰彇鎺堟潈浜�
- selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
- uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
- selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
+ authorizedPerson: "/user/getDeviceManager", //鑾峰彇鎺堟潈浜�
+ selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
+ uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
+ selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
}
const insOrder = {
selectInsOrderParameter: "/insOrder/selectInsOrderParameter", //鏌ヨ妫�楠屼笅鍗�
+ getDeviceManager: "/user/getDeviceManager", //鑾峰彇鎸囨淳浜哄憳
}
const insOrderPlan = {
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index b960d9e..9a50c89 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -30,11 +30,39 @@
.search_input {
width: calc(100% - 120px);
}
+
+ .node_i {
+ color: orange;
+ font-size: 18px;
+ }
</style>
<style>
.ins_order_add .el-input-group__append,
.el-input-group__prepend {
padding: 0 10px;
+ }
+
+ .ins_order_add .el-tree-node__content {
+ height: 32px;
+ font-size: 14px;
+ border-radius: 2px;
+ }
+
+ .ins_order_add .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+ color: #3A7BFA;
+ }
+
+ .ins_order_add .has-gutter .el-table__cell .cell {
+ line-height: 30px;
+ background-color: #fafafa;
+ }
+
+ .ins_order_add .has-gutter .el-table__cell {
+ background-color: #fafafa !important;
+ }
+
+ .ins_order_add .el-table__row .cell {
+ font-size: 12px;
}
</style>
@@ -90,7 +118,8 @@
<div class="search_label"><span class="required-span">* </span>鏍峰搧鍚嶇О锛�</div>
<div class="search_input">
<el-input readonly size="small" v-model="addObj.sample">
- <template slot="append"><el-button slot="append" icon="el-icon-search" @click=""></el-button></template>
+ <template slot="append"><el-button slot="append" icon="el-icon-search"
+ @click="selectStandardTree = true"></el-button></template>
</el-input>
</div>
</el-col>
@@ -130,7 +159,8 @@
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鏍峰搧鏁伴噺锛�</div>
<div class="search_input">
- <el-input-number size="small" v-model="addObj.sampleNum" :controls="false" :min="0" :precision="0" style="width: 50%;"></el-input-number>
+ <el-input-number size="small" v-model="addObj.sampleNum" :controls="false" :min="0" :max="1000"
+ :precision="0" style="width: 50%;" @change="onSample"></el-input-number>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -151,16 +181,53 @@
<el-col class="search_thing" :span="6">
<div class="search_label">鐣欐牱鏁伴噺锛�</div>
<div class="search_input">
- <el-input-number size="small" v-model="addObj.leaveNum" :controls="false" :min="0" :disabled="addObj.isLeave == 0" style="width: 50%;"></el-input-number>
+ <el-input-number size="small" v-model="addObj.leaveNum" :controls="false" :min="0"
+ :disabled="addObj.isLeave == 0" style="width: 50%;"></el-input-number>
</div>
</el-col>
- <el-col class="search_thing" :span="12">
+ <el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
<div class="search_label">澶囨敞锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.remark"></el-input>
+ <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable
+ v-model="addObj.remark"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label" style="width: 160px;">鏄惁娑夊強閰嶅鏍峰搧锛�</div>
+ <div class="search_input" style="width: calc(100% - 160px);">
+ <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()">
+ <el-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
+ </el-radio-group>
</div>
</el-col>
</el-row>
+ </div>
+ <div style="display: flex;">
+ <el-table class="el-table" ref="sampleTable" :data="sampleList" height="300px" tooltip-effect="dark" border
+ @selection-change="selectSample">
+ <el-table-column type="selection" width="60"></el-table-column>
+ <el-table-column type="index" label="搴忓彿" width="65" align="center"></el-table-column>
+ <el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" show-overflow-tooltip
+ min-width="100"></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}"
+ v-model="scope.row.joinName"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="joinModel" 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}"
+ v-model="scope.row.joinModel"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="65" align="center">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
<el-dialog title="閫夋嫨瀹㈡埛" :visible.sync="selectUserDia" width="70%">
<div class="body" style="height: 60vh;" v-if="selectUserDia">
@@ -169,6 +236,34 @@
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="selectUser">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="閫夋嫨鏍峰搧" :visible.sync="selectStandardTree" width="400px">
+ <div class="body" style="height: 60vh;overflow-y: auto;" v-if="selectStandardTree">
+ <el-row>
+ <el-col :span="24">
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" suffix-icon="el-icon-search" v-model="search" size="small"
+ style="margin-bottom: 5px;" clearable @blur="searchFilter" @clear="searchFilter"
+ @keyup.enter.native="searchFilter"></el-input>
+ </el-col>
+ </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">
+ <div class="custom-tree-node" slot-scope="{ node, data }">
+ <el-row>
+ <el-col :span="24">
+ <span><i
+ :class="`node_i ${data.children != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
+ {{ data.code }} {{ data.label }}</span>
+ </el-col>
+ </el-row>
+ </div>
+ </el-tree>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="selectStandardTree = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="activeStandardTree">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -194,6 +289,7 @@
code: null,
laboratory: null,
appointedTime: null,
+ factory: null,
sample: null,
sampleType: null,
sampleNum: null,
@@ -201,7 +297,8 @@
isLeave: 0,
leaveNum: null,
remark: null,
- otcCode: null
+ otcCode: null,
+ mating: 0
},
type: [],
selectUserDia: false,
@@ -230,13 +327,23 @@
}
},
selectField: {},
- }
+ },
+ selectStandardTree: false,
+ search: null,
+ list: [],
+ selectTree: null,
+ expandedKeys: [],
+ sampleList: [],
+ sampleIds: [],
+ methodList: []
}
},
mounted() {
this.selectEnumByCategoryForType()
+ this.getUserNow()
+ this.selectStandardTreeList()
},
- methods:{
+ methods: {
selectEnumByCategoryForType() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "绱ф�ョ▼搴�"
@@ -259,9 +366,90 @@
this.addObj.code = selects.code
this.selectUserDia = false
},
- save(){
+ save() {
console.log(this.addObj);
+ },
+ getUserNow() {
+ this.$axios.get(this.$api.user.getUserNow).then(res => {
+ let selects = res.data
+ if (selects == null) return
+ this.addObj.userId = selects.id
+ this.addObj.company = selects.company
+ this.addObj.custom = selects.name
+ this.addObj.code = selects.code
+ })
+ },
+ searchFilter() {
+ this.$refs.tree.filter(this.search)
+ },
+ nodeOpen(data, node, el) {
+ $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
+ },
+ nodeClose(data, node, el) {
+ $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
+ },
+ handleNodeClick(val, node, el) { //鏍戠殑鍊�
+ this.selectTree = ''
+ this.getNodeParent(node)
+ this.selectTree = this.selectTree.replace(' - ', '')
+ let data = this.selectTree.split(' - ')
+ let data2 = ''
+ for (let index = data.length - 1; index >= 0; index--) {
+ data2 += " - " + data[index]
+ }
+ this.selectTree = data2.replace(' - ', '')
+ },
+ getNodeParent(val) {
+ if (val.parent != null) {
+ this.selectTree += ' - ' + val.label
+ this.getNodeParent(val.parent)
+ }
+ },
+ selectStandardTreeList() {
+ this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
+ this.list = res.data
+ this.list.forEach(a => {
+ a.children.forEach(b => {
+ this.expandedKeys.push(b.label)
+ })
+ })
+ })
+ },
+ filterNode(value, data) {
+ if (!value) return true;
+ return data.label.indexOf(value) !== -1;
+ },
+ activeStandardTree() {
+ let trees = this.selectTree.split(" - ")
+ if (trees.length < 4) {
+ this.$message.error('鏈�夋嫨鏍峰搧')
+ return
+ }
+ this.addObj.factory = trees[0]
+ this.addObj.laboratory = trees[1]
+ this.addObj.sampleType = trees[2]
+ this.addObj.sample = trees[3]
+ this.addObj.model = trees[4]
+ this.selectStandardTree = false
+ this.onSample()
+ },
+ selectSample(val) {
+ val.forEach(a => {
+ this.sampleIds = a.id
+ })
+ },
+ onSample() {
+ this.sampleList = []
+ if (this.addObj.sampleNum == 0 || this.addObj.sample == null || this.addObj.sample == '') return
+ for (var i = 0; i < this.addObj.sampleNum; i++) {
+ this.sampleList.push({
+ sample: this.addObj.sample,
+ joinName: null,
+ joinModel: null
+ })
+ }
+ this.$refs.sampleTable.doLayout()
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 5034b53..a062c6a 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -147,14 +147,16 @@
</el-dialog>
<!-- 涓嬪彂 -->
<el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="30%" :before-close="handleClose">
- <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm">
+ <el-form :label-position="labelPosition" :model="formData2" label-width="150px" ref="ruleForm">
<el-form-item label="绾﹀畾鏃堕棿锛�">
- <el-date-picker style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="formData.downTime"
+ <el-date-picker style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="formData2.appointed2"
type="date" size="small" placeholder="閫夋嫨鏃堕棿">
</el-date-picker>
</el-form-item>
+ <el-form-item >
+ </el-form-item>
<el-form-item label="鎸囨淳浜哄憳锛�">
- <el-select v-model="formData.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="formData2.getUserMenu" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -162,12 +164,12 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-row>
- <el-button @click="handleClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
+ <el-button @click="handleClose2">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm2" :loading="upLoad">纭� 瀹�</el-button>
</el-row>
</span>
</el-dialog>
- <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="70%" :before-close="handleClose">
+ <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="70%" :before-close="handleClose2">
<div style="height: 70vh;overflow-y: auto;">
<ValueTable ref="ValueTableDataLook" :url="$api.deviceScope.selectDeviceParameter"
:componentData="componentDataDataLook" :key="upIndex" />
@@ -197,8 +199,12 @@
verifyDialogVisible: false,
quashDialogVisible: false,
issuedDialogVisible: false,
+ issuedDialogVisible2: false,
dataDialogVisible: false,
formData: {},
+ formData0:{},
+ formData1:{},
+ formData2:{},
// 浜哄憳鍒楄〃
personList: [],
labelPosition: 'right',
@@ -240,21 +246,21 @@
method: 'handleIssued'
}],
tagField: {
- deviceStatus: {
+ type: {
select: [{
value: 0,
type: 'success',
- label: '姝ｅ父'
+ label: '鏅��'
}, {
value: 1,
type: 'warning',
- label: '鎶ュ簾'
+ label: '浼樺厛'
}, {
value: 2,
type: 'danger',
- label: '淇濅慨'
+ label: '绱ф��'
}]
- }
+ },
},
linkEvent:{
deviceName:{
@@ -326,8 +332,21 @@
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.getPower()
+ this.getAuthorizedPerson()
},
methods: {
+ getAuthorizedPerson(){
+ this.$axios.get(this.$api.deviceScope.selectDevicePrincipal).then(res => {
+ let data = []
+ res.data.forEach(a=>{
+ data.push({
+ label: a.name,
+ value: a.id
+ })
+ })
+ this.personList = data
+ })
+ },
refreshTable() {
this.$refs['ValueTable'].selectList()
},
@@ -367,6 +386,13 @@
this.dataDialogVisible = false;
this.upLoad = false;
},
+ handleClose2() {
+ this.verifyDialogVisible = false;
+ this.quashDialogVisible = false;
+ this.issuedDialogVisible = false;
+ this.dataDialogVisible = false;
+ this.upLoad = false;
+ },
// 璇︽儏
selectAllByOne(row) {
//鎵撳紑寮规
@@ -394,6 +420,28 @@
// 涓嬪彂
handleIssued(row) {
this.issuedDialogVisible = true;
+ this.issuedDialogVisible2 = true;
+ },
+ submitForm2(){
+ this.upLoad = true;
+ this.$axios.post(this.$api.insOrder.getDeviceManager, this.formData2, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code === 201) {
+ this.upLoad = false
+ return
+ }
+ this.$message.success('淇敼鎴愬姛')
+ this.upLoad = false
+ this.refreshTable()
+ this.dialogVisible = false
+ }).catch(e => {
+ this.$message.error('淇敼澶辫触')
+ this.dialogVisible = false
+ this.upLoad = false
+ })
},
submitForm() {
this.upLoad = true;
@@ -403,7 +451,7 @@
delete this.formData.createUser
delete this.formData.updateUser
this.formData.authorizedPerson = authorizedPerson
- this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
+ this.$axios.post(this.$api.insOrder.getDeviceManager, this.formData, {
headers: {
'Content-Type': 'application/json'
}
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index c203284..4b39e82 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -97,9 +97,9 @@
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addDia = true"></el-button>
</el-col>
</el-row>
- <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'label' }"
- node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current
- @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false">
+ <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" v-loading="treeLoad" :expand-on-click-node="false" :default-expanded-keys="expandedKeys">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row>
<el-col :span="21">
@@ -325,7 +325,8 @@
deviceGroup:{select:[]}
},
selectField: {},
- }
+ },
+ expandedKeys:[]
}
},
mounted() {
@@ -462,6 +463,13 @@
this.treeLoad = true
this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
this.list = res.data
+ this.list.forEach(a=>{
+ a.children.forEach(b=>{
+ b.children.forEach(c=>{
+ this.expandedKeys.push(c.label)
+ })
+ })
+ })
this.treeLoad = false
})
},
diff --git a/src/view/index.vue b/src/view/index.vue
index 3a373e8..200863a 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -162,8 +162,7 @@
}
.tag>.el-icon-s-unfold,
- .el-icon-s-fold,
- .tag>.el-icon-delete {
+ .el-icon-s-fold{
font-size: 16px;
cursor: pointer;
margin: 0 8px;
@@ -211,6 +210,11 @@
.active_tab i {
display: inline;
color: #3A7BFA;
+ border-radius: 50%;
+ }
+
+ .active_tab i:hover{
+ background-color: rgba(0, 0, 0, 0.08);
}
.component_view {
@@ -311,7 +315,6 @@
<i class="el-icon-close" @click="removeTab(ai)" v-if="tabActive!=0"></i>
</div>
</div>
- <i class="el-icon-delete" @click="allDel" title="鍒犻櫎鎵�鏈夋爣绛鹃〉"></i>
</div>
<div class="component_view">
<component class="com_index" v-for="(com, index) in tabs" :is="com.u" :key="com.k" v-show="com.k == tabActive"
--
Gitblit v1.9.3