From 95fb18f99827a5eeefa1ebf661c6f6459646b87b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 20 七月 2022 19:27:37 +0800
Subject: [PATCH] 1.修改bug 2.正在开发缺陷定义
---
src/views/scgl/gd.vue | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 946845a..6732ca5 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -30,7 +30,6 @@
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
<el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
-
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<!-- <el-select v-model="form.partcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">-->
<!-- <el-option-->
@@ -349,9 +348,9 @@
>
<el-option
v-for="item in routeArr"
- :key="item.route_code"
- :label="item.route_name"
- :value="item.route_code"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -422,7 +421,7 @@
<!-- 宸ヨ壓璺嚎鏀惧ぇ闀滃璇濇-->
<el-dialog
- title="宸ュ簭"
+ title="宸ヨ壓璺嚎"
:visible.sync="dialogVisibleSearch"
width="840px"
top="20vh"
@@ -556,14 +555,12 @@
import Pagination from '@/components/Pagination'
import {
AddUpdateMesOrder,
- ClosedErpOrder,
ClosedMesOrder,
DeleteMesOrder,
- MesOrderSearch, RouteSelectWkshop, SearchWorkStep,
+ MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
SelectRouteStep
} from '@/api/scgl'
-import { WorkShopSelect } from '@/api/sbgl'
-import { PartSelect, PartSelectRpute } from '@/api/zzmx'
+import { PartSelect } from '@/api/zzmx'
import { handleDatetime } from '@/utils/global'
import { getCookie } from '@/utils/auth'
import { MesOrderPrintSearch1 } from '@/api/utils'
@@ -788,9 +785,22 @@
// 浜у搧淇℃伅鍊兼敼鍙�
async partcodeChange(val) {
- const { data: res } = await PartSelectRpute({ partcode: val })
+ console.log(val, 22)
+ const { data: res } = await PartSelectRoute({ partcode: val })
this.routeArr = res
- this.dialogForm.routecode = ''
+
+ let flag = false
+ this.routeArr.forEach(item => {
+ if (item.code === item.default_route) {
+ this.dialogForm.routecode = item.code
+ this.routecodeChange(this.dialogForm.routecode)
+ flag = true
+ }
+ })
+ if (!flag) {
+ this.dialogForm.routecode = ''
+ }
+
this.dialogForm.wkshopcode = ''
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
@@ -834,8 +844,7 @@
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.routecodeChange(this.dialogForm.routecode)
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())
@@ -988,12 +997,11 @@
if (res.code === '200') {
// 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
var args = {
- type: 'print', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ type: 'preview', // preview print
+ showOptionDlg: true, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
report: urlAddRandomNo('./static/grf/浜у搧娴佷紶鍗旳4.grf'),
data: res.data
}
-
webapp_ws_ajax_run(args)
}
},
--
Gitblit v1.9.3