Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html

zhangyanpeng

2024-08-02 b5812cecf98745f4b36a8bf72ff082c3220ef1d6

 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放入(而不是放入obj_) formdata_rule_group结构如下
                                 //obj_用作检测是否重复，若未重复，则将该obj放入(而不是放入obj_) 构建的formdata_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>