From 06b2f5be922e87d086d1d4e6cdcc2119e7d3a1a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 09 七月 2025 14:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaInternalCompanyWindow.vue | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/admin/src/components/business/OperaInternalCompanyWindow.vue b/admin/src/components/business/OperaInternalCompanyWindow.vue
index 6445653..783f6b9 100644
--- a/admin/src/components/business/OperaInternalCompanyWindow.vue
+++ b/admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -15,8 +15,11 @@
<el-form-item label="缁勭粐鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" v-trim/>
</el-form-item>
- <el-form-item label="缁勭粐绫诲瀷" prop="type">
- <el-radio-group v-model="form.type" >
+ <el-form-item label="鎺掑簭鐮�" prop="sortnum">
+ <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
+ </el-form-item>
+ <el-form-item label="缁勭粐绫诲瀷" prop="type" v-if="(editType === 'edit' && parentId) || (editType === 'add')">
+ <el-radio-group v-model="form.type" :disabled="(editType === 'edit') || (!!(editType === 'add' && parentId))">
<el-radio :label="0">鐩稿叧鏂圭粍缁�</el-radio>
<el-radio :label="1">鍐呴儴缁勭粐</el-radio>
</el-radio-group>
@@ -39,12 +42,15 @@
// 琛ㄥ崟鏁版嵁
form: {
id: null,
- type: '0',
+ type: 0,
name: '',
parentId: null,
disable: false,
- parentName: ''
+ parentName: '',
+ sortnum: ''
},
+ editType: '',
+ parentId: null,
// 楠岃瘉瑙勫垯
rules: {
name: [
@@ -68,27 +74,36 @@
})
},
methods: {
- open(title,target,row){
- this.title =title
- this.visible =true
- console.log(target)
- this.form= {
+ open(title, target, row, editType){
+ this.title = title
+ this.editType = editType
+ if (editType === 'edit') {
+ this.parentId = row.parentId
+ } else if (editType === 'add') {
+ this.parentId = target.parentId
+ }
+ this.visible = true
+ this.form = {
id: null,
type: 0,
name: '',
parentId: null,
disable: false,
- parentName: ''
+ parentName: '',
+ parentType: null,
+ sortnum: null
}
if (target != null) {
this.form.parentId = target.id
- this.form.parentName = target.companyPath
+ this.form.parentType = target.type
+ this.form.parentName = target.companyNamePath
}
// 鏂板缓缁勭粐
if (row == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
+ this.form.type = target.type
})
return
}
@@ -97,6 +112,9 @@
this.originPermissionCode = target.code
for (const key in this.form) {
this.form[key] = row[key]
+ }
+ if(target.type == 0){
+ this.form.type = 0
}
})
},
@@ -112,7 +130,8 @@
this.api.create({
parentId: this.form.parentId,
name: this.form.name,
- type: this.form.type
+ type: this.form.type,
+ sortnum: this.form.sortnum
})
.then(() => {
this.visible = false
@@ -120,7 +139,7 @@
this.$emit('success')
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
@@ -130,7 +149,8 @@
id: this.form.id,
parentId: this.form.parentId,
name: this.form.name,
- type: this.form.type
+ type: this.form.type,
+ sortnum: this.form.sortnum
})
.then(() => {
this.visible = false
@@ -138,7 +158,7 @@
this.$emit('success')
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
--
Gitblit v1.9.3