From f3335e01ea71614db9fa6aedf1d35e1202c3b12f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 八月 2022 15:46:26 +0800
Subject: [PATCH] 修改登陆时传PC参数
---
src/views/scgl/sckbg.vue | 772 +++++++++++++++++++++++-----------------------------------
1 files changed, 308 insertions(+), 464 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 8d169cd..a70ce4e 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1,7 +1,6 @@
<template>
<div>
- <div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
-
+ <div class="body" style="padding-top: 10px;" :style="{height:mainHeight+'px'}">
<el-tabs ref="elTabs" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
@@ -31,9 +30,9 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight+'px'"
+ :height="isIpad? (tableHeight+50):tableHeight"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -57,6 +56,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="status"
@@ -74,32 +74,37 @@
<el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
+ min-width="160"
sortable="custom"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="partname"
+ min-width="110"
label="浜у搧鍚嶇О"
sortable="custom"
/>
<el-table-column
prop="stepname"
label="宸ュ簭"
+ min-width="80"
sortable="custom"
/>
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
- width="150"
+ min-width="150"
sortable="custom"
/>
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="110"
sortable="custom"
/>
<el-table-column
@@ -120,6 +125,7 @@
label="璁″垝寮�宸ユ棩鏈�"
width="185"
sortable="custom"
+ fixed="right"
/>
<!-- <el-table-column-->
<!-- label="鎿嶄綔"-->
@@ -142,7 +148,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -187,9 +193,9 @@
<div class="elTableDiv">
<el-table
:data="WXtableData"
- :height="tableHeight+'px'"
+ :height="isIpad? (tableHeight+50):tableHeight"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -213,6 +219,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="status"
@@ -230,32 +237,37 @@
<el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
+ min-width="160"
sortable="custom"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="stepname"
label="宸ュ簭"
+ min-width="80"
sortable="custom"
/>
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
- width="150"
+ min-width="150"
sortable="custom"
/>
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="110"
sortable="custom"
/>
<el-table-column
@@ -268,7 +280,6 @@
prop="ng_qty"
label="涓嶈壇鏁伴噺"
width="150"
-
sortable="custom"
/>
<el-table-column
@@ -276,6 +287,7 @@
label="璁″垝寮�宸ユ棩鏈�"
width="185"
sortable="custom"
+ fixed="right"
/>
<!-- <el-table-column-->
<!-- label="鎿嶄綔"-->
@@ -298,196 +310,10 @@
:page.sync="WXform.page"
:limit.sync="WXform.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
- </el-tab-pane>
- <el-tab-pane label="宸ュ簭妫�楠�">
- <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
- <div style="margin-bottom: 10px;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px">鎵弿鏉＄爜锛�</div>
- <el-input
- v-model="GXform.orderstepqrcode"
- name="GXproduceCode"
- style="width: 300px"
- @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
- />
- </div>
- <!-- 鍏」淇℃伅 -->
- <div style="display:flex;margin-top: 10px;align-items: center">
- <div style="display: flex;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
- <div style="width: 100px">PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧缂栫爜锛�</div>
- <div style="width: 100px">123-446-789</div>
- </div>
- </div>
- <div style="display: flex;margin-left: 30px;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">浜у搧鍚嶇О锛�</div>
- <div style="width: 100px">PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧瑙勬牸锛�</div>
- <div style="width: 100px">123-446-789</div>
- </div>
- </div>
- <div style=" display: flex;margin-left: 30px;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
- <div>PX00120012312</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
- <div>123-446-789</div>
- </div>
- </div>
- </div>
- <div style="margin: 10px 0;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px">妫�楠屾爣鍑嗭細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- <div style="width: 90px;margin-left: 50px;">妫�楠屼汉鍛橈細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
- <div style="margin: 10px 0;font-size: 14px">
- <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
- </div>
- <div>
- <el-button type="primary" @click="add">鏂板</el-button>
- </div>
- <div style="margin-top: 10px">
- <el-table
- :data="JYTableData"
- :height="(tableHeight-195)+'px'"
- border
- stripe
- :style="{width: 100+'%',height:tableHeight+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="JYsortChange"
- >
- <el-table-column
- prop="RowNum"
- label="搴忓彿"
- />
- <!-- <el-table-column-->
- <!-- prop="bm"-->
- <!-- label="妫�楠岄」鐩紪鐮�"-->
- <!-- sortable="custom"-->
- <!-- />-->
- <el-table-column
- prop="mc"
- sortable="custom"
- label="妫�楠岄」鐩悕绉�"
- >
- <!-- <template slot-scope="{row}">-->
- <!-- <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- <!-- <div v-else> {{ row.group_code }}</div>-->
- <!-- </template>-->
- </el-table-column>
- <el-table-column
- prop="ms"
- label="妫�楠屾爣鍑嗘弿杩�"
- sortable="custom"
- >
- <!-- <template slot-scope="{row}">-->
- <!-- <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- <!-- <div v-else> {{ row.group_code }}</div>-->
- <!-- </template>-->
- </el-table-column>
- <el-table-column
- prop="jg"
- label="妫�楠岀粨鏋�"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div style="justify-content: flex-start ;">
- <el-radio v-model="radio" label="1">澶囬�夐」</el-radio>
- <el-radio v-model="radio" label="2">澶囬�夐」</el-radio>
- </div>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="del(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="confirm(row)">纭</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="cancel(row)">鍙栨秷</el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
- <div style="display: flex;margin-top: 20px;align-items: center">
-
- <div style="display: flex;margin-right: 50px;align-items: center">
- <div style="width: 90px">妫�楠岀粨鏋滐細</div>
- <el-select
- v-model="dialogForm.aaa"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in ARR"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">妫�楠屽娉細</div>
- <!-- <el-input v-model="row.group_code" placeholder="璇疯緭鍏�" />-->
- </div>
-
- </div>
-
- <div style="display: flex;margin: 20px 0;align-items: center">
- <el-button type="primary">棣栨淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px">宸℃淇濆瓨</el-button>
- <el-button type="primary" style="margin-left: 50px">瀹屽伐妫�淇濆瓨</el-button>
- <el-button type="info" style="margin-left: 50px">鍙栨秷</el-button>
- </div>
- </div>
</el-tab-pane>
</el-tabs>
@@ -496,7 +322,7 @@
<el-dialog
:title="dialogTitle"
:visible.sync="dialogVisible"
- width="800"
+ width="850px"
class="dialogVisible"
:top="dialogTitle==='鑷埗鎶ュ伐'?'5vh':'15vh'"
:close-on-click-modal="false"
@@ -629,7 +455,7 @@
<el-table
:data="userTableData"
border
- stripe
+ :row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
height="180"
@@ -640,6 +466,7 @@
width="100"
label="搴忓彿"
type="index"
+ fixed
/>
<el-table-column
prop="username"
@@ -666,6 +493,7 @@
<el-table-column
prop="RowNum"
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -683,7 +511,7 @@
:page.sync="Userform.page"
:limit.sync="Userform.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -831,6 +659,69 @@
</div>
</span>
</el-dialog>
+
+ <!--鎵撳嵃棰勮椤甸潰-->
+ <el-dialog
+ title="棰勮"
+ :visible.sync="dialogVisible2"
+ width="1140"
+ :close-on-click-modal="false"
+ @close="dialogVisible2Close"
+ >
+ <!-- 瑕佹墦鍗扮殑鍖哄煙 -->
+ <div id="printMe2" style="padding: 30px;">
+ <div
+ style="display: flex;width: 250px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
+ >
+
+ <div style="width: 60px;display: flex;flex-direction: column;border-right: 1px solid #000">
+ <div
+ style="display: flex;height: 75%;border-bottom:1px solid #000;justify-content: center;align-items: center "
+ >
+ <div id="qrCode2" ref="qrCodeDiv2" />
+ </div>
+ <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center">
+ <div style="margin-left: 5px;width: 40px">鏁伴噺:</div>
+ {{ qrForm.startqty }}
+ </div>
+ </div>
+
+ <div style="width:190px;display: flex;flex-direction: column">
+ <div
+ style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width: 60px;margin-left: 5px;">宸ュ崟缂栧彿:</div>
+ <div>{{ qrForm.wo_code }}</div>
+ </div>
+ <div
+ style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+ >
+ <div style="width: 60px;margin-left: 5px;">浜у搧缂栫爜:</div>
+ <div>{{ qrForm.partcode }}</div>
+ </div>
+ <div
+ style="display: flex;height: 25%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width:60px;margin-left: 5px;">浜у搧鍚嶇О:</div>
+ <div>{{ qrForm.partname }}</div>
+ </div>
+ <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center;text-align: left">
+ <div style="width: 60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
+ <div>{{ qrForm.nextstepname }}</div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisible2 = false">鍙� 娑�</el-button>
+ <el-button v-print="printObj2" type="primary">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
</div>
</template>
@@ -852,8 +743,8 @@
SavaMesOrderStepStart,
SavaMesOrderStepReport
} from '@/api/scgl'
-import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
-import { UserGroupDelete } from '@/api/jcsz'
+import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
+import QRCode from 'qrcodejs2'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -883,6 +774,7 @@
return {
mainHeight: 0,
tableHeight: 0,
+ isIpad: false,
// produceCode: '', // 宸ュ簭鐮�
// WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
radioSelected: '', // 宸ュ簭閫変腑
@@ -991,19 +883,52 @@
]
},
activeName: '',
- GXform: { // 宸ュ簭
- orderstepqrcode: '' // 鎵弿鐨勪簩缁寸爜淇℃伅
- // prop: 'wo_code', // 鎺掑簭瀛楁z
- // order: 'asc', // 鎺掑簭瀛楁
- // page: 1, // 绗嚑椤�
- // rows: 20 // 姣忛〉澶氬皯鏉�
+ dialogVisible2: false,
+ printObj2: {
+ id: 'printMe2',
+ popTitle: '鎵撳嵃妯℃澘',
+ preview: false,
+ extraHead: '<meta http-equiv="Content-Language" content="zh-cn"/>',
+ closeCallback(vue) { // 鍏抽棴鎵撳嵃鐨勫洖璋冧簨浠讹紙鏃犳硶纭畾鐐瑰嚮鐨勬槸纭杩樻槸鍙栨秷锛�
+ console.log('11212', vue)
+ // vue.dialogVisible = false
+ vue.dialogVisible2 = false
+ vue.dialogVisible = false
+ },
+ beforeOpenCallback(vue) {
+ vue.printLoading = true
+ console.log('鎵撳紑涔嬪墠')
+ console.log()
+ },
+ openCallback(vue) {
+ vue.printLoading = false
+ console.log('鎵ц浜嗘墦鍗�')
+ }
},
- JYTableData: [
- { RowNum: 1, bm: '001', mc: '灏哄', ms: '鏃�', jg: '鎴戞槸缁撴灉', isVisible: 0 }
- ], // 妫�楠岄」淇℃伅琛ㄦ牸
- radio: ''
+ qrForm: {
+ qrvalue: '',
+ startqty: '',
+ wo_code: '',
+ partcode: '',
+ partname: '',
+ nextstepname: ''
+ }
}
},
+ // computed: {
+ // qrLink: function() {
+ // return this.$store.getters.getPreviewUrl
+ // }
+ // },
+ // watch: {
+ // qrLink: function(newVal, oldNew) {
+ // if (newVal !== oldNew) {
+ // this.$nextTick(() => {
+ // this.bindQRCode(newVal)
+ // })
+ // }
+ // }
+ // },
created() {
this.getMesOrderStepSearch()
this.tabClick()
@@ -1014,11 +939,15 @@
this.$nextTick(() => {
$("input[name='produceCode']")[0].focus()
+ // this.bindQRCode('10001;001')
})
// webapp_urlprotocol_startup()
- webapp_ws_autoupdate(true)
+ // webapp_ws_autoupdate(true)
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
async getMesOrderStepSearch() {
const res = await MesOrderStepSearch(this.form)
if (res.code === '200') {
@@ -1083,11 +1012,6 @@
this.form.orderstepqrcode = ''
})
}
- if (this.$refs.elTabs.currentName === '2') {
- this.$nextTick(() => {
- $("input[name='GXproduceCode']")[0].focus()
- })
- }
},
// 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
@@ -1126,10 +1050,6 @@
if (res.code === '200' && res.count === 3) {
await this.WXback(res.data)
}
- }
-
- if (belong === 'GXproduceCode') {
- console.log('GXproduceCode')
}
},
// 鏌ヨ
@@ -1188,8 +1108,10 @@
if (obj.nextstepname === null || obj.nextstepcode === '') {
this.dialogForm.nextstepname = obj.stepname
+ this.dialogForm.nextstepcode = obj.stepcode
} else {
this.dialogForm.nextstepname = obj.nextstepname
+ this.dialogForm.nextstepcode = obj.nextstepcode
}
this.dialogForm.startqtySum = obj.noreportqty
@@ -1251,8 +1173,10 @@
this.dialogForm.stepcode = obj.stepcode
if (obj.nextstepname === null || obj.nextstepcode === '') {
this.dialogForm.nextstepname = obj.stepname
+ this.dialogForm.nextstepcode = obj.stepcode
} else {
this.dialogForm.nextstepname = obj.nextstepname
+ this.dialogForm.nextstepcode = obj.nextstepcode
}
this.dialogForm.noputqty = obj.noputqty
this.dialogForm.stepseq = obj.seq
@@ -1334,6 +1258,10 @@
},
// 鐢ㄦ埛鍒楄〃淇濆瓨
userSave(row) {
+ console.log(row, 123)
+ if (row.usercode === '') {
+ return this.$message.info('浜哄憳鍚嶇О涓嶈兘涓虹┖锛�')
+ }
this.userTableData.forEach(item => {
if (item.number === row.number) {
item.isVisible = 0
@@ -1458,9 +1386,10 @@
}
SavaMesOrderStepIn(data).then(res => {
if (res.code === '200') {
- this.WXprint()
+ this.WXprint2()
this.$message.success('鏀舵枡鎴愬姛锛�')
this.dialogVisible = false
+ this.dialogVisible2 = true
this.tabClick()
} else {
this.$message.error('鏀舵枡澶辫触!')
@@ -1520,11 +1449,13 @@
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
+
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
- this.ZZprint()
+ this.ZZprint2()
this.$message.success('鎶ュ伐鎴愬姛锛�')
this.dialogVisible = false
+ this.dialogVisible2 = true
this.tabClick()
} else {
this.$message.error('鎶ュ伐澶辫触!')
@@ -1534,112 +1465,63 @@
}
})
},
- async ZZprint() {
- const obj = {
- recordset: [
- {
- wo_code: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
- partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
- partname: this.dialogForm.partname, // 浜у搧鍚嶇О
- next_stepname: this.dialogForm.nextstepname, // 涓嬮亾宸ュ簭
- qty: this.dialogForm.startqty, // 鏁伴噺
- qrcode: this.form.orderstepqrcode// 浜岀淮鐮�
- }
- ]
- }
- const args = {
- type: 'print', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo('./static/grf/鎶ュ伐浜у嚭鏍囩.grf'),
- data: obj
- }
- webapp_ws_ajax_run(args)
+ // 鐢熸垚浜岀淮鐮�
+ bindQRCode(text) {
+ new QRCode(this.$refs.qrCodeDiv2, {
+ text: text,
+ width: 50,
+ height: 50,
+ colorDark: '#000', // 浜岀淮鐮侀鑹�
+ colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
+ correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
+ })
},
- // 澶栧崗鏀舵枡鎵撳嵃
- WXprint() {
- // 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
- const obj = {
- recordset: [
- {
- wo_code: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
- partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
- partname: this.dialogForm.partname, // 浜у搧鍚嶇О
- next_stepname: this.dialogForm.nextstepname, // 涓嬮亾宸ュ簭
- qty: this.dialogForm.sqty, // 鏁伴噺
- qrcode: this.WXform.orderstepqrcode// 浜岀淮鐮�
- }
- ]
- }
- const args = {
- type: 'print', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo('./static/grf/澶栧崗鏀舵枡鏍囩.grf'),
- data: obj
- }
- webapp_ws_ajax_run(args)
+ ZZprint2() {
+ this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ this.qrForm.startqty = this.dialogForm.startqty
+ this.qrForm.wo_code = this.dialogForm.wo_code
+ this.qrForm.partcode = this.dialogForm.partcode
+ this.qrForm.partname = this.dialogForm.partname
+ this.qrForm.nextstepname = this.dialogForm.nextstepname
+
+ this.$nextTick(() => {
+ this.bindQRCode(this.qrForm.qrvalue)
+ console.log(this.$refs.qrCodeDiv2, 123)
+ // console.log(this.$refs.qrCodeDiv2.querySelectorAll('#qrCode2>img'), 1)
+ // console.log(this.$refs.qrCodeDiv2.querySelectorAll('#qrCode2>canvas'), 2)
+ })
},
+ WXprint2() {
+ this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ this.qrForm.startqty = this.dialogForm.sqty
+ this.qrForm.wo_code = this.dialogForm.wo_code
+ this.qrForm.partcode = this.dialogForm.partcode
+ this.qrForm.partname = this.dialogForm.partname
+ this.qrForm.nextstepname = this.dialogForm.nextstepname
+ this.$nextTick(() => {
+ this.bindQRCode(this.qrForm.qrvalue)
+ })
+ },
+ dialogVisible2Close() {
+ this.qrForm.qrvalue = ''
+ this.qrForm.startqty = ''
+ this.qrForm.wo_code = ''
+ this.qrForm.partcode = ''
+ this.qrForm.partname = ''
+ this.qrForm.nextstepname = ''
+ this.$refs.qrCodeDiv2 = ''
+ },
+
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 80
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 220
+ this.isIpad = window.innerHeight < 769
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
- },
- /*
- *妫�楠岄」淇℃伅
- * */
- JYsortChange({ column, prop, order }) {
- if (order === 'descending') {
- order = 'desc'
- } else if (order === 'ascending') {
- order = 'asc'
- } else {
- order = 'desc'
- }
- this.GXform.order = order
- this.GXform.prop = prop
- // this.getOrganizationSearch()
- },
- // 鑾峰彇宸ュ簭鍒楄〃
- // getList(){
- //
- // },
- // 鏂板
- add() {
- // this.JYTableData.forEach(item => {
- // item.isVisible = 0
- // })
-
- // let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- // number = number === 0 ? (10 + Math.random()) : number
-
- // const data = { group_code: '', group_name: '', description: '', isVisible: 1, number: number }
- // this.JYTableData.unshift(data)
- },
- // 鍒犻櫎
- del() {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- // UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // this.getUserGroupSearch()
- // }
- // })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
- })
- },
- // 纭
- confirm() {
-
- },
- // 鍙栨秷
- cancel() {
-
}
}
}
@@ -1647,124 +1529,15 @@
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-
-::v-deep .el-button--primary:hover {
- border: none;
-}
-
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
-}
-
-::v-deep .el-dialog__footer {
- display: flex;
- justify-content: flex-end;
-}
-
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-table .caret-wrapper {
- transform: scale(0.8);
-}
-
-::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
+.el-button--text{
font-size: 14px;
cursor: pointer;
}
-
.operationClass {
height: 23px;
display: flex;
justify-content: space-between;
align-items: center;
-}
-
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
}
::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
@@ -1779,36 +1552,6 @@
margin: 10px 30px 0px 0;
}
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
-}
-
-.body ::v-deep .el-form-item {
- margin-bottom: 0;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
-}
-
//.dialogVisible{
::v-deep .el-select .el-input .el-select__caret {
display: flex;
@@ -1823,3 +1566,104 @@
}
}
</style>
+<style media="print">
+/*@media print {*/
+@page {
+ size: auto;
+ margin: 3mm;
+ font-size: 10px;
+}
+
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
+}
+.el-icon-edit-outline{
+ margin-right: 15px;
+}
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
--
Gitblit v1.9.3