From bd3670cf1f3ddf4201941a1673d870cc185fe184 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 13:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/metering/metering-form.vue | 58 +++++++++++++++++++++++++----
src/views/equipment/metering/index.vue | 11 +++--
src/views/common/ztt-table.vue | 4 +-
3 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 6367bee..2f5a551 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -507,11 +507,11 @@
>
<i class="el-icon-upload"></i>
<div class="el-upload__text"><em>鐐瑰嚮瀵煎叆鏁版嵁</em></div>
- <div class="el-upload__tip" slot="tip">
+ <div class="el-upload__tip" slot="tip" >
鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
type="text"
style="font-size:12px;"
- @click="downDataTemplate"
+ @click="downDataTemplate" v-if="uploadInfo.Download"
>涓嬭浇妯℃澘</el-button
>
</div>
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 3364d51..ea43bd6 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -65,7 +65,8 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ Download:false,
+ isShow: true,
url: '/mes/equipmentDevice/upload'
},
prelang: 'workstation',
@@ -143,7 +144,7 @@
minWidth: '150',
width: '250',
prop: 'createTime',
- label: '鍒涘缓鏃堕棿',
+ label: '鏍″噯鏃堕棿',
sort: true,
isTrue: true,
formatter: this.formatReceiveTime,
@@ -155,7 +156,7 @@
minWidth: '150',
width: '250',
prop: 'updateTime',
- label: '淇敼鏃堕棿',
+ label: '鏍″噯鍒版湡鏃堕棿',
sort: true,
isTrue: true,
formatter: this.formatReceiveTime,
@@ -203,7 +204,7 @@
},
{
minWidth: '30',
- prop: 'InspectionUnit',
+ prop: 'inspectionUnit',
label: '妫�楠屽崟浣�',
sort: true,
isTrue: true,
@@ -239,7 +240,7 @@
},
{
minWidth: '30',
- prop: 'FixedPointPosition',
+ prop: 'fixedPointPosition',
label: '瀹氱偣浣嶇疆',
sort: true,
isTrue: true,
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 1d290dd..2e1ca3e 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -22,7 +22,7 @@
<el-input v-model="dataForm.name" placeholder="鍚嶇О"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="绫诲瀷" prop="type">
<el-select
v-model="dataForm.type"
@@ -39,7 +39,16 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
+ <!-- <el-col :span="12">
+ <el-form-item label="璐ｄ换浜�" prop="createUser">
+ <el-input
+ v-model="dataForm.createUser"
+ placeholder="璐ｄ换浜�"
+ ></el-input>
+ </el-form-item>
+ </el-col> -->
+
<el-col :span="12">
<el-form-item label="鍘傚" prop="supplier">
<el-input
@@ -48,11 +57,38 @@
></el-input>
</el-form-item>
</el-col>
+
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="state">
- <el-select
+ <el-form-item label="璐ｄ换閮ㄩ棬" prop="responsibleDepartment">
+ <el-input
+ v-model="dataForm.responsibleDepartment"
+ placeholder="璐ｄ换閮ㄩ棬"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-input
v-model="dataForm.status"
placeholder="鐘舵��"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸" prop="specifications">
+ <el-input
+ v-model="dataForm.specifications"
+ placeholder="瑙勬牸"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+
+
+ <!-- <el-col :span="12">
+ <el-form-item label="璁惧鐘舵��" prop="status">
+ <el-select
+ v-model="dataForm.status"
+ placeholder="璁惧鐘舵��"
filterable
style="width: 100%"
>
@@ -64,7 +100,7 @@
/>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -100,12 +136,18 @@
typeSpecification: '',
manufactureDate: '',
installDate: '',
- state: '',
+ // state: '',
+ specifications:'',
+ responsibleDepartment:'',
+ // createUser:'',
+ status:'',
+
+
description: '',
value1: '',
code: null,
- type: null,
- status: null,
+ // type: null,
+ // status: null,
supplier: null
},
dataRule: {
--
Gitblit v1.9.3