From 31ce9a56c95000f1567cda9f5821aadb5d1e4fd0 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 30 八月 2023 16:25:02 +0800
Subject: [PATCH] 1.递交
---
src/views/scgl/gd.vue | 373 +++++++++++++++++++++++++++++++---------------------
1 files changed, 222 insertions(+), 151 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 7d97b28..42cb162 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -38,10 +38,10 @@
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
- <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item label="鍗曟嵁绫诲瀷" style=" display: flex;">
<el-select
@@ -60,16 +60,16 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍒涘缓鏃堕棿" style=" display: flex;">
<!-- <el-date-picker-->
@@ -93,7 +93,9 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <div class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
@@ -346,7 +348,7 @@
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
+ <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)"/>
</el-tooltip>
</div>
</template>
@@ -494,7 +496,7 @@
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" prop="mesordercode">
- <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px" />
+ <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px"/>
</el-form-item>
<div style="display: flex">
<el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
@@ -564,13 +566,13 @@
</el-select>
</el-form-item>
<el-form-item v-if="operation!=='add'" label="浜у搧鍚嶇О" prop="partname">
- <el-input v-model="dialogForm.partname" disabled style="width: 200px" />
+ <el-input v-model="dialogForm.partname" disabled style="width: 200px"/>
</el-form-item>
<el-form-item label="浜у搧缂栫爜">
- <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />
+ <el-input v-model="dialogForm.partcode" disabled style="width: 200px"/>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
- <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
+ <el-input v-model="dialogForm.partspec" disabled style="width: 200px"/>
</el-form-item>
<div style="display: flex">
<div style="display: flex;flex-wrap: nowrap">
@@ -609,6 +611,7 @@
:popper-append-to-body="false"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ @change="wkshopcodeChange"
:disabled="dialogForm.routecode===''"
>
<el-option
@@ -620,29 +623,29 @@
</el-select>
</el-form-item>
</div>
-<!-- <el-form-item label="鏄惁鎺掔▼" prop="isAps">-->
-<!-- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">-->
-<!-- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>-->
-<!-- <el-radio key="N" label="N" value="N">鍚�</el-radio>-->
-<!-- </el-radio-group>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">-->
-<!-- <el-select-->
-<!-- v-model="dialogForm.bomId"-->
-<!-- filterable-->
-<!-- :disabled="dialogForm.isAps==='N'"-->
-<!-- :popper-append-to-body="false"-->
-<!-- style="width: 200px;"-->
-<!-- placeholder="璇烽�夋嫨"-->
-<!-- >-->
-<!-- <el-option-->
-<!-- v-for="item in bomIdArr"-->
-<!-- :key="item.id"-->
-<!-- :label="item.version"-->
-<!-- :value="item.id"-->
-<!-- />-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
+ <!-- <el-form-item label="鏄惁鎺掔▼" prop="isAps">-->
+ <!-- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">-->
+ <!-- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>-->
+ <!-- <el-radio key="N" label="N" value="N">鍚�</el-radio>-->
+ <!-- </el-radio-group>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.bomId"-->
+ <!-- filterable-->
+ <!-- :disabled="dialogForm.isAps==='N'"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in bomIdArr"-->
+ <!-- :key="item.id"-->
+ <!-- :label="item.version"-->
+ <!-- :value="item.id"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
<el-date-picker
v-model="dialogForm.planstartdate"
@@ -743,11 +746,20 @@
<div class="footerButton">
<el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
<!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
+ <el-button
+ v-if="!sumbitBottonIsDisabled"
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
+
<el-button
+ v-if="sumbitBottonIsDisabled"
v-waves
type="primary"
- :loading="$store.state.app.buttonIsDisabled"
- :disabled="$store.state.app.buttonIsDisabled"
+ disabled
@click="dialogVisibleConfirm"
>纭� 瀹�</el-button>
</div>
@@ -870,45 +882,45 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm" style="justify-content: flex-start">
- <el-form-item
- label="棰勮寮�宸ユ椂闂�"
- label-width="100px"
- style=" display: flex;font-size: 14px;margin-top: 3px"
- >
- <el-date-picker
- v-model="sourceForm.paystartdate"
- type="daterange"
- range-separator="~"
- class="timeMini"
- size="mini"
- style="width: 200px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
- :clearable="false"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- />
- <!-- :picker-options="expireTimeOption"-->
+ <!-- <el-form-item-->
+ <!-- label="棰勮寮�宸ユ椂闂�"-->
+ <!-- label-width="100px"-->
+ <!-- style=" display: flex;font-size: 14px;margin-top: 3px"-->
+ <!-- >-->
+ <!-- <el-date-picker-->
+ <!-- v-model="sourceForm.paystartdate"-->
+ <!-- type="daterange"-->
+ <!-- range-separator="~"-->
+ <!-- class="timeMini"-->
+ <!-- size="mini"-->
+ <!-- style="width: 200px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"-->
+ <!-- :clearable="false"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- />-->
+ <!-- <!– :picker-options="expireTimeOption"–>-->
- </el-form-item>
- <el-form-item
- label="棰勮瀹屽伐鏃堕棿"
- label-width="100px"
- style=" display: flex;font-size: 14px;margin-top: 3px"
- >
- <el-date-picker
- v-model="sourceForm.payenddate"
- type="daterange"
- :clearable="false"
- class="timeMini"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- style="width: 200px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
- end-placeholder="缁撴潫鏃ユ湡"
- size="mini"
- />
- </el-form-item>
- <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
+ <!-- </el-form-item>-->
+ <!-- <el-form-item-->
+ <!-- label="棰勮瀹屽伐鏃堕棿"-->
+ <!-- label-width="100px"-->
+ <!-- style=" display: flex;font-size: 14px;margin-top: 3px"-->
+ <!-- >-->
+ <!-- <el-date-picker-->
+ <!-- v-model="sourceForm.payenddate"-->
+ <!-- type="daterange"-->
+ <!-- :clearable="false"-->
+ <!-- class="timeMini"-->
+ <!-- range-separator="~"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- style="width: 200px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- size="mini"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
- v-model="sourceForm.erporderstus"
+ v-model="sourceForm.mesordercode"
filterable
:popper-append-to-body="false"
style="width: 200px"
@@ -922,10 +934,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-input v-model="sourceForm.sourceorder" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="浜у搧缂栫爜" style=" display: flex;">
+ <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -937,6 +949,27 @@
</el-form-item>
<el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+
+ <el-form-item
+ v-show="isExpandDialog"
+ label="鍒涘缓鏃堕棿"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;margin-top: 3px"
+ >
+ <el-date-picker
+ v-model="sourceForm.createdate"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
+ <!-- :picker-options="expireTimeOption"-->
+
</el-form-item>
</div>
@@ -1002,27 +1035,32 @@
fixed
label="搴忓彿"
/>
+ <!-- <el-table-column-->
+ <!-- prop="status"-->
+ <!-- label="宸ュ崟鐘舵��"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="110"-->
+ <!-- >-->
+ <!-- <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==='CLOSED'">宸插叧闂�</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
- prop="status"
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟缂栧彿"
+ prop="wo_code"
show-tooltip-when-overflow
- sortable="custom"
- width="110"
- >
- <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==='CLOSED'">宸插叧闂�</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wo"
- label="璁㈠崟缂栧彿"
- show-tooltip-when-overflow
- sortable="custom"
min-width="150"
- />
+ sortable="custom"
+ >
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.m_po">{{ row.m_po }}</div>-->
+ <!-- <div v-else>{{ row.wo_code }}</div>-->
+ <!-- </template>-->
+ </el-table-column>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
@@ -1050,19 +1088,28 @@
</template>
</el-table-column>
<el-table-column
- prop="qty"
- label="璁㈠崟鏁伴噺"
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
width="150"
show-tooltip-when-overflow
sortable="custom"
/>
+
<el-table-column
- prop="relse_qty"
- show-tooltip-when-overflow
- label="宸蹭笅鍗曟暟閲�"
+ prop="bad_qty"
+ label="鎶ュ簾鏁伴噺"
width="150"
+ show-tooltip-when-overflow
sortable="custom"
/>
+
+ <!-- <el-table-column-->
+ <!-- prop="relse_qty"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="宸蹭笅鍗曟暟閲�"-->
+ <!-- width="150"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
@@ -1076,50 +1123,50 @@
</template>
</el-table-column>
<el-table-column
- prop="planstartdate"
+ prop="plan_startdate"
label="棰勮寮�宸ユ椂闂�"
show-tooltip-when-overflow
sortable="custom"
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="planenddate"
+ prop="plan_enddate"
label="棰勮瀹屽伐鏃堕棿"
show-tooltip-when-overflow
sortable="custom"
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
+ <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="createuser"
+ prop="lm_user"
label="鍒涘缓浜哄憳"
show-tooltip-when-overflow
sortable="custom"
width="150"
>
<template slot-scope="{row}">
- <div v-if="row.createuser">{{ row.createuser }}</div>
+ <div v-if="row.lm_user">{{ row.lm_user }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="createdate"
+ prop="lm_date"
label="鍒涘缓鏃堕棿"
show-tooltip-when-overflow
width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
+ <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -1151,7 +1198,7 @@
align="right"
layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
- @pagination="getErpOrderSearch"
+ @pagination="getMesBadOrderSearch"
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -1226,7 +1273,7 @@
>
<!-- <div id="qrCode0" ref="qrCodeDiv0" />-->
</div>
- <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0" />
+ <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0"/>
<div
style="z-index: 10;background-color:transparent;width: 120px;height:120px; position: absolute;right: 21px"
/>
@@ -1257,7 +1304,7 @@
align="center"
>
<template slot-scope="{row}">
- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" class="tableColumn" />
+ <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" class="tableColumn"/>
</template>
</el-table-column>
<el-table-column
@@ -1547,11 +1594,11 @@
@close="handleCloseRoute"
>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 浜у搧鍚嶇О锛歿{ dialogFormRoute.projectName }}
+ <i class="el-icon-s-comment" style="color:#42b983;"/> 浜у搧鍚嶇О锛歿{ dialogFormRoute.projectName }}
</div>
- <el-divider />
+ <el-divider/>
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヨ壓璺嚎闆嗗悎
+ <i class="el-icon-s-operation" style="color:#42b983;"/> 宸ヨ壓璺嚎闆嗗悎
</div>
<div class="myCheckboxGroup">
@@ -1575,9 +1622,9 @@
</div>
</div>
- <el-divider />
+ <el-divider/>
<div>
- <i class="el-icon-s-operation" style="color:#42b983;" /> 榛樿宸ヨ壓璺嚎
+ <i class="el-icon-s-operation" style="color:#42b983;"/> 榛樿宸ヨ壓璺嚎
</div>
<div style="margin-top: 20px">
<el-select
@@ -1595,9 +1642,9 @@
/>
</el-select>
</div>
- <el-divider />
+ <el-divider/>
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ュ簭鍒楄〃
+ <i class="el-icon-s-operation" style="color:#42b983;"/> 宸ュ簭鍒楄〃
</div>
<div style="overflow-y: scroll">
<el-table
@@ -1633,11 +1680,11 @@
>
<template slot-scope="{row}">
<div v-if="row.enable==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <svg-icon icon-class="circleYes" style="margin-right: 2px"/>
鏄�
</div>
<div v-if="row.enable==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <svg-icon icon-class="circleNo" style="margin-right: 2px"/>
鍚�
</div>
</template>
@@ -1660,8 +1707,8 @@
import {
AddUpdateMesOrder,
ClosedMesOrder,
- DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison,
- MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
+ DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison, MesBadOrderSearch,
+ MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1711,8 +1758,8 @@
{ code: 'ALLO', name: '宸叉淳鍙�' },
{ code: 'START', name: '寮�宸�' },
{ code: 'CLOSED', name: '瀹屽伐' },
- { code: 'NOSCHED', name: '寰呮帓绋�' },
- { code: 'SCHED', name: '宸叉帓绋�' }
+ // { code: 'NOSCHED', name: '寰呮帓绋�' },
+ // { code: 'SCHED', name: '宸叉帓绋�' }
],
total: 10,
radioSelected: '',
@@ -1865,17 +1912,18 @@
dialogVisibleSource: false,
sourceTableData: [],
sourceForm: {
- erporderstus: '', // 璁㈠崟鐘舵�佺爜
- erpordercode: '', // 璁㈠崟缂栧彿
+ mesordercode: '', // 璁㈠崟鐘舵�佺爜
+ sourceorder: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
// paystartdate: '', // 浜や粯鏃堕棿
- paystartdate: '', // 棰勮寮�宸ユ椂闂�
- payenddate: '', // 棰勮瀹屽伐鏃堕棿
+ // paystartdate: '', // 棰勮寮�宸ユ椂闂�
+ // payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
- prop: 'createdate', // 鎺掑簭瀛楁
+
+ prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -1906,7 +1954,8 @@
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
- }
+ },
+ sumbitBottonIsDisabled: false
}
},
created() {
@@ -1967,6 +2016,20 @@
erporderstusChange(val) {
this.form.mesorderstus = val
},
+ // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
+ wkshopcodeChange(val) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode,
+ wkshopcode: val
+ }
+ SelectRouteOrWkshop(data).then((res) => {
+ // console.log(res, 1)
+ }).catch(err => {
+ // console.log(err, 2)
+ this.sumbitBottonIsDisabled = true
+ })
+ },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
@@ -1990,7 +2053,7 @@
}
this.sourceForm.order = order
this.sourceForm.prop = prop
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
// 鏌ヨ
search() {
@@ -2041,6 +2104,8 @@
}
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -2052,6 +2117,8 @@
const { data: res2 } = await RouteSelectWkshop(data)
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
// 鏄惁鎺掔▼鍊兼敼鍙樻椂
changeIsAps(val) {
@@ -2214,6 +2281,7 @@
this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
+ this.sumbitBottonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -2447,6 +2515,11 @@
this.$nextTick(() => {
console.log(this.qrForm.qrvalue, 3333)
this.bindQRCode2(this.qrForm.qrvalue)
+
+ const div = document.getElementById('qrCode2')
+ // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
+ div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+ // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
@@ -2483,30 +2556,31 @@
return this.$message.info('宸ュ崟绫诲瀷涓烘姤搴熻ˉ鍗曟儏鍐典笅鍙�夋嫨锛�')
}
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
this.dialogVisibleSource = true
},
- async getErpOrderSearch() {
- let tempDate2 = this.sourceForm.paystartdate
- if (tempDate2.length > 0) {
- tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
- }
+ async getMesBadOrderSearch() {
+ // let tempDate2 = this.sourceForm.paystartdate
+ // if (tempDate2.length > 0) {
+ // tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ // }
- let tempDate = this.sourceForm.payenddate
+ let tempDate = this.sourceForm.createdate
if (tempDate.length > 0) {
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
- erporderstus: this.sourceForm.erporderstus, // 璁㈠崟鐘舵�佺爜
- erpordercode: this.sourceForm.erpordercode, // 璁㈠崟缂栧彿
+ mesordercode: this.sourceForm.mesordercode, // 璁㈠崟鐘舵�佺爜
+ sourceorder: this.sourceForm.sourceorder, // 宸ュ崟缂栧彿
partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
partname: this.sourceForm.partname, // 浜у搧鍚嶇О
partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
- paystartdate: tempDate2, // 浜や粯鏃堕棿
- payenddate: tempDate, // 浜や粯鏃堕棿
+ // paystartdate: tempDate2, // 浜や粯鏃堕棿
+ // payenddate: tempDate, // 浜や粯鏃堕棿
creatuser: this.sourceForm.creatuser, // 鍒涘缓浜哄憳
+ createdate: tempDate, // 鍒涘缓鏃堕棿
prop: this.sourceForm.prop, // 鎺掑簭瀛楁
order: this.sourceForm.order, // 鎺掑簭瀛楁
@@ -2515,20 +2589,17 @@
}
- const res = await ErpOrderSearch(data)
- this.sourceTableData = res.data.filter(item => item.status !== 'NEW')
+ const res = await MesBadOrderSearch(data)
+ this.sourceTableData = res.data
this.sourceFormTotal = res.count
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
- // getCurrentRowSource2(id) {
- // this.radioSelectedId = id
- // },
- // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
getCurrentRowSource(row, event, column) {
this.radioSelectedId = row.id
+ this.dialogForm.mesqty = row.bad_qty
},
sourceSearch() {
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
sourceReset() {
this.sourceForm.erporderstus = ''
@@ -2540,7 +2611,7 @@
this.sourceForm.payenddate = ''
this.sourceForm.creatuser = ''
this.sourceForm.createdate = ''
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
dialogVisibleSourceClose() {
this.radioSelectedId = ''
@@ -2565,7 +2636,7 @@
console.log(this.radioSelectedId)
this.sourceTableData.forEach(item => {
if (item.id === this.radioSelectedId) {
- this.dialogForm.sourceorder = item.wo
+ this.dialogForm.sourceorder = item.wo_code
this.dialogForm.partcode = item.partcode
this.dialogForm.partspec = item.partspec
}
--
Gitblit v1.9.3