From 6140eb0f56b7adae1d4e41dbd4a1ac582dd17d9b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 11:23:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/resourceDemand/device/component/files.vue | 124 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 55 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index 40ac949..1850918 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -7,7 +7,7 @@
<el-button type="primary" size="small" @click="openEditForm" style="">淇妗ｆ</el-button>
<el-button type="primary" size="small" @click="dialogVisible1 = true" style="">娣诲姞闄勪欢</el-button>
<el-button type="primary" size="small" @click="deviceDialog = true" style="">鏌ョ湅璁惧浜岀淮鐮�</el-button>
- <el-button type="primary" size="small" @click="handleDownOne" style="">瀵煎嚭</el-button>
+<!-- <el-button type="primary" size="small" @click="handleDownOne" style="">瀵煎嚭</el-button>-->
</div>
</div>
<el-divider></el-divider>
@@ -16,7 +16,7 @@
<el-col :span="6">
<!-- 鍔犳椂闂存埑閬垮厤娴忚鍣ㄧ紦瀛橀棶棰� -->
<el-image :src="`${javaApi}/img/${Mdata.imageUpload}`" fit="fill" :key="'personalPicture' + timeStamp"
- style="width: 200px;height: 300px;border: 1px solid #000;border-radius: 10px;margin-left: 30px;margin-top: 20px;">
+ style="width: 200px;height: 300px;border: 1px solid #000;border-radius: 10px;margin-left: 30px;margin-top: 20px;">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline" style="font-size: 40px;"></i>
</div>
@@ -26,8 +26,11 @@
<div class="form-item">
<label>璁惧鍚嶇О</label>
<!-- <p>{{ Mdata.deviceName }}</p> -->
- <el-tooltip class="item" :content="Mdata.deviceName">
- <span class="text-ellipsis">{{ Mdata.deviceName }}</span>
+ <el-tooltip
+ class="item"
+ :content="Mdata.deviceName"
+ >
+ <span class="text-ellipsis" >{{ Mdata.deviceName }}</span>
</el-tooltip>
</div>
<div class="form-item">
@@ -46,8 +49,11 @@
<div class="form-item">
<label>鐢熶骇鍘傚</label>
<!-- <p>{{ Mdata.manufacturer }}</p> -->
- <el-tooltip class="item" :content="Mdata.manufacturer">
- <span class="text-ellipsis">{{ Mdata.manufacturer }}</span>
+ <el-tooltip
+ class="item"
+ :content="Mdata.manufacturer"
+ >
+ <span class="text-ellipsis" >{{ Mdata.manufacturer }}</span>
</el-tooltip>
</div>
<div class="form-item">
@@ -60,7 +66,7 @@
<p>{{ Mdata.acquisitionDate | formaterDateTime }}</p>
</div>
<div class="form-item">
- <label>鏍″噯鏈夋晥鏈�</label>
+ <label>鍚敤鏃ユ湡</label>
<p>{{ Mdata.activationDate | formaterDateTime }}</p>
</div>
<div class="form-item">
@@ -74,7 +80,10 @@
</div>
<div class="form-item">
<label>鍑嗙‘搴﹂噺鍊�</label>
- <el-tooltip class="item" :content="Mdata.technicalIndicators">
+ <el-tooltip
+ class="item"
+ :content="Mdata.technicalIndicators"
+ >
<span class="text-ellipsis">{{ Mdata.technicalIndicators }}</span>
</el-tooltip>
<!-- <p>{{ Mdata.technicalIndicators }}</p> -->
@@ -105,10 +114,10 @@
<div class="form-items">
<label>璁惧鐘舵��</label>
<el-radio-group v-model="Mdata.deviceStatus" style="margin-left: 10px;">
- <el-radio :label="0" :disabled="Mdata.deviceStatus != 0">姝ｅ父</el-radio>
- <el-radio :label="1" :disabled="Mdata.deviceStatus != 1">缁翠慨</el-radio>
- <el-radio :label="2" :disabled="Mdata.deviceStatus != 2">鍋滅敤</el-radio>
- <el-radio :label="3" :disabled="Mdata.deviceStatus != 3">鎶ュ簾</el-radio>
+ <el-radio :label="0" :disabled="Mdata.deviceStatus != 0">姝ｅ父</el-radio>
+ <el-radio :label="1" :disabled="Mdata.deviceStatus != 1">缁翠慨</el-radio>
+ <el-radio :label="2" :disabled="Mdata.deviceStatus != 2">鍋滅敤</el-radio>
+ <el-radio :label="3" :disabled="Mdata.deviceStatus != 3">鎶ュ簾</el-radio>
</el-radio-group>
</div>
<div class="form-item">
@@ -121,8 +130,13 @@
</div>
<div class="form-item">
<label>妫�楠岄」</label>
- <el-tooltip class="item" effect="dark" :content="Mdata.insProductItem" placement="top">
- <span class="text-ellipsis">{{ Mdata.insProductItem }}</span>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ :content="Mdata.insProductItem"
+ placement="top"
+ >
+ <span class="text-ellipsis" >{{ Mdata.insProductItem }}</span>
</el-tooltip>
</div>
<div class="form-item">
@@ -131,16 +145,16 @@
</div>
<div class="form-item">
- <label>鏈�杩戞牎鍑嗘棩鏈�</label>
+ <label>鏈�杩戞函婧愭棩鏈�</label>
<p>{{ Mdata.lastCalibrationDate | formaterDateTime }}</p>
- </div>
- <div class="form-item">
- <label>涓嬫鏍″噯鏃ユ湡</label>
- <p>{{ Mdata.nextCalibrationDate | formaterDateTime }}</p>
</div>
<div class="form-item">
<label>閲囪喘璐圭敤(鍏�)</label>
<p>{{ Mdata.unitPrice }}</p>
+ </div>
+ <div class="form-item">
+ <label>鍋滅敤鏃堕棿</label>
+ <p>{{ Mdata.nextCalibrationDate | formaterDateTime }}</p>
</div>
<div class="form-item">
<label>璁惧璐熻矗浜�</label>
@@ -170,27 +184,27 @@
<el-table-column prop="quantity" label="浠芥暟" min-width="80" />
<el-table-column prop="pageCount" label="椤电爜" min-width="80" />
<el-table-column prop="provider" label="鎻愪緵鑰�" min-width="150" />
- <el-table-column prop="provideDate" label="褰掓。鏃ユ湡" min-width="150" />
+ <el-table-column prop="provideDate" label="鎻愪緵鏃ユ湡" min-width="150" />
<el-table-column prop="comments" label="澶囨敞" min-width="150" />
<el-table-column fixed="right" label="鎿嶄綔" min-width="180">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleAttachmentClick(scope.row)">涓嬭浇闄勪欢</el-button>
- <el-button type="text" size="small" @click="handleViewClick(scope.row)">缂栬緫</el-button>
+ <el-button type="text" size="small" @click="handleViewClick(scope.row)">鏌ョ湅</el-button>
<el-button type="text" size="small" @click="handleDeleteClick(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 淇 -->
- <el-dialog title="妗ｆ淇" top="5vh" :visible.sync="dialogVisible" width="70%" @open="openFileRevisionDialog"
- :before-close="handleClose">
- <el-row style="display:flex;justify-content: space-around;max-height: 75vh;overflow-y: auto;">
+ <el-dialog title="淇妗ｆ" top="5vh" :visible.sync="dialogVisible" width="70%" @open="openFileRevisionDialog"
+ :before-close="handleClose">
+ <el-row style="display:flex;justify-content: space-around;">
<!-- 宸﹁竟甯冨眬 -->
<el-col :span="7">
<el-col>
<!-- 鍥剧墖 -->
<el-image class="img" style="width:100%;height: 320px;margin-bottom:16px"
- :src="javaApi + '/img/' + editData.imageUpload">
+ :src="javaApi + '/img/' + editData.imageUpload">
<div slot="error" class="image-error" style="width: calc(100% - 2px);
height: 318px;
border-radius: 16px;
@@ -222,7 +236,7 @@
<el-col :span="7">
<el-form :model="editData" label-width="116px" ref="rules2" :rules="rules1">
<el-form-item label="鏍″噯鏈嶅姟鏈烘瀯:">
- <el-input v-model="editData.calibrationServices" size="small"></el-input>
+ <el-input v-model="editData.calibrationServices" disabled size="small"></el-input>
</el-form-item>
<el-form-item label="璧勪骇缂栫爜:">
<el-input v-model="editData.assetCode" size="small"></el-input>
@@ -238,12 +252,12 @@
</el-form-item>
<el-form-item label="璐疆鏃ユ湡:">
<el-date-picker style="width:100%" v-model="editData.acquisitionDate" type="date" format="yyyy-MM-dd"
- value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃ユ湡">
+ value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="鏍″噯鏈夋晥鏈�:" prop="activationDate">
+ <el-form-item label="鍚敤鏃ユ湡:" prop="activationDate">
<el-date-picker style="width:100%" v-model="editData.activationDate" type="date" format="yyyy-MM-dd"
- value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃ユ湡">
+ value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item label="璐熻矗浜�:">
@@ -264,28 +278,28 @@
<el-col :span="7">
<el-form :model="editData" label-width="140px" ref="ruleForm" :rules="rules1">
<!-- 瀹為獙瀹ゅ垪琛� -->
- <el-form-item label="鎵�灞為儴闂�:" prop="subordinateDepartmentsId">
+ <el-form-item label="鎵�灞為儴闂�:">
<el-select v-model="editData.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option v-for="item in subordinateDepartmentsList" :key="item.value" :label="item.label"
- :value="item.value">
+ :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="妫�娴嬮」鐩�:">
<el-cascader v-model="editData.insProductIds" :options="options" :show-all-levels="false" :props="props"
- placeholder="璇烽�夋嫨" size="small" style="width:100%;" :collapse-tags="true" separator="," filterable
- clearable></el-cascader>
+ placeholder="璇烽�夋嫨" size="small" style="width:100%;" :collapse-tags="true" separator="," filterable
+ clearable></el-cascader>
</el-form-item>
- <el-form-item label="鏈�杩戞牎鍑嗘棩鏈�:">
- <el-date-picker style="width:100%" v-model="editData.lastCalibrationDate" format="yyyy-MM-dd"
+ <!-- <el-form-item label="鏈�杩戞牎鍑嗘棩鏈�:">
+ <el-date-picker style="width:100%" v-model="Mdata.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-date-picker style="width:100%" v-model="Mdata.nextCalibrationDate" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss" type="date" size="small" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
- </el-form-item>
- <el-form-item label="涓嬫鏍″噯鏃ユ湡:">
- <el-date-picker style="width:100%" v-model="editData.nextCalibrationDate" format="yyyy-MM-dd"
- value-format="yyyy-MM-dd HH:mm:ss" type="date" size="small" placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="璁惧绫诲瀷:">
<el-select v-model="editData.largeCategory" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option v-for="item in equipmentList" :key="item.value" :label="item.label" :value="item.value">
@@ -305,7 +319,7 @@
<el-input v-model="editData.calibrationDate" size="small"></el-input>
</el-form-item>
<el-form-item label="琚巿鏉冧汉:">
- <el-select v-model="editData.authorizedPerson" multiple placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="editData.authorizedPerson" multiple placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option v-for="item in responsiblePersonList" :key="item.name" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -324,8 +338,9 @@
<div>
<div v-show="editData.imageName" class="picName">{{ editData.imageName }}</div>
<el-upload :action="action" :on-success="handleSuccessUpImg2" :show-file-list="false"
- accept='image/jpg,image/jpeg,image/png' :headers="uploadHeader" :on-change="beforeUpload"
- :on-error="onError" ref='upload' class="avatar-uploader">
+ accept='image/jpg,image/jpeg,image/png' :headers="uploadHeader" :on-change="beforeUpload"
+ :on-error="onError" ref='upload' class="avatar-uploader"
+ >
<img v-if="editData.imageUpload" :src="javaApi + '/img/' + editData.imageUpload" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
@@ -341,7 +356,7 @@
</el-row>
</span>
</el-dialog>
- <el-dialog title="璁惧闄勪欢" top="5vh" v-if="dialogVisible1" :visible.sync="dialogVisible1" width="40%">
+ <el-dialog title="娣诲姞璁惧闄勪欢" top="5vh" v-if="dialogVisible1" :visible.sync="dialogVisible1" width="40%">
<el-form ref="form" :model="addFile" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
@@ -370,13 +385,13 @@
<el-col :span="12">
<el-form-item label="浠芥暟锛�">
<el-input-number v-model="addFile.quantity" controls-position="right" style="width: 100%;" size="small"
- :min="0" :max="10"></el-input-number>
+ :min="0" :max="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="椤电爜锛�">
<el-input-number v-model="addFile.pageCount" controls-position="right" style="width: 100%;" size="small"
- :min="0" :max="10"></el-input-number>
+ :min="0" :max="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -386,8 +401,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="褰掓。鏃ユ湡锛�">
- <el-date-picker type="date" style="width:100%" placeholder="璇烽�夋嫨鏃ユ湡" size="small"
- v-model="addFile.provideDate" format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+ <el-date-picker type="date" style="width:100%" placeholder="璇烽�夋嫨鏃ユ湡" size="small" v-model="addFile.archiveDate"
+ format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -397,9 +412,9 @@
</el-col>
<el-col :span="24">
<el-form-item label="闄勪欢锛�" style="float: left;">
- <el-upload class="upload-demo" :action="action" :headers="uploadHeader" ref="uploadFile"
- :on-error="onError" :on-remove="handleRemove" :on-success="onSuccess" :before-remove="beforeRemove"
- multiple :limit="1" :on-exceed="handleExceed" :file-list="fileList">
+ <el-upload class="upload-demo" :action="action" :headers="uploadHeader" ref="uploadFile" :on-error="onError"
+ :on-remove="handleRemove" :on-success="onSuccess" :before-remove="beforeRemove" multiple :limit="1"
+ :on-exceed="handleExceed" :file-list="fileList">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
@@ -455,11 +470,10 @@
updateDocument,
addDocument,
deleteDocumentById,
- getAllDocuments,
selectDeviceByCode,
upDeviceParameter,
exportDeviceFile,
- getInsProduction,
+ getInsProduction, getListByDId,
} from '@/api/cnas/resourceDemand/device.js'
import { selectUserCondition } from "@/api/system/user";
import {
@@ -704,7 +718,7 @@
},
// 鑾峰彇鐩稿叧鏂囨。鏁版嵁鐨刟pi
getPage() {
- getAllDocuments({ deviceId: this.clickNodeVal.value }).then(res => {
+ getListByDId({ id: this.clickNodeVal.value }).then(res => {
if (res.code == 200)
this.tableDataA = res.data
})
--
Gitblit v1.9.3