From 9c6115340a7cd7e36198a0d0503068a260d30581 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 03 三月 2023 16:32:25 +0800
Subject: [PATCH] 1.节拍工价、工单新增控制必须设置计件单价
---
src/views/kb/cjsc.vue | 36 ++++++++++++++---
src/views/scgl/gd.vue | 33 +++++++++++++++-
src/views/zzmx/jpgj.vue | 3 +
src/api/scgl.js | 9 ++++
src/views/kb/zhkb.vue | 11 ++++-
5 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/src/api/scgl.js b/src/api/scgl.js
index 102dee4..3d1caff 100644
--- a/src/api/scgl.js
+++ b/src/api/scgl.js
@@ -252,3 +252,12 @@
data
})
}
+
+// 宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠�
+export function SelectRouteOrWkshop(data) {
+ return request({
+ url: 'ProductionManagement/SelectRouteOrWkshop',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/views/kb/cjsc.vue b/src/views/kb/cjsc.vue
index b9022a6..6c7caef 100644
--- a/src/views/kb/cjsc.vue
+++ b/src/views/kb/cjsc.vue
@@ -44,7 +44,12 @@
prop="partname"
width="120"
label="浜у搧鍚嶇О"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
@@ -78,7 +83,12 @@
prop="partname"
width="120"
label="浜у搧鍚嶇О"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
@@ -147,6 +157,7 @@
>
<template slot-scope="{row}">
<div
+ class="ellipsis"
:style="{color:row.eqp_name==='瑁呴厤涓�绾�'?'#FFFF77':row.eqp_name==='瑁呴厤浜岀嚎'?'#FF8888':row.eqp_name==='瑁呴厤涓夌嚎'?'#D28EFF':'#66FFFF'}"
> {{ row.partname }}
</div>
@@ -167,7 +178,7 @@
<el-table-column
prop="plan_startdate"
label="棰勮寮�濮�"
- width="130"
+ width="125"
>
<template slot-scope="{row}">
<div
@@ -181,7 +192,7 @@
<el-table-column
prop="plan_enddate"
label="棰勮瀹屽伐"
- width="130"
+ width="125"
>
<template slot-scope="{row}">
<div
@@ -195,10 +206,11 @@
<el-table-column
prop="stepname"
label="宸ュ簭"
- width="90"
+ width="100"
>
<template slot-scope="{row}">
<div
+ class="ellipsis"
:style="{color:row.eqp_name==='瑁呴厤涓�绾�'?'#FFFF77':row.eqp_name==='瑁呴厤浜岀嚎'?'#FF8888':row.eqp_name==='瑁呴厤涓夌嚎'?'#D28EFF':'#66FFFF'}"
> {{ row.stepname }}
</div>
@@ -242,7 +254,12 @@
prop="partname"
width="120"
label="浜у搧鍚嶇О"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
@@ -276,7 +293,12 @@
prop="partname"
width="120"
label="浜у搧鍚嶇О"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 909c462..68fbcf4 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -233,14 +233,19 @@
/>
<el-table-column
prop="linename"
- width="165"
+ width="125"
label="浜х嚎"
/>
<el-table-column
prop="partname"
- width="120"
+ width="160"
label="浜у搧"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="good_qty"
label="鏁伴噺"
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index f0ced12..91601cc 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -578,6 +578,7 @@
style="width: 200px;"
placeholder="璇烽�夋嫨"
:disabled="dialogForm.routecode===''"
+ @change="wkshopcodeChange"
>
<el-option
v-for="item in wkshopArr"
@@ -684,9 +685,19 @@
<el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
<!-- <el-button 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"
+ disabled
@click="dialogVisibleConfirm"
>纭� 瀹�</el-button>
</div>
@@ -1561,7 +1572,7 @@
AddUpdateMesOrder,
ClosedMesOrder,
DeleteMesOrder, ErpOrderSearch,
- MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
+ MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1793,7 +1804,8 @@
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
- }
+ },
+ sumbitBottonIsDisabled: false
}
},
created() {
@@ -1849,6 +1861,20 @@
// 鑾峰彇浜у搧淇℃伅
const { data: res1 } = await PartSelect()
this.partArr = res1
+ },
+ // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
+ 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
+ })
},
// 璁㈠崟鐘舵�佹敼鍙樻椂
erporderstusChange(val) {
@@ -1930,6 +1956,8 @@
}
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -2085,6 +2113,7 @@
this.dialogForm.orderlev = '' // 宸ュ崟绛夌骇
this.$refs.dialogForm.clearValidate()
+ this.sumbitBottonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index de525e9..7bdc3a6 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -691,6 +691,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