From 3f936872cab3297e6a944c748d200e3f40d0b869 Mon Sep 17 00:00:00 2001
From: tom <tom.he@highdatas.com>
Date: 星期六, 03 八月 2024 13:50:08 +0800
Subject: [PATCH] 1
---
module/md/page/customer/page/customer_basic.html | 26 ++++++------
module/md/page/customer/page/evaluation_management.html | 36 +++++++++++++++++
module/md/page/customer/page/customer_basic_acct.html | 18 +++++----
module/md/page/customer/page/evaluation_management_edit.html | 8 +++-
4 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/module/md/page/customer/page/customer_basic.html b/module/md/page/customer/page/customer_basic.html
index 2c272fc..506c8b7 100644
--- a/module/md/page/customer/page/customer_basic.html
+++ b/module/md/page/customer/page/customer_basic.html
@@ -755,19 +755,19 @@
data: {},
}
//鏂板鐨勬儏鍐�
- me.formdata_group.map(group => {//
- group.children.map(unitobj => {
- var row_ = {
- id: uuid_short(),
- parent_id: me.formData.id,
- criteria_id: unitobj.id,
- criteria_value: unitobj.criteria_value,
- remark: unitobj.remark,
- }
- md_org_account_criteria_.push(row_);
- })
- })
- param.data["md_org_account_criteria"] = md_org_account_criteria_.length ? md_org_account_criteria_ : null;
+ // me.formdata_group.map(group => {//
+ // group.children.map(unitobj => {
+ // var row_ = {
+ // id: uuid_short(),
+ // parent_id: me.formData.id,
+ // criteria_id: unitobj.id,
+ // criteria_value: unitobj.criteria_value,
+ // remark: unitobj.remark,
+ // }
+ // md_org_account_criteria_.push(row_);
+ // })
+ // })
+ // param.data["md_org_account_criteria"] = md_org_account_criteria_.length ? md_org_account_criteria_ : null;
param.data[this.dataname] = entity;
diff --git a/module/md/page/customer/page/customer_basic_acct.html b/module/md/page/customer/page/customer_basic_acct.html
index ec53615..b426936 100644
--- a/module/md/page/customer/page/customer_basic_acct.html
+++ b/module/md/page/customer/page/customer_basic_acct.html
@@ -1891,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>
@@ -1921,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>
@@ -1954,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>
diff --git a/module/md/page/customer/page/evaluation_management.html b/module/md/page/customer/page/evaluation_management.html
index 8e083f9..c398eb9 100644
--- a/module/md/page/customer/page/evaluation_management.html
+++ b/module/md/page/customer/page/evaluation_management.html
@@ -242,7 +242,7 @@
return bo_
},
onclick: function(obj) {
- me.openCustomer('browse',obj.selectedList[0])
+ me.openCustomerHistory('browse',obj.selectedList[0])
}
}
]
@@ -282,6 +282,40 @@
};
me.doPopupByPublic(config);
},
+ openCustomerHistory(sceneCode, obj) {
+ let me = this;
+ var row = {}
+ if (sceneCode == "edit" || sceneCode == "browse") {
+ row = me.selectTabObj.selectedrow;
+ if(!row){
+ Root.message({
+ type: 'warning',
+ message: '璇烽�夋嫨涓�鏉℃暟鎹�'
+ });
+ return;
+ }
+ }
+
+ var config = {
+ totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
+ width: "1100px",
+ height: "520px",
+ icon: "icon-product",
+ text: "鎺ㄥ箍鍟嗚瘎浼拌褰�" + (row.customer_code ? ("-" + row.customer_code) : ""),
+ id: "evaluation_management_edit" + row.id + sceneCode,
+ url: "module/md/page/customer/page/evaluation_history.html",
+ data: row,
+ delta: {},
+ sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
+ callback: function(obj, callback) {
+ me.onQuery();
+ if (callback) {
+ callback();
+ }
+ }
+ };
+ me.doPopupByPublic(config);
+ },
}
});
diff --git a/module/md/page/customer/page/evaluation_management_edit.html b/module/md/page/customer/page/evaluation_management_edit.html
index da88915..97d605f 100644
--- a/module/md/page/customer/page/evaluation_management_edit.html
+++ b/module/md/page/customer/page/evaluation_management_edit.html
@@ -674,7 +674,7 @@
var formData_criteria_ = []
var formData_criteria_new = []
var criteria_ = {}
-
+
me.formdata_rule_group.map(g=>{
formData_criteria_ = formData_criteria_.concat(g.children)
}) //缂栬緫椤甸潰鐨勮瘎鍒嗘暟鎹拰棰樼洰
@@ -691,7 +691,11 @@
}
})
})
-
+ let formData_criteria_history = clone(me.formData_criteria)
+ formData_criteria_history.map(e =>{
+ e['data_id'] = e.id
+ delete e.id
+ })
// me.formdata_rule_group.map(g=>{
// })
--
Gitblit v1.8.0