@indfnd/common 0.0.84 → 0.0.85

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.85](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.84...v0.0.85) (2024-03-06)
+
+
+### Features
+
+* 表格输入框小数位n个0问题修复 ([0962bcb](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/0962bcbd4fc76a740247b8c52d37d4e154ffc360))
+* 增加卷烟筛选条件接口 ([9b22d51](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/9b22d51b4bb55dbb1e0e0067492a63dd3223ba6a))
+* fix下拉内容过多样式问题 ([3453ca5](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/3453ca5270c83bdc2ff0c30d05c57d858ad441db))
+
+
+### Bug Fixes
+
+* 不知道为什么总报找不到panel，先使用全局的 ([994a9df](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/994a9dfa35bfc5d85d2bf0af74364227ecb23524))
+* 更新依赖 ([43894c4](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/43894c4e4aeaefd8391ffac4d05fbae976e0181e))
+* 更新依赖 ([1302f43](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/1302f434c058d278bf4e45dbd6d083a79fe904e1))
+* **table:** 列定义支持设置cellDataType ([ed0ceb7](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/ed0ceb73ecc5f45fc230797861fe021e396c7c03))
+
 ### [0.0.84](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.0.83...v0.0.84) (2024-03-03)
 
 

package/dist/ind-common.es.js

@@ -1,8 +1,8 @@
 import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Drawer$1, Dropdown as Dropdown$1, Modal as Modal$1, Form, FormItem, Select, Option, Row, Col, Switch, Menu, MenuItem, Badge, DropdownMenu, DropdownItem, Submenu, Tag, Header, Layout, Content, Spin, Poptip as Poptip$1, Checkbox, Card, RadioGroup, Radio, Message, LoadingBar } from "view-design";
-import { isNil, formatDate as formatDate$1, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on as on$1, off as off$1, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, MIME_TYPE, base64ToBlob, putOssFileApi, getPriceCode, getPriceSeg, getItem, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
+import { isNil, formatDate as formatDate$1, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on as on$1, off as off$1, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, MIME_TYPE, base64ToBlob, putOssFileApi, getPriceInfo, getItem, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version$1 = "0.0.83";
+const version$1 = "0.0.84";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -53,7 +53,7 @@ const dependencies = {
   "xlsx-populate": "^1.11.0"
 };
 const devDependencies = {
-  "@indfnd/utils": "^0.0.38",
+  "@indfnd/utils": "^0.0.39",
   "ag-grid-community": "^30.1.0",
   "ag-grid-enterprise": "^30.1.0",
   "ag-grid-vue": "^30.1.0",
@@ -55377,7 +55377,7 @@ const __vue2_script$X = {
     if (scale === 0) {
       renderVal = value ? parseInt(value) : value;
     } else if (scale) {
-      let cellV = parseFloat(value);
+      let cellV = _.round(parseFloat(value), 6);
       if (!isNaN(cellV)) {
         renderVal = cellV.toFixed(scale);
       }
@@ -55401,7 +55401,7 @@ const __vue2_script$X = {
               v = ((props == null ? void 0 : props.enableNegative) ? formatRlt[1] : "") + formatRlt[2] + (formatRlt[4] || "");
             }
             if (type == "number") {
-              this.params.setValue(parseFloat(v));
+              this.params.setValue(_.round(parseFloat(v), 6));
               this.$refs.input && this.$refs.input.setCurrentValue(v);
             } else {
               this.params.setValue(v);
@@ -56616,14 +56616,14 @@ const __vue2_script$P = {
       if (val == "X") {
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = parseFloat(d[dd]);
+            let t2 = _.round(parseFloat(d[dd]), 6);
             d[dd] = isNaN(t2) ? null : t2 / 5;
           });
         });
       } else if (val == "WZ") {
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = parseFloat(d[dd]);
+            let t2 = _.round(parseFloat(d[dd]), 6);
             d[dd] = isNaN(t2) ? null : t2 * 5;
           });
         });
@@ -56904,7 +56904,7 @@ const __vue2_script$P = {
           minWidth: column.minWidth,
           maxWidth: column.maxWidth,
           pinned: column.fixed || column.pinned,
-          cellDataType: "text",
+          cellDataType: column.cellDataType || "text",
           headerTooltip: (_b = (_a = this.$store) == null ? void 0 : _a.getters) == null ? void 0 : _b.getIndexDesc[column.standardField || column.key || column.field]
         };
         if (column.flex) {
@@ -57326,7 +57326,7 @@ const __vue2_script$P = {
                 mergedRows.push(...rows2.slice(1));
               });
               if (!mergedRows.includes(idx)) {
-                sumData[field] = sumData[field] + (!d[field] || isNaN(d[field]) ? 0 : parseFloat(d[field]));
+                sumData[field] = sumData[field] + (!d[field] || isNaN(d[field]) ? 0 : _.round(parseFloat(d[field]), 6));
               }
             });
             return s;
@@ -57395,14 +57395,14 @@ const __vue2_script$P = {
               if (this.unitType == "WZ") {
                 data.forEach((d) => {
                   this.switchCols.forEach((dd) => {
-                    let t2 = parseFloat(d[dd]);
+                    let t2 = _.round(parseFloat(d[dd]), 6);
                     d[dd] = isNaN(t2) ? null : t2 * 5;
                   });
                 });
               } else {
                 data.forEach((d) => {
                   this.switchCols.forEach((dd) => {
-                    let t2 = parseFloat(d[dd]);
+                    let t2 = _.round(parseFloat(d[dd]), 6);
                     d[dd] = isNaN(t2) ? null : t2 / 5;
                   });
                 });
@@ -57433,14 +57433,14 @@ const __vue2_script$P = {
         if (this.unitType == "WZ") {
           datasTmp.forEach((d) => {
             this.switchCols.forEach((dd) => {
-              let t2 = parseFloat(d[dd]);
+              let t2 = _.round(parseFloat(d[dd]));
               d[dd] = isNaN(t2) ? null : t2 * 5;
             });
           });
         } else {
           datasTmp.forEach((d) => {
             this.switchCols.forEach((dd) => {
-              let t2 = parseFloat(d[dd]);
+              let t2 = _.round(parseFloat(d[dd]));
               d[dd] = isNaN(t2) ? null : t2 / 5;
             });
           });
@@ -57474,7 +57474,7 @@ const __vue2_script$P = {
         let datasTmp = _.cloneDeep(this.tableData);
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = parseFloat(d[dd]);
+            let t2 = _.round(parseFloat(d[dd]));
             d[dd] = isNaN(t2) ? null : t2 / 5;
           });
         });
@@ -57488,7 +57488,7 @@ const __vue2_script$P = {
         let datasTmp = _.cloneDeep(this.tableData);
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = parseFloat(d[dd]);
+            let t2 = _.round(parseFloat(d[dd]));
             d[dd] = isNaN(t2) ? null : t2 * 5;
           });
         });
@@ -57502,7 +57502,7 @@ const __vue2_script$P = {
         let datasTmp = _.cloneDeep(this.topRows);
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = parseFloat(d[dd]);
+            let t2 = _.round(parseFloat(d[dd]));
             d[dd] = isNaN(t2) ? null : t2 / 5;
           });
         });
@@ -57516,7 +57516,7 @@ const __vue2_script$P = {
         let datasTmp = _.cloneDeep(this.topRows);
         datasTmp.forEach((d) => {
           this.switchCols.forEach((dd) => {
-            let t2 = parseFloat(d[dd]);
+            let t2 = _.round(parseFloat(d[dd]));
             d[dd] = isNaN(t2) ? null : t2 * 5;
           });
         });
@@ -61247,12 +61247,12 @@ var render$q = function() {
   var _c = _vm._self._c || _h;
   return _c("div", { ref: "detailView", staticClass: "ind-detail-view ind-flex-column" }, [_vm.isShowHeader ? _c("div", { staticClass: "ind-flex-no-shrink header" }, [_vm.isShowBackBtn ? _c("Button", { staticClass: "back-btn", attrs: { "bizType": "back" }, on: { "click": function($event) {
     _vm.useGoBack ? _vm.goBack() : _vm.$backToMenu();
-  } } }, [_vm._v("\u8FD4\u56DE")]) : _vm._e(), _c("span", { staticClass: "title" }, [_vm._v(_vm._s(_vm.customTitle || _vm.title))]), _c("div", { staticClass: "header-buttons" }, [_vm._t("headerButton")], 2)], 1) : _vm._e(), _c("BackTopPanel", { staticClass: "ind-flex-column ind-flex-grow content" }, [_vm._t("default")], 2), _c("div", { staticClass: "ind-flex-no-shrink function-wrapper" }, [_vm._t("footer")], 2)], 1);
+  } } }, [_vm._v("\u8FD4\u56DE")]) : _vm._e(), _c("span", { staticClass: "title" }, [_vm._v(_vm._s(_vm.customTitle || _vm.title))]), _c("div", { staticClass: "header-buttons" }, [_vm._t("headerButton")], 2)], 1) : _vm._e(), _c("IndBackTopPanel", { staticClass: "ind-flex-column ind-flex-grow content" }, [_vm._t("default")], 2), _c("div", { staticClass: "ind-flex-no-shrink function-wrapper" }, [_vm._t("footer")], 2)], 1);
 };
 var staticRenderFns$q = [];
 const __vue2_script$r = {
   name: "IndDetailView",
-  components: { Button, BackTopPanel },
+  components: { Button },
   props: {
     isShowHeader: { type: Boolean, default: true },
     isShowBackBtn: { type: Boolean, default: true },
@@ -61303,12 +61303,12 @@ var render$p = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", { staticClass: "ind-page-view ind-flex-column" }, [_vm.isShowHeader ? _c("div", { staticClass: "ind-flex-no-shrink header" }, [_vm.isShowBackBtn ? _c("Button", { staticClass: "back-btn", attrs: { "bizType": "back" }, on: { "click": _vm.$backToMenu } }, [_vm._v("\u8FD4\u56DE")]) : _vm._e(), _c("span", { staticClass: "title" }, [_vm._v(_vm._s(_vm.customTitle || _vm.title))]), _c("div", { staticClass: "function-wrapper" }, [_vm._t("headerButton")], 2)], 1) : _vm._e(), _c("LoadingPanel", { staticClass: "ind-flex-column ind-flex-grow content", attrs: { "loading": _vm.loading } }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.topSearch, expression: "$slots.topSearch" }], staticClass: "ind-flex-no-shrink ind-panel top-search-content search" }, [_vm._t("topSearch")], 2), _c("div", { staticClass: "ind-flex-grow body-content" }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.leftContent, expression: "$slots.leftContent" }], staticClass: "ind-panel body-left-content" }, [_vm._t("leftContent")], 2), _c("div", { staticClass: "ind-panel ind-flex-column body-right-content" }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], staticClass: "ind-flex-no-shrink search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots["important-tip"], expression: "$slots['important-tip']" }], staticClass: "important-tip" }, [_c("Icons", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { staticClass: "ind-flex-grow main-content" }, [_vm._t("default")], 2), _c("div", { staticClass: "ind-flex-no-shrink body-right-content-footer" }, [_vm._t("footer")], 2)])]), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.bottom, expression: "$slots.bottom" }], staticClass: "ind-flex-no-shrink ind-panel bottom" }, [_vm._t("bottom")], 2)])], 1);
+  return _c("div", { staticClass: "ind-page-view ind-flex-column" }, [_vm.isShowHeader ? _c("div", { staticClass: "ind-flex-no-shrink header" }, [_vm.isShowBackBtn ? _c("Button", { staticClass: "back-btn", attrs: { "bizType": "back" }, on: { "click": _vm.$backToMenu } }, [_vm._v("\u8FD4\u56DE")]) : _vm._e(), _c("span", { staticClass: "title" }, [_vm._v(_vm._s(_vm.customTitle || _vm.title))]), _c("div", { staticClass: "function-wrapper" }, [_vm._t("headerButton")], 2)], 1) : _vm._e(), _c("IndLoadingPanel", { staticClass: "ind-flex-column ind-flex-grow content", attrs: { "loading": _vm.loading } }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.topSearch, expression: "$slots.topSearch" }], staticClass: "ind-flex-no-shrink ind-panel top-search-content search" }, [_vm._t("topSearch")], 2), _c("div", { staticClass: "ind-flex-grow body-content" }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.leftContent, expression: "$slots.leftContent" }], staticClass: "ind-panel body-left-content" }, [_vm._t("leftContent")], 2), _c("div", { staticClass: "ind-panel ind-flex-column body-right-content" }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], staticClass: "ind-flex-no-shrink search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots["important-tip"], expression: "$slots['important-tip']" }], staticClass: "important-tip" }, [_c("Icons", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { staticClass: "ind-flex-grow main-content" }, [_vm._t("default")], 2), _c("div", { staticClass: "ind-flex-no-shrink body-right-content-footer" }, [_vm._t("footer")], 2)])]), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.bottom, expression: "$slots.bottom" }], staticClass: "ind-flex-no-shrink ind-panel bottom" }, [_vm._t("bottom")], 2)])], 1);
 };
 var staticRenderFns$p = [];
 const __vue2_script$q = {
   name: "IndPageView",
-  components: { LoadingPanel, ButtonGroup, Button, Icons, Col, Row },
+  components: { ButtonGroup, Button, Icons, Col, Row },
   props: {
     customTitle: String,
     loading: Boolean,
@@ -61375,7 +61375,7 @@ function __vue2_injectStyles$p(context) {
     this[o] = __cssModules$p[o];
   }
 }
-var BackTopPanel = /* @__PURE__ */ function() {
+var backTopPanel = /* @__PURE__ */ function() {
   return __component__$p.exports;
 }();
 var render$n = function() {
@@ -64125,18 +64125,22 @@ var render$c = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("Modal", { attrs: { "value": _vm.show, "title": "\u5377\u70DF\u9009\u62E9", "mask-closable": false, "width": _vm.width }, on: { "on-cancel": _vm.onCancel } }, [_vm.loading ? _c("Spin", { attrs: { "fix": "" } }) : _vm._e(), _c("Form", { staticClass: "item-comp-panel-form", attrs: { "label-width": 120 } }, [_c("FormItem", { attrs: { "label": "\u5377\u70DF\u54C1\u724C" } }, [_c("IndTreeSelect", { ref: "brandSelect", attrs: { "data-url": _vm.dataUrl, "show-checkbox": "" } })], 1), _c("FormItem", { attrs: { "label": "\u5377\u70DF\u89C4\u683C" } }, [_c("IndTreeSelect", _vm._b({ ref: "itemSelect" }, "IndTreeSelect", _vm.$attrs, false))], 1), _c("FormItem", { attrs: { "label": "\u5377\u70DF\u4EF7\u7C7B" } }, [_c("Select", { attrs: { "multiple": "", "max-tag-count": 2 }, model: { value: _vm.conditions.kind, callback: function($$v) {
+  return _c("Modal", { attrs: { "value": _vm.show, "title": "\u5377\u70DF\u9009\u62E9", "mask-closable": false, "width": _vm.width }, on: { "on-cancel": _vm.onCancel } }, [_vm.loading ? _c("Spin", { attrs: { "fix": "" } }) : _vm._e(), _c("Form", { staticClass: "item-comp-panel-form", attrs: { "label-width": 120 } }, [_c("FormItem", { attrs: { "label": "\u54C1\u724C" } }, [_c("IndTreeSelect", { ref: "brandSelect", attrs: { "data-url": _vm.dataUrl, "show-checkbox": "" } })], 1), _c("FormItem", { attrs: { "label": "\u89C4\u683C" } }, [_c("IndTreeSelect", _vm._b({ ref: "itemSelect" }, "IndTreeSelect", _vm.$attrs, false))], 1), _c("FormItem", { attrs: { "label": "\u5927\u7C7B" } }, [_c("Select", { attrs: { "multiple": "", "max-tag-count": 2 }, model: { value: _vm.conditions.kind, callback: function($$v) {
     _vm.$set(_vm.conditions, "kind", $$v);
   }, expression: "conditions.kind" } }, _vm._l(_vm.kinds, function(item2) {
-    return _c("Option", { key: item2.kind, attrs: { "value": item2.kind } }, [_vm._v(_vm._s(item2.kindName))]);
-  }), 1)], 1), _c("FormItem", { attrs: { "label": "\u7EC6\u5206\u4EF7\u7C7B" } }, [_c("Select", { attrs: { "multiple": "", "max-tag-count": 1 }, model: { value: _vm.conditions.priceCode, callback: function($$v) {
+    return _c("Option", { key: item2.kindCode, attrs: { "value": item2.kindCode } }, [_vm._v(_vm._s(item2.kindName))]);
+  }), 1)], 1), _c("FormItem", { attrs: { "label": "\u4EF7\u7C7B" } }, [_c("Select", { attrs: { "multiple": "", "max-tag-count": 1 }, model: { value: _vm.conditions.priceCode, callback: function($$v) {
     _vm.$set(_vm.conditions, "priceCode", $$v);
   }, expression: "conditions.priceCode" } }, _vm._l(_vm.priceCodes, function(item2) {
-    return _c("Option", { key: item2.priceCode, attrs: { "value": item2.priceCode } }, [_vm._v(_vm._s(item2.kindName))]);
-  }), 1)], 1), _c("FormItem", { attrs: { "label": "\u7EC6\u5206\u6863\u4F4D" } }, [_c("Select", { attrs: { "multiple": "", "max-tag-count": 2 }, model: { value: _vm.conditions.gearCode, callback: function($$v) {
+    return _c("Option", { key: item2.priceCode, attrs: { "value": item2.priceCode } }, [_vm._v(_vm._s(item2.priceName))]);
+  }), 1)], 1), _c("FormItem", { attrs: { "label": "\u6863\u4F4D" } }, [_c("Select", { attrs: { "multiple": "", "max-tag-count": 2 }, model: { value: _vm.conditions.gearCode, callback: function($$v) {
     _vm.$set(_vm.conditions, "gearCode", $$v);
   }, expression: "conditions.gearCode" } }, _vm._l(_vm.gears, function(item2) {
     return _c("Option", { key: item2.gearCode, attrs: { "value": item2.gearCode } }, [_vm._v(_vm._s(item2.gearName))]);
+  }), 1)], 1), _c("FormItem", { attrs: { "label": "\u4EF7\u4F4D\u6BB5" } }, [_c("Select", { attrs: { "multiple": "" }, model: { value: _vm.conditions.priceSeg, callback: function($$v) {
+    _vm.$set(_vm.conditions, "priceSeg", $$v);
+  }, expression: "conditions.priceSeg" } }, _vm._l(_vm.priceSegs, function(item2) {
+    return _c("Option", { key: item2.priceSegCode, attrs: { "value": item2.priceSegCode } }, [_vm._v(" " + _vm._s(item2.priceSegName) + " ")]);
   }), 1)], 1), _c("FormItem", { attrs: { "label": "\u7EC6\u5206\u54C1\u7C7B" } }, [_c("RadioGroup", { model: { value: _vm.conditions.categoryCode, callback: function($$v) {
     _vm.$set(_vm.conditions, "categoryCode", $$v);
   }, expression: "conditions.categoryCode" } }, [_c("Radio", { attrs: { "label": "" } }, [_vm._v("\u5168\u90E8")]), _vm._l(_vm.CATEGORY, function(item2) {
@@ -64149,13 +64153,9 @@ var render$c = function() {
     _vm.$set(_vm.conditions, "brandType", $$v);
   }, expression: "conditions.brandType" } }, [_c("Radio", { attrs: { "label": "" } }, [_vm._v("\u5168\u90E8")]), _vm._l(_vm.BRAND_TYPE, function(item2) {
     return _c("Radio", { key: item2.value, attrs: { "label": item2.value } }, [_vm._v(_vm._s(item2.label))]);
-  })], 2)], 1), _c("FormItem", { attrs: { "label": "\u96F6\u552E\u4EF7\u533A\u95F4" } }, [_c("Select", { attrs: { "multiple": "" }, model: { value: _vm.conditions.priceSeg, callback: function($$v) {
-    _vm.$set(_vm.conditions, "priceSeg", $$v);
-  }, expression: "conditions.priceSeg" } }, _vm._l(_vm.priceSegs, function(item2) {
-    return _c("Option", { key: item2.priceSegId, attrs: { "value": item2.priceSegId } }, [_vm._v(" " + _vm._s(item2.priceSegName) + " ")]);
-  }), 1)], 1), _vm._l(_vm.numConditions, function(item2) {
-    return _c("FormItem", { key: item2.value, attrs: { "label": "" + item2.label } }, [_c("NumCondition", { ref: item2.value, refInFor: true })], 1);
-  })], 2), _c("div", { attrs: { "slot": "footer" }, slot: "footer" }, [_c("Button", { on: { "click": _vm.clear } }, [_vm._v("\u6E05\u9664")]), _c("Button", { attrs: { "type": "primary" }, on: { "click": _vm.onConfirm } }, [_vm._v("\u786E\u5B9A")])], 1)], 1);
+  })], 2)], 1), _c("FormItem", { attrs: { "label": "\u662F\u5426\u4F4E\u4EF7\u4F4D" } }, [_c("RadioGroup", { model: { value: _vm.conditions.brandType, callback: function($$v) {
+    _vm.$set(_vm.conditions, "brandType", $$v);
+  }, expression: "conditions.brandType" } }, [_c("Radio", { attrs: { "label": "" } }, [_vm._v("\u5168\u90E8")]), _c("Radio", { attrs: { "label": "1" } }, [_vm._v("\u662F")]), _c("Radio", { attrs: { "label": "0" } }, [_vm._v("\u5426")])], 1)], 1)], 1), _c("div", { attrs: { "slot": "footer" }, slot: "footer" }, [_c("Button", { on: { "click": _vm.clear } }, [_vm._v("\u6E05\u9664")]), _c("Button", { attrs: { "type": "primary" }, on: { "click": _vm.onConfirm } }, [_vm._v("\u786E\u5B9A")])], 1)], 1);
 };
 var staticRenderFns$c = [];
 var panel_vue_vue_type_style_index_0_scoped_true_lang = "";
@@ -64203,66 +64203,24 @@ const __vue2_script$d = {
       kinds: [],
       priceCodes: [],
       priceSegs: [],
-      gears: [
-        {
-          gearCode: "1",
-          gearName: "\u4E00\u6863"
-        },
-        {
-          gearCode: "2",
-          gearName: "\u4E8C\u6863"
-        },
-        {
-          gearCode: "3",
-          gearName: "\u4E09\u6863"
-        },
-        {
-          gearCode: "4",
-          gearName: "\u56DB\u6863"
-        },
-        {
-          gearCode: "5",
-          gearName: "\u4E94\u6863"
-        },
-        {
-          gearCode: "6",
-          gearName: "\u516D\u6863"
-        },
-        {
-          gearCode: "7",
-          gearName: "\u4E03\u6863"
-        },
-        {
-          gearCode: "8",
-          gearName: "\u516B\u6863"
-        }
-      ],
+      gears: [],
       loading: false,
       conditions: { ...defaultConditions }
     };
   },
   created() {
-    this.getPriceCode();
-    this.getPriceSeg();
-    let url = this.$attrs["data-url"] || config.eoaEcoServer + "/tree/getItemTree";
-    this.dataUrl = (url.indexOf("?") > -1 ? url + "&" : url + "?") + "selType=1";
+    this.getPriceInfo();
+    let url = this.$attrs["data-url"] || config.ismAmServerContext + "/tree/item/listItemTree";
+    this.dataUrl = (url.indexOf("?") > -1 ? url + "&" : url + "?") + "showType=31";
   },
   methods: {
-    async getPriceCode() {
-      try {
-        const { data = [] } = await getPriceCode();
-        this.kinds = data.filter((item2) => item2.kind === item2.priceCode && item2.priceCode !== "6");
-        this.priceCodes = data.filter(
-          (item2) => item2.priceCode !== "1" && item2.priceCode !== "3" && item2.priceCode !== "6"
-        );
-      } catch (error) {
-        console.log(error);
-      }
-    },
-    async getPriceSeg() {
+    async getPriceInfo() {
       try {
-        const { data } = await getPriceSeg();
-        this.priceSegs = data || [];
+        const { data } = await getPriceInfo();
+        this.kinds = data.kinds || [];
+        this.priceCodes = data.priceCodes || [];
+        this.gears = data.gears || [];
+        this.priceSegs = data.priceSegs || [];
       } catch (error) {
         console.log(error);
       }
@@ -64396,7 +64354,7 @@ var __component__$d = /* @__PURE__ */ normalizeComponent(
   staticRenderFns$c,
   false,
   __vue2_injectStyles$d,
-  "4aeaf869",
+  "1ab53156",
   null,
   null
 );
@@ -66840,7 +66798,7 @@ var components = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProp
   HelpTreeModal,
   MaterialItemModal: materialItemModal,
   SignModal: signModal,
-  BackTopPanel,
+  BackTopPanel: backTopPanel,
   LoadingPanel,
   Poptip,
   UnitRadio: unitRadio,
@@ -67582,4 +67540,4 @@ const API = {
   getDefaultTheme,
   doChangeTheme
 };
-export { AppMenu, auditLogModal as AuditLogModal, auditModal as AuditModal, BackTop, BackTopPanel, BasicLayout, brandInputModal as BrandInputModal, Button, ButtonGroup, Collect, comInputModal as ComInputModal, datePicker as DatePicker, detailView as DetailView, Drawer, Dropdown, EmptyLayout, ErrorContent, errorStore as ErrorStore, index$3 as ExcelFlowModal, FormWrap, Fullscreen as FullScreen, helpTableModal as HelpTableModal, HelpTreeModal, Icons, configPlugin as IndConfigPlugin, routerPlugin as IndRouterPlugin, index$1 as ItemCompModal, itemInputModal as ItemInputModal, itemTypeCombineSelect as ItemTypeCombineSelect, language as Language, LoadingPanel, Login, materialItemModal as MaterialItemModal, Modal, NotFound, option2 as Option, optionGroup as OptionGroup, OtherMenu, pageView as PageView, Poptip, select as Select, SideMenu, SideMenuItem, SiderTrigger, Sign, signModal as SignModal, index as StepTrack, Table, TagsNav, Tooltip, Tree, index$2 as TreeModal, ImpTreeSelect as TreeSelect, unitRadio as UnitRadio, uploadFile as UploadFile, uploadImg as UploadImg, User, addRouterGuards, clickOutside, createMacroBasicRoutes, createMicroBasicRoutes, API as default, permission, print, routerOptions, store, transferDom };
+export { AppMenu, auditLogModal as AuditLogModal, auditModal as AuditModal, BackTop, backTopPanel as BackTopPanel, BasicLayout, brandInputModal as BrandInputModal, Button, ButtonGroup, Collect, comInputModal as ComInputModal, datePicker as DatePicker, detailView as DetailView, Drawer, Dropdown, EmptyLayout, ErrorContent, errorStore as ErrorStore, index$3 as ExcelFlowModal, FormWrap, Fullscreen as FullScreen, helpTableModal as HelpTableModal, HelpTreeModal, Icons, configPlugin as IndConfigPlugin, routerPlugin as IndRouterPlugin, index$1 as ItemCompModal, itemInputModal as ItemInputModal, itemTypeCombineSelect as ItemTypeCombineSelect, language as Language, LoadingPanel, Login, materialItemModal as MaterialItemModal, Modal, NotFound, option2 as Option, optionGroup as OptionGroup, OtherMenu, pageView as PageView, Poptip, select as Select, SideMenu, SideMenuItem, SiderTrigger, Sign, signModal as SignModal, index as StepTrack, Table, TagsNav, Tooltip, Tree, index$2 as TreeModal, ImpTreeSelect as TreeSelect, unitRadio as UnitRadio, uploadFile as UploadFile, uploadImg as UploadImg, User, addRouterGuards, clickOutside, createMacroBasicRoutes, createMicroBasicRoutes, API as default, permission, print, routerOptions, store, transferDom };