From 6ac64fea29fa0df01f9d0e70372e086de9725aa1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 三月 2024 19:50:01 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 201 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 143 insertions(+), 58 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 59fead3..418e866 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -19,6 +19,36 @@
@refreshDataList="getData"
></table-form>
</basic-container>
+ <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
+ <div style="width:100%;height:400px;overflow-y: auto;">
+ <div class="dia_body" id="printRaw">
+ <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;">
+ <el-row>
+ <el-col :span="8" :offset="1">搴忓彿锛�</el-col>
+ <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="8" :offset="1">缂栧彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ tem.number }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="8" :offset="1">璁惧鍚嶇О锛�</el-col>
+ <el-col :span="7" style="font-weight: bold;">{{ tem.name }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="8" :offset="1">璁惧浜岀淮鐮侊細</el-col>
+ <el-col :span="7">
+ <vueQr :text="tem.number" :size="80" :margin="2"></vueQr>
+ </el-col>
+ </el-row>
+ </el-card>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -29,6 +59,8 @@
import { mapGetters } from 'vuex'
import * as fecha from 'element-ui/lib/utils/date'
import { remote } from '../../../api/admin/dict'
+import vueQr from 'vue-qr'
+import PrintJS from 'print-js'
export default {
data() {
return {
@@ -36,9 +68,10 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/equipment/upload'
},
+ diaPrintTab: false,
prelang: 'workstation',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -64,6 +97,7 @@
// 璁惧缂栧彿
{
minWidth: '30',
+ width: '200',
prop: 'number',
label: '璁惧缂栧彿',
sort: true,
@@ -77,8 +111,19 @@
// 璁惧鍚嶇О
{
minWidth: '30',
+ width: '100',
prop: 'name',
label: '璁惧鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ // 鐘舵��
+ {
+ minWidth: '30',
+ prop: 'state',
+ label: '鐘舵��',
sort: true,
isTrue: true,
isSearch: true,
@@ -114,19 +159,19 @@
label: '浣嶇疆',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
},
// 閭
- {
- minWidth: '30',
- prop: 'email',
- label: '閭',
- sort: true,
- isTrue: true,
- isSearch: false,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '30',
+ // prop: 'email',
+ // label: '閭',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: false,
+ // searchInfoType: 'text'
+ // },
// 渚涘簲鍟�
{
minWidth: '30',
@@ -134,7 +179,7 @@
label: '渚涘簲鍟�',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
},
// 鍒堕�犲晢
@@ -144,7 +189,7 @@
label: '鍒堕�犲晢',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
},
// 鍨嬪彿瑙勬牸
@@ -154,13 +199,13 @@
label: '鍨嬪彿瑙勬牸',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
},
// 鍒堕�犳棩鏈�
{
minWidth: '150',
- width: '250',
+ width: '100',
prop: 'manufactureDate',
label: '鍒堕�犳棩鏈�',
sort: true,
@@ -172,7 +217,7 @@
// 瀹夎鏃ユ湡
{
minWidth: '150',
- width: '250',
+ width: '100',
prop: 'installDate',
label: '瀹夎鏃ユ湡',
sort: true,
@@ -180,47 +225,10 @@
isSearch: true,
formatter: this.formatReceiveTime,
searchInfoType: 'datetimerange'
- },
- // 鐘舵��
- {
- minWidth: '30',
- prop: 'state',
- label: '鐘舵��',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '鍚屾',
- type: 'primary',
- loading: false,
- fun: this.pullEquipFun
- }
- ],
- operator: [
- {
- text: '淇敼',
- icon: 'el-icon-edit',
- type: 'text',
- size: 'small',
- fun: this.addOrUpdateHandle
- },
- {
- text: '鍒犻櫎',
- icon: 'el-icon-delete',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }
- ],
+ toolbar: [],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -234,12 +242,55 @@
},
components: {
ttable,
- TableForm
+ TableForm,
+ vueQr
},
computed: {
...mapGetters(['permissions'])
},
created() {
+ if(this.permissions.equipment_equipment_add){
+ this.table.toolbar.push({
+ text: '鏂板',
+ type: 'primary',
+ fun: this.addOrUpdateHandle
+ })
+ }
+ if(this.permissions.equipment_equipment_labelprint){
+ this.table.toolbar.push({
+ text: '鏍囩鎵撳嵃',
+ type: 'primary',
+ fun: this.labelPrint
+ })
+ }
+ if(this.permissions.equipment_equipment_sync){
+ this.table.toolbar.push({
+ text: '鍚屾',
+ type: 'primary',
+ loading: false,
+ fun: this.pullEquipFun
+ })
+ }
+ let arr = []
+ if(this.permissions.equipment_equipment_edit){
+ arr.push({
+ text: '淇敼',
+ icon: 'el-icon-edit',
+ type: 'text',
+ size: 'small',
+ fun: this.addOrUpdateHandle
+ })
+ }
+ if(this.permissions.equipment_equipment_del){
+ arr.push({
+ text: '鍒犻櫎',
+ icon: 'el-icon-delete',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteHandle
+ })
+ }
+ this.table.operator = arr.length>0 ? arr : null
remote('work_shop').then((response) => {
if (response.data.code === 0) {
this.workshopList = response.data.data
@@ -249,10 +300,37 @@
})
},
methods: {
+ printFun() {
+ // this.printDialogVisible = false;
+ this.diaPrintTab = false;
+ PrintJS({
+ printable: 'printRaw',//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
+ maxWidth:450,
+ targetStyles:['*'],
+ style: `@page {
+ margin:0;
+ padding: 0;
+ size: 360px 170px;
+ }
+ html{
+ zoom:100%;
+ }
+ @media print{
+ width: 360px;
+ height: 170px;
+ margin:0;
+ padding: 0;
+ }`,
+ onPrintDialogClose: this.erexcel=false,
+ targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+ font_size: '',
+ });
+ },
pullEquipFun(){
this.table.toolbar.find((e) => e.text === '鍚屾').loading = true
pullEquip().then(res=>{
- this.$message.success(res.data.data.msg)
+ this.$message.success(res.data.msg)
this.table.toolbar.find((e) => e.text === '鍚屾').loading = false
}).catch(error=>{
this.$message.error("鍚屾澶辫触",error)
@@ -300,7 +378,14 @@
this.$message.success('鍒犻櫎鎴愬姛')
this.getData()
})
- }
+ },
+ labelPrint(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ this.diaPrintTab = true
+ }
}
}
</script>
--
Gitblit v1.9.3