From 6caecd26f75979777956dc96e14d6f3b39ce6688 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 15 七月 2022 17:23:42 +0800
Subject: [PATCH] 1.修改bug
---
src/views/scgl/gd.vue | 156 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 108 insertions(+), 48 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 9ee6dc7..4296c2c 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -12,10 +12,12 @@
<div class="elForm">
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
- v-model="form.erporderstus"
+ v-model="form.mesorderstus"
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ filterable
+ @change="erporderstusChange"
>
<el-option
v-for="item in erporderstusArr"
@@ -26,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -52,18 +54,21 @@
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
<!-- <el-date-picker-->
<!-- v-model="form.createdate"-->
- <!-- type="date"-->
- <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- type="daterange"-->
+ <!-- :clearable="false"-->
+ <!-- range-separator="~"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- size="mini"-->
<!-- />-->
<el-date-picker
v-model="form.createdate"
- type="daterange"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
+ type="date"
size="mini"
+ :clearable="false"
+ style="width: 200px;"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
/>
</el-form-item>
</div>
@@ -98,7 +103,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -187,6 +192,7 @@
sortable="custom"
width="120"
/>
+
<el-table-column
prop="plan_startdate"
label="璁″垝寮�濮嬫椂闂�"
@@ -273,6 +279,7 @@
<el-select
v-model="dialogForm.mesorderstus"
disabled
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -304,6 +311,7 @@
>
<el-select
v-model="dialogForm.partcode"
+ filterable
:disabled="operation!=='add'"
:popper-append-to-body="false"
style="width: 200px"
@@ -328,29 +336,16 @@
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
<div style="display: flex">
- <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
- <el-select
- v-model="dialogForm.wkshopcode"
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in wkshopArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
<div style="display: flex;flex-wrap: nowrap">
<el-form-item label="宸ヨ壓璺嚎" prop="routecode">
<el-select
v-model="dialogForm.routecode"
+ filterable
:disabled="dialogForm.partcode===''"
:popper-append-to-body="false"
- style="width: 160px"
+ style="width: 172px"
placeholder="璇烽�夋嫨"
+ @change="routecodeChange"
>
<el-option
v-for="item in routeArr"
@@ -369,11 +364,29 @@
<!-- :disabled="dialogForm.routecode===''"-->
</div>
+ <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.routecode===''"
+ >
+ <el-option
+ v-for="item in wkshopArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
</div>
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
<el-date-picker
v-model="dialogForm.planstartdate"
type="date"
+ :clearable="false"
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
@@ -383,6 +396,7 @@
<el-date-picker
v-model="dialogForm.planenddate"
type="date"
+ :clearable="false"
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
@@ -391,6 +405,7 @@
<el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
<el-select
v-model="dialogForm.orderlev"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -409,10 +424,11 @@
<el-dialog
title="宸ュ簭"
:visible.sync="dialogVisibleSearch"
- width="540px"
- top="25vh"
+ width="840px"
+ top="20vh"
class="dialogVisibleSearch"
append-to-body
+ :close-on-click-modal="false"
>
<el-table
:data="searchTableData"
@@ -455,7 +471,8 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-else type="primary" @click="dialogVisibleConfirm">纭� 瀹�/鎵� 鍗�</el-button>
</div>
</span>
</el-dialog>
@@ -487,6 +504,7 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
+ width="200"
/>
<el-table-column
prop="stepcode"
@@ -541,16 +559,19 @@
ClosedErpOrder,
ClosedMesOrder,
DeleteMesOrder,
- MesOrderSearch, SearchWorkStep,
+ MesOrderSearch, RouteSelectWkshop, SearchWorkStep,
SelectRouteStep
} from '@/api/scgl'
import { WorkShopSelect } from '@/api/sbgl'
import { PartSelect, PartSelectRpute } from '@/api/zzmx'
import { handleDatetime } from '@/utils/global'
+import { getCookie } from '@/utils/auth'
+import { MesOrderPrintSearch1 } from '@/api/utils'
+import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'GD',
components: {
Pagination
},
@@ -684,13 +705,15 @@
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+ // webapp_urlprotocol_startup()
+ webapp_ws_autoupdate(true)
},
methods: {
async getMesOrderSearch() {
- let tempDate = this.form.createdate
- if (tempDate.length > 0) {
- tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
- }
+ // let tempDate = this.form.createdate
+ // if (tempDate.length > 0) {
+ // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ // }
const data = {
mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
@@ -699,7 +722,7 @@
partname: this.form.partname, // 浜у搧鍚嶇О
partspec: this.form.partspec, // 浜у搧瑙勬牸
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, // 绗嚑椤�
@@ -715,10 +738,10 @@
// 鑾峰彇浜у搧淇℃伅
const { data: res1 } = await PartSelect()
this.partArr = res1
-
- // 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
- const { data: res2 } = await WorkShopSelect()
- this.wkshopArr = res2
+ },
+ // 璁㈠崟鐘舵�佹敼鍙樻椂
+ erporderstusChange(val) {
+ this.form.mesorderstus = val
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -740,8 +763,8 @@
// 閲嶇疆
reset(val) {
- this.form.erporderstus = ''
- this.form.erpordercode = ''
+ this.form.mesorderstus = ''
+ this.form.mesordercode = ''
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
@@ -758,6 +781,9 @@
async add(operation) {
this.operation = operation
this.dialogVisible = true
+ this.dialogForm.planstartdate = handleDatetime(new Date())
+ this.dialogForm.planenddate = handleDatetime(new Date())
+ this.dialogForm.orderlev = 3
},
// 浜у搧淇℃伅鍊兼敼鍙�
@@ -765,9 +791,21 @@
const { data: res } = await PartSelectRpute({ partcode: val })
this.routeArr = res
this.dialogForm.routecode = ''
+ this.dialogForm.wkshopcode = ''
+ },
+ // 宸ヨ壓璺嚎鍊兼敼鍙�
+ async routecodeChange(val) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode
+ }
+ // 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
+ const { data: res2 } = await RouteSelectWkshop(data)
+ this.wkshopArr = res2
+ this.dialogForm.wkshopcode = ''
},
// 宸ュ簭浠诲姟
- async check(row) {
+ async check(row) {
this.dialogVisibleTask = true
const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
this.taskTableData = res
@@ -796,8 +834,8 @@
this.dialogForm.partname = row.partname
this.dialogForm.mesqty = row.plan_qty
this.dialogForm.partspec = row.partspec
- this.dialogForm.routecode = row.route_code// 宸ヨ壓璺嚎浠ｇ爜
- this.dialogForm.wkshopcode = row.wkshp_code// 鐢熶骇杞﹂棿浠ｇ爜
+ // this.dialogForm.routecode = row.route_code// 宸ヨ壓璺嚎浠ｇ爜
+ // this.dialogForm.wkshopcode = row.wkshp_code// 鐢熶骇杞﹂棿浠ｇ爜
this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
this.dialogForm.planenddate = row.plan_enddate !== null ? row.plan_enddate : handleDatetime(new Date())
@@ -925,9 +963,11 @@
orderlev: this.dialogForm.orderlev, // 宸ュ崟绛夌骇
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
- console.log(data, 1)
AddUpdateMesOrder(data).then(res => {
if (res.code === '200') {
+ if (this.operation !== 'add') {
+ this.sendPrint()
+ }
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
this.dialogVisible = false
this.getMesOrderSearch()
@@ -938,12 +978,31 @@
}
})
},
+ // 娲惧彂鎵撳嵃
+ async sendPrint() {
+ const data = {
+ username: getCookie('admin'),
+ mesordercode: this.dialogForm.mesordercode
+ }
+ const res = await MesOrderPrintSearch1(data)
+ if (res.code === '200') {
+ // 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+ var args = {
+ type: 'print', // preview print
+ showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo('./static/grf/浜у搧娴佷紶鍗旳4.grf'),
+ data: res.data
+ }
+
+ webapp_ws_ajax_run(args)
+ }
+ },
// 鑾峰彇椤甸潰楂樺害
getHeight() {
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
}
@@ -1017,6 +1076,7 @@
::v-deep .el-dialog__body {
padding: 20px 100px !important;
}
+
.dialogVisibleSearch ::v-deep .el-dialog__body {
padding: 20px 20px !important;
}
--
Gitblit v1.9.3