From 6ef9e5189ac1888b8c4c504d5c5d3f431807ff56 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期六, 15 三月 2025 11:57:40 +0800
Subject: [PATCH] 修改电路试验单位
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 52 ++-
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 36 +
src/components/do/b1-inspect-order-plan/circuit-parameters3.vue | 23 +
src/components/do/a6-device/management.vue | 613 +++++++++-------------------------------------
4 files changed, 197 insertions(+), 527 deletions(-)
diff --git a/src/components/do/a6-device/management.vue b/src/components/do/a6-device/management.vue
index 0eae648..440cba1 100644
--- a/src/components/do/a6-device/management.vue
+++ b/src/components/do/a6-device/management.vue
@@ -4,375 +4,176 @@
<div class="search" v-show="!showData">
<div class="search_thing">
<div class="search_label">鐘舵�侊細</div>
- <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-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>
</div>
<div class="search_thing">
<div class="search_label">璁惧鍚嶇О锛�</div>
<div class="search_input">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="componentData.entity.deviceName"
- @keyup.enter.native="refreshTable()"
- >
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.deviceName"
+ @keyup.enter.native="refreshTable()">
</el-input>
</div>
</div>
<div class="search_thing">
<div class="search_label">瑙勬牸鍨嬪彿锛�</div>
<div class="search_input">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="componentData.entity.specificationModel"
- @keyup.enter.native="refreshTable()"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.specificationModel"
+ @keyup.enter.native="refreshTable()"></el-input>
</div>
</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-button size="small" type="primary" @click="dialogVisible2 = true"
- >鏂� 澧�</el-button
- >
- <el-button size="small" type="primary" @click="handleDownOne"
- >瀵� 鍑�</el-button
- >
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ <el-button size="small" type="primary" @click="dialogVisible2 = true">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="handleDownOne">瀵� 鍑�</el-button>
</div>
</div>
<div class="table" v-show="!showData">
<!-- 璇硶 瀛愮粍浠堕�氳繃 this.$emit +浼犲叆鏂规硶鍚� 璋冪敤鐖剁粍浠舵柟娉� 渚嬪 this.$emit锛坰electAllByOne锛� 灏遍渶鍦ㄧ埗缁勪欢澹版槑骞朵紶鍏� @selectAllByOne="selectAllByOne" -->
- <ValueTable
- @selectAllByOne="selectAllByOne"
- @isUpdate="isUpdate"
- ref="ValueTable"
- :dateFormat="dateFormat"
- :upUrl="$api.deviceScope.upDeviceParameter"
- :delUrl="$api.deviceScope.delDeviceParameter"
- :componentData="componentData"
- :key="upIndex"
- :url="
- $api.deviceScope.selectDeviceParameter +
- '?laboratoryNameIsNull=' +
- laboratoryNameIsNull
- "
- />
+ <ValueTable @selectAllByOne="selectAllByOne" @isUpdate="isUpdate" ref="ValueTable" :dateFormat="dateFormat"
+ :upUrl="$api.deviceScope.upDeviceParameter" :delUrl="$api.deviceScope.delDeviceParameter"
+ :componentData="componentData" :key="upIndex" :url="$api.deviceScope.selectDeviceParameter +
+ '?laboratoryNameIsNull=' +
+ laboratoryNameIsNull
+ " />
</div>
- <el-dialog
- :title="isUp ? '璁惧璇︽儏' : '妗ｆ淇'"
- :visible.sync="dialogVisible"
- width="70%"
- top="5vh"
- :before-close="handleClose"
- >
- <el-row
- style="display:flex;justify-content: space-around;max-height: 75vh;overflow-y: auto;"
- >
+ <el-dialog :title="isUp ? '璁惧璇︽儏' : '妗ｆ淇'" :visible.sync="dialogVisible" width="70%" top="5vh"
+ :before-close="handleClose">
+ <el-row style="display:flex;justify-content: space-around;max-height: 75vh;overflow-y: auto;">
<!-- 宸﹁竟甯冨眬 -->
<el-col :span="7">
<el-col>
<!-- 鍥剧墖 -->
- <el-image
- class="img"
- style="width:100%;height: 320px;marginBottom:16px"
- :src="javaApi + '/img/' + formData.imageUpload"
- >
- <div
- slot="error"
- class="image-error"
- style="width: calc(100% -2px);
+ <el-image class="img" style="width:100%;height: 320px;marginBottom:16px"
+ :src="javaApi + '/img/' + formData.imageUpload">
+ <div slot="error" class="image-error" style="width: calc(100% -2px);
height: 318px;
border-radius: 16px;
display: flex;
align-items: center;
justify-content: center;
- border: 1px solid #EEEEEE;"
- >
- <i
- class="el-icon-picture-outline"
- style="font-size:60px;color:#666666;"
- ></i>
+ border: 1px solid #EEEEEE;">
+ <i class="el-icon-picture-outline" style="font-size:60px;color:#666666;"></i>
</div>
</el-image>
<!-- 琛ㄥ崟 -->
- <el-form
- :label-position="labelPosition"
- :model="formData"
- label-width="120px"
- >
+ <el-form :label-position="labelPosition" :model="formData" label-width="120px">
<el-form-item label="浠櫒鍚嶇О:" required>
- <el-input
- :disabled="isUp"
- v-model="formData.deviceName"
- size="small"
- ></el-input>
+ <el-input :disabled="isUp" v-model="formData.deviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="浠櫒鍚嶇ОEN:" required>
- <el-input
- :disabled="isUp"
- v-model="formData.enDeviceName"
- size="small"
- ></el-input>
+ <el-input :disabled="isUp" v-model="formData.enDeviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿:" required>
- <el-input
- :disabled="isUp"
- v-model="formData.specificationModel"
- size="small"
- ></el-input>
+ <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-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 :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-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-input :disabled="isUp" v-model="formData.factoryNo" size="small"></el-input>
</el-form-item>
<el-form-item label="绠＄悊缂栧彿:" required>
- <el-input
- :disabled="isUp"
- v-model="formData.managementNumber"
- size="small"
- ></el-input>
+ <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 :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="鏍″噯鏃ユ湡:" required>
- <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 :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-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-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-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="140px"
- ref="ruleForm"
- >
+ <el-form :label-position="labelPosition" :model="formData" label-width="140px" 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-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-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 :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="涓嬫鏍″噯鏃ユ湡:" 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 :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-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-input :disabled="isUp" v-model="formData.unitPrice" size="small"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鐘舵��:" required>
- <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-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="鏍″噯鍛ㄦ湡锛堟湀锛�:" required>
- <el-input
- :disabled="isUp"
- v-model="formData.calibrationDate"
- size="small"
- ></el-input>
+ <el-input :disabled="isUp" v-model="formData.calibrationDate" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="杞欢鐗堟湰">
+ <el-input v-model="formData.version" size="small" :disabled="isUp"></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;"
- >
+ 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
- :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;padding-top:8px"
- >涓婁紶</el-button
- >
+ <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;padding-top:8px">涓婁紶</el-button>
</el-upload>
</div>
</el-form-item>
@@ -382,214 +183,105 @@
<span slot="footer" class="dialog-footer">
<el-row v-if="!isUp">
<el-button @click="handleClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
</el-row>
</span>
</el-dialog>
<!-- 鏂板-->
- <el-dialog
- title="鏂板璁惧"
- top="5vh"
- :visible.sync="dialogVisible2"
- width="70%"
- :before-close="handleClose2"
- >
+ <el-dialog title="鏂板璁惧" top="5vh" :visible.sync="dialogVisible2" width="70%" :before-close="handleClose2">
<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/' + formData2.imageUpload"
- >
- <div
- slot="error"
- class="image-error"
- style="width: calc(100% -2px);
+ <el-image class="img" style="width:100%;height: 320px;margin-bottom:16px"
+ :src="javaApi + '/img/' + formData2.imageUpload">
+ <div slot="error" class="image-error" style="width: calc(100% -2px);
height: 318px;
border-radius: 16px;
display: flex;
align-items: center;
justify-content: center;
- border: 1px solid #EEEEEE;"
- >
- <i
- class="el-icon-picture-outline"
- style="font-size:60px;color:#666666;"
- ></i>
+ border: 1px solid #EEEEEE;">
+ <i class="el-icon-picture-outline" style="font-size:60px;color:#666666;"></i>
</div>
</el-image>
<!-- 琛ㄥ崟 -->
- <el-form
- :label-position="labelPosition"
- :model="formData2"
- label-width="120px"
- >
+ <el-form :label-position="labelPosition" :model="formData2" label-width="120px">
<el-form-item label="浠櫒鍚嶇О:" required>
- <el-input
- 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="浠櫒鍚嶇ОEN:" required>
- <el-input
- v-model="formData2.enDeviceName"
- size="small"
- ></el-input>
+ <el-input v-model="formData2.enDeviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿:" required>
- <el-input
- 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-input
- v-model="formData2.manufacturer"
- size="small"
- ></el-input>
+ <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="110px"
- >
+ <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-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="绠＄悊缂栧彿:" required>
- <el-input
- v-model="formData2.managementNumber"
- size="small"
- ></el-input>
+ <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 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="鍚敤鏃ユ湡:" required>
- <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 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-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-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-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-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="120px"
- ref="ruleForm"
- >
+ <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-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-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-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>
@@ -597,47 +289,27 @@
<el-input v-model="formData2.unitPrice" size="small"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鐘舵��:" required>
- <el-select
- v-model="formData2.deviceStatus"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width:100%"
- >
- <el-option
- v-for="item in deviceStatusList"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <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="鏍″噯鍛ㄦ湡锛堟湀锛�:" required>
- <el-input
- v-model="formData2.calibrationDate"
- size="small"
- ></el-input>
+ <el-input v-model="formData2.calibrationDate" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="杞欢鐗堟湰">
+ <el-input v-model="formData2.version" size="small"></el-input>
</el-form-item>
<el-form-item label="鍥剧墖:">
<div
- style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;line-height:32px;display:flex;justify-content: space-around;font-size: 13px;"
- >
+ style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;line-height:32px;display:flex;justify-content: space-around;font-size: 13px;">
<div v-show="formData2.imageName" class="picName">
{{ formData2.imageName }}
</div>
- <el-upload
- :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;padding-top:8px"
- >涓婁紶</el-button
- >
+ <el-upload :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;padding-top:8px">涓婁紶</el-button>
</el-upload>
</div>
</el-form-item>
@@ -647,9 +319,7 @@
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="handleClose2">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm2" :loading="upLoad2"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="submitForm2" :loading="upLoad2">纭� 瀹�</el-button>
</el-row>
</span>
</el-dialog>
@@ -658,83 +328,46 @@
<div class="search_label">
<span style="color:red;margin-right: 4px;">*</span>IP锛�
</div>
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="configForm.ip"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.ip"></el-input>
</div>
<div class="search_thing" style="margin-bottom: 14px;">
<div class="search_label">
<span style="color:red;margin-right: 4px;">*</span>閲囬泦鍦板潃锛�
</div>
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="configForm.collectUrl"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.collectUrl"></el-input>
</div>
<div class="search_thing" style="margin-bottom: 14px;">
<div class="search_label">
<span style="color:red;margin-right: 4px;">*</span>鍌ㄥ瓨鍦板潃锛�
</div>
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="configForm.storageUrl"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.storageUrl"></el-input>
</div>
<div class="search_thing" style="margin-bottom: 14px;">
<div class="search_label">
<span style="color:red;margin-right: 4px;">*</span>鍙傜収锛�
</div>
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="configForm.refer"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.refer"></el-input>
</div>
<div class="search_thing" style="margin-bottom: 14px;">
<div class="search_label">
<span style="color:red;margin-right: 4px;">*</span>X锛�
</div>
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="configForm.x"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.x"></el-input>
</div>
<div class="search_thing" style="margin-bottom: 14px;">
<div class="search_label">
<span style="color:red;margin-right: 4px;">*</span>Y锛�
</div>
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="configForm.y"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.y"></el-input>
</div>
<div class="search_thing">
<div class="search_label">鍏紡锛�</div>
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="configForm.formula"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.formula"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="dialogVisible3 = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm3" :loading="upLoad3"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="submitForm3" :loading="upLoad3">纭� 瀹�</el-button>
</el-row>
</span>
</el-dialog>
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
index b43b65f..12cdaf7 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -6,7 +6,8 @@
<el-row>
<el-col :span="23" style="display: flex;flex-wrap: wrap;">
<table border="1" cellpadding="10" style="margin: 4px 10px 10px 0;width: 32%;"
- v-for="(item, index) in insProductNew" :key="index + 'ppp'" v-show="isMore ? true : (index < 3 ? true : false)">
+ v-for="(item, index) in insProductNew" :key="index + 'ppp'"
+ v-show="isMore ? true : (index < 3 ? true : false)">
<tr>
<td style="text-align: center;background: #F0F1F5;">
<el-tooltip effect="dark" :content="item.inspectionItemSubclass" placement="top-start"><span
@@ -70,8 +71,8 @@
<el-option v-for="item in bandList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
- <el-button size="small" @click="deleteList(y, allBandList, '鍒犻櫎棰戞')" :disabled="state > 1" style="margin-left: 16px;"
- type="danger">鍒犻櫎棰戞</el-button>
+ <el-button size="small" @click="deleteList(y, allBandList, '鍒犻櫎棰戞')" :disabled="state > 1"
+ style="margin-left: 16px;" type="danger">鍒犻櫎棰戞</el-button>
<el-button type="primary" size="small" @click="addList(h.projectList, '浜掕皟')" style="margin-left: 16px;"
:disabled="state > 1" v-show="!isLook && intermodulationNum > 0">娣诲姞浜掕皟</el-button>
<!-- <el-button size="small" @click="deleteList(0,h.projectList,'浜掕皟')" :disabled="state>1" v-show="!isLook&&intermodulationNum>0">鍒犻櫎浜掕皟</el-button> -->
@@ -100,7 +101,8 @@
<td>绔彛</td>
<td v-for="(item, index) in n.portList" :key="index + 'aaa'">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"></el-input>
+ <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"
+ @blur="handleInterface(n.portList, index)"></el-input>
</div>
</td>
</tr>
@@ -123,7 +125,8 @@
</el-col>
<el-col :span="1">
<div style="text-align: center;" :class="{ red: n.result === 0, green: n.result === 1 }">{{
- n.result === 0 ? '涓嶅悎鏍�' : (n.result === 1 ? '鍚堟牸' : (n.result === 3 ? '涓嶅垽瀹�' : (n.result === 3 ?'涓嶅垽瀹�':'寰呭畾'))) }}
+ n.result === 0 ? '涓嶅悎鏍�' : (n.result === 1 ? '鍚堟牸' : (n.result === 3 ? '涓嶅垽瀹�' : (n.result === 3
+ ? '涓嶅垽瀹�' : '寰呭畾'))) }}
</div>
</el-col>
</el-row>
@@ -163,7 +166,8 @@
<td>绔彛</td>
<td v-for="(item, index) in n.portList" :key="index + 'fff'">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"></el-input>
+ <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"
+ @blur="handleInterface(n.portList, index)"></el-input>
</div>
</td>
<!-- <td :rowspan="n.angleList.length+1">
@@ -191,7 +195,8 @@
</el-col>
<el-col :span="1">
<div style="text-align: center;" :class="{ red: n.result === 0, green: n.result === 1 }">{{
- n.result === 0 ? '涓嶅悎鏍�' : (n.result === 1 ? '鍚堟牸' : (n.result === 3 ? '涓嶅垽瀹�' : (n.result === 3 ?'涓嶅垽瀹�':'寰呭畾'))) }}
+ n.result === 0 ? '涓嶅悎鏍�' : (n.result === 1 ? '鍚堟牸' : (n.result === 3 ? '涓嶅垽瀹�' : (n.result === 3
+ ? '涓嶅垽瀹�' : '寰呭畾'))) }}
</div>
</el-col>
</el-row>
@@ -242,7 +247,7 @@
</el-col>
<el-col :span="1">
<div style="text-align: center;" :class="{ red: n.result === 0, green: n.result === 1 }">{{
- n.result === 0 ? '涓嶅悎鏍�' : (n.result === 1 ? '鍚堟牸' : (n.result === 3 ?'涓嶅垽瀹�':'寰呭畾')) }}
+ n.result === 0 ? '涓嶅悎鏍�' : (n.result === 1 ? '鍚堟牸' : (n.result === 3 ? '涓嶅垽瀹�' : '寰呭畾')) }}
</div>
</el-col>
</el-row>
@@ -285,7 +290,7 @@
</el-col>
<el-col :span="1">
<div style="text-align: center;" :class="{ red: n.result === 0, green: n.result === 1 }">{{
- n.result === 0 ? '涓嶅悎鏍�' : (n.result === 1 ? '鍚堟牸' : (n.result === 3 ?'涓嶅垽瀹�':'寰呭畾')) }}
+ n.result === 0 ? '涓嶅悎鏍�' : (n.result === 1 ? '鍚堟牸' : (n.result === 3 ? '涓嶅垽瀹�' : '寰呭畾')) }}
</div>
</el-col>
</el-row>
@@ -306,16 +311,16 @@
bandList0: [],
portList: [
{
- value: '1',
+ value: 'P1',
},
{
- value: '2',
+ value: 'P2',
},
{
- value: '3',
+ value: 'P3',
},
{
- value: '4',
+ value: 'P4',
},
],
angleList: [
@@ -491,7 +496,7 @@
if (item.insProductResult2.length > 0 && item.insProductResult2.length < bandList.length) {
let obj0 = item.insProductResult2.find(n => m.frequency == n.frequency)
if (!obj0) {
- let port = '1,2,3,4'
+ let port = 'P1,P2,P3,P4'
let value = JSON.parse(m.value)
let value0 = []
value.forEach(n => {
@@ -507,7 +512,7 @@
}
} else {
// 濡傛灉涓�鏉℃暟鎹兘娌℃湁锛屽垯琛ュ叏鏁版嵁
- let port = '1,2,3,4'
+ let port = 'P1,P2,P3,P4'
let value = JSON.parse(m.value)
let value0 = []
value.forEach(n => {
@@ -604,16 +609,16 @@
// 璧嬪�肩鍙ｅ拰瑙掑害
this.portList = [
{
- value: '1',
+ value: 'P1',
},
{
- value: '2',
+ value: 'P2',
},
{
- value: '3',
+ value: 'P3',
},
{
- value: '4',
+ value: 'P4',
},
]
this.angleList = [
@@ -830,6 +835,15 @@
n.often = n.often + 'MHz'
}
},
+ // 娣诲姞绔彛P
+ handleInterface(arr, index) {
+ if (!arr[index].value) {
+ return
+ }
+ if (!arr[index].value.includes('P')) {
+ this.$set(arr[index], 'value', 'P' + arr[index].value)
+ }
+ },
save(h, y) {
let arr = h.projectList.map(item => {
if (item.portList && item.portList.length > 0) {
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
index 7634954..3dfc601 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -100,7 +100,8 @@
<td>绔彛</td>
<td v-for="(item, index) in n.portList" :key="index + 'aaa'">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"></el-input>
+ <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"
+ @blur="handleInterface(n.portList, index)"></el-input>
</div>
</td>
</tr>
@@ -162,7 +163,8 @@
<td>绔彛</td>
<td v-for="(item, index) in n.portList" :key="index + 'fff'">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"></el-input>
+ <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"
+ @blur="handleInterface(n.portList, index)"></el-input>
</div>
</td>
</tr>
@@ -206,16 +208,16 @@
bandList0: [],
portList: [
{
- value: '1',
+ value: 'P1',
},
{
- value: '2',
+ value: 'P2',
},
{
- value: '3',
+ value: 'P3',
},
{
- value: '4',
+ value: 'P4',
},
],
angleList: [
@@ -352,7 +354,7 @@
if (item.insProductResult2.length > 0 && item.insProductResult2.length < bandList.length) {
let obj0 = item.insProductResult2.find(n => m.frequency == n.frequency)
if (!obj0) {
- let port = '1,2,3,4'
+ let port = 'P1,P2,P3,P4'
let value = JSON.parse(m.value)
let value0 = []
value.forEach(n => {
@@ -368,7 +370,7 @@
}
} else {
// 濡傛灉涓�鏉℃暟鎹兘娌℃湁锛屽垯琛ュ叏鏁版嵁
- let port = '1,2,3,4'
+ let port = 'P1,P2,P3,P4'
let value = JSON.parse(m.value)
let value0 = []
value.forEach(n => {
@@ -465,16 +467,16 @@
item.equipValue = ''
this.portList = [
{
- value: '1',
+ value: 'P1',
},
{
- value: '2',
+ value: 'P2',
},
{
- value: '3',
+ value: 'P3',
},
{
- value: '4',
+ value: 'P4',
},
]
this.angleList = [
@@ -676,6 +678,7 @@
}
})
},
+ // 娣诲姞棰戠偣鍗曚綅
handlePort(n) {
if (!n.often) {
return
@@ -684,6 +687,15 @@
n.often = n.often + 'MHz'
}
},
+ // 娣诲姞绔彛P
+ handleInterface(arr, index) {
+ if (!arr[index].value) {
+ return
+ }
+ if (!arr[index].value.includes('P')) {
+ this.$set(arr[index], 'value', 'P' + arr[index].value)
+ }
+ },
async methodFocus(item) {
this.$delete(item, 'equipOptions')
this.$set(item, 'equipOptions', await this.getEquipOptions(item))
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters3.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters3.vue
index 752e5ba..0eb5369 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters3.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters3.vue
@@ -94,7 +94,8 @@
<td>绔彛</td>
<td v-for="(item, index) in n.portList" :key="index + 'aaa'">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"></el-input>
+ <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"
+ @blur="handleInterface(n.portList, index)"></el-input>
</div>
</td>
</tr>
@@ -154,7 +155,8 @@
<td>绔彛</td>
<td v-for="(item, index) in n.portList" :key="index + 'fff'">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"></el-input>
+ <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state > 1"
+ @blur="handleInterface(n.portList, index)"></el-input>
</div>
</td>
</tr>
@@ -283,7 +285,7 @@
bandList0: [],
portList: [
{
- value: '1',
+ value: 'P1',
},
],
projectList: [
@@ -406,7 +408,7 @@
if (item.insProductResult2.length > 0 && item.insProductResult2.length < bandList.length) {
let obj0 = item.insProductResult2.find(n => m.frequency == n.frequency)
if (!obj0) {
- let port = '1'
+ let port = 'P1'
let value = JSON.parse(m.value)
let value0 = []
value.forEach(n => {
@@ -422,7 +424,7 @@
}
} else {
// 濡傛灉涓�鏉℃暟鎹兘娌℃湁锛屽垯琛ュ叏鏁版嵁
- let port = '1'
+ let port = 'P1'
let value = JSON.parse(m.value)
let value0 = []
value.forEach(n => {
@@ -510,7 +512,7 @@
// 璧嬪�肩鍙ｅ拰瑙掑害
this.portList = [
{
- value: '1',
+ value: 'P1',
},
]
item.portList = JSON.parse(JSON.stringify(this.portList))
@@ -696,6 +698,15 @@
n.often = n.often + 'MHz'
}
},
+ // 娣诲姞绔彛P
+ handleInterface(arr, index) {
+ if (!arr[index].value) {
+ return
+ }
+ if (!arr[index].value.includes('P')) {
+ this.$set(arr[index], 'value', 'P' + arr[index].value)
+ }
+ },
save(h, y) {
let arr = h.projectList.map(item => {
if (item.portList && item.portList.length > 0) {
--
Gitblit v1.9.3