From a8fb7ae2dbb61a94141ed5e73d3bb2632b7b84df Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期日, 28 九月 2025 15:25:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/business/OperaInternalCompanyWindow.vue | 84 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/admin/src/components/business/OperaInternalCompanyWindow.vue b/admin/src/components/business/OperaInternalCompanyWindow.vue
index 082e5d2..edaf287 100644
--- a/admin/src/components/business/OperaInternalCompanyWindow.vue
+++ b/admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -6,12 +6,24 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="涓婄骇缁勭粐" prop="parentId">
- <companySelect v-if="visible" v-model="form.parentId" placeholder="璇烽�夋嫨涓婄骇鑿滃崟" clearable :inline="false"/>
+ <el-form-item label="涓婄骇缁勭粐" >
+<!--
+ <companySelect v-if="!form.id " v-model="form.parentId" placeholder="璇烽�夋嫨涓婄骇鑿滃崟" clearable :inline="false"/>
+-->
+ <span>銆恵{form.parentName || '-'}}銆�</span>
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" v-trim/>
</el-form-item>
+ <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>
+ </el-form-item>
</el-form>
</GlobalWindow>
</template>
@@ -30,14 +42,22 @@
// 琛ㄥ崟鏁版嵁
form: {
id: null,
+ type: 0,
name: '',
- parentId: [],
- disable: false
+ parentId: null,
+ disable: false,
+ parentName: '',
+ sortnum: ''
},
+ editType: '',
+ parentId: null,
// 楠岃瘉瑙勫垯
rules: {
name: [
{ required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�' }
+ ],
+ type: [
+ { required: true, message: '璇烽�夋嫨缁勭粐绫诲瀷' }
]
}
}
@@ -49,11 +69,55 @@
},
created () {
this.config({
- api: '/business/company',
+ api: '/business/company.js',
'field.id': 'id'
})
},
methods: {
+ 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: '',
+ parentType: null,
+ sortnum: null
+ }
+ if (target != null) {
+ this.form.parentId = target.id
+ 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
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ this.originPermissionCode = target.code
+ for (const key in this.form) {
+ this.form[key] = row[key]
+ }
+ if(target.type == 0){
+ this.form.type = 0
+ }
+ })
+ },
// 纭鏂板缓/淇敼
confirm () {
this.$refs.form.validate((valid) => {
@@ -66,7 +130,8 @@
this.api.create({
parentId: this.form.parentId,
name: this.form.name,
- type: 1
+ type: this.form.type,
+ sortnum: this.form.sortnum
})
.then(() => {
this.visible = false
@@ -74,7 +139,7 @@
this.$emit('success')
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
@@ -84,7 +149,8 @@
id: this.form.id,
parentId: this.form.parentId,
name: this.form.name,
- type: 1
+ type: this.form.type,
+ sortnum: this.form.sortnum
})
.then(() => {
this.visible = false
@@ -92,7 +158,7 @@
this.$emit('success')
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
--
Gitblit v1.9.3