浏览代码

Merge branch 'master' of http://39.106.8.246:3003/web/ibms

YaolongHan 5 年之前
父节点
当前提交
b3b1e6c4ca
共有 2 个文件被更改,包括 2 次插入50 次删除
  1. 1 1
      src/components/ledger/handsontables/system.vue
  2. 1 49
      src/views/data_admin/buildData/index.vue

+ 1 - 1
src/components/ledger/handsontables/system.vue

@@ -614,7 +614,7 @@ export default {
               if (!!item.infos[key]) {
                 this.headers.map(child => {
                   //如果一级标签为动态参数或者设定参数放入数据等待请求
-                  if (key == child.infoPointCode && (child.InputMode == "L" || child.InputMode == "L1" || child.InputMode == "L2" || child.InputMode == "M")) {
+                  if (key == child.InfoPointCode && (child.InputMode == "L" || child.InputMode == "L1" || child.InputMode == "L2" || child.InputMode == "M")) {
                     param.data.criterias.push({
                       id: item.id,
                       code: key

+ 1 - 49
src/views/data_admin/buildData/index.vue

@@ -1225,54 +1225,6 @@
                 this.createPicSwiper();
                 this.rowArr = rowArr;
             },
-            //插件修改
-            customDropdownRenderer(
-                instance,
-                td,
-                row,
-                col,
-                prop,
-                value,
-                cellProperties
-            ) {
-                var selectedId;
-                var optionsList = cellProperties.chosenOptions.data;
-                if (
-                    typeof optionsList === "undefined" ||
-                    typeof optionsList.length === "undefined" ||
-                    !optionsList.length
-                ) {
-                    Handsontable.renderers.TextRenderer(
-                        instance,
-                        td,
-                        row,
-                        col,
-                        prop,
-                        value,
-                        cellProperties
-                    );
-                    return td;
-                }
-                var values = (value + "").split(",");
-                value = [];
-                for (var index = 0; index < optionsList.length; index++) {
-                    if (values.indexOf(optionsList[index].code + "") > -1) {
-                        selectedId = optionsList[index].code;
-                        value.push(optionsList[index].name);
-                    }
-                }
-                value = value.join(", ");
-                Handsontable.renderers.TextRenderer(
-                    instance,
-                    td,
-                    row,
-                    col,
-                    prop,
-                    value,
-                    cellProperties
-                );
-                return td;
-            },
             //下层的弹窗不显示
             picNoShow() {
                 this.picShow = false;
@@ -1772,7 +1724,7 @@
                 }, {
                     editor: "chosen",
                     data: "Family",
-                    renderer: this.customDropdownRenderer,
+                    renderer: tools.customDropdownRenderer,
                     chosenOptions: {
                         data: this.AllFamily
                     }