From 864f0e9e1fa3eefc21fe4b44fc8e2bcd5df5a0c3 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 25 七月 2022 17:11:46 +0800
Subject: [PATCH] 1.对接导入功能
---
src/views/scgl/gd.vue | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 946845a..261f83d 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-->
@@ -133,6 +132,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="status"
@@ -153,14 +153,13 @@
prop="wo_code"
label="宸ュ崟缂栧彿"
sortable="custom"
-
- width="160"
+ min-width="160"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
- width="120"
+ min-width="120"
/>
<el-table-column
prop="partname"
@@ -190,7 +189,7 @@
prop="route_name"
label="宸ヨ壓璺嚎"
sortable="custom"
- width="130"
+ min-width="130"
/>
<el-table-column
@@ -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,18 +555,16 @@
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'
-import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
+import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -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())
@@ -993,7 +1002,6 @@
report: urlAddRandomNo('./static/grf/浜у搧娴佷紶鍗旳4.grf'),
data: res.data
}
-
webapp_ws_ajax_run(args)
}
},
--
Gitblit v1.9.3