From c552dfd69248938b68e349a047a599063402044c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 19:06:06 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
---
src/views/plan/customerorder/index.vue | 87 +++++++++++++++++++++----------------------
1 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 9c4423c..15515eb 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -67,20 +67,20 @@
>
</el-dropdown-menu>
</el-dropdown>
- <el-button
+ <!-- <el-button
v-if="permissions.customerorder_ifs_line"
style="margin-left:10px;"
type="primary"
@click="pullIfsLineNo"
>鑾峰彇OTC琛屽彿</el-button
- >
- <el-button
+ > -->
+ <!-- <el-button
v-if="permissions.customerorder_push_otc"
style="margin-left:10px;"
type="primary"
@click="pushOtc"
>鎺ㄩ�丱TC</el-button
- >
+ > -->
<!-- <el-button
style="margin-left:10px;"
type="primary"
@@ -93,13 +93,13 @@
@click="exportStandBook"
>瀵煎嚭鍙拌处</el-button
> -->
- <el-button
+ <!-- <el-button
v-if="permissions.plan_customerorder_return"
style="margin-left:10px;"
type="primary"
@click="returnOrder"
>璁㈠崟閫�鍥�</el-button
- >
+ > -->
</template>
</ttable>
@@ -342,6 +342,13 @@
showCustomerorderReturn: false,
scheduleVisible: false,
showDocument: false,
+ sourceIdList: [{
+ label: '澶栭儴',
+ value: '0',
+ },{
+ label: '鍐呴儴',
+ value: '1',
+ }],
stateTagArr: [
{
label: '鏍囪闆朵欢寰呴��',
@@ -661,18 +668,18 @@
],
toolbar: [],
operator: [
- {
- text: '璁㈠崟璇存槑',
- type: 'text',
- size: 'small',
- fun: this.openCustomerOrder
- },
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.stockHandle
- },
+ // {
+ // text: '璁㈠崟璇存槑',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.openCustomerOrder
+ // },
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.stockHandle
+ // },
{
text: '浣滃簾',
type: 'text',
@@ -683,7 +690,6 @@
'01partUnCheck',
'02technologyUnCheck',
'03plan'
- // '04planed'
],
key: 'coState'
}
@@ -692,7 +698,7 @@
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 260,
+ width: 100,
minWidth: 100
}
},
@@ -809,7 +815,7 @@
}
},
immediate: true
- }
+ },
},
mounted() {
this.initQueryParams()
@@ -860,6 +866,14 @@
}
},
methods: {
+ getSourceId(row, column, cellValue) {
+ this.sourceIdList.forEach((obj) => {
+ if (obj.value === cellValue) {
+ cellValue = obj.label
+ }
+ })
+ return cellValue
+ },
getOtcPartSyncOptionList() {
return this.otcPartSyncOptionList
},
@@ -870,7 +884,6 @@
prop: 'coState',
searchInfoType: 'select',
// propVal: '01partUnCheck'
- propVal: '02technologyUnCheck'
})
)
this.$refs.customerOrderTable.setQueryParam(queryParam)
@@ -914,6 +927,7 @@
}
}
this.scheduleVisible = true
+ console.log(this.multipleSelection);
this.$nextTick(() => {
this.$refs.schedule.init(this.multipleSelection)
})
@@ -1099,13 +1113,13 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+ this.$confirm('纭浣滃簾閿�鍞鍗曞彿涓恒��' + row.contractNo + '銆戠殑鏁版嵁?','鎻愮ず' , {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
type: 'warning'
}).then(() => {
- dropByContractNo(row.customerOrderNo).then((res) => {
+ dropByContractNo({id:row.id}).then((res) => {
if (res.data.code === 0) {
this.$message.success('浣滃簾鎴愬姛')
this.getData()
@@ -1113,22 +1127,7 @@
this.$message.error('浣滃簾澶辫触')
}
})
- })
- // .then(() => {
- // markPlanned([row.id], '05cancel').then((response) => {
- // var data = response.data
- // if (data.code === 0) {
- // this.$message.success('浣滃簾鎴愬姛')
- // this.getData()
- // } else {
- // this.$message.error('浣滃簾澶辫触')
- // }
- // })
- // })
- // .then((data) => {
- // this.$message.success('浣滃簾鎴愬姛')
- // this.getData()
- // })
+ }).catch(()=>{ })
},
// 鍒犻櫎
deleteHandle(row) {
@@ -1353,10 +1352,10 @@
'瀛樺湪閿�鍞鍗曞凡鍏宠仈宸ヨ壓鏂囦欢锛屽闇�鏇存敼锛岃鍏堣В闄ゅ叧鑱�'
)
}
- if (item.salesPartNo == null || item.salesPartNo === '') {
- status = true
- this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛岃鍏堢粦瀹�')
- }
+ // if (item.salesPartNo == null || item.salesPartNo === '') {
+ // status = true
+ // this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛岃鍏堢粦瀹�')
+ // }
if (item.partNo != firstPartNo) {
status = true
this.$message.error('璁㈠崟闆朵欢鍙蜂笉涓�鑷�')
--
Gitblit v1.9.3