From b8b16d90fd13bcad5881a4562b5bbe96e576bd6b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 03 八月 2022 16:27:56 +0800
Subject: [PATCH] 1.解决工单手动打印大二维码问题
---
src/views/scgl/scdd.vue | 146 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 102 insertions(+), 44 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 42439ad..f04d867 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -13,6 +13,7 @@
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.erporderstus"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -28,7 +29,6 @@
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
<el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
-
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -38,34 +38,45 @@
<el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="浜や粯鏃堕棿" style=" display: flex;">
- <el-date-picker
- v-model="form.paydate"
- type="daterange"
- range-separator="~"
- size="mini"
- :clearable="false"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- />
- <!-- :picker-options="expireTimeOption"-->
- </el-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <el-form-item label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" display: flex;">
<el-date-picker
- v-model="form.createdate"
+ v-model="form.paystartdate"
+ type="daterange"
+ range-separator="~"
+ size="mini"
+ style="width: 240px"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
+ <!-- :picker-options="expireTimeOption"-->
+
+ </el-form-item>
+ <el-form-item label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;">
+ <el-date-picker
+ v-model="form.payenddate"
type="daterange"
:clearable="false"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 240px"
end-placeholder="缁撴潫鏃ユ湡"
size="mini"
/>
<!-- :picker-options="expireTimeOption"-->
-
+ <!-- <el-date-picker-->
+ <!-- v-model="form.createdate"-->
+ <!-- type="date"-->
+ <!-- size="mini"-->
+ <!-- :clearable="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- format="yyyy-MM-dd"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- />-->
</el-form-item>
</div>
<div style="min-height: 100px">
@@ -110,7 +121,7 @@
<el-button
type="primary"
icon="el-icon-refresh-right"
- @click="reset('update')"
+ @click="syncERP"
>鍚屾ERP
</el-button>
<el-button
@@ -119,14 +130,12 @@
@click="orderClose"
>鍏抽棴璁㈠崟
</el-button>
- <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -141,6 +150,7 @@
<!-- />-->
<el-table-column
width="50"
+ fixed
>
<template slot-scope="{row}">
<el-radio
@@ -154,6 +164,7 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
@@ -164,8 +175,8 @@
>
<template slot-scope="{row}">
<div v-if="row.status==='NEW'">鏂拌鍗�</div>
- <div v-if="row.status==='CREATING'">鍒涘缓涓�</div>
- <div v-if="row.status==='CREATED'">宸插垱寤�</div>
+ <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
+ <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
<div v-if="row.status==='CLOSED'">宸插叧闂�</div>
</template>
</el-table-column>
@@ -173,29 +184,35 @@
prop="wo"
label="璁㈠崟缂栧彿"
sortable="custom"
- width="150"
+ min-width="150"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
- width="150"
+ min-width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
- width="150"
+ min-width="150"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
sortable="custom"
- width="110"
+ min-width="110"
/>
<el-table-column
prop="qty"
label="璁㈠崟鏁伴噺"
+ width="150"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="relse_qty"
+ label="宸蹭笅鍗曟暟閲�"
width="150"
sortable="custom"
/>
@@ -206,8 +223,14 @@
width="150"
/>
<el-table-column
- prop="paydate"
- label="瑕佹眰浜や粯鏃堕棿"
+ prop="planstartdate"
+ label="棰勮寮�宸ユ椂闂�"
+ sortable="custom"
+ width="160"
+ />
+ <el-table-column
+ prop="planenddate"
+ label="棰勮瀹屽伐鏃堕棿"
sortable="custom"
width="160"
/>
@@ -343,11 +366,12 @@
<script>
import Pagination from '@/components/Pagination'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
-import { handleDatatime, handleDatetime } from '@/utils/global'
+import { handleDatetime } from '@/utils/global'
+import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SCDD',
components: {
Pagination
},
@@ -373,8 +397,10 @@
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
- paydate: '', // 浜や粯鏃堕棿
creatuser: '', // 鍒涘缓浜哄憳
+ // paystartdate: '', // 浜や粯鏃堕棿
+ paystartdate: '', // 棰勮寮�宸ユ椂闂�
+ payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
prop: 'createdate', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -383,8 +409,8 @@
},
erporderstusArr: [
{ code: 'NEW', name: '鏂拌鍗�' },
- { code: 'CREATING', name: '鍒涘缓涓�' },
- { code: 'CREATED', name: '宸插垱寤�' },
+ { code: 'CREATING', name: '閮ㄥ垎涓嬭揪' },
+ { code: 'CREATED', name: '鍏ㄩ儴涓嬭揪' },
{ code: 'CLOSED', name: '宸插叧闂�' }
],
total: 10,
@@ -394,7 +420,7 @@
dialogForm: {
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
- paydate: '', // 浜や粯鏃堕棿
+ // paystartdate: '', // 棰勮寮�宸ユ椂闂�
wkshopname: '', // 杞﹂棿鍚嶇О
warehousename: '', // 浠撳簱鍚嶇О
@@ -444,12 +470,12 @@
methods: {
async getErpOrderSearch() {
console.log(this.form, 1)
- let tempDate2 = this.form.paydate
+ let tempDate2 = this.form.paystartdate
if (tempDate2.length > 0) {
tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
}
- let tempDate = this.form.createdate
+ let tempDate = this.form.payenddate
if (tempDate.length > 0) {
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
@@ -460,9 +486,11 @@
partcode: this.form.partcode, // 浜у搧缂栫爜
partname: this.form.partname, // 浜у搧鍚嶇О
partspec: this.form.partspec, // 浜у搧瑙勬牸
- paydate: tempDate2, // 浜や粯鏃堕棿
+ paystartdate: tempDate2, // 浜や粯鏃堕棿
+ payenddate: tempDate, // 浜や粯鏃堕棿
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
- createdate: tempDate, // 鍒涘缓鏃堕棿
+ // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
+
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -487,24 +515,49 @@
this.form.prop = prop
this.getErpOrderSearch()
},
+ // 鍚屾ERP
+ syncERP() {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍚屾ERP锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
+ SeaveSearchErpOrder().then(res => {
+ console.log(res, 11)
+ if (res.code === '200') {
+ setTimeout(() => {
+ this.getErpOrderSearch()
+ loading.close()
+ this.$message.success('鍚屾鎴愬姛锛�')
+ }, 2000)
+ }
+ // else if (res.code === '300') {
+ // setTimeout(() => {
+ // loading.close()
+ // this.$message.error('鍚屾澶辫触锛�')
+ // }, 10000)
+ // }
+ })
+ },
// 鏌ヨ
search() {
this.getErpOrderSearch()
},
// 閲嶇疆
- reset(val) {
+ reset() {
this.form.erporderstus = ''
this.form.erpordercode = ''
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
- this.form.paydate = ''
+ this.form.paystartdate = ''
+ this.form.payenddate = ''
this.form.creatuser = ''
this.form.createdate = ''
this.getErpOrderSearch()
- if (val.length > 0) {
- this.$message.success('ERP宸插悓姝ワ紒')
- }
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
getCurrentRow(wo) {
@@ -628,7 +681,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
if (this.isFullscreen) {
this.tableHeight = this.tableHeight - 50
}
@@ -809,3 +862,8 @@
}
</style>
+<style>
+.osloading{
+ font-size: 40px;
+}
+</style>
--
Gitblit v1.9.3