From ebb8e1fd49f89323d561b1f78547fc1bc129e3b7 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期二, 12 三月 2024 09:08:37 +0800
Subject: [PATCH] 6 设备工具明细 功能调整
---
src/components/view/a6-device-management.vue | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 57f7967..150759a 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -149,18 +149,18 @@
</el-date-picker>
</el-form-item>
<el-form-item label="璁惧璐熻矗浜�:" >
- <el-select :disabled="isUp" v-model="formData.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select :disabled="isUp" v-model="formData.getDeviceManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option
v-for="item in responsiblePersonList"
:key="item.value"
:label="item.label"
:value="item.value"
- >
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="琚巿鏉冧汉:" >
- <el-select :disabled="isUp" v-model="formData.authorizedPerson" size="small" multiple placeholder="璇烽�夋嫨" style="width:100%">
+ <el-select :disabled="isUp" v-model="formData.getDeviceManager" size="small" multiple placeholder="璇烽�夋嫨" style="width:100%">
<el-option
v-for="item in authorizerList"
:key="item.value"
@@ -345,7 +345,7 @@
<!-- 琛ㄥ崟 -->
<el-form :label-position="labelPosition" :model="formData2" label-width="90px">
<el-form-item label="璁惧鍒嗙被:" >
- <el-select :disabled="isUp" v-model="formData2.largeCategory" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="formData2.largeCategory" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option
v-for="item in equipmentList"
:key="item.value"
@@ -358,7 +358,6 @@
<el-form-item label="鍑哄巶鏃ユ湡:">
<el-date-picker
style="width:100%"
- :disabled="isUp"
v-model="formData2.dateProduction"
type="datetime"
size="small"
@@ -368,7 +367,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="璁惧璐熻矗浜�:" >
- <el-select :disabled="isUp" v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option
v-for="item in responsiblePersonList"
:key="item.value"
@@ -379,7 +378,7 @@
</el-select>
</el-form-item>
<el-form-item label="琚巿鏉冧汉:" >
- <el-select :disabled="isUp" v-model="formData2.authorizedPerson" size="small" multiple placeholder="璇烽�夋嫨" style="width:100%">
+ <el-select v-model="formData2.authorizedPerson" size="small" multiple placeholder="璇烽�夋嫨" style="width:100%">
<el-option
v-for="item in authorizerList"
:key="item.value"
@@ -395,17 +394,16 @@
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData2" label-width="116px">
<el-form-item label="璁惧鍚嶇О:" >
- <el-input :disabled="isUp" v-model="formData2.deviceName" size="small"></el-input>
+ <el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="鍐呴儴缂栫爜:">
- <el-input :disabled="isUp" v-model="formData2.internalCode" size="small"></el-input>
+ <el-input v-model="formData2.internalCode" size="small"></el-input>
</el-form-item>
<el-form-item label="璧勪骇缂栫爜:" >
- <el-input :disabled="isUp" v-model="formData2.assetCode" size="small"></el-input>
+ <el-input v-model="formData2.assetCode" size="small"></el-input>
</el-form-item>
<el-form-item label="鏍″噯鏃ユ湡锛堟湀锛�:" >
<el-date-picker
- :disabled="isUp"
v-model="formData2.calibrationDate"
type="month"
size="small"
@@ -418,7 +416,6 @@
<el-form-item label="鎶ュ簾鏃堕棿:" >
<el-date-picker
style="width:100%"
- :disabled="isUp"
v-model="formData2.scrapTime"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
@@ -428,15 +425,14 @@
</el-date-picker>
</el-form-item>
<el-form-item label="楠屾敹璁板綍:" >
- <el-input :disabled="isUp" v-model="formData2.acceptanceRecords" size="small"></el-input>
+ <el-input v-model="formData2.acceptanceRecords" size="small"></el-input>
</el-form-item>
<el-form-item label="鍑哄巶缂栧彿:" >
- <el-input :disabled="isUp" v-model="formData2.factoryNo" size="small"></el-input>
+ <el-input v-model="formData2.factoryNo" size="small"></el-input>
</el-form-item>
<el-form-item label="璐疆鏃ユ湡:" >
<el-date-picker
style="width:100%"
- :disabled="isUp"
v-model="formData2.acquisitionDate"
type="datetime"
size="small"
@@ -446,10 +442,10 @@
</el-date-picker>
</el-form-item>
<el-form-item label="鍑嗙‘搴﹂噺鍊�:" >
- <el-input :disabled="isUp" v-model="formData2.accurateMeasurement" size="small"></el-input>
+ <el-input v-model="formData2.accurateMeasurement" size="small"></el-input>
</el-form-item>
<el-form-item label="澶囨敞:" >
- <el-input :disabled="isUp" v-model="formData2.notes" size="small"></el-input>
+ <el-input v-model="formData2.notes" size="small"></el-input>
</el-form-item>
</el-form>
</el-col>
@@ -457,10 +453,10 @@
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData2" label-width="110px" ref="ruleForm">
<el-form-item label="瑙勬牸鍨嬪彿:" >
- <el-input :disabled="isUp" v-model="formData2.specificationModel" size="small"></el-input>
+ <el-input v-model="formData2.specificationModel" size="small"></el-input>
</el-form-item>
<el-form-item label="璁惧鐘舵��:">
- <el-select :disabled="isUp" v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option
v-for="item in deviceStatusList"
:key="item.value"
@@ -471,12 +467,11 @@
</el-select>
</el-form-item>
<el-form-item label="瀛樻斁鐐�:" >
- <el-input :disabled="isUp" v-model="formData2.storagePoint" size="small"></el-input>
+ <el-input v-model="formData2.storagePoint" size="small"></el-input>
</el-form-item>
<el-form-item label="鏈�杩戣拷婧棩鏈�:" >
<el-date-picker
style="width:100%"
- :disabled="isUp"
v-model="formData2.latestTraceability"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -488,7 +483,6 @@
<el-form-item label="鍋滅敤鏃堕棿:" >
<el-date-picker
style="width:100%"
- :disabled="isUp"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="formData2.downTime"
@@ -498,16 +492,16 @@
</el-date-picker>
</el-form-item>
<el-form-item label="缁翠慨璁板綍:" >
- <el-input :disabled="isUp" v-model="formData2.maintenanceRecords" size="small"></el-input>
+ <el-input v-model="formData2.maintenanceRecords" size="small"></el-input>
</el-form-item>
<el-form-item label="鐢熶骇鍘傚:" >
- <el-input :disabled="isUp" v-model="formData2.manufacturer" size="small" ></el-input>
+ <el-input v-model="formData2.manufacturer" size="small" ></el-input>
</el-form-item>
<el-form-item label="閲囪喘璐圭敤:" >
- <el-input :disabled="isUp" v-model="formData2.procurementCosts" size="small"></el-input>
+ <el-input v-model="formData2.procurementCosts" size="small"></el-input>
</el-form-item>
<el-form-item label="鏍″噯璇佷功:" >
- <el-input :disabled="isUp" v-model="formData2.calibrationCerticate" size="small"></el-input>
+ <el-input v-model="formData2.calibrationCerticate" size="small"></el-input>
</el-form-item>
<el-form-item v-if="!isUp" label="鍥剧墖:" >
<div style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
@@ -673,12 +667,12 @@
},
// 鑾峰彇鎺堟潈浜�
getAuthorizedPerson(){
- this.$axios.get(this.$api.deviceScope.authorizedPerson).then(res => {
+ this.$axios.get(this.$api.deviceScope.selectDevicePrincipal).then(res => {
let data = []
res.data.forEach(a=>{
data.push({
- label: a.authorizedPerson,
- value: a.authorizedPerson
+ label: a.name,
+ value: a.id
})
})
this.authorizerList = data
@@ -703,8 +697,8 @@
let data = []
res.data.forEach(a=>{
data.push({
- label: a.equipmentManager,
- value: a.equipmentManager
+ label: a.name,
+ value: a.id
})
})
this.responsiblePersonList = data
--
Gitblit v1.9.3