@vtx/modals2 5.0.32 → 5.0.34

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

@@ -1306,5 +1306,47 @@ export var JzljService = {
     return {
       unitStr: unitStr
     };
+  },
+  // 处置证字段配置
+  useCzzFields: function useCzzFields() {
+    var _useRequest51 = useRequest(function () {
+        return http.get("/cloud/jzlj/web/field/config/list", {
+          body: {
+            ledgerType: 'CZHZBA'
+          }
+        });
+      }, {
+        refreshDeps: []
+      }),
+      res = _useRequest51.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
+    };
+  },
+  // 联单字段配置
+  useLdFields: function useLdFields() {
+    var _useRequest52 = useRequest(function () {
+        return http.get("/cloud/jzlj/web/field/config/list", {
+          body: {
+            ledgerType: 'CLYSLD'
+          }
+        });
+      }, {
+        refreshDeps: []
+      }),
+      res = _useRequest52.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-car-modal/content/Jzlj/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); }
@@ -55,7 +59,30 @@ export default function Collection() {
     endingPointName = state.endingPointName,
     totalData = state.totalData,
     chartData = state.chartData;
-  var columns = [['联单编号', 'code', {
+  var _JzljService$useLdFie = JzljService.useLdFields(),
+    visibleList = _JzljService$useLdFie.visibleList;
+  var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.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
@@ -98,7 +125,7 @@ export default function Collection() {
   }], ['运量(吨)', 'receivedWeight', {
     width: 120,
     align: 'right'
-  }], ['操作', 'action', {
+  }]]), [['操作', 'action', {
     width: 60,
     fixed: 'right',
     render: function render(text, record) {
@@ -113,7 +140,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-car-modal/content/Jzlj/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); }
@@ -41,12 +45,35 @@ export default function Dispose() {
     startingPointName = state.startingPointName,
     effectiveStatusCode = state.effectiveStatusCode,
     pieData = state.pieData;
+  var _JzljService$useCzzFi = JzljService.useCzzFields(),
+    visibleList = _JzljService$useCzzFi.visibleList;
   var effectiveStatusList = JzljService.fetchJzljEnum('EffectiveStatusEnum');
   var fieldConfigData = JzljService.fieldConfig();
   var transportWeightField = fieldConfigData.find(function (item) {
     return item.dataKey === 'transportWeight';
   }) || {};
-  var columns = [['处置证编号', 'code', {
+  var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.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: item.columnWidth || 120,
+      ellipsis: true,
+      align: item.dataShowKey === 'transportWeight' ? 'right' : 'left'
+    }];
+  }) : [['处置证编号', 'code', {
     width: 160,
     ellipsis: true
   }], ['运输单位', 'transportUnitName', {
@@ -80,7 +107,7 @@ export default function Dispose() {
         type: color
       });
     }
-  }], ['操作', 'action', {
+  }]]), [['操作', 'action', {
     width: 60,
     render: function render(_, record) {
       return /*#__PURE__*/_jsx("a", {
@@ -94,7 +121,7 @@ export default function Dispose() {
         children: "\u67E5\u770B"
       });
     }
-  }]].map(function (item) {
+  }]]).map(function (item) {
     return _objectSpread({
       title: item[0],
       dataIndex: item[1],

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

@@ -96,24 +96,54 @@ var BaseService = {
       data: data
     };
   },
-  useGetChartData: function useGetChartData(_ref2) {
-    var monitorItemIds = _ref2.monitorItemIds,
-      deviceId = _ref2.deviceId,
-      collectFrequency = _ref2.collectFrequency,
-      startTime = _ref2.startTime,
-      endTime = _ref2.endTime;
+  useGetKnowledgeBase: function useGetKnowledgeBase(id) {
     var _useRequest3 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return request.get('/cloud/device/knowledgeBase/get', {
+                data: {
+                  id: id
+                }
+              });
+            case 2:
+              res = _context2.sent;
+              return _context2.abrupt("return", (res === null || res === void 0 ? void 0 : res.data) || {});
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      })), {
+        refreshDeps: [id],
+        ready: !!id
+      }),
+      _useRequest3$data = _useRequest3.data,
+      data = _useRequest3$data === void 0 ? {} : _useRequest3$data;
+    return {
+      data: data
+    };
+  },
+  useGetChartData: function useGetChartData(_ref3) {
+    var monitorItemIds = _ref3.monitorItemIds,
+      deviceId = _ref3.deviceId,
+      collectFrequency = _ref3.collectFrequency,
+      startTime = _ref3.startTime,
+      endTime = _ref3.endTime;
+    var _useRequest4 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var res;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (!(isEmpty(monitorItemIds) || !startTime || !endTime || !collectFrequency)) {
-                _context2.next = 2;
+                _context3.next = 2;
                 break;
               }
-              return _context2.abrupt("return", []);
+              return _context3.abrupt("return", []);
             case 2:
-              _context2.next = 4;
+              _context3.next = 4;
               return request.get('/cloud/device/realtime/monitor/data/eCharts', {
                 data: {
                   monitorItemIds: monitorItemIds,
@@ -124,31 +154,31 @@ var BaseService = {
                 }
               });
             case 4:
-              res = _context2.sent;
-              return _context2.abrupt("return", (res === null || res === void 0 ? void 0 : res.data) || []);
+              res = _context3.sent;
+              return _context3.abrupt("return", (res === null || res === void 0 ? void 0 : res.data) || []);
             case 6:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2);
+        }, _callee3);
       })), {
         refreshDeps: [JSON.stringify(monitorItemIds), collectFrequency, startTime, endTime]
       }),
-      _useRequest3$data = _useRequest3.data,
-      data = _useRequest3$data === void 0 ? [] : _useRequest3$data,
-      loading = _useRequest3.loading;
+      _useRequest4$data = _useRequest4.data,
+      data = _useRequest4$data === void 0 ? [] : _useRequest4$data,
+      loading = _useRequest4.loading;
     return {
       data: data,
       loading: loading
     };
   },
   useGetDeviceTree: function useGetDeviceTree(id) {
-    var _useRequest4 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _useRequest5 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var res, treeData, _data;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return request.get('/cloud/device/realtime/monitor/data/generateDeviceJsonTree', {
                 data: {
                   showDeviceFlag: true,
@@ -156,7 +186,7 @@ var BaseService = {
                 }
               });
             case 2:
-              res = _context3.sent;
+              res = _context4.sent;
               treeData = [];
               if ((res === null || res === void 0 ? void 0 : res.result) === 0 && res !== null && res !== void 0 && res.data) {
                 _data = res.data || {};
@@ -175,36 +205,36 @@ var BaseService = {
                   }
                 });
               }
-              return _context3.abrupt("return", treeData);
+              return _context4.abrupt("return", treeData);
             case 6:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }))),
-      _useRequest4$data = _useRequest4.data,
-      data = _useRequest4$data === void 0 ? [] : _useRequest4$data;
+      _useRequest5$data = _useRequest5.data,
+      data = _useRequest5$data === void 0 ? [] : _useRequest5$data;
     return {
       data: data
     };
   },
-  useGetMonitor: function useGetMonitor(_ref5) {
-    var deviceIds = _ref5.deviceIds;
-    var _useRequest5 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+  useGetMonitor: function useGetMonitor(_ref6) {
+    var deviceIds = _ref6.deviceIds;
+    var _useRequest6 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var res, data;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return request.get('/cloud/device/monitor/item/loadItemTree', {
                 data: {
                   deviceIds: deviceIds.join(',')
                 }
               });
             case 2:
-              res = _context4.sent;
+              res = _context5.sent;
               data = (res === null || res === void 0 ? void 0 : res.data) || {};
-              return _context4.abrupt("return", parseTreeData(data.children || [], {
+              return _context5.abrupt("return", parseTreeData(data.children || [], {
                 renderNode: function renderNode(node) {
                   var selectable = node.type === 'monitorItem';
                   return _objectSpread(_objectSpread({}, node), {}, {
@@ -218,33 +248,33 @@ var BaseService = {
               }));
             case 5:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       })), {
         refreshDeps: [deviceIds]
       }),
-      _useRequest5$data = _useRequest5.data,
-      data = _useRequest5$data === void 0 ? [] : _useRequest5$data;
+      _useRequest6$data = _useRequest6.data,
+      data = _useRequest6$data === void 0 ? [] : _useRequest6$data;
     return {
       data: data
     };
   },
-  useCollectList: function useCollectList(_ref7) {
-    var deviceIds = _ref7.deviceIds,
-      monitorItemIds = _ref7.monitorItemIds;
-    var _useRequest6 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+  useCollectList: function useCollectList(_ref8) {
+    var deviceIds = _ref8.deviceIds,
+      monitorItemIds = _ref8.monitorItemIds;
+    var _useRequest7 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
         var res;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (!(isEmpty(deviceIds) || isEmpty(monitorItemIds))) {
-                _context5.next = 2;
+                _context6.next = 2;
                 break;
               }
-              return _context5.abrupt("return", []);
+              return _context6.abrupt("return", []);
             case 2:
-              _context5.next = 4;
+              _context6.next = 4;
               return request.get('/cloud/device/monitor/factor/listCollectFrequency', {
                 data: {
                   deviceIds: deviceIds,
@@ -252,89 +282,89 @@ var BaseService = {
                 }
               });
             case 4:
-              res = _context5.sent;
-              return _context5.abrupt("return", (res === null || res === void 0 ? void 0 : res.data) || []);
+              res = _context6.sent;
+              return _context6.abrupt("return", (res === null || res === void 0 ? void 0 : res.data) || []);
             case 6:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5);
+        }, _callee6);
       })), {
         refreshDeps: [deviceIds, monitorItemIds],
         ready: !isEmpty(deviceIds) && !isEmpty(monitorItemIds)
       }),
-      _useRequest6$data = _useRequest6.data,
-      data = _useRequest6$data === void 0 ? [] : _useRequest6$data;
+      _useRequest7$data = _useRequest7.data,
+      data = _useRequest7$data === void 0 ? [] : _useRequest7$data;
     return {
       data: data
     };
   },
-  useGetAnalysis: function useGetAnalysis(_ref9) {
-    var timeType = _ref9.timeType,
-      danTimeEndTime = _ref9.danTimeEndTime,
-      duoTimeType = _ref9.duoTimeType,
-      duoTimeList = _ref9.duoTimeList,
-      danTimeType = _ref9.danTimeType,
-      danTimeStartTime = _ref9.danTimeStartTime,
-      month = _ref9.month,
-      year = _ref9.year,
-      monitorItemIds = _ref9.monitorItemIds,
-      deviceIds = _ref9.deviceIds,
-      collectFrequency = _ref9.collectFrequency;
-    var _useRequest7 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+  useGetAnalysis: function useGetAnalysis(_ref10) {
+    var timeType = _ref10.timeType,
+      danTimeEndTime = _ref10.danTimeEndTime,
+      duoTimeType = _ref10.duoTimeType,
+      duoTimeList = _ref10.duoTimeList,
+      danTimeType = _ref10.danTimeType,
+      danTimeStartTime = _ref10.danTimeStartTime,
+      month = _ref10.month,
+      year = _ref10.year,
+      monitorItemIds = _ref10.monitorItemIds,
+      deviceIds = _ref10.deviceIds,
+      collectFrequency = _ref10.collectFrequency;
+    var _useRequest8 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var chartDataList, format, startTime, endTime, res, dataList, newDataList;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (!(isEmpty(monitorItemIds) || isEmpty(deviceIds) || !collectFrequency)) {
-                _context6.next = 2;
+                _context7.next = 2;
                 break;
               }
-              return _context6.abrupt("return", []);
+              return _context7.abrupt("return", []);
             case 2:
               format = 'YYYY-MM-DD HH:mm:ss';
               if (!(timeType === 'danTime')) {
-                _context6.next = 37;
+                _context7.next = 37;
                 break;
               }
               //单时段
               startTime = '', endTime = '';
-              _context6.t0 = danTimeType;
-              _context6.next = _context6.t0 === '1h' ? 8 : _context6.t0 === '24h' ? 11 : _context6.t0 === '3days' ? 14 : _context6.t0 === '7days' ? 17 : _context6.t0 === 'self' ? 20 : _context6.t0 === 'month' ? 23 : _context6.t0 === 'year' ? 26 : 29;
+              _context7.t0 = danTimeType;
+              _context7.next = _context7.t0 === '1h' ? 8 : _context7.t0 === '24h' ? 11 : _context7.t0 === '3days' ? 14 : _context7.t0 === '7days' ? 17 : _context7.t0 === 'self' ? 20 : _context7.t0 === 'month' ? 23 : _context7.t0 === 'year' ? 26 : 29;
               break;
             case 8:
               startTime = dayjs().subtract(1, 'hours').format(format);
               endTime = dayjs().format(format);
-              return _context6.abrupt("break", 31);
+              return _context7.abrupt("break", 31);
             case 11:
               startTime = dayjs().subtract(24, 'hours').format(format);
               endTime = dayjs().format(format);
-              return _context6.abrupt("break", 31);
+              return _context7.abrupt("break", 31);
             case 14:
               startTime = dayjs().subtract(3, 'days').format(format);
               endTime = dayjs().format(format);
-              return _context6.abrupt("break", 31);
+              return _context7.abrupt("break", 31);
             case 17:
               startTime = dayjs().subtract(7, 'days').format(format);
               endTime = dayjs().format(format);
-              return _context6.abrupt("break", 31);
+              return _context7.abrupt("break", 31);
             case 20:
               startTime = dayjs(danTimeStartTime).startOf('day').format(format);
               endTime = dayjs(danTimeEndTime).endOf('day').format(format);
-              return _context6.abrupt("break", 31);
+              return _context7.abrupt("break", 31);
             case 23:
               startTime = dayjs(month).startOf('month').startOf('day').format(format);
               endTime = dayjs(month).endOf('month').endOf('day').format(format);
-              return _context6.abrupt("break", 31);
+              return _context7.abrupt("break", 31);
             case 26:
               startTime = dayjs(year).startOf('year').startOf('day').format(format);
               endTime = dayjs(year).endOf('year').endOf('day').format(format);
-              return _context6.abrupt("break", 31);
+              return _context7.abrupt("break", 31);
             case 29:
               startTime = dayjs().subtract(1, 'hours').startOf('day').format(format);
               endTime = dayjs().endOf('day').format(format);
             case 31:
-              _context6.next = 33;
+              _context7.next = 33;
               return request.get('/cloud/device/realtime/monitor/data/eCharts', {
                 data: {
                   deviceIds: deviceIds,
@@ -345,7 +375,7 @@ var BaseService = {
                 }
               });
             case 33:
-              res = _context6.sent;
+              res = _context7.sent;
               if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
                 dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
                 chartDataList = dataList.map(function (item) {
@@ -385,11 +415,11 @@ var BaseService = {
                   return item;
                 });
               }
-              _context6.next = 41;
+              _context7.next = 41;
               break;
             case 37:
               newDataList = [];
-              _context6.next = 40;
+              _context7.next = 40;
               return Promise.all(duoTimeList.map(function (item) {
                 return request.get('/cloud/device/realtime/monitor/data/eCharts', {
                   data: {
@@ -452,32 +482,32 @@ var BaseService = {
                 };
               });
             case 41:
-              return _context6.abrupt("return", chartDataList);
+              return _context7.abrupt("return", chartDataList);
             case 42:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6);
+        }, _callee7);
       })), {
         refreshDeps: [timeType, danTimeEndTime, duoTimeType, duoTimeList, danTimeType, danTimeStartTime, month, year, monitorItemIds, deviceIds, collectFrequency]
       }),
-      _useRequest7$data = _useRequest7.data,
-      data = _useRequest7$data === void 0 ? [] : _useRequest7$data,
-      loading = _useRequest7.loading;
+      _useRequest8$data = _useRequest8.data,
+      data = _useRequest8$data === void 0 ? [] : _useRequest8$data,
+      loading = _useRequest8.loading;
     return {
       data: data,
       loading: loading
     };
   },
-  useGetAlarmPage: function useGetAlarmPage(_ref11) {
-    var page = _ref11.page,
-      alarmStartTimeBegin = _ref11.alarmStartTimeBegin,
-      alarmStartTimeEnd = _ref11.alarmStartTimeEnd,
-      alarmStatuses = _ref11.alarmStatuses,
-      alarmTypes = _ref11.alarmTypes,
-      deviceIds = _ref11.deviceIds,
-      monitorItemId = _ref11.monitorItemId;
-    var _useRequest8 = useRequest(function () {
+  useGetAlarmPage: function useGetAlarmPage(_ref12) {
+    var page = _ref12.page,
+      alarmStartTimeBegin = _ref12.alarmStartTimeBegin,
+      alarmStartTimeEnd = _ref12.alarmStartTimeEnd,
+      alarmStatuses = _ref12.alarmStatuses,
+      alarmTypes = _ref12.alarmTypes,
+      deviceIds = _ref12.deviceIds,
+      monitorItemId = _ref12.monitorItemId;
+    var _useRequest9 = useRequest(function () {
         return request.post('/cloud/device/alarmInfo/page', {
           body: JSON.stringify({
             page: page,
@@ -493,20 +523,20 @@ var BaseService = {
       }, {
         refreshDeps: [alarmStatuses, alarmStartTimeBegin, alarmStartTimeEnd, deviceIds, page, monitorItemId]
       }),
-      data = _useRequest8.data,
-      loading = _useRequest8.loading;
+      data = _useRequest9.data,
+      loading = _useRequest9.loading;
     return {
       alarmRecord: (data === null || data === void 0 ? void 0 : data.data) || {},
       loading: loading
     };
   },
-  useGetAlarmSummary: function useGetAlarmSummary(_ref12) {
-    var alarmStartTimeBegin = _ref12.alarmStartTimeBegin,
-      alarmStartTimeEnd = _ref12.alarmStartTimeEnd,
-      alarmStatuses = _ref12.alarmStatuses,
-      alarmTypes = _ref12.alarmTypes,
-      deviceIds = _ref12.deviceIds;
-    var _useRequest9 = useRequest(function () {
+  useGetAlarmSummary: function useGetAlarmSummary(_ref13) {
+    var alarmStartTimeBegin = _ref13.alarmStartTimeBegin,
+      alarmStartTimeEnd = _ref13.alarmStartTimeEnd,
+      alarmStatuses = _ref13.alarmStatuses,
+      alarmTypes = _ref13.alarmTypes,
+      deviceIds = _ref13.deviceIds;
+    var _useRequest10 = useRequest(function () {
         return request.post('/cloud/device/alarmInfo/summary', {
           body: JSON.stringify({
             alarmTypes: alarmTypes ? [alarmTypes] : [],
@@ -520,8 +550,8 @@ var BaseService = {
       }, {
         refreshDeps: [alarmStatuses, alarmStartTimeBegin, alarmStartTimeEnd, deviceIds]
       }),
-      data = _useRequest9.data,
-      loading = _useRequest9.loading;
+      data = _useRequest10.data,
+      loading = _useRequest10.loading;
     return {
       alarmSummary: (data === null || data === void 0 ? void 0 : data.data) || {},
       loading: loading

package/lib/vtx-device-modal/components/BaseInfo/KnowledgeBasesDetail.js

@@ -1,13 +1,17 @@
 import { VmWrapper } from "../../../_components";
 import VtxBaseModal from "../../../vtx-base-modal";
+import { BaseService } from "../../api";
 import PreviewAndDownload from "./PreviewAndDownload";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Content = function Content(_ref) {
   var info = _ref.info,
     theme = _ref.theme;
-  var content = info.content,
-    title = info.title,
-    knowledgeCategoryName = info.knowledgeCategoryName;
+  var id = info.id;
+  var _BaseService$useGetKn = BaseService.useGetKnowledgeBase(id),
+    data = _BaseService$useGetKn.data;
+  var content = data.content,
+    title = data.title,
+    knowledgeCategoryName = data.knowledgeCategoryName;
   var attachments = [];
   if (info.attachments) {
     attachments = JSON.parse(info.attachments);
@@ -20,7 +24,7 @@ var Content = function Content(_ref) {
       },
       children: [/*#__PURE__*/_jsx("h2", {
         style: {
-          marginBottom: 24,
+          marginBottom: 12,
           textAlign: 'center',
           color: 'var(--modal-title-color)'
         },
@@ -43,7 +47,7 @@ var Content = function Content(_ref) {
           data: item,
           theme: theme
         }, item.id);
-      }) : '--']
+      }) : null]
     })
   });
 };

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],

package/lib/vtx-jzlj-gcxm-modal/api.js

@@ -322,4 +322,48 @@ export var useUnit = function useUnit() {
   return {
     unitStr: unitStr
   };
+};
+
+// 处置证字段配置
+export var useCzzFields = function useCzzFields() {
+  var _useRequest10 = useRequest(function () {
+      return request.get("/cloud/jzlj/web/field/config/list", {
+        data: {
+          ledgerType: 'CZHZBA'
+        }
+      });
+    }, {
+      refreshDeps: []
+    }),
+    res = _useRequest10.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 _useRequest11 = useRequest(function () {
+      return request.get("/cloud/jzlj/web/field/config/list", {
+        data: {
+          ledgerType: 'CLYSLD'
+        }
+      });
+    }, {
+      refreshDeps: []
+    }),
+    res = _useRequest11.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-gcxm-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 { JzljGcxmContext } 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 !== 'startingPointName' && item.dataShowKey !== 'startingPointDivisionName';
+  }).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-gcxm-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 { JzljGcxmContext } 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";
@@ -56,9 +60,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 !== 'startingPointName';
+  }).map(function (item) {
+    return [item.displayName, item.dataShowKey, item.dataShowKey === 'effectiveStatusName' ? {
+      width: item.columnWidth || 120,
+      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
   }], ['运输终点', 'endingPointName', {
@@ -89,7 +118,7 @@ export default function Dispose() {
         type: color
       });
     }
-  }], ['操作', 'action', {
+  }]]), [['操作', 'action', {
     width: 60,
     render: function render(_, record) {
       return /*#__PURE__*/_jsx("a", {
@@ -103,7 +132,7 @@ export default function Dispose() {
         children: "\u67E5\u770B"
       });
     }
-  }]].map(function (item) {
+  }]]).map(function (item) {
     return _objectSpread({
       title: item[0],
       dataIndex: item[1],

package/lib/vtx-jzlj-xnc-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-xnc-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 { JzljXncContext } 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-xnc-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 { JzljXncContext } 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: item.columnWidth || 120,
+      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],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "5.0.32",
+  "version": "5.0.34",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",