From e6c265b5e37ce1df1eb96cc95164d7e9577f2edf Mon Sep 17 00:00:00 2001
From: tom <tom.he@highdatas.com>
Date: 星期四, 01 八月 2024 17:12:51 +0800
Subject: [PATCH] tt
---
module/md/page/customer/page/customer_list_account.html | 22 +
module/md/page/customer/page/customer_basic.html | 440 ++++++++++++++++++++++++++++
module/md/page/customer/page/evaluation_management.html | 2
module/md/page/customer/page/customer_basic_acct.html | 106 +++++-
module/md/page/customer/page/evaluation_management_edit.html | 289 ++++++++++++++++++
5 files changed, 806 insertions(+), 53 deletions(-)
diff --git a/module/md/page/customer/page/customer_basic.html b/module/md/page/customer/page/customer_basic.html
index 970b6c0..ea7ba7a 100644
--- a/module/md/page/customer/page/customer_basic.html
+++ b/module/md/page/customer/page/customer_basic.html
@@ -64,7 +64,13 @@
label:"name",//鏄笅鎷夐�夐」鏃惰缃�
filter: "",
orderby: "name"
- }
+ },
+ {
+ name: "md_org_account_criteria_rule",
+ dataname: "md_org_account_criteria_rule",
+ isnotoption: true, //true:涓嶆槸閫夐」
+ filter: "",
+ },
],
options_md_geo_province: [],
md_geo_city_obj: {},
@@ -80,15 +86,29 @@
},
formFields: [],
+ formFields_criteria: [],
formData: {},
-
+ formData_criteria: {},
+ formData1:[],
+ imgLoading:false,
+ imgurl:'',
+
+ formdata_group:[{group_name:'瀹㈣璇勫垎',group_code:'Objective',children:[]},{group_name:'涓昏璇勫垎',group_code:'Subjective',children:[]}],
+
//鎸夐敭鏉冮檺璁剧疆
isedit: false,//鎻愪氦鍓嶇紪杈戯紝淇濆瓨/鎻愪氦
isrefuseedit: false,//鎷掔粷鍚庣紪杈戯紝淇濆瓨/鍐嶆鎻愪氦
isapproval: false,//瀹℃壒锛屽悓鎰�/鎷掔粷/杞姙/閫�鍥�
+ isChange:false,
iscommit: false,//鎻愪氦鏍囪
+
+ // 瀹℃壒
+ reasonvisible: false, // 瀹℃壒澶囨敞濉啓寮圭獥
+ approveremark: "", // 瀹℃壒澶囨敞
+ passOrRefuse: false, // 閫氳繃鎴栨嫆缁�
+ loading_pass: false,
//寮圭獥鍙傛暟
popupParames: {},
@@ -130,6 +150,22 @@
this.formAttr.disabled = true;
}
else if (this.popupParames.sceneCode == "edit") {//缂栬緫
+ var newEntity_ = {
+ name: "md_org_account_criteria",
+ url: "root/data/getEntitySet",
+ paramsobj: {dataname: 'md_org_account_criteria',parent_id:this.popupParames.data.id},
+ isnotoption: true, //true:涓嶆槸閫夐」
+ }
+ this.dataRequest.push(newEntity_);
+
+ // if (this.newformData) {
+ // let formData_ = clone(this.formData);
+
+ // for (var k in this.newformData) {
+ // formData_[k] = this.newformData[k];
+ // }
+ // this.formData = formData_;
+ // }
this.isedit = true;
}
else if (this.popupParames.sceneCode == "approval") {//瀹℃壒
@@ -156,6 +192,44 @@
this.loadRequestData(this.dataRequest, result, function(data) {
me.dataRequestObj = data;
//棰勫姞杞芥暟鎹悗缁欏摢浜涘瓧娈佃缃畂ptions鎴杅ormatterjson
+ if (me.dataRequestObj.md_org_account_criteria_rule) {
+ me.formFields_criteria = me.dataRequestObj.md_org_account_criteria_rule;
+ //鏁版嵁澶勭悊
+ me.formdata_group.map(g=>{
+ me.formFields_criteria.map(v=>{
+ if (v.group_code == g.group_code) {
+ v['criteria_value'] = null
+ v['remark'] = null
+ g.children.push(v)
+ }
+ })
+ })
+ console.log(me.formdata_group)
+ }
+ if (me.dataRequestObj.md_org_account_criteria && me.dataRequestObj.md_org_account_criteria.data && me.dataRequestObj.md_org_account_criteria.data.entityset.length>0) {
+ me.formData_criteria = me.dataRequestObj.md_org_account_criteria.data.entityset
+ //鏁版嵁澶勭悊
+ me.formFields_criteria.map(g=>{
+ me.formData_criteria.map(e=>{
+ if (g.id == e.criteria_id) {
+ e['group_name'] = g.group_name
+ e['group_code'] = g.group_code
+ e['content_before'] = g.content_before
+ e['content_type'] = g.content_type
+ }
+ })
+ })
+ me.formdata_group.map(g=>{
+ formData_criteria.map(v=>{
+ if (v.group_code == g.group_code) {
+ // v['content_before'] = g.content_before
+ g.children.push(v)
+ }
+ })
+ })
+ console.log(me.formdata_group)
+
+ }
if (me.dataRequestObj.md_geo_province) {
me.options_md_geo_province = me.dataRequestObj.md_geo_province
}
@@ -263,6 +337,7 @@
if (this.formData.id) {
id_ = this.formData.id;
}
+
this.getRowDataById(id_, function(result) {//鏌ヨ鍚庣殑鍥炶皟锛岀敤浜庤幏鍙栧瓧娈电殑
if (result.meta && result.meta[me.dataname] && result.meta[me.dataname].fields) {
var metas = clone(result.meta[me.dataname].fields);
@@ -304,6 +379,8 @@
}
}
})
+ console.log(me.formdata_group)
+
},
tableFieldClick() {
@@ -495,6 +572,40 @@
}
});
},
+ uploadFileFun_file(one,fileList,type) {
+ var me = this;
+ me.imgLoading = true
+ me.imgurl =URL.createObjectURL(one.raw) //淇濇寔鏂囦欢鍦ㄦ湰绐楀彛锛屽惁鍒欎細鍔犺浇澶辫触
+ // me.imgurl = one.url
+ // console.log(one+fileList+type)
+
+ },
+ showThumbnail(file, type, num) {
+ var me = this;
+
+ if(num == "2"){
+ return me.fileUrl;
+ }
+ if(type == "pic") {
+ return file.url;
+ }
+ console.log(file)
+ // var me = this;
+
+ // if(num == "2"){
+ // return me.fileUrl;
+ // }
+ // if(type == "pic") {
+ // me.imgurl = file.url
+ // return file.url;
+ // }
+
+ },
+ delyyzz() {//鍒犻櫎钀ヤ笟鎵х収
+ var me = this;
+ me.imgurl = "";
+ me.formData1 = []
+ },
//鎻愪氦
submitRowTable() {
@@ -510,11 +621,138 @@
this.iscommit = true;
this.saveRowTable();
},
-
+ showCluster() {
+ this.$forceUpdate();
+ },
+ onShowApproval(passOrRefuse) {
+ this.approveremark = "";
+ this.reasonvisible = true;//瀹℃壒澶囨敞濉啓寮圭獥
+ this.passOrRefuse = passOrRefuse;// commit涓嬩竴涓姸鎬�;approve閫氳繃;gohome;//鎷掔粷 goback;//鍥為��
+ },
+ saveReason() {
+ this.loading_pass = true;
+ if(this.passOrRefuse == "commit" || this.passOrRefuse == "approve"){
+ this.doApproval();
+ }
+ else{
+ if(this.approveremark != ""){
+ this.doApproval();
+ }
+ else{
+ Root.message({
+ type: 'warning',
+ message: '璇峰～鍐欏師鍥�'
+ });
+ this.loading_pass = false;
+ }
+ }
+ },
+ doApproval() {
+ var me = this;
+ me.doRunApproval();
+
+ // this.getMachine(function(next_step, up_step) { //
+ // me.doRunApproval(next_step, up_step);
+ // });
+ },
+ doRunApproval(next_step, up_step) {
+ var me = this;
+ if (!next_step) {
+ next_step = {}
+ }
+ if (!up_step) {
+ up_step = {}
+ }
+
+ // this.passOrRefuse;//棣栨寮�鎴�-閫氳繃
+ // commit // 涓嬩竴涓姸鎬�
+ // approve // 閫氳繃
+ // gohome // 鎷掔粷
+ // goback // 鍥為��
+
+ var to_state_ = "";
+ if (this.passOrRefuse == "commit") {
+ to_state_ = next_step[this.formData.state_code];
+ }
+ else if (this.passOrRefuse == "approve") {
+ // to_state_ = up_step[this.formData.state_code];
+ }
+ else if (this.passOrRefuse == "gohome") {
+ // to_state_ = up_step[this.formData.state_code];
+ }
+ else if (this.passOrRefuse == "goback") {
+ to_state_ = up_step[this.formData.state_code];
+ }
+
+ let param = {
+ dataname: "md_org",
+ id: me.formData.id,
+ remark: this.approveremark
+ }
+ if (to_state_) {
+ param.to_state = to_state_
+ }
+ //
+ // return
+ Server.call("root/data/" + this.passOrRefuse, param, function(result) {
+ me.loading_pass = false;
+ console.log(result);
+ if (me.passOrRefuse == "commit" || me.passOrRefuse == "approve") {
+ Root.message({
+ type: 'success',
+ message: '瀹℃壒鎴愬姛'
+ });
+ }
+ else if (me.passOrRefuse == "goback") {
+ Root.message({
+ type: 'success',
+ message: '宸查��鍥�'
+ });
+ }
+ else if (me.passOrRefuse == "gohome") {
+ Root.message({
+ type: 'success',
+ message: '宸叉嫆缁�'
+ });
+ }
+ me.saveAfter();
+ }, function(errorresult) {
+ console.log("閿欒淇℃伅", errorresult);
+ me.loading_pass = false;
+ if (errorresult.messages && errorresult.messages.count && errorresult.messages.count.error) {
+ if (errorresult.messages.list) {
+ var config = {
+ totab: false,
+ // width: "1200px",
+ // height: 800,
+ icon: "icon-product",
+ text: "閿欒淇℃伅",
+ url: "module/tool/page/popup_error_messages.html",
+ data: {},
+ delta: errorresult.messages.list,
+ callback: function(obj, callback) {
+ if (callback) {
+ callback();
+ }
+ }
+ };
+ me.doPopupByPublic(config);
+
+ }
+ }
+ else {
+ Root.message({
+ type: 'error',
+ message: '瀹℃壒澶辫触'
+ });
+ }
+ });
+ },
//淇濆瓨
saveRowTable() {
var me = this;
- var operator_ = "save";//淇濆瓨
+ var operator_ = "saveEntity";//淇濆瓨
+ var md_org_account_criteria_ = []
var entity_ = clone(this.formData);
var entity = {};
@@ -525,8 +763,6 @@
}
if(me.iscommit) {
operator_ = "commit";//鎻愪氦
- entity.state_code = "Open"
- entity.state_name = "宸茬敓鏁�"
}
let param = {
dataname: this.dataname,
@@ -534,9 +770,25 @@
// operator: operator_,
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;
param.data[this.dataname] = entity;
+
+
- Server.call("root/data/uniqueSaveEntity", param, function(result) {
+ Server.call("root/data/"+operator_, param, function(result) {
console.log(result);
if (result.success) {
if(me.iscommit){
@@ -631,6 +883,30 @@
[v-cloak] {
display: none !important;
}
+ .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;
+ }
+ .ocr_img .el-upload-list--picture-card .el-upload-list__item {
+ width: 100% ;
+ height: 100% ;
+ }
+ div .el-upload--picture-card {
+ width: 100% ;
+
+ }
</style>
</head>
@@ -647,7 +923,29 @@
</div>
<div :style="{height: dheight + 'px', 'overflow-y': 'auto'}">
<!-- <div style="position: absolute; top:40px; bottom: 50px; left: 0px; right: 0px; overflow-y: auto;"> -->
- <div class="el-dialog__body">
+ <div class="el-dialog__body" style="width: 20%; float: left;">
+ <el-image
+ v-if="imgurl.length>0"
+ :style="{width: '100%', 'max-height': dheight + 'px'}"
+ :src="imgurl"
+ :preview-src-list="[imgurl]">
+ </el-image>
+ <el-upload
+ v-else-if="!imgurl"
+ class="ocr_img"
+ action="#" style="margin-top: 15px;margin-bottom: 15px;" accept="image/jpeg,image/gif,image/png"
+ ref="reportUpload1" list-type="picture-card" :file-list="formData1"
+ :on-change="(file, fileList) => {uploadFileFun_file(file, fileList, '1')}" :auto-upload="false">
+ <!-- <i slot="default" class="el-icon-plus"></i> -->
+ <span style="font-size: 14px; color: #909399;">钀ヤ笟鎵х収涓婁紶</span>
+ <div slot="file" slot-scope="{file}">
+ <img class="el-upload-list__item-thumbnail" :src="showThumbnail(file, 'pic', '1')" alt="">
+ </div>
+ </el-upload>
+ <el-button v-if="imgurl" size="small" type="danger" @click="delyyzz">鍒犻櫎钀ヤ笟鎵х収</el-button>
+ </div>
+
+ <div class="el-dialog__body" style="width: 79%; float: right;">
<h-form
ref="form1"
:form-attr="formAttr"
@@ -657,17 +955,133 @@
>
</h-form>
</div>
+ <div v-if='formFields.length>0' class="el-dialog__body" style="width: 100%; float: right; ">
+ <div style="border: 1px solid #C0C4CC ;padding: 5px">
+ <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>
+ <!-- <el-row style="display: flex;flex-direction: row;justify-content:space-between;padding-left: 91px;padding-top: 10px;" >
+ <el-col :span="16"><div class="itemgroup_field"><span>璇勫垎椤�</span></div></el-col>
+ <el-col :span="8"><div class="itemgroup_field"><span>璇勫垎</span></div></el-col>
+ </el-row> -->
+ <div style="width: 100%;height: 5px;margin: 10px 0px 25px 0px;background-color: gainsboro; opacity: 40%;"></div>
+ <template v-for="(formgroup, k) in formdata_group">
+ <div style="display: flex;justify-content: space-between;padding: 5px;">
+ <div style="width: 7%; display: flex; align-items: center; justify-content: center; text-align: center;font-weight: bold;border-right: 3px solid gainsboro;">
+ <div style="display: flex;justify-content: center;align-items: center;margin-right: 15px;">
+ <!-- {{formgroup.groupname}} -->
+ {{formgroup.group_name}}
+ </div>
+ </div>
+ <div style="width: 93%;padding: 0 10px;">
+
+ <el-row v-for="(unitobj, kc) in formgroup.children" :key="'YWNL' + k + kc" class="me_h_itemgroup_row">
+ <el-col :span="6" class="itemgroup_row_item">
+ <div>
+ <span :class="[unitobj.required_no ? 'me_h_nounitlabel' : 'me_h_unitlabel']" style="font-size: 12px;">
+ <!-- {{unitobj.content_before}} -->
+ {{unitobj.content_before}}
+ </span>
+ </div>
+ </el-col>
+ <el-col :span="18" >
+ <div v-if="unitobj.content_type == 'textarea'">
+ <el-input 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 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-group>
+ </div>
+ <div v-else-if="unitobj.content_type == 'input'">
+ <el-input style="width:100%" @input="showCluster"
+ 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"
+ v-model="unitobj.criteria_value">
+ </el-date-picker>
+ </div>
+ <div v-else-if="unitobj.content_type == 'upload'">
+ <table>
+ <tr>
+ <td align="left" style="width: 100%; padding: 0px; overflow: hidden; border-bottom: 1px solid #DCDFE6;">
+ <span class="h_cellclick" @click="buttonArrayClick(unitobj, {code:'showfile'})">{{unitobj.criteria_value}}</span>
+ </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>
+ </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>
+ </template >
+ </td>
+ </tr>
+ </table>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ </div>
+ <div style="width: 100%;height: 5px;margin: 25px 0px;background-color: gainsboro;opacity: 40%"></div>
+ </template >
+ </div>
+ </div>
</div>
- <div class="el-dialog__footer" style="position: absolute; bottom: 0px; left: 0px; right: 0px;">
+ <!-- <div class="el-dialog__footer" style="position: absolute; bottom: 0px; left: 0px; right: 0px;">
+ <el-button size="small" type="default" @click="reasonvisible = false">鍙� 娑�</el-button>
<el-button size="small" type="default" @click="closeDialog">鍙� 娑�</el-button>
<el-button size="small" v-if="isedit || isrefuseedit" type="primary" :loading="loading_save" @click="saveRowTable":icon="buttonsconfig.save.icon">{{buttonsconfig.save.name}}</el-button>
<el-button size="small" v-if="isedit" type="success" :loading="loading_submit" @click="submitRowTable":icon="buttonsconfig.submit.icon">{{buttonsconfig.submit.name}}</el-button>
<el-button size="small" v-if="isrefuseedit" type="success" @click="">鍐嶆鎻愪氦</el-button>
- <el-button size="small" v-if="isapproval" type="success" @click="">閫� 杩�</el-button>
- <el-button size="small" v-if="isapproval" type="danger" @click="">鎷� 缁�</el-button>
- <el-button size="small" v-if="isapproval" type="primary" @click="">杞� 鍔�</el-button>
- <el-button size="small" v-if="isapproval" type="success" @click="">閫� 鍥�</el-button>
+ <el-button-group style="margin-right: 80px;" >
+ <el-button size="small" v-if="isapproval" type="warning" plain @click="onShowApproval('gohome')">閫�鍥炲埌鐢宠浜�</el-button>
+ <el-button size="small" v-if="isapproval" type="danger" plain @click="onShowApproval('goback')">閫�鍥炲埌涓婁竴姝�</el-button>
+ </el-button-group>
+ <el-button size="small" v-if="isapproval" type="success" @click="onShowApproval('approve')">閫� 杩�</el-button>
+ </div> -->
+ <el-dialog title="濉啓鍘熷洜" :visible.sync="reasonvisible" height="50%">
+ <el-input
+ type="textarea"
+ :autosize="{ minRows: 2, maxRows: 10}"
+ placeholder="璇疯緭鍏ュ師鍥�"
+ v-model="approveremark">
+ </el-input>
+
+ <div slot="footer" class="dialog-footer" >
+ <el-button size="small" type="default" @click="reasonvisible = false">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" :loading="loading_pass" @click="saveReason">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+
+ <div class="el-dialog__footer">
+ <el-button-group style="margin-right: 80px;" >
+ <el-button size="small" v-if="isapproval" type="warning" plain @click="onShowApproval('gohome')">閫�鍥炲埌鐢宠浜�</el-button>
+ <el-button size="small" v-if="isapproval" type="danger" plain @click="onShowApproval('goback')">閫�鍥炲埌涓婁竴姝�</el-button>
+ </el-button-group>
+ <el-button size="small" type="default" @click="closeDialog">鍙� 娑�</el-button>
+ <el-button size="small" v-if="!isChange && (isedit || isrefuseedit)" type="primary" @click="saveRowTable":icon="buttonsconfig.save.icon">{{buttonsconfig.save.name}}</el-button>
+ <el-button size="small" v-if="!isChange && isedit" type="success" @click="submitRowTable":icon="buttonsconfig.submit.icon">{{buttonsconfig.submit.name}}</el-button>
+
+ <el-button size="small" v-if="isChange" type="primary" @click="saveChangeRowTable":icon="buttonsconfig.save.icon">{{buttonsconfig.save.name}}</el-button>
+ <el-button size="small" v-if="isChange" type="success" @click="submitRowTable":icon="buttonsconfig.submit.icon">{{buttonsconfig.submit.name}}</el-button>
+
+ <el-button size="small" v-if="isrefuseedit" type="success" @click="">鍐嶆鎻愪氦</el-button>
+
+ <el-button size="small" v-if="isapproval" type="success" @click="onShowApproval('approve')">閫� 杩�</el-button>
+ <!-- <el-button size="small" v-if="isapproval" type="danger" @click="onShowApproval('goback')">鎷� 缁�</el-button> -->
+ <!-- <el-button size="small" v-if="isapproval" type="primary" @click="">杞� 鍔�</el-button> -->
+ <!-- <el-button size="small" v-if="isapproval" type="success" @click="onShowApproval('gohome')">閫� 鍥�</el-button> -->
</div>
</div>
</div>
diff --git a/module/md/page/customer/page/customer_basic_acct.html b/module/md/page/customer/page/customer_basic_acct.html
index 35cb2f3..45c6e89 100644
--- a/module/md/page/customer/page/customer_basic_acct.html
+++ b/module/md/page/customer/page/customer_basic_acct.html
@@ -173,13 +173,63 @@
this.popupParames = clone(Root.popupParames);
this.title = this.popupParames.title || this.popupParames.text
if (this.popupParames.data) {
- this.formData = clone(this.popupParames.data);
- if (this.formData.source && !this.formData.md_org__source) {
- this.newformData.md_org__source = this.formData.source;
- }
- else if (this.formData.md_org__ncc_code) {
- this.newformData.md_org__source = "NCC"
- }
+ // var formdata_ = {}
+ // let formdata_ = {
+ // account_name,
+ // actor_code,
+ // actor_name,
+ // authorize_province,
+ // authorize_province_remark,
+ // bu_id,
+ // bu_name,
+ // business_address,
+ // business_email,
+ // business_need_code,
+ // business_need_name,
+ // business_need_others,
+ // business_person,
+ // business_phone,
+ // check_error,
+ // code,
+ // combined_score,
+ // company_id,
+ // company_name,
+ // create_time,
+ // creator_id,
+ // creator_name,
+ // credit_amt,
+ // credit_available,
+ // degree,
+ // file_authorization_name,
+ // file_authorization_id,
+ // h_rowindex,
+ // id,
+ // is_frozen,
+ // objective_score,
+ // open_date,
+ // opening_reason,
+ // org_id,
+ // org_ncc_id,
+ // platform_account_code,
+ // platform_account_id,
+ // platform_account_name,
+ // platform_org_id,
+ // remark,
+ // settlement,
+ // state_code,
+ // state_name,
+ // subjective_score,
+ // update_time,
+
+ // } = clone(this.popupParames.data);
+ // this.formData = {}
+ // if (this.formData.source && !this.formData.md_org__source) {
+ // this.newformData.md_org__source = this.formData.source;
+ // }
+ // else if (this.formData.md_org__ncc_code) {
+ // this.newformData.md_org__source = "NCC"
+ // }
+ this.formData = this.popupParames.data
}
var customer_id = ""
@@ -319,6 +369,10 @@
//棰勫姞杞芥暟鎹悗缁欏摢浜涘瓧娈佃缃畂ptions鎴杅ormatterjson
if (me.dataRequestObj.newEntity) {
var formData = clone(me.dataRequestObj.newEntity.data[me.dataname]);
+ formData['company_id'] = '1181'
+ formData['company_name'] = '姹囧畤鍒惰嵂'
+ formData['bu_id'] = 'BU-GM'
+ formData['bu_name'] = '鑲跨槫'
// formData.product_category_name = [];
if (me.newformData) {
let formData_ = clone(formData);
@@ -722,20 +776,20 @@
business_address: me.accountnccdata.md_org__business_address,
// 缁忛攢鍟嗗叧鑱斾俊鎭�
- business_person: me.accountnccdata.md_org__business_person,
- business_phone: me.accountnccdata.md_org__business_phone,
- business_email: me.accountnccdata.md_org__business_email,
- md_org__license_business_no: me.accountnccdata.md_org__license_business_no,
- md_org__register_address: me.accountnccdata.md_org__register_address,
- md_org__code: me.accountnccdata.md_org__code,
- md_org__ncc_code: me.accountnccdata.md_org__ncc_code,
- md_org__province: me.accountnccdata.md_org__province,
- md_org__city: me.accountnccdata.md_org__city,
- md_org__county: me.accountnccdata.md_org__county,
-
- md_org__receive_address: me.accountnccdata.md_org__receive_address,
- md_org__receiver_name: me.accountnccdata.md_org__receiver_name,
- md_org__receiver_phone: me.accountnccdata.md_org__receiver_phone,
+ business_person: me.accountnccdata.md_org__business_person,
+ business_phone: me.accountnccdata.md_org__business_phone,
+ business_email: me.accountnccdata.md_org__business_email,
+ md_org__license_business_no: me.accountnccdata.md_org__license_business_no,
+ md_org__register_address: me.accountnccdata.md_org__register_address,
+ md_org__code: me.accountnccdata.md_org__code,
+ md_org__ncc_code: me.accountnccdata.md_org__ncc_code,
+ md_org__province: me.accountnccdata.md_org__province,
+ md_org__city: me.accountnccdata.md_org__city,
+ md_org__county: me.accountnccdata.md_org__county,
+
+ md_org__receive_address: me.accountnccdata.md_org__receive_address,
+ md_org__receiver_name: me.accountnccdata.md_org__receiver_name,
+ md_org__receiver_phone: me.accountnccdata.md_org__receiver_phone,
}
for (var k in me.formData) {
@@ -1285,7 +1339,7 @@
if (this.formData.business_email) { // 濉啓浜嗛偖绠憋紝鍒欐洿鏂癿d_org涓殑閭淇℃伅
var param = {
- dataname: "md_org",
+ dataname: "md_org_account",
id: this.formData.org_id,
data: {
md_org: {
@@ -1528,10 +1582,10 @@
if(me.iscommit) {
// param.to_state = "OpeningApproval";//鎻愪氦
if (me.formData.org_ncc_id) {
- param.refer = {
- dataname: "md_org_account_ncc",
- id: me.formData.org_ncc_id
- }
+ // param.refer = {
+ // dataname: "md_org_account",
+ // id: me.formData.org_ncc_id
+ // }
}
}
diff --git a/module/md/page/customer/page/customer_list_account.html b/module/md/page/customer/page/customer_list_account.html
index 572f99e..a820d5f 100644
--- a/module/md/page/customer/page/customer_list_account.html
+++ b/module/md/page/customer/page/customer_list_account.html
@@ -730,7 +730,7 @@
code: "edit",isselected: true,classname: "",
disabled: function(selectRowList) {
var bo_ = true;
- if (selectRowList[0] && selectRowList[0].source == "DMS") {
+ if (selectRowList[0] && selectRowList[0].state_code == "Input") {
bo_ = false;
}
return bo_
@@ -740,17 +740,26 @@
}
},
{
- name: "寮�鎴�", isbuttonshow: me.cbuttons_r.accountOpen ? me.cbuttons_r.accountOpen : false,type:"success",icon: "el-icon-news",
+ name: "棰勫悎浣滅敵璇�", isbuttonshow: true,type:"success",icon: "el-icon-news",
code: "account",isselected: true,classname: "",
disabled: function(selectRowList) {
var bo_ = true;
- if (selectRowList[0] && selectRowList[0].source == "DMS" && !selectRowList[0].is_distributor) {
+ if (selectRowList[0] && selectRowList[0].state_code == "Prepared") {
bo_ = false;
}
return bo_
},
onclick: function(obj) {
- me.openCustomerUser('add')
+
+ // obj.selectedList
+ // me.closeData('browse', obj.selectedList[0]);
+ // me.commitData(obj.selectedList[0]);
+ obj.selectedList[0]['company_id'] = '1181'
+ obj.selectedList[0]['company_name'] = '姹囧畤鍒惰嵂'
+ obj.selectedList[0]['bu_id'] = 'BU-GM'
+ obj.selectedList[0]['bu_name'] = '鑲跨槫'
+ console.log(obj.selectedList[0])
+ me.openCustomerUser('add', obj.selectedList[0]);
}
},
// {
@@ -845,7 +854,7 @@
},
{
- name: "鍏虫埛", isbuttonshow: me.cbuttons_r.accountClose ? me.cbuttons_r.accountClose : false,type:"danger",icon: "el-icon-circle-close",
+ name: "閫�鍑�", isbuttonshow: me.cbuttons_r.accountClose ? me.cbuttons_r.accountClose : false,type:"danger",icon: "el-icon-circle-close",
code: "account",isselected: true,classname: "",
disabled: function(selectRowList) {
var bo_ = true;
@@ -939,6 +948,7 @@
me.openCustomerUser('edit', obj.selectedList[0]);
}
},
+
{
// name: "璇︽儏", // type: "primary", // icon: "el-icon-edit",
isbuttonshow: me.cbuttons_r.formdetail ? me.cbuttons_r.formdetail : false,
@@ -1337,7 +1347,7 @@
width: "1100px",
height: "520px",
icon: "icon-product",
- text: "瀹㈠晢淇℃伅" + (row.name ? row.name : ""),
+ text: "鎺ㄥ箍鍟嗕俊鎭�" + (row.name ? row.name : ""),
id: "customer_basic" + (row.id? row.id : "add"),//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
url: "module/md/page/customer/page/customer_basic.html",
data: row,
diff --git a/module/md/page/customer/page/evaluation_management.html b/module/md/page/customer/page/evaluation_management.html
index 518268d..a65b3c4 100644
--- a/module/md/page/customer/page/evaluation_management.html
+++ b/module/md/page/customer/page/evaluation_management.html
@@ -259,7 +259,7 @@
width: "1100px",
height: "520px",
icon: "icon-product",
- text: "鎺ㄥ箍鍟嗕俊鎭�" + (row.customer_code ? ("-" + row.customer_code) : ""),
+ text: "鎺ㄥ箍鍟嗚瘎浼颁俊鎭�" + (row.customer_code ? ("-" + row.customer_code) : ""),
id: "evaluation_management_edit" + row.id + sceneCode,
url: "module/md/page/customer/page/evaluation_management_edit.html",
data: row,
diff --git a/module/md/page/customer/page/evaluation_management_edit.html b/module/md/page/customer/page/evaluation_management_edit.html
index 35ea2c0..e09d1c3 100644
--- a/module/md/page/customer/page/evaluation_management_edit.html
+++ b/module/md/page/customer/page/evaluation_management_edit.html
@@ -82,6 +82,169 @@
formData_: [],
formData_group:[],
formdata_obj:[{group_name:'瀹㈣璇勫垎',group_code:'Objective',children:[]},{group_name:'涓昏璇勫垎',group_code:'Subjective',children:[]}],
+
+ activities: [
+ {
+ content: '涓村簥鎷滆',
+ timestamp: '2024-04-15'
+ },
+ {
+ content: '鎻愬崟',
+ timestamp: '2024-06-10'
+ },
+ {
+ content: '涓撮噰',
+ timestamp: '2024-06-29'
+ },
+ {
+ content: '杩囦細鍑嗗涓庢矡閫�',
+ timestamp: '2024-07-01'
+ },
+ {
+ content: '鍏ラ櫌閲囪喘',
+ timestamp: '2024-07-15'
+ },
+ {
+ content: '姝ｅ紡閲囪喘',
+ timestamp: ''
+ },
+ ],
+ treeData: [{
+ id:1,
+ time: '2024鎺ㄥ箍鍟嗘祦鍚戞眹鎬�',
+ amt:4200,
+ children: [{
+ id:2,
+ time: '2024-01瀛ｅ害閲戦姹囨��',
+ amt:1200,
+ children: [{
+ id:6,
+ time: '01鏈堥噾棰�',
+ amt:300,
+ },
+ {
+ id:7,
+ time: '02鏈堥噾棰�',
+ amt:400,
+ },
+ {
+ id:8,
+ time: '03鏈堥噾棰�',
+ amt:500,
+ }]
+ },
+ {
+ id:3,
+ time: '2024-02瀛ｅ害閲戦姹囨��',
+ amt:1000,
+ children: [{
+ id:9,
+ time: '04鏈堥噾棰�',
+ amt:300,
+ },
+ {
+ id:10,
+ time: '05鏈堥噾棰�',
+ amt:400,
+ },
+ {
+ id:11,
+ time: '06鏈堥噾棰�',
+ amt:500,
+ }]
+ },
+ {
+ id:4,
+ time: '2024-03瀛ｅ害閲戦姹囨��',
+ amt:1000,
+ children: [{
+ id:12,
+ time: '07鏈堥噾棰�',
+ amt:300,
+ },
+ {
+ id:13,
+ time: '08鏈堥噾棰�',
+ amt:400,
+ },
+ {
+ id:14,
+ time: '09鏈堥噾棰�',
+ amt:500,
+ }]
+ },
+ {
+ id:5,
+ time: '2024-04瀛ｅ害閲戦姹囨��',
+ amt:1000,
+ children: [{
+ id:15,
+ time: '10鏈堥噾棰�',
+ amt:300,
+ },
+ {
+ id:16,
+ time: '11鏈堥噾棰�',
+ amt:400,
+ },
+ {
+ id:17,
+ time: '12鏈堥噾棰�',
+ amt:500,
+ }]
+ }
+ ],
+ }],
+ treeTxtFormatter: "{time} 锟amt}",
+ currentnodekey: 8,
+ defaultExpandedKeys: [2,6],
+ maxlevel:6,
+
+ tableData:[
+ {
+
+ date:'2024-08-01',
+ // date:new Date(stamp).toISOString().replace(/T/, ' ').replace(/\..+/, '').substring(0, 19),
+ product:'澶氳タ浠栬禌娉ㄥ皠娑�',
+ qty:'12',
+ price:'2000',
+ amt:'24000',
+ rank:'D',
+ sale_employe:'',
+ },
+ ],
+ isEditTableData: false,
+ tableFields: [
+ // {isshow: "F", field: "id", name: "id", width: "70"},
+ //{isshow: "T", field: "category_id", name: "鍗忚绫诲瀷-ID", width: "100"},
+ {isshow: "T", field: "date", name: "鏇存柊鏃ユ湡", width: "100"},
+ //{isshow: "T", field: "template_id", name: "妯℃澘-ID", width: "100"},
+ {isshow: "F", field: "code", name: "鎺ㄥ箍鍟嗙紪鐮�", width: "100"},
+ {isshow: "F", field: "name", name: "鎺ㄥ箍鍟嗗悕绉�", width: "220",align:'left',isminwidth:'T'},
+ {isshow: "T", field: "product", name: "浜у搧", width: "100",isminwidth:'T'},
+ {isshow: "T", field: "qty", name: "浜у搧鏁伴噺", width: "100"},
+ {isshow: "T", field: "price", name: "浜у搧鍗曚环", width: "100",formatter:"formatter_money",prefix:'锟�'},
+ {isshow: "T", field: "amt", name: "鎬婚噾棰�", width: "100",formatter:"formatter_money",prefix:'锟�'},
+ {isshow: "T", field: "rank", name: "绛夌骇鍒掑垎", width: "100"},
+ {isshow: "T", field: "sale_employe", name: "褰掑睘浜哄憳", width: "100"},
+ //{isshow: "T", field: "state_code", name: "鍗忚鐘舵��-缂栫爜", width: "100"},
+ // {isshow: "T", field: "state_name", name: "瀹㈣璇勪及", type:"tag", tagtype: '{^鑽夌^:^info^,^鐢熸晥^:^success^,^鍏抽棴^:^danger^}', width: "80"},
+ // {isshow: "T", field: "", name: "瀹㈣璇勪及", headercolor: "#bdf1ff", children: [
+ // {isshow: "T", field: "completion_rate", name: "瀹屾垚鐜�", width: "100", headercolor: "#bdf1ff"},
+ // {isshow: "T", field: "exploitation_rate", name: "寮�鍙戠巼", width: "100", headercolor: "#bdf1ff"},
+ // {isshow: "T", field: "growth_rate", name: "澧為暱鐜�", width: "100", headercolor: "#bdf1ff"},
+ // {isshow: "T", field: "reach_rate", name: "杈炬爣鍗犳瘮", width: "100", headercolor: "#bdf1ff",formatter:"formatter_percent",align:"right",suffix:"%"},
+ // ]},
+ // {isshow: "T", field: "", name: "涓昏璇勪及", headercolor: "#e5ffab", children: [
+ // {isshow: "T", field: "customer_item", name: "瀹㈡埛璇勪及", width: "100", headercolor: "#e5ffab"},
+ // {isshow: "T", field: "hospital_item", name: "鍖婚櫌璇勪及", width: "100", headercolor: "#e5ffab"},
+ // {isshow: "T", field: "employee_item", name: "閿�鍞瘎浼�", width: "100", headercolor: "#e5ffab"},
+
+ // ]},
+ ],
+
+ stepStatus:['wait','process','finish','error','success'],
+ active:0,
//鎸夐敭鏉冮檺璁剧疆
isedit: false,//鎻愪氦鍓嶇紪杈戯紝淇濆瓨/鎻愪氦
@@ -137,7 +300,6 @@
// }
// this.formData = formData_;
// }
- this.isedit = true;
this.isedit = true;
}
else if (this.popupParames.sceneCode == "approval") {//瀹℃壒
@@ -479,7 +641,61 @@
}
});
},
-
+ stepClick(index) {
+ console.log(index)
+ },
+ onNodeClick(data) {
+ console.log(data)
+ },
+ openDetail(activity) {
+ var me = this;
+ var data_ = {};
+ var text_ = activity.content+"璇︽儏"
+ var config = {
+ totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
+ width: "500px",
+ height: "80vh",
+ icon: "icon-product",
+ text: text_,
+ id: uuid_short(),//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+ url: "module/approval/page/my_approval_list.html",
+ data: data_,
+ delta: {},
+ // filter: "org_id='"+ me.selectedrow.org_id + "' and bu_id='" + me.selectedrow.bu_id + "'",
+ sceneCode: 'browser',//"refuseedit",//"approval", //"add"//"browse",
+ callback: function(popupobj, popupcallback) {
+ callback(popupobj)
+
+ if (popupcallback) {
+ popupcallback();
+ }
+ }
+ };
+ me.doPopupByPublic(config);
+ },
+ openDocument() {
+ let me = this;
+ var row = {}
+ var config = {
+ totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
+ width: "1100px",
+ height: "520px",
+ icon: "icon-product",
+ text: "閬撮�変俊鎭�" + (row.customer_code ? ("-" + row.customer_code) : ""),
+ id: "evaluation_management_edit",
+ url: "module/md/page/customer/page/evaluation_management_404.html",
+ data: row,
+ delta: {},
+ sceneCode: 'browse',//"refuseedit",//"approval", //"add"//"browse",
+ callback: function(obj, callback) {
+ me.onQuery();
+ if (callback) {
+ callback();
+ }
+ }
+ };
+ me.doPopupByPublic(config);
+ },
//鎻愪氦
submitRowTable() {
//蹇呭～椤规牎楠�
@@ -655,6 +871,18 @@
text-decoration: underline;
cursor: pointer;
}
+ div .h_table .h_h_table {
+ display: none;
+ }
+ div .custom-tree-node {
+ font-size: 14px;
+ }
+ div .custom-tree-node .nodeLabel{
+ max-width: 100%;
+ }
+ div .el-card__header {
+ padding: 10px 20px;
+ }
</style>
</head>
@@ -667,6 +895,7 @@
<div class="dialog-title">
<i class="iconfont icon-customermanagement"></i>
<span> {{title}}</span>
+ <el-button style="float: right;right: 10%;" @click="openDocument()">閬撮�夎烦杞�</el-button>
</div>
</div>
<div :style="{height: dheight + 'px', 'overflow-y': 'auto'}">
@@ -674,11 +903,11 @@
<div class="el-dialog__body">
<!-- <div v-if="showtab.SYPG && activeTabName=='SYPG' && activeTabName_detail=='YWNL'"> -->
<div>
- <div style="width: 100%; float: right;">
+ <div style=" border: 1px solid #C0C4CC ;padding: 5px">
<div >
<el-row style="display: flex;flex-direction: row;justify-content:space-between;padding-left: 91px;" >
- <el-col :span="16"><div class="itemgroup_field"><span>璇勫垎椤�</span></div></el-col>
- <el-col :span="8"><div class="itemgroup_field"><span>璇勫垎</span></div></el-col>
+ <el-col :span="6"><div class="itemgroup_field"><span>璇勫垎椤�</span></div></el-col>
+ <el-col :span="18"><div class="itemgroup_field"><span>璇勫垎</span></div></el-col>
</el-row>
<div style="width: 100%;height: 5px;margin: 10px 0px 25px 0px;background-color: gainsboro; opacity: 40%;"></div>
@@ -693,7 +922,7 @@
<div style="width: 93%;padding: 0 10px;">
<el-row v-for="(unitobj, kc) in formgroup.children" :key="'YWNL' + k + kc" class="me_h_itemgroup_row">
- <el-col :span="12" class="itemgroup_row_item">
+ <el-col :span="6" class="itemgroup_row_item">
<div>
<span :class="[unitobj.required_no ? 'me_h_nounitlabel' : 'me_h_unitlabel']" style="font-size: 13px;">
<!-- {{unitobj.content_before}} -->
@@ -701,7 +930,7 @@
</span>
</div>
</el-col>
- <el-col :span="12" >
+ <el-col :span="18" >
<div v-if="unitobj.content_type == 'textarea'">
<el-input style="width:100%" type="textarea"
v-model="unitobj.criteria_value">
@@ -756,7 +985,53 @@
</div>
</div>
</div>
+ <el-row>
+ <el-col :span="12" style="padding-right: 10px;" >
+ <el-card class="box-card" style="min-height: 408px;">
+ <div slot="header" class="clearfix">
+ <span style="font-size: 14px;font-weight: bold;">鎺ㄥ箍杩囩▼</span>
+ </div>
+ <el-timeline :reverse="false" style="padding-top: 10px;">
+ <el-timeline-item @click.native="openDetail(activity)"
+ v-for="(activity, index) in activities"
+ :key="index"
+ :timestamp="activity.timestamp">
+ {{activity.content}}
+ </el-timeline-item>
+ </el-timeline>
+ </el-card>
+
+ </el-col>
+ <el-col :span="12" style="padding-right: 10px;" >
+ <el-card class="box-card" style="height: 408px;overflow: auto;">
+ <div slot="header" class="clearfix" style="height: 20%;">
+ <span style="font-size: 14px;font-weight: bold;" >娴佸悜姹囨��</span>
+ </div>
+ <h-tree
+ :isfilter="true"
+ :tree-data="treeData"
+ :tree-txt-formatter="treeTxtFormatter"
+ :currentnodekey="currentnodekey"
+ :is-readonly="true"
+ :maxlevel="maxlevel"
+ :default-expand-all="false"
+ :default-expanded-keys="defaultExpandedKeys"
+ :isbottomadd="true"
+
+ @node-click="onNodeClick"
+ >
+ </h-tree>
+ </el-card>
+
+ <!--
+
+ -->
+ </div>
+ </el-col>
+
+ </el-row>
</div>
+
<div class="el-dialog__footer" style="position: absolute; bottom: 0px; left: 0px; right: 0px;">
<el-button size="small" type="default" @click="closeDialog">鍙� 娑�</el-button>
<el-button size="small" v-if="isedit || isrefuseedit" type="primary" :loading="loading_save" @click="saveRowTable":icon="buttonsconfig.save.icon">{{buttonsconfig.save.name}}</el-button>
--
Gitblit v1.8.0