From 2278ff7c0401f7f97e168a0943192357c1999cbf Mon Sep 17 00:00:00 2001
From: tom <tom.he@highdatas.com>
Date: 星期六, 03 八月 2024 13:50:15 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html
---
module/md/page/customer/page/customer_basic_acct.html | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/module/md/page/customer/page/customer_basic_acct.html b/module/md/page/customer/page/customer_basic_acct.html
index 34d8cec..b426936 100644
--- a/module/md/page/customer/page/customer_basic_acct.html
+++ b/module/md/page/customer/page/customer_basic_acct.html
@@ -483,20 +483,13 @@
var obj = {}
obj_[e.group_code] = e.group_code
obj_[e.group_name] = e.group_name
- //obj_鐢ㄤ綔妫�娴嬫槸鍚﹂噸澶嶏紝鑻ユ湭閲嶅锛屽垯灏嗚obj鏀惧叆(鑰屼笉鏄斁鍏bj_) formdata_rule_group缁撴瀯濡備笅
+ //obj_鐢ㄤ綔妫�娴嬫槸鍚﹂噸澶嶏紝鑻ユ湭閲嶅锛屽垯灏嗚obj鏀惧叆(鑰屼笉鏄斁鍏bj_) 鏋勫缓鐨刦ormdata_rule_group缁撴瀯濡備笅
// formdata_rule_group:[{group_name:'瀹㈣璇勫垎',group_code:'Objective',children:[]},{group_name:'涓昏璇勫垎',group_code:'Subjective',children:[]}],
obj['group_code'] = e.group_code
obj['group_name'] = e.group_name
obj['children'] = []
- obj.children.push(e)
+ // obj.children.push(e)
me.formdata_rule_group.push(obj)
- }
- else {
- me.formdata_rule_group.map(g=>{
- if (g.group_code== e.group_code) {
- g.children.push(e)
- }
- })
}
})
}
@@ -616,20 +609,30 @@
}
this.getRowDataById(id_, function(result) {//鏌ヨ鍚庣殑鍥炶皟锛岀敤浜庤幏鍙栧瓧娈电殑
if (result.data.md_org_account_criteria && result.data.md_org_account_criteria.length>0) {
- var formData_criteria_ = result.data.md_org_account_criteria
- me.formFields_criteria.map(g => {
- formData_criteria_.map(e => {
- if (g.id == e.criteria_id) {
- Object.assign(e,g)
+ var criteria_data = []
+ me.formData_criteria = result.data.md_org_account_criteria
+ me.formFields_criteria.map(f=>{
+ me.formData_criteria.map(v=>{
+ if (f.id == v.criteria_id) {
+ var obj_ = {}
+ Object.assign(obj_,f,v)
+ criteria_data.push(obj_)
}
})
})
me.formdata_rule_group.map(g => {
- g.children = []
- formData_criteria_.map(v => {
+ criteria_data.map(v => {
if (v.group_code == g.group_code) {
- // v['content_before'] = g.content_before
g.children.push(v)
+ }
+ })
+ })
+ }
+ else {
+ me.formdata_rule_group.map(g=>{
+ me.formFields_criteria.map(f=>{
+ if(f.group_code == g.group_code) {
+ g.children.push(f)
}
})
})
@@ -1561,7 +1564,7 @@
return
}
var row_ = {
- parent_id: me.formData.org_id,
+ parent_id: me.formData.id,
criteria_id: unitobj.id,
criteria_value: unitobj.criteria_value,
remark: unitobj.remark ? unitobj.remark : '',
@@ -1807,6 +1810,22 @@
padding: 5px;
box-sizing: border-box;
}
+ .me_h_itemgroup_row {
+ margin-bottom: 10px;
+ }
+ .me_h_itemgroup_row .me_h_unitlabel:before {
+ content: '*';
+ color: #F56C6C;
+ margin-right: 4px;
+ }
+ .me_h_itemgroup_row .me_h_nounitlabel:before {
+ content: '*';
+ color: #F56C6C00;
+ margin-right: 4px;
+ }
+ .itemgroup_row_item {
+ text-align: left;
+ }
</style>
</head>
@@ -1872,7 +1891,7 @@
</div>
- <div v-if='formFields.length>0' class="el-dialog__body" style="width: 100%; float: right; ">
+ <div v-if='formFields.length>0' class="el-dialog__body" style="width: 100%; float: right; " >
<div>
<div class="h_table_title"><i class="iconfont icon-fuzhushuxian" style="color: rgb(2, 112, 193);"></i><span style="font-size: 16px;">鎺ㄥ箍鍟嗚瘎鍒�</span></div>
</i>
@@ -1902,28 +1921,30 @@
</el-col>
<el-col :span="18" >
<div v-if="unitobj.content_type == 'textarea'">
- <el-input style="width:100%" type="textarea"
+ <el-input :disabled="formAttr.disabled" style="width:100%" type="textarea"
v-model="unitobj.criteria_value">
</el-input>
</div>
<div v-else-if="unitobj.content_type == 'radio' && !unitobj.dictionary_id">
- <el-radio-group v-model="unitobj.criteria_value">
+ <el-radio-group :disabled="formAttr.disabled" v-model="unitobj.criteria_value">
<el-radio label="T">鏄�</el-radio>
<el-radio label="F">鍚�</el-radio>
</el-radio-group>
</div>
<div v-else-if="unitobj.content_type == 'radio' && unitobj.dictionary_id">
<el-radio-group v-model="unitobj.criteria_value">
- <el-radio v-for="(r, k) in unitobj.options" :key="unitobj.id + k" :label="r.code">{{r.value}}</el-radio>
+ <el-radio :disabled="formAttr.disabled" v-for="(r, k) in unitobj.options" :key="unitobj.id + k" :label="r.code">{{r.value}}</el-radio>
</el-radio-group>
</div>
<div v-else-if="unitobj.content_type == 'input'">
- <el-input style="width:100%"
+ <el-input :disabled="formAttr.disabled" style="width:100%"
v-model="unitobj.criteria_value">
</el-input>
</div>
<div v-else-if="unitobj.content_type == 'date'">
- <el-date-picker style="width:100%" type="date" value-format="yyyy-MM-dd"
+ <el-date-picker
+ :disabled="formAttr.disabled"
+ style="width:100%" type="date" value-format="yyyy-MM-dd"
v-model="unitobj.criteria_value">
</el-date-picker>
</div>
@@ -1935,11 +1956,11 @@
</td>
<td >
<template v-if="isBusiness && unitobj.criteria_value">
- <el-button type="primary" style="padding: 5px;" @click="buttonArrayClick(unitobj, {code:'delfile'})" icon="el-icon-delete" class="form_delfile">鍒犻櫎闄勪欢</el-button>
+ <el-button :disabled="formAttr.disabled" type="primary" style="padding: 5px;" @click="buttonArrayClick(unitobj, {code:'delfile'})" icon="el-icon-delete" class="form_delfile">鍒犻櫎闄勪欢</el-button>
</template >
<template v-else-if="isBusiness && !unitobj.criteria_value">
- <el-button type="primary" style="padding: 5px;" @click="buttonArrayClick(unitobj, {code:'upload'})" icon="el-icon-upload" class="form_uploadfile">闄勪欢涓婁紶</el-button>
+ <el-button :disabled="formAttr.disabled" type="primary" style="padding: 5px;" @click="buttonArrayClick(unitobj, {code:'upload'})" icon="el-icon-upload" class="form_uploadfile">闄勪欢涓婁紶</el-button>
</template >
</td>
</tr>
--
Gitblit v1.8.0