From 0aa79c7b9926e01f61de7c6514ea1deffe3bee7c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 03 三月 2023 16:33:20 +0800
Subject: [PATCH] 1.节拍工价、工单新增控制必须设置计件单价
---
src/views/scgl/gd.vue | 140 +++++++++++++++++++++-------------
src/views/zzmx/jpgj.vue | 3
src/views/kb/ckgl.vue | 74 +++++++++---------
src/api/scgl.js | 10 ++
4 files changed, 135 insertions(+), 92 deletions(-)
diff --git a/src/api/scgl.js b/src/api/scgl.js
index 0e7c63a..991b128 100644
--- a/src/api/scgl.js
+++ b/src/api/scgl.js
@@ -375,3 +375,13 @@
params: data
})
}
+
+// 宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠�
+export function SelectRouteOrWkshop(data) {
+ return request({
+ url: 'ProductionManagement/SelectRouteOrWkshop',
+ method: 'get',
+ params: data
+ })
+}
+
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 40e9ddd..cc72add 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -164,7 +164,7 @@
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="130"
+ width="140"
>
<template slot-scope="{row}">
<div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -174,7 +174,7 @@
<el-table-column
prop="wo"
label="鍗曟嵁缂栧彿"
- width="195"
+ width="228"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.wo }}</div>
@@ -183,7 +183,7 @@
<el-table-column
prop="customename"
label="瀹㈡埛"
- width="125"
+ width="345"
>
<template slot-scope="{row}">
<div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>
@@ -200,16 +200,16 @@
<!-- <div v-else>/</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
- <el-table-column
- prop="SourceVoucherCode"
- label="鏉ユ簮鍗曞彿"
- width="185"
- >
- <template slot-scope="{row}">
- <div v-if="row.SourceVoucherCode" class="ellipsis">{{ row.SourceVoucherCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="SourceVoucherCode"-->
+<!-- label="鏉ユ簮鍗曞彿"-->
+<!-- width="185"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div v-if="row.SourceVoucherCode" class="ellipsis">{{ row.SourceVoucherCode }}</div>-->
+<!-- <div v-else>/</div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="materiel_code"-->
<!-- label="浜у搧缂栧彿"-->
@@ -218,7 +218,7 @@
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="170"
+ width="200"
>
<template slot-scope="{row}">
<div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
@@ -237,7 +237,7 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="87"
+ width="130"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.quantity }}</div>
@@ -246,37 +246,37 @@
<el-table-column
prop="saleOutQuantity"
label="宸插彂璐ф暟閲�"
- width="100"
+ width="130"
>
<template slot-scope="{row}">
<div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
<div v-else>0</div>
</template>
</el-table-column>
- <el-table-column
- prop="priuserdefnvc1"
- label="妫�楠屾柟寮�"
- width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.priuserdefnvc1">{{ row.priuserdefnvc1 }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="priuserdefnvc2"
- label="妫�楠屼汉鍛�"
- width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.priuserdefnvc2">{{ row.priuserdefnvc2 }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="priuserdefnvc1"-->
+<!-- label="妫�楠屾柟寮�"-->
+<!-- width="110"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div v-if="row.priuserdefnvc1">{{ row.priuserdefnvc1 }}</div>-->
+<!-- <div v-else>/</div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="priuserdefnvc2"-->
+<!-- label="妫�楠屼汉鍛�"-->
+<!-- width="110"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div v-if="row.priuserdefnvc2">{{ row.priuserdefnvc2 }}</div>-->
+<!-- <div v-else>/</div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column
prop="deliveryDate"
label="棰勮浜よ揣鏃ユ湡"
- width="141"
+ width="180"
>
<template slot-scope="{row}">
<div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0,10) }}</div>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 7d97b28..326d49c 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>
@@ -923,20 +935,20 @@
</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-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
</div>
@@ -1226,7 +1238,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 +1269,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 +1559,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 +1587,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 +1607,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 +1645,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>
@@ -1661,7 +1673,7 @@
AddUpdateMesOrder,
ClosedMesOrder,
DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison,
- MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
+ MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1906,7 +1918,8 @@
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
- }
+ },
+ sumbitBottonIsDisabled: false
}
},
created() {
@@ -1966,6 +1979,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 }) {
@@ -2041,6 +2068,8 @@
}
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -2214,6 +2243,7 @@
this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
+ this.sumbitBottonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index a3d51ed..538c1c2 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -711,6 +711,9 @@
},
// 淇濆瓨琛�
async saveRow(row) {
+ if (parseFloat(row.unprice) <= 0) {
+ return this.$message.info('璁′欢鍗曚环蹇呴』澶т簬闆讹紒')
+ }
const data = {
partcode: this.eqpTable.partcode, // 浜у搧缂栫爜
routecode: this.eqpTable.routecode, // 宸ヨ壓璺嚎缂栫爜
--
Gitblit v1.9.3