From d5caee05b6d191e05729966b677fcd2d39b4a0e7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 十二月 2023 17:31:21 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 5 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 7dcc880..2b59511 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -18,17 +18,47 @@
ref="addOrUpdate"
@refreshDataList="getData"
></table-form>
+ <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
+ <div class="dia_body">
+ <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;">
+ <el-row>
+ <el-col :span="8" :offset="1">搴忓彿锛�</el-col>
+ <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</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>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</basic-container>
</div>
</template>
<script>
-import { delObj, fetchList } from '@/api/equipment/equipment'
+import { delObj, fetchList,pullEquip } from '@/api/equipment/equipment'
import TableForm from './equipment-form'
import ttable from '@/views/common/ztt-table.vue'
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 {
@@ -39,6 +69,7 @@
isShow: true,
url: '/mes/equipment/upload'
},
+ diaPrintTab: false,
prelang: 'workstation',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -188,7 +219,7 @@
label: '鐘舵��',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
}
],
@@ -197,7 +228,18 @@
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- }
+ },
+ {
+ text: '鏍囩鎵撳嵃',
+ type: 'primary',
+ fun: this.labelPrint
+ },
+ // {
+ // text: '鍚屾',
+ // type: 'primary',
+ // loading: false,
+ // fun: this.pullEquipFun
+ // }
],
operator: [
{
@@ -228,7 +270,8 @@
},
components: {
ttable,
- TableForm
+ TableForm,
+ vueQr
},
computed: {
...mapGetters(['permissions'])
@@ -243,6 +286,32 @@
})
},
methods: {
+ printFun() {
+ // this.printDialogVisible = false;
+ this.diaPrintTab = false;
+ console.log(printRaw);
+ PrintJS({
+ printable: "printRaw",//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
+ maxWidth:450,
+ targetStyles:['*'],
+ style:"@page {margin:0 ;resolution: 300dpi;portrait}",
+ 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.table.toolbar.find((e) => e.text === '鍚屾').loading = false
+ }).catch(error=>{
+ this.$message.error("鍚屾澶辫触",error)
+ this.getData()
+ this.table.toolbar.find((e) => e.text === '鍚屾').loading = false
+ })
+ },
workShopFormatter(row, column, cellValue) {
this.workshopList.forEach((obj) => {
if (obj.value == cellValue) {
@@ -260,6 +329,7 @@
},
handleSelectionChange(val) {
this.multipleSelection = val
+ console.log(this.multipleSelection);
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
@@ -283,7 +353,14 @@
this.$message.success('鍒犻櫎鎴愬姛')
this.getData()
})
- }
+ },
+ labelPrint(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ this.diaPrintTab = true
+ }
}
}
</script>
--
Gitblit v1.9.3