yp

wxdks/src/main/java/com/c3/wxdks/service/impl/OrgInfoServiceImpl.java

@@ -192,17 +192,17 @@ public class OrgInfoServiceImpl implements OrgInfoService {
                 secondList.add(firstGroup);
             }
             // 其他分类信息
-
             if (Blank.isNotEmpty(orgInfo)) {
                 String classificationExplain = Convert.toStr(orgInfo.get("classificationExplain"));
-                HashMap map = JSON.parseObject(classificationExplain, HashMap.class);
-                if (Blank.isNotEmpty(map)) {
+                if (Blank.isNotEmpty(classificationExplain)) {
+                    HashMap map = JSON.parseObject(classificationExplain, HashMap.class);
                     for (Object keyName : map.keySet()) {
                         Map<String, Object> otherMap = new HashMap<>();
                         Map<String, Object> fatInfo = tDictMapper.getFatherInfoById(Convert.toInt(keyName));
                         if (Blank.isNotEmpty(fatInfo)) {
                             otherMap.put("otherDes", map.get(keyName));
                             otherMap.put("beforeName", fatInfo.get("dictValue"));
+                            otherMap.put("beforeDataId", fatInfo.get("dictId"));
                             otherCls.add(otherMap);
                         }
                     }

wxdks/src/main/resources/static/page/companyManage.html

@@ -239,15 +239,6 @@
         <div id="classificationOther">
 
         </div>
-
-<!--        <div class="layui-form-item" id="classificationShow" style="display: none">-->
-<!--            <label class="layui-form-label">分类说明:</label>-->
-<!--            <div class="layui-input-block">-->
-<!--                <input type="text" name="classificationExplain" id="classificationExplain" maxlength="500"-->
-<!--                       class="layui-input" placeholder="请输入分类说明"-->
-<!--                       autocomplete="off">-->
-<!--            </div>-->
-<!--        </div>-->
         <div class="layui-form-item">
             <label class="layui-form-label">机构头像:</label>
             <div class="layui-input-block">

wxdks/src/main/resources/static/page/js/basic/companyManage.js

@@ -128,17 +128,21 @@ function initCompanyPage(){
 
     form.on('submit(submit)', function (data){
         var data = form.val('dataForm');
-        var objs = $("input[name='otherClass']") //选择所有的name属性等于'otherClass'的input元素
-        console.log(objs)
+        // var objs = $("input[name='otherClass']") //选择所有的name属性等于'otherClass'的input元素
+        // console.log(objs)
+        // var otherData = {};
+        // if (objs && objs.length > 0) {
+        //     for (var i = 0; i < objs.length; i++){
+        //         console.log(objs[i].dataset.id)
+        //         var keyName = objs[i].dataset.id;
+        //         otherData[keyName] = objs[i].value;
+        //     }
+        // }
         var otherData = {};
-        if (objs && objs.length > 0) {
-            for (var i = 0; i < objs.length; i++){
-                console.log(objs[i].dataset.id)
-                var keyName = objs[i].dataset.id;
-                otherData[keyName] = objs[i].value;
-            }
-        }
-        // console.log(otherData)
+        $('#classificationOther').find($("input[name='otherClass']")).each(function (){
+            var keyName = $(this).attr("data-id");
+            otherData[keyName] = $(this).val();
+        })
         var clsExplain = JSON.stringify(otherData)
         data.classificationExplain = clsExplain;
 
@@ -276,8 +280,8 @@ function initCompanyPage(){
     // 检测资质下拉
     // initQualifications();
     // 分类下拉
-    xmSelectRenderColumnId([]);
-    xmSelectRender([]);
+    xmSelectRenderColumnId([ ]);
+    xmSelectRender([ ]);
 }
 
 function echoClassification(data) {
@@ -288,8 +292,9 @@ function echoClassification(data) {
             for (var i = 0; i < othClsData.length; i++){
                 var beforeName = othClsData[i].beforeName;
                 var otherDes = othClsData[i].otherDes;
+                var beforeDataId = othClsData[i].beforeDataId;
                 str += '<div class="layui-form-item"><label class="layui-form-label">'+beforeName+':</label>' +
-                        '<div class="layui-input-block"><input type="text" name="otherClass"' +
+                        '<div class="layui-input-block"><input type="text" data-id="'+beforeDataId+'" name="otherClass"' +
                         'maxlength="500" class="layui-input" ' +
                         'value="'+ otherDes +'" autocomplete="off"></div></div>';
             }
@@ -587,7 +592,6 @@ function certificateImgUpload() {
  */
 function emptyForm(){
     $("#classificationOther").empty();
-
     // 清空input
     var emptyObj = {
         'id': '',
@@ -601,7 +605,6 @@ function emptyForm(){
         'testingQualification': '',
         'orgPicture': '',
         'orgIntroduction': '',
-        'classificationExplain': '',
         'orgBook': '',
         'orgOfficialWebsite': '',
         'longitude': '',
@@ -631,9 +634,9 @@ function emptyForm(){
     // $('#testingQualification').val('');
     // $('#classification').val('');
     // 多选拉下清空
-    xmSelect.get('#type', true).setValue([]);
-    xmSelect.get('#columnId', true).setValue([]);
-    xmSelect.get('#classification', true).setValue([]);
+    xmSelect.get('#type', true).setValue([ ]);
+    xmSelect.get('#columnId', true).setValue([ ]);
+    xmSelect.get('#classification', true).setValue([ ]);
     form.render();
 }
 
@@ -761,7 +764,8 @@ function xmSelectRenderType(data){
                 }
                 key = key.substring(0, key.lastIndexOf(","))
             }
-            xmSelectRender([]);
+            xmSelectRender([ ]);
+            $("#classificationOther").empty();
             initFirstData(key)
         },
         data: data,
@@ -794,40 +798,4 @@ function xmSelectRender(data, vAttr, kAttr){
             }
         },
     })
-
-    // var selectData = [];
-    // for (var i = 0; i < data.length; i++) {
-    //     var obj = {
-    //         name: data[i][kAttr],
-    //         value: data[i][vAttr],
-    //     };
-    //     selectData.push(obj);
-    // }
-    // console.log(selectData);
-    // xmSelect.render({
-    //     el: '#classification',
-    //     tips: '请选择分类',
-    //     data: data,
-    //     on: function(data){
-    //         //arr:  当前多选已选中的数据
-    //         var arr = data.arr;
-    //         var clsFlag = false;
-    //         if (arr && arr.length > 0) {
-    //             for (let i = 0; i < arr.length; i++) {
-    //                 if (arr[i].name === '其他') {
-    //                     clsFlag = true;
-    //                 }
-    //             }
-    //         }
-    //         if (clsFlag) {
-    //             $("#classificationShow").show();
-    //         }else {
-    //             $("#classificationExplain").val('');
-    //             $("#classificationShow").hide();
-    //         }
-    //     },
-    //     // tree: {
-    //     //     show: true
-    //     // }
-    // })
 }