From 5b23c2562004da7d6c06c42447a20dbd2f097672 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 03 三月 2023 16:33:41 +0800
Subject: [PATCH] 1.节拍工价、工单新增控制必须设置计件单价
---
src/views/scgl/gd.vue | 34 ++++++++++++++++-
src/views/zzmx/jpgj.vue | 5 ++
vue.config.js | 4 +-
src/views/scgl/sckbg.vue | 7 +++
src/api/scgl.js | 8 ++++
src/views/zzmx/gxdy.vue | 4 +-
6 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/api/scgl.js b/src/api/scgl.js
index 602a55e..e554662 100644
--- a/src/api/scgl.js
+++ b/src/api/scgl.js
@@ -305,3 +305,11 @@
})
}
+// 宸ュ崟娲惧彂閫夋嫨宸ヨ壓璺嚎鎴栭�夋嫨鐢熶骇杞﹂棿鏃跺垽鏂粦瀹氭潯浠�
+export function SelectRouteOrWkshop(data) {
+ return request({
+ url: 'ProductionManagement/SelectRouteOrWkshop',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 13bb53d..ed9761b 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -581,6 +581,7 @@
style="width: 200px;"
placeholder="璇烽�夋嫨"
:disabled="dialogForm.routecode===''"
+ @change="wkshopcodeChange"
>
<el-option
v-for="item in wkshopArr"
@@ -687,9 +688,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>
@@ -1604,7 +1615,7 @@
AddUpdateMesOrder,
ClosedMesOrder,
DeleteMesOrder, ErpOrderSearch,
- MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SearchWorkStepSopList,
+ MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SearchWorkStepSopList, SelectRouteOrWkshop,
SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1841,7 +1852,9 @@
/* 鏂囦欢棰勮閮ㄥ垎*/
dialogVisibleCheck: false,
sopSelectArr: [], // sop涓嬫媺閫夐」鏁扮粍
- sopSelectValue: ''// sop涓嬫媺閫変腑鍊�
+ sopSelectValue: '', // sop涓嬫媺閫変腑鍊�
+
+ sumbitBottonIsDisabled: false
}
},
created() {
@@ -1950,6 +1963,20 @@
getCurrentRow(wo_code) {
this.radioSelected = wo_code
},
+ // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
+ 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
+ })
+ },
// 鏂板鎸夐挳
async add(operation) {
this.operation = operation
@@ -1978,6 +2005,8 @@
}
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -2149,6 +2178,7 @@
this.dialogForm.orderlev = '' // 宸ュ崟绛夌骇
this.$refs.dialogForm.clearValidate()
+ this.sumbitBottonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index ab545b2..0d82174 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -550,6 +550,7 @@
v-model="dialogForm.eqpcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in ZZeqpArr"
@@ -599,11 +600,12 @@
v-model="dialogForm.reportuser"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in ZZuserArr"
:key="item.usercode"
- :label="item.username"
+ :label="item.username+' / '+item.usercode"
:value="item.usercode"
/>
</el-select>
@@ -613,6 +615,7 @@
<el-select
v-model="dialogForm.eqpcode"
style="width: 200px;"
+ filterable
placeholder="璇烽�夋嫨"
>
<el-option
@@ -638,6 +641,7 @@
:disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
multiple
collapse-tags
+ filterable
>
<el-option
v-for="item in badArr"
@@ -655,6 +659,7 @@
v-model="dialogForm.operation"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in OperationArr"
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index edc9fc6..21754f1 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -364,7 +364,7 @@
:data="workDialogForm.workTreeArr"
show-checkbox
node-key="code"
- style="height: 280px;"
+ style="height: 280px;overflow: auto"
default-expand-all
:props="workTreeDefaultProps"
@check="checkBoxClick"
@@ -411,7 +411,7 @@
:data="defectTree"
show-checkbox
node-key="code"
- style="height: 400px;"
+ style="height: 400px;overflow: auto"
default-expand-all
:props="workTreeDefaultProps"
/>
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 6e4804e..2656b6a 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -262,7 +262,7 @@
<el-option
v-for="item in partArr2"
:key="item.partcode"
- :label="item.partname"
+ :label="item.partname + ' / '+ item.partcode"
:value="item.partcode"
/>
</el-select>
@@ -696,6 +696,9 @@
},
// 淇濆瓨琛�
async saveRow(row) {
+ if (parseFloat(row.unprice) <= 0) {
+ return this.$message.info('璁′欢鍗曚环蹇呴』澶т簬闆讹紒')
+ }
const data = {
partcode: this.eqpTable.partcode, // 浜у搧缂栫爜
routecode: this.eqpTable.routecode, // 宸ヨ壓璺嚎缂栫爜
diff --git a/vue.config.js b/vue.config.js
index f08aa27..f591afb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -50,8 +50,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- // target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
- target: 'http://192.168.0.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑)
+ target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
+ // target: 'http://192.168.0.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3