From 2fd9231d7768c1955579430a70d3c34f7d9bfa96 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 27 十月 2023 16:19:24 +0800
Subject: [PATCH] 1.MES工单 打印 解决销售单号未出来的问题
---
src/views/basicSettings/organizationList.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/views/basicSettings/organizationList.vue b/src/views/basicSettings/organizationList.vue
index 09c8836..095265b 100644
--- a/src/views/basicSettings/organizationList.vue
+++ b/src/views/basicSettings/organizationList.vue
@@ -168,7 +168,7 @@
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
<!-- <el-button type="primary" size="mini" />-->
<!-- <el-button type="danger" size="mini">鍒犻櫎</el-button>-->
@@ -220,7 +220,7 @@
<el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
<el-input v-model="dialogForm.OrgName" style="width: 200px" />
</el-form-item>
- <el-form-item v-if="dialogForm.OrgType!=='閮ㄩ棬'" prop="SupUnit" label="涓婄骇鍗曚綅">
+ <el-form-item v-if="dialogForm.OrgType!=='閮ㄩ棬'&&$store.state.settings.orgType===''" prop="SupUnit" label="涓婄骇鍗曚綅">
<el-select
v-model="dialogForm.SupUnit"
style="width: 200px"
@@ -474,9 +474,9 @@
handleRequest() {
this.getOrganizationSearch().then(res => {
- if (res.code === '200') {
- this.getPrentOrganization()
- }
+ // if (res.code === '200') {
+ // this.getPrentOrganization()
+ // }
})
},
async getOrganizationSearch() {
@@ -523,6 +523,8 @@
return this.$message.info('褰撳墠鐢ㄦ埛鏃犳柊澧炴潈闄愶紒')
}
+ await this.getPrentOrganization()
+
this.operation = operation
this.dialogVisible = true
@@ -531,11 +533,11 @@
// this.numvalue = res.numvalue
},
// 淇敼鎸夐挳
- edit(operation, row) {
+ async edit(operation, row) {
if (this.$store.state.settings.orgType === 'W') {
return this.$message.info('褰撳墠鐢ㄦ埛鏃犱慨鏀规潈闄愶紒')
}
-
+ await this.getPrentOrganization()
this.operation = operation
this.dialogVisible = true
// if (row.description === 'F') {
@@ -552,14 +554,13 @@
// this.dialogForm.OrgType = '鐢熶骇绾�'
// }
this.$nextTick(() => {
- this.changeRadio(this.dialogForm.OrgType)
this.dialogForm.OrgCode = row.org_code
this.dialogForm.OrgName = row.org_name
this.dialogForm.SupUnit = row.parent_id
})
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
if (this.$store.state.settings.orgType === 'W') {
return this.$message.info('褰撳墠鐢ㄦ埛鏃犲垹闄ゆ潈闄愶紒')
}
@@ -569,7 +570,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: id }).then(res => {
+ DeleteOrganization({ orgid: row.id, orgcode: row.org_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
if (this.form.page > 1 && this.tableData.length === 1) {
--
Gitblit v1.9.3