@vtx/modals2 5.0.33 → 5.0.35

package/lib/vtx-default-modal/components/BaseInfo/index.js

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { VtxImage } from '@vtx/components';
 import { getVtxToken } from '@vtx/utils';
-import { Carousel, Col, Row } from 'antd';
+import { Carousel } from 'antd';
 import { VmEmpty, VmInfoCollection, VmMap, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { CommonService } from "../../../_service";
@@ -50,63 +50,60 @@ var BaseInfo = function BaseInfo(props) {
       };
     })) || [];
   }
-  return /*#__PURE__*/_jsx("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: "default-baseContent",
-    children: /*#__PURE__*/_jsxs(Row, {
-      gutter: [16, 10],
-      children: [/*#__PURE__*/_jsx(Col, {
-        flex: "430px",
-        children: /*#__PURE__*/_jsxs(VmWrapper, {
-          title: "\u57FA\u672C\u4FE1\u606F",
-          children: [photos && /*#__PURE__*/_jsx("div", {
-            className: "default-base-img",
-            children: photos.length ? /*#__PURE__*/_jsx(VtxImage.PreviewGroup, {
-              children: /*#__PURE__*/_jsx(Carousel, {
-                style: {
-                  width: '100%',
-                  height: '100%',
-                  overflow: 'hidden'
-                },
-                children: photos.map(function (item) {
-                  return /*#__PURE__*/_jsx(VtxImage, {
-                    src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getVtxToken('token')),
-                    alt: item.name,
-                    style: {
-                      width: '100%',
-                      height: '100%',
-                      overflow: 'hidden'
-                    }
-                  }, item.id);
-                })
+    children: [/*#__PURE__*/_jsx("div", {
+      className: "default-baseContent-left",
+      children: /*#__PURE__*/_jsxs(VmWrapper, {
+        title: "\u57FA\u672C\u4FE1\u606F",
+        children: [photos && /*#__PURE__*/_jsx("div", {
+          className: "default-base-img",
+          children: photos.length ? /*#__PURE__*/_jsx(VtxImage.PreviewGroup, {
+            children: /*#__PURE__*/_jsx(Carousel, {
+              style: {
+                width: '100%',
+                height: '100%',
+                overflow: 'hidden'
+              },
+              children: photos.map(function (item) {
+                return /*#__PURE__*/_jsx(VtxImage, {
+                  src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getVtxToken('token')),
+                  alt: item.name,
+                  style: {
+                    width: '100%',
+                    height: '100%',
+                    overflow: 'hidden'
+                  }
+                }, item.id);
               })
-            }) : /*#__PURE__*/_jsx(VmEmpty, {
-              type: "NO_PICTURE",
-              showText: false
             })
-          }), /*#__PURE__*/_jsx("div", {
-            className: "default-base-text",
-            children: /*#__PURE__*/_jsx(VmInfoCollection, {
-              data: (data === null || data === void 0 ? void 0 : data.length) > 0 ? data : getFieldRender(fields, info),
-              horizontal: true,
-              width: "50%",
-              ellipsis: true
-            })
-          })]
-        })
-      }), /*#__PURE__*/_jsx(Col, {
-        flex: "auto",
-        children: /*#__PURE__*/_jsx("div", {
-          className: "default-base-map",
-          children: /*#__PURE__*/_jsx(VmMap, _objectSpread({
-            mapCenter: mapCenter,
-            mapType: (mapInfo === null || mapInfo === void 0 ? void 0 : mapInfo.mapType) || 'bmap',
-            geometryType: geometryType,
-            mapPoints: _mapPoints,
-            mapPolygons: lineLayer !== null && lineLayer !== void 0 && lineLayer.rings ? [lineLayer] : []
-          }, customMapInfo))
-        })
-      })]
-    })
+          }) : /*#__PURE__*/_jsx(VmEmpty, {
+            type: "NO_PICTURE",
+            showText: false
+          })
+        }), /*#__PURE__*/_jsx("div", {
+          className: "default-base-text",
+          children: /*#__PURE__*/_jsx(VmInfoCollection, {
+            data: (data === null || data === void 0 ? void 0 : data.length) > 0 ? data : getFieldRender(fields, info),
+            horizontal: true,
+            width: "50%",
+            ellipsis: true
+          })
+        })]
+      })
+    }), /*#__PURE__*/_jsx("div", {
+      className: "default-baseContent-right",
+      children: /*#__PURE__*/_jsx("div", {
+        className: "default-base-map",
+        children: /*#__PURE__*/_jsx(VmMap, _objectSpread({
+          mapCenter: mapCenter,
+          mapType: (mapInfo === null || mapInfo === void 0 ? void 0 : mapInfo.mapType) || 'bmap',
+          geometryType: geometryType,
+          mapPoints: _mapPoints,
+          mapPolygons: lineLayer !== null && lineLayer !== void 0 && lineLayer.rings ? [lineLayer] : []
+        }, customMapInfo))
+      })
+    })]
   });
 };
 export default BaseInfo;

package/lib/vtx-default-modal/components/BaseInfo/index.less

@@ -1,5 +1,15 @@
 .default-baseContent {
   height: 100%;
+  display: flex;
+  justify-content: start;
+  gap: 16px;
+
+  &-left {
+    width: 430px;
+  }
+  &-right {
+    flex: 1;
+  }
 
   .ant-row {
     height: 100%;
@@ -9,7 +19,6 @@
     &-img {
       margin-bottom: 16px;
       img {
-        width: 100%;
         height: 207px;
       }
     }
@@ -20,7 +29,7 @@
   }
   .default-base-map {
     width: 100%;
-    height: 660px;
+    height: 659px;
     border-radius: 8px;
   }
 }

package/lib/vtx-device-modal/components/DataAnalysis/index.less

@@ -1,66 +1,66 @@
-.vtx-device-analysis-dot {
-  width: 6px;
-  height: 6px;
-  background: var(--green-color);
-  border-radius: 50%;
-  &.error {
-    background: var(--red-color);
-  }
-}
-
-.vtx-device-analysis-tabs {
-  display: flex;
-  gap: 16px;
-  color: var(--modal-title-color);
-  font-size: 14px;
-  &-item {
-    cursor: pointer;
-    &.active {
-      color: var(--blue-color);
-    }
-  }
-}
-
-.vtx-device-alarm-summary {
-  width: 368px;
-  height: 104px;
-  padding: 20px;
-  margin-bottom: 20px;
-  color: var(--modal-title-color);
-  display: flex;
-  justify-content: space-between;
-  flex-direction: column;
-  cursor: pointer;
-  background-image: url("../../imgs/current.png");
-  background-size: 100% 100%;
-  border-radius: 8px;
-  border: 1px solid transparent;
-  &-lable {
-    font-size: 16px;
-    font-weight: 600;
-  }
-  &-value {
-    font-weight: 600;
-    font-size: 24px;
-    color: var(--red-color);
-  }
-  &.dark {
-    background-image: url("../../imgs/current_dark.png");
-    &:last-child {
-      background-image: url("../../imgs/history_dark.png");
-    }
-  }
-  &.active {
-    border:1px solid var(--red-color);
-  }
-  &:last-child {
-    margin-bottom: 0;
-    background-image: url("../../imgs/history.png");
-    .vtx-device-alarm-summary-value {
-      color: var(--yellow-color);
-    }
-    &.active {
-      border:1px solid var(--yellow-color);
-    }
-  }
-}
+.vtx-device-analysis-dot {
+  width: 6px;
+  height: 6px;
+  background: var(--green-color);
+  border-radius: 50%;
+  &.error {
+    background: var(--red-color);
+  }
+}
+
+.vtx-device-analysis-tabs {
+  display: flex;
+  gap: 16px;
+  color: var(--modal-title-color);
+  font-size: 14px;
+  &-item {
+    cursor: pointer;
+    &.active {
+      color: var(--blue-color);
+    }
+  }
+}
+
+.vtx-device-alarm-summary {
+  width: 368px;
+  height: 104px;
+  padding: 20px;
+  margin-bottom: 20px;
+  color: var(--modal-title-color);
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  cursor: pointer;
+  background-image: url("../../imgs/current.png");
+  background-size: 100% 100%;
+  border-radius: 8px;
+  border: 1px solid transparent;
+  &-lable {
+    font-size: 16px;
+    font-weight: 600;
+  }
+  &-value {
+    font-weight: 600;
+    font-size: 24px;
+    color: var(--red-color);
+  }
+  &.dark {
+    background-image: url("../../imgs/current_dark.png");
+    &:last-child {
+      background-image: url("../../imgs/history_dark.png");
+    }
+  }
+  &.active {
+    border:1px solid var(--red-color);
+  }
+  &:last-child {
+    margin-bottom: 0;
+    background-image: url("../../imgs/history.png");
+    .vtx-device-alarm-summary-value {
+      color: var(--yellow-color);
+    }
+    &.active {
+      border:1px solid var(--yellow-color);
+    }
+  }
+}

package/lib/vtx-df-modal/api.js

@@ -28,7 +28,8 @@ var BaseService = {
         return request.get('/cloud/zd/lm/api/cp/dataBoard/getSumData.smvc', {
           data: {
             disposeUnitCode: code,
-            date: date
+            date: date,
+            beenFilterProductNames: false
           }
         });
       }, {

package/lib/vtx-df-modal/components/BaseInfo/Jcqsfx.js

@@ -22,40 +22,37 @@ export default function Jcqsfx(props) {
     children: /*#__PURE__*/_jsx(VmWrapper, {
       title: "\u8FDB\u573A\u8D8B\u52BF\u5206\u6790",
       needChange: false,
-      children: /*#__PURE__*/_jsx("div", {
-        className: "base-top--chart",
-        children: /*#__PURE__*/_jsx(VmLineCharts, {
-          unit: "\u5428",
-          height: 320,
-          showLegend: false,
-          xAxis: (trendRes === null || trendRes === void 0 ? void 0 : trendRes.names) || [],
-          yMax: maxNum,
-          dataList: [{
-            data: ((_trendRes$values2 = trendRes.values) === null || _trendRes$values2 === void 0 ? void 0 : _trendRes$values2[0]) || [],
-            name: '进场量',
-            markLine: {
-              data: [{
-                yAxis: trendRes !== null && trendRes !== void 0 && trendRes.values && trendRes.values[1] ? trendRes.values[1][0] : 0,
-                lineStyle: {
-                  normal: {
-                    color: '#FFE25D'
-                  }
-                },
-                name: '设计能力(吨/日)'
-              }],
+      children: /*#__PURE__*/_jsx(VmLineCharts, {
+        unit: "\u5428",
+        height: 240,
+        showLegend: false,
+        xAxis: (trendRes === null || trendRes === void 0 ? void 0 : trendRes.names) || [],
+        yMax: maxNum,
+        dataList: [{
+          data: ((_trendRes$values2 = trendRes.values) === null || _trendRes$values2 === void 0 ? void 0 : _trendRes$values2[0]) || [],
+          name: '进场量',
+          markLine: {
+            data: [{
+              yAxis: trendRes !== null && trendRes !== void 0 && trendRes.values && trendRes.values[1] ? trendRes.values[1][0] : 0,
               lineStyle: {
-                color: '#52C41A'
+                normal: {
+                  color: '#FFE25D'
+                }
               },
-              label: {
-                show: true,
-                position: 'insideEndTop',
-                formatter: '{b}: {c}',
-                color: isDark ? '#fff' : chartFontColor,
-                fontWeight: 'normal'
-              }
+              name: '设计能力(吨/日)'
+            }],
+            lineStyle: {
+              color: '#52C41A'
+            },
+            label: {
+              show: true,
+              position: 'insideEndTop',
+              formatter: '{b}: {c}',
+              color: isDark ? '#fff' : chartFontColor,
+              fontWeight: 'normal'
             }
-          }]
-        })
+          }
+        }]
       })
     })
   });

package/lib/vtx-df-modal/components/BaseInfo/Qyjcl.js

@@ -19,7 +19,7 @@ function Qyjcl(props) {
     className: "df-qyjcl",
     children: areaSumData !== null && areaSumData !== void 0 && (_areaSumData$areaDeta = areaSumData.areaDetailList) !== null && _areaSumData$areaDeta !== void 0 && _areaSumData$areaDeta.length ? /*#__PURE__*/_jsx(VmPieCharts, {
       height: 216,
-      total: total,
+      total: total === null || total === void 0 ? void 0 : total.toFixed(2),
       title: "\u5428",
       unit: "\u5428",
       name: "\u533A\u57DF\u8FDB\u573A\u91CF",

package/lib/vtx-df-modal/components/BaseInfo/RealtimeMonitor.js

@@ -134,7 +134,10 @@ export default function RealtimeMonitor(_ref) {
               }, tableProps))
             })]
           }) : /*#__PURE__*/_jsx(VmEmpty, {
-            type: "NO_DATA"
+            type: "NO_DATA",
+            style: {
+              height: 244
+            }
           })
         })
       })

package/lib/vtx-df-modal/components/BaseInfo/index.js

@@ -71,9 +71,6 @@ var BaseInfo = function BaseInfo(props) {
           })
         }), /*#__PURE__*/_jsx("div", {
           className: "base-top--base",
-          style: {
-            height: 382
-          },
           children: /*#__PURE__*/_jsx(VmInfoCollection, {
             data: getFieldRender(fields, info),
             horizontal: true,

package/lib/vtx-df-modal/components/Metering/ChartJccc.js

@@ -28,6 +28,7 @@ var ChartJccc = function ChartJccc(_ref) {
     needChange: false,
     children: [/*#__PURE__*/_jsxs("div", {
       className: "metering-content-charts-desc",
+      title: "\u8FDB\u573A\u9AD8\u5CF0\u96C6\u4E2D\u5728".concat((dates === null || dates === void 0 ? void 0 : dates.join('点、')) || 0, "\u70B9\uFF0C\u8FDB\u573A\u8F66\u6B21\u5206\u522B\u4E3A").concat((count === null || count === void 0 ? void 0 : count.join('次、')) || '-', "\u6B21\uFF0C\n      \u6CE8\u610F\u5408\u7406\u8C03\u5EA6\uFF0C \u7F13\u89E3\u5382\u533A\u6392\u961F\u60C5\u51B5\u3002"),
       children: ["\u8FDB\u573A\u9AD8\u5CF0\u96C6\u4E2D\u5728", (dates === null || dates === void 0 ? void 0 : dates.join('点、')) || 0, "\u70B9\uFF0C\u8FDB\u573A\u8F66\u6B21\u5206\u522B\u4E3A", (count === null || count === void 0 ? void 0 : count.join('次、')) || '-', "\u6B21\uFF0C\u6CE8\u610F\u5408\u7406\u8C03\u5EA6\uFF0C \u7F13\u89E3\u5382\u533A\u6392\u961F\u60C5\u51B5\u3002"]
     }), /*#__PURE__*/_jsx("div", {
       style: {

package/lib/vtx-jzlj-df-tpd-modal/api.js

@@ -240,4 +240,48 @@ export var useUnit = function useUnit() {
   return {
     unitStr: unitStr
   };
+};
+
+// 处置证字段配置
+export var useCzzFields = function useCzzFields() {
+  var _useRequest9 = useRequest(function () {
+      return request.get("/cloud/jzlj/web/field/config/list", {
+        data: {
+          ledgerType: 'CZHZBA'
+        }
+      });
+    }, {
+      refreshDeps: []
+    }),
+    res = _useRequest9.data;
+  var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
+  var visibleList = dataList.filter(function (item) {
+    var _item$functionKeys;
+    return ['YES', 'YES_NO_UPDATE'].includes(item.isVisible) && ['YES', 'YES_NO_UPDATE'].includes(item.listVisible) && (item === null || item === void 0 || (_item$functionKeys = item.functionKeys) === null || _item$functionKeys === void 0 || (_item$functionKeys = _item$functionKeys.split(',')) === null || _item$functionKeys === void 0 ? void 0 : _item$functionKeys.includes('modal_show'));
+  });
+  return {
+    visibleList: visibleList
+  };
+};
+
+// 联单字段配置
+export var useLdFields = function useLdFields() {
+  var _useRequest10 = useRequest(function () {
+      return request.get("/cloud/jzlj/web/field/config/list", {
+        data: {
+          ledgerType: 'CLYSLD'
+        }
+      });
+    }, {
+      refreshDeps: []
+    }),
+    res = _useRequest10.data;
+  var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
+  var visibleList = dataList.filter(function (item) {
+    var _item$functionKeys2;
+    return ['YES', 'YES_NO_UPDATE'].includes(item.isVisible) && ['YES', 'YES_NO_UPDATE'].includes(item.listVisible) && (item === null || item === void 0 || (_item$functionKeys2 = item.functionKeys) === null || _item$functionKeys2 === void 0 || (_item$functionKeys2 = _item$functionKeys2.split(',')) === null || _item$functionKeys2 === void 0 ? void 0 : _item$functionKeys2.includes('modal_show'));
+  });
+  return {
+    visibleList: visibleList
+  };
 };

package/lib/vtx-jzlj-df-tpd-modal/components/Collection/index.js

@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -16,7 +20,7 @@ import React, { useEffect } from 'react';
 import { JzljDfTpdContext } from "../..";
 import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
-import { collectionApis, useUnit } from "../../api";
+import { collectionApis, useLdFields, useUnit } from "../../api";
 import "./index.less";
 import dayjs from 'dayjs';
 import cc_dark from "../../imgs/overview_ctyl_pjrcc_dark.png";
@@ -57,7 +61,32 @@ export default function Collection() {
     chartData = state.chartData;
   var _useUnit = useUnit(),
     unitStr = _useUnit.unitStr;
-  var columns = [['联单编号', 'code', {
+  var _useLdFields = useLdFields(),
+    visibleList = _useLdFields.visibleList;
+  var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.filter(function (item) {
+    return item.dataShowKey !== 'endingPointName' && item.dataShowKey !== 'endingPointDivisionName';
+  }).map(function (item) {
+    return [item.displayName, item.dataShowKey, item.dataShowKey === 'jointOrderStatusName' ? {
+      width: item.columnWidth || 120,
+      render: function render(text, record) {
+        var colorMap = {
+          yqy: 'yellow',
+          yyd: 'blue',
+          yjs: 'green',
+          yqr: 'green'
+        };
+        var color = colorMap[record.jointOrderStatusCode] || 'yellow';
+        return /*#__PURE__*/_jsx(VmTag, {
+          title: text,
+          type: color
+        });
+      }
+    } : {
+      width: 120,
+      ellipsis: true,
+      align: item.dataShowKey === 'receivedWeight' ? 'right' : 'left'
+    }];
+  }) : [['联单编号', 'code', {
     width: 120,
     fixed: 'left',
     ellipsis: true
@@ -99,7 +128,7 @@ export default function Collection() {
   }], ["\u8FD0\u91CF(".concat(unitStr, ")"), 'receivedWeight', {
     width: 120,
     align: 'right'
-  }], ['操作', 'action', {
+  }]]), [['操作', 'action', {
     width: 60,
     fixed: 'right',
     render: function render(text, record) {
@@ -114,7 +143,7 @@ export default function Collection() {
         children: "\u67E5\u770B"
       });
     }
-  }]].map(function (item) {
+  }]]).map(function (item) {
     return _objectSpread({
       title: item[0],
       dataIndex: item[1],

package/lib/vtx-jzlj-df-tpd-modal/components/Dispose/index.js

@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -16,7 +20,7 @@ import React from 'react';
 import { JzljDfTpdContext } from "../..";
 import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
-import { disposeApis, fetchJzljEnum, getByParamTypeCode, overviewApis, useUnit } from "../../api";
+import { disposeApis, fetchJzljEnum, getByParamTypeCode, overviewApis, useCzzFields, useUnit } from "../../api";
 import FlowMap from "./FlowMap";
 import "./index.less";
 import dispose_czz_dark from "../../imgs/dispose_czz_dark.png";
@@ -54,9 +58,34 @@ export default function Dispose() {
     flowData = state.flowData;
   var _useUnit = useUnit(),
     unitStr = _useUnit.unitStr;
+  var _useCzzFields = useCzzFields(),
+    visibleList = _useCzzFields.visibleList;
   var effectiveStatusList = fetchJzljEnum('EffectiveStatusEnum');
   var garbageTypeList = getByParamTypeCode('param_jzlj_disposal_garbage_type');
-  var columns = [['运输单位', 'transportUnitName', {
+  var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.filter(function (item) {
+    return item.dataShowKey !== 'endingPointName';
+  }).map(function (item) {
+    return [item.displayName, item.dataShowKey, item.dataShowKey === 'effectiveStatusName' ? {
+      width: 100,
+      render: function render(text, record) {
+        var colorMap = {
+          wsx: 'yellow',
+          sxz: 'green',
+          ysx: 'red',
+          yzz: 'gray'
+        };
+        var color = colorMap[record.effectiveStatusCode] || 'yellow';
+        return /*#__PURE__*/_jsx(VmTag, {
+          title: text,
+          type: color
+        });
+      }
+    } : {
+      width: 100,
+      ellipsis: true,
+      align: item.dataShowKey === 'transportWeight' ? 'right' : 'left'
+    }];
+  }) : [['运输单位', 'transportUnitName', {
     width: 160,
     ellipsis: true
   }], ['运输起点', 'startingPointName', {
@@ -87,7 +116,7 @@ export default function Dispose() {
         type: color
       });
     }
-  }], ['操作', 'action', {
+  }]]), [['操作', 'action', {
     width: 60,
     render: function render(_, record) {
       return /*#__PURE__*/_jsx("a", {
@@ -101,7 +130,7 @@ export default function Dispose() {
         children: "\u67E5\u770B"
       });
     }
-  }]].map(function (item) {
+  }]]).map(function (item) {
     return _objectSpread({
       title: item[0],
       dataIndex: item[1],