From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a6-device-management.vue | 478 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 251 insertions(+), 227 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 9c54d17..ad072e5 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -55,13 +55,14 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">璁惧宸ュ叿鏄庣粏</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="dialogVisible2 = true">鏂板</el-button>
</el-col>
</el-row>
</div>
<div class="search">
<div class="search_thing">
<div class="search_label">鐘舵�侊細</div>
- <el-select v-model="componentData.entity.deviceStatus" placeholder="鍏ㄩ儴">
+ <el-select v-model="componentData.entity.deviceStatus" placeholder="鍏ㄩ儴" size="small">
<el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -76,19 +77,9 @@
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.specificationModel" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
- <div class="search_label">璁惧澶х被锛�</div>
- <el-select v-model="componentData.entity.largeCategory" placeholder="璇烽�夋嫨">
- <el-option v-for="item in equipmentList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- <el-col :span="12" style="text-align: right;">
- <el-button size="medium" type="primary" @click="dialogVisible2 = true">鏂板</el-button>
- </el-col>
</div>
</div>
<div class="table">
@@ -116,126 +107,121 @@
</div>
</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="閫夋嫨鏃ユ湡">
- </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-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-option v-for="item in authorizerList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-form>
- </el-col>
- </el-col>
- <!-- 涓棿甯冨眬 -->
- <el-col :span="7">
- <el-form :label-position="labelPosition" :model="formData" label-width="116px">
- <el-form-item label="璁惧鍚嶇О:">
+ <el-form :label-position="labelPosition" :model="formData" label-width="100px">
+ <el-form-item label="浠櫒鍚嶇О:">
<el-input :disabled="isUp" v-model="formData.deviceName" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鍐呴儴缂栫爜:">
- <el-input :disabled="isUp" v-model="formData.internalCode" size="small"></el-input>
- </el-form-item>
- <el-form-item label="璧勪骇缂栫爜:">
- <el-input :disabled="isUp" v-model="formData.assetCode" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍″噯鏃ユ湡锛堟湀锛�:">
- <el-date-picker :disabled="isUp" v-model="formData.calibrationDate" type="month" size="small"
- format="yyyy-MM" value-format="yyyy-MM" style="width:100%" placeholder="閫夋嫨鏈�">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鎶ュ簾鏃堕棿:">
- <el-date-picker style="width:100%" :disabled="isUp" v-model="formData.scrapTime" type="datetime"
- format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <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>
+ <el-form-item label="浠櫒鍚嶇ОEN:">
+ <el-input :disabled="isUp" v-model="formData.enDeviceName" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="瑙勬牸鍨嬪彿:">
+ <el-input :disabled="isUp" v-model="formData.specificationModel" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚:">
+ <el-input :disabled="isUp" v-model="formData.manufacturer" size="small"></el-input>
+ </el-form-item>
+ </el-form>
+ </el-col>
+ </el-col>
+ <!-- 涓棿甯冨眬 -->
+ <el-col :span="7">
+ <el-form :label-position="labelPosition" :model="formData" label-width="116px">
+ <el-form-item label="鏍″噯鏈嶅姟鏈烘瀯:">
+ <el-input :disabled="isUp" v-model="formData.calibrationServices" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鍑哄巶缂栧彿:">
<el-input :disabled="isUp" v-model="formData.factoryNo" size="small"></el-input>
- </el-form-item>
- <el-form-item label="璐疆鏃ユ湡:">
- <el-date-picker style="width:100%" :disabled="isUp" v-model="formData.acquisitionDate" type="datetime"
- size="small" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鍑嗙‘搴﹂噺鍊�:">
- <el-input :disabled="isUp" v-model="formData.accurateMeasurement" size="small"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞:">
- <el-input :disabled="isUp" v-model="formData.notes" size="small"></el-input>
- </el-form-item>
+ </el-form-item>
+ <el-form-item label="绠＄悊缂栧彿:">
+ <el-input :disabled="isUp" v-model="formData.managementNumber" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="璐疆鏃ユ湡:">
+ <el-date-picker :disabled="isUp" style="width:100%" v-model="formData.acquisitionDate" type="date"
+ format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鍚敤鏃ユ湡:">
+ <el-date-picker :disabled="isUp" style="width:100%" v-model="formData.activationDate" type="date"
+ format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="绠＄悊浜�:">
+ <el-select v-model="formData.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-option :disabled="isUp" 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-input :disabled="isUp" v-model="formData.storagePoint" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鎶�鏈寚鏍�:">
+ <el-input :disabled="isUp" v-model="formData.technicalIndicators" :rows="7" type="textarea" size="small"></el-input>
+ </el-form-item>
</el-form>
</el-col>
<!-- 鍙宠竟甯冨眬 -->
<el-col :span="7">
- <el-form :label-position="labelPosition" :model="formData" label-width="110px" ref="ruleForm">
- <el-form-item label="瑙勬牸鍨嬪彿:">
- <el-input :disabled="isUp" v-model="formData.specificationModel" size="small"></el-input>
+ <el-form :label-position="labelPosition" :model="formData" label-width="120px" ref="ruleForm">
+ <!-- 瀹為獙瀹ゅ垪琛� -->
+ <el-form-item label="鎵�灞為儴闂�:">
+ <el-select :disabled="isUp" v-model="formData.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-option v-for="item in subordinateDepartmentsList" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="妫�娴嬮」鐩�:">
+ <el-cascader
+ :disabled="isUp"
+ v-model="formData.insProductIds"
+ :options="options"
+ :show-all-levels="false"
+ :props="props"
+ placeholder="璇烽�夋嫨" size="small"
+ style="width:100%;"
+ :collapse-tags="!isUp"
+ separator=","
+ filterable
+ clearable></el-cascader>
+ </el-form-item>
+ <el-form-item label="鏈�杩戞牎鍑嗘棩鏈�:" v-if="isUp">
+ <el-date-picker :disabled="isUp" style="width:100%" v-model="formData.latestTraceability" format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" type="date" size="small" placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</el-form-item>
- <el-form-item label="璁惧鐘舵��:">
- <el-select :disabled="isUp" v-model="formData.deviceStatus" placeholder="璇烽�夋嫨" size="small"
- style="width:100%">
+ <el-form-item label="涓嬫鏍″噯鏃ユ湡:" v-if="isUp">
+ <el-date-picker :disabled="isUp" style="width:100%" v-model="formData.latestTraceability" format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" type="date" size="small" placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <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-input :disabled="isUp" v-model="formData.unitPrice" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="褰撳墠鐘舵��:">
+ <el-select :disabled="isUp" v-model="formData.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="瀛樻斁鐐�:">
- <el-input :disabled="isUp" v-model="formData.storagePoint" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏈�杩戣拷婧棩鏈�:">
- <el-date-picker style="width:100%" :disabled="isUp" v-model="formData.latestTraceability"
- format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="small"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <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="formData.downTime" type="datetime" size="small"
- placeholder="閫夋嫨鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="缁翠慨璁板綍:">
- <el-input :disabled="isUp" v-model="formData.maintenanceRecords" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚:">
- <el-input :disabled="isUp" v-model="formData.manufacturer" size="small"></el-input>
- </el-form-item>
- <el-form-item label="閲囪喘璐圭敤:">
- <el-input :disabled="isUp" v-model="formData.procurementCosts" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍″噯璇佷功:">
- <el-input :disabled="isUp" v-model="formData.calibrationCerticate" size="small"></el-input>
- </el-form-item>
- <el-form-item v-if="!isUp" label="鍥剧墖:">
+ <el-form-item label="鏍″噯鍛ㄦ湡锛堟湀锛�:">
+ <el-input :disabled="isUp" v-model="formData.calibrationDate" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鍥剧墖:">
<div
style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
<div v-show="formData.imageName" class="picName">{{formData.imageName}}</div>
- <el-upload :action="action" :on-success="handleSuccessUpImg" :show-file-list="false"
+ <el-upload :disabled="isUp" :action="action" :on-success="handleSuccessUpImg2" :show-file-list="false"
accept='image/jpg,image/jpeg,image/png' :headers="headers" :on-change="beforeUpload"
:on-error="onError" ref='upload'>
- <el-button type="text" style="height:30px;paddingTop:8px">涓婁紶</el-button>
+ <el-button type="text" style="height:30px;padding-top:8px">涓婁紶</el-button>
</el-upload>
</div>
</el-form-item>
@@ -272,113 +258,105 @@
</div>
</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 :label-position="labelPosition" :model="formData2" label-width="100px">
+ <el-form-item label="浠櫒鍚嶇О:">
+ <el-input v-model="formData2.deviceName" size="small"></el-input>
</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="閫夋嫨鏃ユ湡">
- </el-date-picker>
+ <el-form-item label="浠櫒鍚嶇ОEN:">
+ <el-input v-model="formData2.enDeviceName" size="small"></el-input>
</el-form-item>
- <el-form-item label="璁惧璐熻矗浜�:">
- <el-select v-model="formData2.equipmentManager" 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 label="瑙勬牸鍨嬪彿:">
+ <el-input v-model="formData2.specificationModel" size="small"></el-input>
</el-form-item>
- <el-form-item label="琚巿鏉冧汉:">
- <el-select v-model="formData2.authorizedPerson" size="small" multiple placeholder="璇烽�夋嫨"
- style="width:100%">
- <el-option v-for="item in authorizerList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
+ <el-form-item label="鐢熶骇鍘傚:">
+ <el-input v-model="formData2.manufacturer" size="small"></el-input>
</el-form-item>
</el-form>
</el-col>
</el-col>
<!-- 涓棿甯冨眬 -->
<el-col :span="7">
- <el-form :label-position="labelPosition" :model="formData2" label-width="116px">
- <el-form-item label="璁惧鍚嶇О:">
- <el-input v-model="formData2.deviceName" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鍐呴儴缂栫爜:">
- <el-input v-model="formData2.internalCode" size="small"></el-input>
- </el-form-item>
- <el-form-item label="璧勪骇缂栫爜:">
- <el-input v-model="formData2.assetCode" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍″噯鏃ユ湡锛堟湀锛�:">
- <el-date-picker v-model="formData2.calibrationDate" type="month" size="small" format="yyyy-MM"
- value-format="yyyy-MM" style="width:100%" placeholder="閫夋嫨鏈�">
+ <el-form :label-position="labelPosition" :model="formData2" label-width="110px">
+ <!-- <el-form-item label="鐢熶骇鍘傚EN:">
+ <el-input v-model="formData2.factoryNo" size="small"></el-input>
+ </el-form-item> -->
+ <el-form-item label="鏍″噯鏈嶅姟鏈烘瀯:">
+ <el-input v-model="formData2.calibrationServices" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鍑哄巶缂栧彿:">
+ <el-input v-model="formData2.factoryNo" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="绠＄悊缂栧彿:">
+ <el-input v-model="formData2.managementNumber" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="璐疆鏃ユ湡:">
+ <el-date-picker style="width:100%" v-model="formData2.acquisitionDate" type="date"
+ format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="鎶ュ簾鏃堕棿:">
- <el-date-picker style="width:100%" v-model="formData2.scrapTime" type="datetime"
- format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃堕棿">
+ <el-form-item label="鍚敤鏃ユ湡:">
+ <el-date-picker style="width:100%" v-model="formData2.activationDate" type="date"
+ format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="楠屾敹璁板綍:">
- <el-input v-model="formData2.acceptanceRecords" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鍑哄巶缂栧彿:">
- <el-input v-model="formData2.factoryNo" size="small"></el-input>
- </el-form-item>
- <el-form-item label="璐疆鏃ユ湡:">
- <el-date-picker style="width:100%" v-model="formData2.acquisitionDate" type="datetime" size="small"
- format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鍑嗙‘搴﹂噺鍊�:">
- <el-input v-model="formData2.accurateMeasurement" size="small"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞:">
- <el-input v-model="formData2.notes" size="small"></el-input>
- </el-form-item>
+ <el-form-item label="绠＄悊浜�:">
+ <el-select v-model="formData2.equipmentManager" 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-input v-model="formData2.storagePoint" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鎶�鏈寚鏍�:">
+ <el-input v-model="formData2.technicalIndicators" :rows="7" type="textarea" size="small"></el-input>
+ </el-form-item>
</el-form>
</el-col>
<!-- 鍙宠竟甯冨眬 -->
<el-col :span="7">
- <el-form :label-position="labelPosition" :model="formData2" label-width="110px" ref="ruleForm">
- <el-form-item label="瑙勬牸鍨嬪彿:">
- <el-input v-model="formData2.specificationModel" size="small"></el-input>
- </el-form-item>
- <el-form-item label="璁惧鐘舵��:">
+ <el-form :label-position="labelPosition" :model="formData2" label-width="120px" ref="ruleForm">
+ <!-- 瀹為獙瀹ゅ垪琛� -->
+ <el-form-item label="鎵�灞為儴闂�:">
+ <el-select v-model="formData2.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-option v-for="item in subordinateDepartmentsList" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="妫�娴嬮」鐩�:">
+ <el-cascader
+ v-model="formData2.insProductIds"
+ :options="options"
+ :show-all-levels="false"
+ :props="props"
+ placeholder="璇烽�夋嫨" size="small"
+ style="width:100%"
+ collapse-tags
+ separator=","
+ filterable
+ clearable></el-cascader>
+ </el-form-item>
+ <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-input v-model="formData2.unitPrice" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="褰撳墠鐘舵��:">
<el-select v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
- <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in deviceStatusList" :key="item.id" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="瀛樻斁鐐�:">
- <el-input v-model="formData2.storagePoint" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏈�杩戣拷婧棩鏈�:">
- <el-date-picker style="width:100%" v-model="formData2.latestTraceability" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="small" placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鍋滅敤鏃堕棿:">
- <el-date-picker style="width:100%" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
- v-model="formData2.downTime" type="datetime" size="small" placeholder="閫夋嫨鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="缁翠慨璁板綍:">
- <el-input v-model="formData2.maintenanceRecords" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚:">
- <el-input v-model="formData2.manufacturer" size="small"></el-input>
- </el-form-item>
- <el-form-item label="閲囪喘璐圭敤:">
- <el-input v-model="formData2.procurementCosts" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍″噯璇佷功:">
- <el-input v-model="formData2.calibrationCerticate" size="small"></el-input>
- </el-form-item>
+ <el-form-item label="鏍″噯鍛ㄦ湡锛堟湀锛�:">
+ <el-input v-model="formData2.calibrationDate" size="small"></el-input>
+ </el-form-item>
<el-form-item label="鍥剧墖:">
<div
style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
@@ -413,12 +391,14 @@
return {
//鏄惁鏄。妗堜慨璁� true涓嶆槸 false鏄�
isUp: true,
- formData: {},
+ formData: {
+ },
formData2: {
imageUpload: '',
imageName: ''
},
value: '',
+ props: { multiple: true,emitPath:false,value:'id',label:'name' },
options: [],
labelPosition: 'right',
dialogVisible: false,
@@ -432,7 +412,7 @@
largeCategory: null,
orderBy: {
field: 'id',
- order: 'asc'
+ order: 'desc'
}
},
isIndex: true,
@@ -451,26 +431,17 @@
}],
tagField: {
deviceStatus: {
- select: [{
- value: 0,
- type: 'success',
- label: '姝ｅ父'
- }, {
- value: 1,
- type: 'warning',
- label: '鎶ュ簾'
- }, {
- value: 2,
- type: 'danger',
- label: '淇濅慨'
- }]
+ select: []
},
equipmentManager: {
select: []
},
authorizedPerson: {
select: []
- }
+ },
+ insProductIds:{
+ select:[]
+ }
},
linkEvent: {
deviceName: {
@@ -484,7 +455,11 @@
},
equipmentManager: {
select: []
- }
+ },
+ insProductIds:{
+ select:[],
+ choose: true
+ }
},
requiredAdd: [],
requiredUp: []
@@ -499,8 +474,10 @@
responsiblePersonList: [],
// 鎺堟潈浜哄垪琛�
authorizerList: [],
- // 璁惧鐘舵�佸垪琛�
+ // 褰撳墠鐘舵�佸垪琛�
deviceStatusList: [],
+ // 鎵�灞為儴闂�
+ subordinateDepartmentsList: [],
upLoad: false,
upLoad2: false,
}
@@ -521,8 +498,22 @@
// this.getAuthorizedPerson()
this.selectEnumByCategory()
this.selectDevicePrincipal()
+ this.obtainItemParameterList()
+ this.getInsProductIds()
},
methods: {
+ obtainItemParameterList() {
+ this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
+ let data = []
+ res.data.forEach(a=>{
+ data.push({
+ label: a.laboratoryName,
+ value: a.id
+ })
+ })
+ this.subordinateDepartmentsList = data
+ })
+ },
refreshTable() {
this.$refs['ValueTable'].selectList()
},
@@ -561,6 +552,12 @@
category: "璁惧鐘舵��"
}).then(res => {
this.deviceStatusList = res.data
+ this.deviceStatusList.forEach(a=>{
+ if(!isNaN(a.value)){
+ a.value = parseInt(a.value)
+ }
+ })
+ this.componentData.tagField.deviceStatus.select = res.data
})
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "璁惧鍒嗙被"
@@ -584,11 +581,38 @@
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 = m.name;
+ let children = m.children.map(n=>{
+ n.label = n.name;
+ n.value = n.id;
+ return n
+ })
+ 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.formData = {}
+ this.formData2 = {
+ imageUpload: '',
+ imageName: ''
+ }
this.dialogVisible = false;
this.upLoad = false;
},
handleClose2() {
+ this.formData = {}
+ this.formData2 = {
+ imageUpload: '',
+ imageName: ''
+ }
this.dialogVisible2 = false;
this.upLoad = false;
},
@@ -599,7 +623,7 @@
//row = 鐐瑰嚮瀵瑰簲琛屽��
//澶嶅埗缁檉ormData
this.formData = this.HaveJson(row);
- this.formData.authorizedPerson = row.authorizedPerson ? row.authorizedPerson.split(',') : [];
+ this.formData.insProductIds = row.insProductIds ? row.insProductIds.split(',') : [];
},
isUpdate(row) {
//淇敼 isUp 涓烘。妗堜慨鏀�
@@ -609,7 +633,10 @@
//row = 鐐瑰嚮瀵瑰簲琛屽�间竴琛屽��
//澶嶅埗缁檉ormData
this.formData = this.HaveJson(row);
- this.formData.authorizedPerson = row.authorizedPerson ? row.authorizedPerson.split(',') : [];
+ if(typeof(row.insProductIds)==='number'){
+ row.insProductIds = row.insProductIds+''
+ }
+ this.formData.insProductIds = row.insProductIds ? row.insProductIds.split(',') : [];
},
beforeUpload(file) {
if (file.size > 1024 * 1024 * 10) {
@@ -640,13 +667,12 @@
}
},
submitForm() {
- this.upLoad = true;
- let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
delete this.formData.createTime
delete this.formData.updateTime
delete this.formData.createUser
delete this.formData.updateUser
- this.formData.authorizedPerson = authorizedPerson
+ this.formData.insProductIds = this.formData.insProductIds.join()
+ this.upLoad = true;
this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
headers: {
'Content-Type': 'application/json'
@@ -668,9 +694,7 @@
},
submitForm2() {
this.upLoad2 = true;
- let authorizedPerson = this.formData2.authorizedPerson.length > 0 ? this.formData2.authorizedPerson.join(',') :
- ''
- this.formData2.authorizedPerson = authorizedPerson
+ this.formData2.insProductIds = this.formData2.insProductIds.join()
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
headers: {
'Content-Type': 'application/json'
--
Gitblit v1.9.3