From 998b76da54ab3556592d6f6329e0150327fb2195 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 四月 2024 11:01:42 +0800
Subject: [PATCH] 修改设备工具明细'
---
src/main.js | 3 +
src/components/view/a6-device-management.vue | 74 ++++++++++++++++++++++++++++--------
src/assets/api/controller.js | 1
3 files changed, 60 insertions(+), 18 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index ecb0d36..5fa4b80 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -100,6 +100,7 @@
delTestObject: "/capacityScope/delTestObject", //鍒犻櫎妫�娴嬪璞�
upTestObject: "/capacityScope/upTestObject", //淇敼妫�娴嬪璞�
selectTestObjectByName: "/capacityScope/selectTestObjectByName", //鑾峰彇妫�楠屽璞℃灇涓�
+ getInsProduction: "/capacityScope/getInsProduction", //璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)
}
const laboratoryScope = {
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 9c54d17..718be7c 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -117,13 +117,6 @@
</el-image>
<!-- 琛ㄥ崟 -->
<el-form :label-position="labelPosition" :model="formData" label-width="90px">
- <el-form-item label="璁惧鍒嗙被:">
- <el-select :disabled="isUp" v-model="formData.largeCategory" placeholder="璇烽�夋嫨" size="small"
- style="width:100%">
- <el-option v-for="item in equipmentList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="鍑哄巶鏃ユ湡:">
<el-date-picker style="width:100%" :disabled="isUp" v-model="formData.dateProduction" type="datetime"
size="small" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鏃ユ湡">
@@ -143,6 +136,18 @@
<el-option v-for="item in authorizerList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
+ </el-form-item>
+ <el-form-item label="妫�楠岄」鐩�:">
+ <el-cascader
+ v-model="formData.insProductIds"
+ :options="options"
+ :show-all-levels="false"
+ :props="props"
+ placeholder="璇烽�夋嫨" size="small"
+ style="width:100%"
+ collapse-tags
+ separator=","
+ clearable></el-cascader>
</el-form-item>
</el-form>
</el-col>
@@ -172,7 +177,7 @@
<el-form-item label="楠屾敹璁板綍:">
<el-input :disabled="isUp" v-model="formData.acceptanceRecords" size="small"></el-input>
</el-form-item>
- <el-form-item label="鍑哄巶缂栧彿:">
+ <el-form-item label="璁惧缂栫爜:">
<el-input :disabled="isUp" v-model="formData.factoryNo" size="small"></el-input>
</el-form-item>
<el-form-item label="璐疆鏃ユ湡:">
@@ -273,12 +278,6 @@
</el-image>
<!-- 琛ㄥ崟 -->
<el-form :label-position="labelPosition" :model="formData2" label-width="90px">
- <el-form-item label="璁惧鍒嗙被:">
- <el-select v-model="formData2.largeCategory" placeholder="璇烽�夋嫨" size="small" style="width:100%">
- <el-option v-for="item in equipmentList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="鍑哄巶鏃ユ湡:">
<el-date-picker style="width:100%" v-model="formData2.dateProduction" type="datetime" size="small"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鏃ユ湡">
@@ -297,6 +296,18 @@
<el-option v-for="item in authorizerList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
+ </el-form-item>
+ <el-form-item label="妫�楠岄」鐩�:">
+ <el-cascader
+ v-model="formData.insProductIds"
+ :options="options"
+ :show-all-levels="false"
+ :props="props"
+ placeholder="璇烽�夋嫨" size="small"
+ style="width:100%"
+ collapse-tags
+ separator=","
+ clearable></el-cascader>
</el-form-item>
</el-form>
</el-col>
@@ -326,7 +337,7 @@
<el-form-item label="楠屾敹璁板綍:">
<el-input v-model="formData2.acceptanceRecords" size="small"></el-input>
</el-form-item>
- <el-form-item label="鍑哄巶缂栧彿:">
+ <el-form-item label="璁惧缂栫爜:">
<el-input v-model="formData2.factoryNo" size="small"></el-input>
</el-form-item>
<el-form-item label="璐疆鏃ユ湡:">
@@ -419,6 +430,7 @@
imageName: ''
},
value: '',
+ props: { multiple: true,emitPath:false,value:'id',label:'name' },
options: [],
labelPosition: 'right',
dialogVisible: false,
@@ -470,7 +482,10 @@
},
authorizedPerson: {
select: []
- }
+ },
+ insProductIds:{
+ select:[]
+ }
},
linkEvent: {
deviceName: {
@@ -484,7 +499,11 @@
},
equipmentManager: {
select: []
- }
+ },
+ insProductIds:{
+ select:[],
+ choose: true
+ }
},
requiredAdd: [],
requiredUp: []
@@ -521,6 +540,7 @@
// this.getAuthorizedPerson()
this.selectEnumByCategory()
this.selectDevicePrincipal()
+ this.getInsProductIds()
},
methods: {
refreshTable() {
@@ -584,6 +604,24 @@
this.componentData.tagField.authorizedPerson = data
})
},
+ getInsProductIds(){
+ this.$axios.post(this.$api.capacityScope.getInsProduction).then(res => {
+ this.componentData.tagField.insProductIds.select = []
+ this.componentData.selectField.insProductIds.select = []
+ this.options = res.data.map((m,i)=>{
+ m.id = i;
+ let children = m.children.map(n=>{
+ n.label = n.name;
+ n.value = n.id;
+ return n
+ })
+ console.log(123,children)
+ this.componentData.tagField.insProductIds.select = [...this.componentData.tagField.insProductIds.select,...children]
+ this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
+ return m
+ })
+ })
+ },
handleClose() {
this.dialogVisible = false;
this.upLoad = false;
@@ -647,6 +685,7 @@
delete this.formData.createUser
delete this.formData.updateUser
this.formData.authorizedPerson = authorizedPerson
+ this.formData.insProductIds = JSON.stringify(this.formData.insProductIds)
this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
headers: {
'Content-Type': 'application/json'
@@ -671,6 +710,7 @@
let authorizedPerson = this.formData2.authorizedPerson.length > 0 ? this.formData2.authorizedPerson.join(',') :
''
this.formData2.authorizedPerson = authorizedPerson
+ this.formData.insProductIds = JSON.stringify(this.formData.insProductIds)
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
headers: {
'Content-Type': 'application/json'
diff --git a/src/main.js b/src/main.js
index b4a6209..31d5bfc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,7 +14,8 @@
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://192.168.0.24:8001';//鏉�
-const javaApi = 'http://192.168.11.249:8001';//寮�
+// const javaApi = 'http://192.168.11.249:8001';//寮�
+const javaApi = 'http://192.168.11.50:8001';//濮�
// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
--
Gitblit v1.9.3