From b15de00ffba31695514c1a404dbbbf65dc1e87c1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 13:21:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/metering/index.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index bbd003d..ea43bd6 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -19,6 +19,34 @@
@refreshDataList="getData"
></table-form>
</basic-container>
+ <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
+ <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
+ <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 15px;">
+ <el-row>
+ <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">缂栧彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ tem.code }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">璁惧鍚嶇О锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ tem.name }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">璁惧浜岀淮鐮侊細</el-col>
+ <el-col :span="10">
+ <vueQr :text="tem.code" :size="80" :margin="2"></vueQr>
+ </el-col>
+ </el-row>
+ </el-card>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="diaPrintTab = false">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -29,6 +57,7 @@
import { mapGetters } from 'vuex'
import * as fecha from 'element-ui/lib/utils/date'
import { remote } from '../../../api/admin/dict'
+ import vueQr from 'vue-qr'
export default {
data() {
return {
@@ -36,7 +65,8 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ Download:false,
+ isShow: true,
url: '/mes/equipmentDevice/upload'
},
prelang: 'workstation',
@@ -114,7 +144,7 @@
minWidth: '150',
width: '250',
prop: 'createTime',
- label: '鍒涘缓鏃堕棿',
+ label: '鏍″噯鏃堕棿',
sort: true,
isTrue: true,
formatter: this.formatReceiveTime,
@@ -126,7 +156,7 @@
minWidth: '150',
width: '250',
prop: 'updateTime',
- label: '淇敼鏃堕棿',
+ label: '鏍″噯鍒版湡鏃堕棿',
sort: true,
isTrue: true,
formatter: this.formatReceiveTime,
@@ -174,7 +204,7 @@
},
{
minWidth: '30',
- prop: 'InspectionUnit',
+ prop: 'inspectionUnit',
label: '妫�楠屽崟浣�',
sort: true,
isTrue: true,
@@ -210,7 +240,7 @@
},
{
minWidth: '30',
- prop: 'FixedPointPosition',
+ prop: 'fixedPointPosition',
label: '瀹氱偣浣嶇疆',
sort: true,
isTrue: true,
@@ -232,6 +262,11 @@
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
+ },
+ {
+ text: '鏍囩鎵撳嵃',
+ type: 'primary',
+ fun: this.labelPrint
},
// {
// text: '鍚屾',
@@ -264,12 +299,14 @@
}
},
addOrUpdateVisible: false,
- workshopList: []
+ workshopList: [],
+ diaPrintTab: false
}
},
components: {
ttable,
- TableForm
+ TableForm,
+ vueQr
},
computed: {
...mapGetters(['permissions'])
@@ -336,6 +373,13 @@
this.$message.success('鍒犻櫎鎴愬姛')
this.getData()
})
+ },
+ labelPrint(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ this.diaPrintTab = true
}
}
}
--
Gitblit v1.9.3