@vtx/modals2 5.0.33 → 5.0.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1306,5 +1306,47 @@ export var JzljService = {
1306
1306
  return {
1307
1307
  unitStr: unitStr
1308
1308
  };
1309
+ },
1310
+ // 处置证字段配置
1311
+ useCzzFields: function useCzzFields() {
1312
+ var _useRequest51 = useRequest(function () {
1313
+ return http.get("/cloud/jzlj/web/field/config/list", {
1314
+ body: {
1315
+ ledgerType: 'CZHZBA'
1316
+ }
1317
+ });
1318
+ }, {
1319
+ refreshDeps: []
1320
+ }),
1321
+ res = _useRequest51.data;
1322
+ var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
1323
+ var visibleList = dataList.filter(function (item) {
1324
+ var _item$functionKeys;
1325
+ 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'));
1326
+ });
1327
+ return {
1328
+ visibleList: visibleList
1329
+ };
1330
+ },
1331
+ // 联单字段配置
1332
+ useLdFields: function useLdFields() {
1333
+ var _useRequest52 = useRequest(function () {
1334
+ return http.get("/cloud/jzlj/web/field/config/list", {
1335
+ body: {
1336
+ ledgerType: 'CLYSLD'
1337
+ }
1338
+ });
1339
+ }, {
1340
+ refreshDeps: []
1341
+ }),
1342
+ res = _useRequest52.data;
1343
+ var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
1344
+ var visibleList = dataList.filter(function (item) {
1345
+ var _item$functionKeys2;
1346
+ 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'));
1347
+ });
1348
+ return {
1349
+ visibleList: visibleList
1350
+ };
1309
1351
  }
1310
1352
  };
@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  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; }
5
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
6
  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); }
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+ 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."); }
9
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
10
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
11
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
12
  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."); }
9
13
  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() {
55
59
  endingPointName = state.endingPointName,
56
60
  totalData = state.totalData,
57
61
  chartData = state.chartData;
58
- var columns = [['联单编号', 'code', {
62
+ var _JzljService$useLdFie = JzljService.useLdFields(),
63
+ visibleList = _JzljService$useLdFie.visibleList;
64
+ var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.map(function (item) {
65
+ return [item.displayName, item.dataShowKey, item.dataShowKey === 'jointOrderStatusName' ? {
66
+ width: item.columnWidth || 120,
67
+ render: function render(text, record) {
68
+ var colorMap = {
69
+ yqy: 'yellow',
70
+ yyd: 'blue',
71
+ yjs: 'green',
72
+ yqr: 'green'
73
+ };
74
+ var color = colorMap[record.jointOrderStatusCode] || 'yellow';
75
+ return /*#__PURE__*/_jsx(VmTag, {
76
+ title: text,
77
+ type: color
78
+ });
79
+ }
80
+ } : {
81
+ width: 120,
82
+ ellipsis: true,
83
+ align: item.dataShowKey === 'receivedWeight' ? 'right' : 'left'
84
+ }];
85
+ }) : [['联单编号', 'code', {
59
86
  width: 120,
60
87
  fixed: 'left',
61
88
  ellipsis: true
@@ -98,7 +125,7 @@ export default function Collection() {
98
125
  }], ['运量(吨)', 'receivedWeight', {
99
126
  width: 120,
100
127
  align: 'right'
101
- }], ['操作', 'action', {
128
+ }]]), [['操作', 'action', {
102
129
  width: 60,
103
130
  fixed: 'right',
104
131
  render: function render(text, record) {
@@ -113,7 +140,7 @@ export default function Collection() {
113
140
  children: "\u67E5\u770B"
114
141
  });
115
142
  }
116
- }]].map(function (item) {
143
+ }]]).map(function (item) {
117
144
  return _objectSpread({
118
145
  title: item[0],
119
146
  dataIndex: item[1],
@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  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; }
5
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
6
  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); }
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+ 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."); }
9
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
10
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
11
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
12
  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."); }
9
13
  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() {
41
45
  startingPointName = state.startingPointName,
42
46
  effectiveStatusCode = state.effectiveStatusCode,
43
47
  pieData = state.pieData;
48
+ var _JzljService$useCzzFi = JzljService.useCzzFields(),
49
+ visibleList = _JzljService$useCzzFi.visibleList;
44
50
  var effectiveStatusList = JzljService.fetchJzljEnum('EffectiveStatusEnum');
45
51
  var fieldConfigData = JzljService.fieldConfig();
46
52
  var transportWeightField = fieldConfigData.find(function (item) {
47
53
  return item.dataKey === 'transportWeight';
48
54
  }) || {};
49
- var columns = [['处置证编号', 'code', {
55
+ var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.map(function (item) {
56
+ return [item.displayName, item.dataShowKey, item.dataShowKey === 'effectiveStatusName' ? {
57
+ width: 100,
58
+ render: function render(text, record) {
59
+ var colorMap = {
60
+ wsx: 'yellow',
61
+ sxz: 'green',
62
+ ysx: 'red',
63
+ yzz: 'gray'
64
+ };
65
+ var color = colorMap[record.effectiveStatusCode] || 'yellow';
66
+ return /*#__PURE__*/_jsx(VmTag, {
67
+ title: text,
68
+ type: color
69
+ });
70
+ }
71
+ } : {
72
+ width: item.columnWidth || 120,
73
+ ellipsis: true,
74
+ align: item.dataShowKey === 'transportWeight' ? 'right' : 'left'
75
+ }];
76
+ }) : [['处置证编号', 'code', {
50
77
  width: 160,
51
78
  ellipsis: true
52
79
  }], ['运输单位', 'transportUnitName', {
@@ -80,7 +107,7 @@ export default function Dispose() {
80
107
  type: color
81
108
  });
82
109
  }
83
- }], ['操作', 'action', {
110
+ }]]), [['操作', 'action', {
84
111
  width: 60,
85
112
  render: function render(_, record) {
86
113
  return /*#__PURE__*/_jsx("a", {
@@ -94,7 +121,7 @@ export default function Dispose() {
94
121
  children: "\u67E5\u770B"
95
122
  });
96
123
  }
97
- }]].map(function (item) {
124
+ }]]).map(function (item) {
98
125
  return _objectSpread({
99
126
  title: item[0],
100
127
  dataIndex: item[1],
@@ -240,4 +240,48 @@ export var useUnit = function useUnit() {
240
240
  return {
241
241
  unitStr: unitStr
242
242
  };
243
+ };
244
+
245
+ // 处置证字段配置
246
+ export var useCzzFields = function useCzzFields() {
247
+ var _useRequest9 = useRequest(function () {
248
+ return request.get("/cloud/jzlj/web/field/config/list", {
249
+ data: {
250
+ ledgerType: 'CZHZBA'
251
+ }
252
+ });
253
+ }, {
254
+ refreshDeps: []
255
+ }),
256
+ res = _useRequest9.data;
257
+ var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
258
+ var visibleList = dataList.filter(function (item) {
259
+ var _item$functionKeys;
260
+ 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'));
261
+ });
262
+ return {
263
+ visibleList: visibleList
264
+ };
265
+ };
266
+
267
+ // 联单字段配置
268
+ export var useLdFields = function useLdFields() {
269
+ var _useRequest10 = useRequest(function () {
270
+ return request.get("/cloud/jzlj/web/field/config/list", {
271
+ data: {
272
+ ledgerType: 'CLYSLD'
273
+ }
274
+ });
275
+ }, {
276
+ refreshDeps: []
277
+ }),
278
+ res = _useRequest10.data;
279
+ var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
280
+ var visibleList = dataList.filter(function (item) {
281
+ var _item$functionKeys2;
282
+ 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'));
283
+ });
284
+ return {
285
+ visibleList: visibleList
286
+ };
243
287
  };
@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  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; }
5
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
6
  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); }
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+ 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."); }
9
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
10
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
11
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
12
  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."); }
9
13
  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';
16
20
  import { JzljDfTpdContext } from "../..";
17
21
  import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../_components";
18
22
  import useSettings from "../../../_hooks/useSettings";
19
- import { collectionApis, useUnit } from "../../api";
23
+ import { collectionApis, useLdFields, useUnit } from "../../api";
20
24
  import "./index.less";
21
25
  import dayjs from 'dayjs';
22
26
  import cc_dark from "../../imgs/overview_ctyl_pjrcc_dark.png";
@@ -57,7 +61,32 @@ export default function Collection() {
57
61
  chartData = state.chartData;
58
62
  var _useUnit = useUnit(),
59
63
  unitStr = _useUnit.unitStr;
60
- var columns = [['联单编号', 'code', {
64
+ var _useLdFields = useLdFields(),
65
+ visibleList = _useLdFields.visibleList;
66
+ var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.filter(function (item) {
67
+ return item.dataShowKey !== 'endingPointName' && item.dataShowKey !== 'endingPointDivisionName';
68
+ }).map(function (item) {
69
+ return [item.displayName, item.dataShowKey, item.dataShowKey === 'jointOrderStatusName' ? {
70
+ width: item.columnWidth || 120,
71
+ render: function render(text, record) {
72
+ var colorMap = {
73
+ yqy: 'yellow',
74
+ yyd: 'blue',
75
+ yjs: 'green',
76
+ yqr: 'green'
77
+ };
78
+ var color = colorMap[record.jointOrderStatusCode] || 'yellow';
79
+ return /*#__PURE__*/_jsx(VmTag, {
80
+ title: text,
81
+ type: color
82
+ });
83
+ }
84
+ } : {
85
+ width: 120,
86
+ ellipsis: true,
87
+ align: item.dataShowKey === 'receivedWeight' ? 'right' : 'left'
88
+ }];
89
+ }) : [['联单编号', 'code', {
61
90
  width: 120,
62
91
  fixed: 'left',
63
92
  ellipsis: true
@@ -99,7 +128,7 @@ export default function Collection() {
99
128
  }], ["\u8FD0\u91CF(".concat(unitStr, ")"), 'receivedWeight', {
100
129
  width: 120,
101
130
  align: 'right'
102
- }], ['操作', 'action', {
131
+ }]]), [['操作', 'action', {
103
132
  width: 60,
104
133
  fixed: 'right',
105
134
  render: function render(text, record) {
@@ -114,7 +143,7 @@ export default function Collection() {
114
143
  children: "\u67E5\u770B"
115
144
  });
116
145
  }
117
- }]].map(function (item) {
146
+ }]]).map(function (item) {
118
147
  return _objectSpread({
119
148
  title: item[0],
120
149
  dataIndex: item[1],
@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  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; }
5
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
6
  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); }
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+ 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."); }
9
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
10
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
11
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
12
  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."); }
9
13
  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';
16
20
  import { JzljDfTpdContext } from "../..";
17
21
  import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../_components";
18
22
  import useSettings from "../../../_hooks/useSettings";
19
- import { disposeApis, fetchJzljEnum, getByParamTypeCode, overviewApis, useUnit } from "../../api";
23
+ import { disposeApis, fetchJzljEnum, getByParamTypeCode, overviewApis, useCzzFields, useUnit } from "../../api";
20
24
  import FlowMap from "./FlowMap";
21
25
  import "./index.less";
22
26
  import dispose_czz_dark from "../../imgs/dispose_czz_dark.png";
@@ -54,9 +58,34 @@ export default function Dispose() {
54
58
  flowData = state.flowData;
55
59
  var _useUnit = useUnit(),
56
60
  unitStr = _useUnit.unitStr;
61
+ var _useCzzFields = useCzzFields(),
62
+ visibleList = _useCzzFields.visibleList;
57
63
  var effectiveStatusList = fetchJzljEnum('EffectiveStatusEnum');
58
64
  var garbageTypeList = getByParamTypeCode('param_jzlj_disposal_garbage_type');
59
- var columns = [['运输单位', 'transportUnitName', {
65
+ var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.filter(function (item) {
66
+ return item.dataShowKey !== 'endingPointName';
67
+ }).map(function (item) {
68
+ return [item.displayName, item.dataShowKey, item.dataShowKey === 'effectiveStatusName' ? {
69
+ width: 100,
70
+ render: function render(text, record) {
71
+ var colorMap = {
72
+ wsx: 'yellow',
73
+ sxz: 'green',
74
+ ysx: 'red',
75
+ yzz: 'gray'
76
+ };
77
+ var color = colorMap[record.effectiveStatusCode] || 'yellow';
78
+ return /*#__PURE__*/_jsx(VmTag, {
79
+ title: text,
80
+ type: color
81
+ });
82
+ }
83
+ } : {
84
+ width: 100,
85
+ ellipsis: true,
86
+ align: item.dataShowKey === 'transportWeight' ? 'right' : 'left'
87
+ }];
88
+ }) : [['运输单位', 'transportUnitName', {
60
89
  width: 160,
61
90
  ellipsis: true
62
91
  }], ['运输起点', 'startingPointName', {
@@ -87,7 +116,7 @@ export default function Dispose() {
87
116
  type: color
88
117
  });
89
118
  }
90
- }], ['操作', 'action', {
119
+ }]]), [['操作', 'action', {
91
120
  width: 60,
92
121
  render: function render(_, record) {
93
122
  return /*#__PURE__*/_jsx("a", {
@@ -101,7 +130,7 @@ export default function Dispose() {
101
130
  children: "\u67E5\u770B"
102
131
  });
103
132
  }
104
- }]].map(function (item) {
133
+ }]]).map(function (item) {
105
134
  return _objectSpread({
106
135
  title: item[0],
107
136
  dataIndex: item[1],
@@ -322,4 +322,48 @@ export var useUnit = function useUnit() {
322
322
  return {
323
323
  unitStr: unitStr
324
324
  };
325
+ };
326
+
327
+ // 处置证字段配置
328
+ export var useCzzFields = function useCzzFields() {
329
+ var _useRequest10 = useRequest(function () {
330
+ return request.get("/cloud/jzlj/web/field/config/list", {
331
+ data: {
332
+ ledgerType: 'CZHZBA'
333
+ }
334
+ });
335
+ }, {
336
+ refreshDeps: []
337
+ }),
338
+ res = _useRequest10.data;
339
+ var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
340
+ var visibleList = dataList.filter(function (item) {
341
+ var _item$functionKeys;
342
+ 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'));
343
+ });
344
+ return {
345
+ visibleList: visibleList
346
+ };
347
+ };
348
+
349
+ // 联单字段配置
350
+ export var useLdFields = function useLdFields() {
351
+ var _useRequest11 = useRequest(function () {
352
+ return request.get("/cloud/jzlj/web/field/config/list", {
353
+ data: {
354
+ ledgerType: 'CLYSLD'
355
+ }
356
+ });
357
+ }, {
358
+ refreshDeps: []
359
+ }),
360
+ res = _useRequest11.data;
361
+ var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
362
+ var visibleList = dataList.filter(function (item) {
363
+ var _item$functionKeys2;
364
+ 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'));
365
+ });
366
+ return {
367
+ visibleList: visibleList
368
+ };
325
369
  };
@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  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; }
5
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
6
  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); }
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+ 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."); }
9
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
10
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
11
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
12
  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."); }
9
13
  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';
16
20
  import { JzljGcxmContext } from "../..";
17
21
  import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../_components";
18
22
  import useSettings from "../../../_hooks/useSettings";
19
- import { collectionApis, useUnit } from "../../api";
23
+ import { collectionApis, useLdFields, useUnit } from "../../api";
20
24
  import "./index.less";
21
25
  import dayjs from 'dayjs';
22
26
  import cc_dark from "../../imgs/overview_ctyl_pjrcc_dark.png";
@@ -57,7 +61,32 @@ export default function Collection() {
57
61
  chartData = state.chartData;
58
62
  var _useUnit = useUnit(),
59
63
  unitStr = _useUnit.unitStr;
60
- var columns = [['联单编号', 'code', {
64
+ var _useLdFields = useLdFields(),
65
+ visibleList = _useLdFields.visibleList;
66
+ var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.filter(function (item) {
67
+ return item.dataShowKey !== 'startingPointName' && item.dataShowKey !== 'startingPointDivisionName';
68
+ }).map(function (item) {
69
+ return [item.displayName, item.dataShowKey, item.dataShowKey === 'jointOrderStatusName' ? {
70
+ width: item.columnWidth || 120,
71
+ render: function render(text, record) {
72
+ var colorMap = {
73
+ yqy: 'yellow',
74
+ yyd: 'blue',
75
+ yjs: 'green',
76
+ yqr: 'green'
77
+ };
78
+ var color = colorMap[record.jointOrderStatusCode] || 'yellow';
79
+ return /*#__PURE__*/_jsx(VmTag, {
80
+ title: text,
81
+ type: color
82
+ });
83
+ }
84
+ } : {
85
+ width: 120,
86
+ ellipsis: true,
87
+ align: item.dataShowKey === 'receivedWeight' ? 'right' : 'left'
88
+ }];
89
+ }) : [['联单编号', 'code', {
61
90
  width: 120,
62
91
  fixed: 'left',
63
92
  ellipsis: true
@@ -99,7 +128,7 @@ export default function Collection() {
99
128
  }], ["\u8FD0\u91CF(".concat(unitStr, ")"), 'receivedWeight', {
100
129
  width: 120,
101
130
  align: 'right'
102
- }], ['操作', 'action', {
131
+ }]]), [['操作', 'action', {
103
132
  width: 60,
104
133
  fixed: 'right',
105
134
  render: function render(text, record) {
@@ -114,7 +143,7 @@ export default function Collection() {
114
143
  children: "\u67E5\u770B"
115
144
  });
116
145
  }
117
- }]].map(function (item) {
146
+ }]]).map(function (item) {
118
147
  return _objectSpread({
119
148
  title: item[0],
120
149
  dataIndex: item[1],
@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  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; }
5
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
6
  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); }
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+ 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."); }
9
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
10
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
11
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
12
  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."); }
9
13
  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';
16
20
  import { JzljGcxmContext } from "../..";
17
21
  import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../_components";
18
22
  import useSettings from "../../../_hooks/useSettings";
19
- import { disposeApis, fetchJzljEnum, getByParamTypeCode, overviewApis, useUnit } from "../../api";
23
+ import { disposeApis, fetchJzljEnum, getByParamTypeCode, overviewApis, useCzzFields, useUnit } from "../../api";
20
24
  import FlowMap from "./FlowMap";
21
25
  import "./index.less";
22
26
  import dispose_czz_dark from "../../imgs/dispose_czz_dark.png";
@@ -56,9 +60,34 @@ export default function Dispose() {
56
60
  flowData = state.flowData;
57
61
  var _useUnit = useUnit(),
58
62
  unitStr = _useUnit.unitStr;
63
+ var _useCzzFields = useCzzFields(),
64
+ visibleList = _useCzzFields.visibleList;
59
65
  var effectiveStatusList = fetchJzljEnum('EffectiveStatusEnum');
60
66
  var garbageTypeList = getByParamTypeCode('param_jzlj_disposal_garbage_type');
61
- var columns = [['运输单位', 'transportUnitName', {
67
+ var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.filter(function (item) {
68
+ return item.dataShowKey !== 'startingPointName';
69
+ }).map(function (item) {
70
+ return [item.displayName, item.dataShowKey, item.dataShowKey === 'effectiveStatusName' ? {
71
+ width: item.columnWidth || 120,
72
+ render: function render(text, record) {
73
+ var colorMap = {
74
+ wsx: 'yellow',
75
+ sxz: 'green',
76
+ ysx: 'red',
77
+ yzz: 'gray'
78
+ };
79
+ var color = colorMap[record.effectiveStatusCode] || 'yellow';
80
+ return /*#__PURE__*/_jsx(VmTag, {
81
+ title: text,
82
+ type: color
83
+ });
84
+ }
85
+ } : {
86
+ width: 100,
87
+ ellipsis: true,
88
+ align: item.dataShowKey === 'transportWeight' ? 'right' : 'left'
89
+ }];
90
+ }) : [['运输单位', 'transportUnitName', {
62
91
  width: 160,
63
92
  ellipsis: true
64
93
  }], ['运输终点', 'endingPointName', {
@@ -89,7 +118,7 @@ export default function Dispose() {
89
118
  type: color
90
119
  });
91
120
  }
92
- }], ['操作', 'action', {
121
+ }]]), [['操作', 'action', {
93
122
  width: 60,
94
123
  render: function render(_, record) {
95
124
  return /*#__PURE__*/_jsx("a", {
@@ -103,7 +132,7 @@ export default function Dispose() {
103
132
  children: "\u67E5\u770B"
104
133
  });
105
134
  }
106
- }]].map(function (item) {
135
+ }]]).map(function (item) {
107
136
  return _objectSpread({
108
137
  title: item[0],
109
138
  dataIndex: item[1],
@@ -240,4 +240,48 @@ export var useUnit = function useUnit() {
240
240
  return {
241
241
  unitStr: unitStr
242
242
  };
243
+ };
244
+
245
+ // 处置证字段配置
246
+ export var useCzzFields = function useCzzFields() {
247
+ var _useRequest9 = useRequest(function () {
248
+ return request.get("/cloud/jzlj/web/field/config/list", {
249
+ data: {
250
+ ledgerType: 'CZHZBA'
251
+ }
252
+ });
253
+ }, {
254
+ refreshDeps: []
255
+ }),
256
+ res = _useRequest9.data;
257
+ var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
258
+ var visibleList = dataList.filter(function (item) {
259
+ var _item$functionKeys;
260
+ 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'));
261
+ });
262
+ return {
263
+ visibleList: visibleList
264
+ };
265
+ };
266
+
267
+ // 联单字段配置
268
+ export var useLdFields = function useLdFields() {
269
+ var _useRequest10 = useRequest(function () {
270
+ return request.get("/cloud/jzlj/web/field/config/list", {
271
+ data: {
272
+ ledgerType: 'CLYSLD'
273
+ }
274
+ });
275
+ }, {
276
+ refreshDeps: []
277
+ }),
278
+ res = _useRequest10.data;
279
+ var dataList = (res === null || res === void 0 ? void 0 : res.data) || [];
280
+ var visibleList = dataList.filter(function (item) {
281
+ var _item$functionKeys2;
282
+ 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'));
283
+ });
284
+ return {
285
+ visibleList: visibleList
286
+ };
243
287
  };
@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  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; }
5
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
6
  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); }
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+ 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."); }
9
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
10
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
11
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
12
  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."); }
9
13
  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';
16
20
  import { JzljXncContext } from "../..";
17
21
  import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../_components";
18
22
  import useSettings from "../../../_hooks/useSettings";
19
- import { collectionApis, useUnit } from "../../api";
23
+ import { collectionApis, useLdFields, useUnit } from "../../api";
20
24
  import "./index.less";
21
25
  import dayjs from 'dayjs';
22
26
  import cc_dark from "../../imgs/overview_ctyl_pjrcc_dark.png";
@@ -57,7 +61,32 @@ export default function Collection() {
57
61
  chartData = state.chartData;
58
62
  var _useUnit = useUnit(),
59
63
  unitStr = _useUnit.unitStr;
60
- var columns = [['联单编号', 'code', {
64
+ var _useLdFields = useLdFields(),
65
+ visibleList = _useLdFields.visibleList;
66
+ var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.filter(function (item) {
67
+ return item.dataShowKey !== 'endingPointName' && item.dataShowKey !== 'endingPointDivisionName';
68
+ }).map(function (item) {
69
+ return [item.displayName, item.dataShowKey, item.dataShowKey === 'jointOrderStatusName' ? {
70
+ width: item.columnWidth || 120,
71
+ render: function render(text, record) {
72
+ var colorMap = {
73
+ yqy: 'yellow',
74
+ yyd: 'blue',
75
+ yjs: 'green',
76
+ yqr: 'green'
77
+ };
78
+ var color = colorMap[record.jointOrderStatusCode] || 'yellow';
79
+ return /*#__PURE__*/_jsx(VmTag, {
80
+ title: text,
81
+ type: color
82
+ });
83
+ }
84
+ } : {
85
+ width: 120,
86
+ ellipsis: true,
87
+ align: item.dataShowKey === 'receivedWeight' ? 'right' : 'left'
88
+ }];
89
+ }) : [['联单编号', 'code', {
61
90
  width: 120,
62
91
  fixed: 'left',
63
92
  ellipsis: true
@@ -99,7 +128,7 @@ export default function Collection() {
99
128
  }], ["\u8FD0\u91CF(".concat(unitStr, ")"), 'receivedWeight', {
100
129
  width: 120,
101
130
  align: 'right'
102
- }], ['操作', 'action', {
131
+ }]]), [['操作', 'action', {
103
132
  width: 60,
104
133
  fixed: 'right',
105
134
  render: function render(text, record) {
@@ -114,7 +143,7 @@ export default function Collection() {
114
143
  children: "\u67E5\u770B"
115
144
  });
116
145
  }
117
- }]].map(function (item) {
146
+ }]]).map(function (item) {
118
147
  return _objectSpread({
119
148
  title: item[0],
120
149
  dataIndex: item[1],
@@ -4,6 +4,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  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; }
5
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
6
  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); }
7
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
+ 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."); }
9
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
10
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
11
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
12
  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."); }
9
13
  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';
16
20
  import { JzljXncContext } from "../..";
17
21
  import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../_components";
18
22
  import useSettings from "../../../_hooks/useSettings";
19
- import { disposeApis, fetchJzljEnum, getByParamTypeCode, overviewApis, useUnit } from "../../api";
23
+ import { disposeApis, fetchJzljEnum, getByParamTypeCode, overviewApis, useCzzFields, useUnit } from "../../api";
20
24
  import FlowMap from "./FlowMap";
21
25
  import "./index.less";
22
26
  import dispose_czz_dark from "../../imgs/dispose_czz_dark.png";
@@ -54,9 +58,34 @@ export default function Dispose() {
54
58
  flowData = state.flowData;
55
59
  var _useUnit = useUnit(),
56
60
  unitStr = _useUnit.unitStr;
61
+ var _useCzzFields = useCzzFields(),
62
+ visibleList = _useCzzFields.visibleList;
57
63
  var effectiveStatusList = fetchJzljEnum('EffectiveStatusEnum');
58
64
  var garbageTypeList = getByParamTypeCode('param_jzlj_disposal_garbage_type');
59
- var columns = [['运输单位', 'transportUnitName', {
65
+ var columns = [].concat(_toConsumableArray(visibleList !== null && visibleList !== void 0 && visibleList.length ? visibleList.filter(function (item) {
66
+ return item.dataShowKey !== 'endingPointName';
67
+ }).map(function (item) {
68
+ return [item.displayName, item.dataShowKey, item.dataShowKey === 'effectiveStatusName' ? {
69
+ width: item.columnWidth || 120,
70
+ render: function render(text, record) {
71
+ var colorMap = {
72
+ wsx: 'yellow',
73
+ sxz: 'green',
74
+ ysx: 'red',
75
+ yzz: 'gray'
76
+ };
77
+ var color = colorMap[record.effectiveStatusCode] || 'yellow';
78
+ return /*#__PURE__*/_jsx(VmTag, {
79
+ title: text,
80
+ type: color
81
+ });
82
+ }
83
+ } : {
84
+ width: 100,
85
+ ellipsis: true,
86
+ align: item.dataShowKey === 'transportWeight' ? 'right' : 'left'
87
+ }];
88
+ }) : [['运输单位', 'transportUnitName', {
60
89
  width: 160,
61
90
  ellipsis: true
62
91
  }], ['运输起点', 'startingPointName', {
@@ -87,7 +116,7 @@ export default function Dispose() {
87
116
  type: color
88
117
  });
89
118
  }
90
- }], ['操作', 'action', {
119
+ }]]), [['操作', 'action', {
91
120
  width: 60,
92
121
  render: function render(_, record) {
93
122
  return /*#__PURE__*/_jsx("a", {
@@ -101,7 +130,7 @@ export default function Dispose() {
101
130
  children: "\u67E5\u770B"
102
131
  });
103
132
  }
104
- }]].map(function (item) {
133
+ }]]).map(function (item) {
105
134
  return _objectSpread({
106
135
  title: item[0],
107
136
  dataIndex: item[1],
package/package.json CHANGED
@@ -1,78 +1,78 @@
1
- {
2
- "name": "@vtx/modals2",
3
- "version": "5.0.33",
4
- "description": "弹窗组件",
5
- "license": "MIT",
6
- "module": "lib/index.js",
7
- "types": "lib/index.d.ts",
8
- "files": [
9
- "lib"
10
- ],
11
- "scripts": {
12
- "build": "father build",
13
- "build:watch": "father dev",
14
- "dev": "dumi dev",
15
- "docs:build": "dumi build",
16
- "docs:preview": "dumi preview",
17
- "doctor": "father doctor",
18
- "lint": "npm run lint:es && npm run lint:css",
19
- "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
20
- "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
21
- "prepare": "husky install && dumi setup",
22
- "prepublishOnly": "npm run build",
23
- "start": "npm run dev"
24
- },
25
- "dependencies": {
26
- "base-64": "^1.0.0",
27
- "htmr": "^1.0.2",
28
- "number-precision": "^1.6.0",
29
- "react-tagcloud": "^2.3.3"
30
- },
31
- "devDependencies": {
32
- "@ant-design/icons": "4.7.0",
33
- "@babel/preset-react": "^7.28.5",
34
- "@babel/runtime": "^7.6.3",
35
- "@commitlint/cli": "^17.1.2",
36
- "@commitlint/config-conventional": "^17.1.0",
37
- "@types/lodash": "^4.14.202",
38
- "@types/qs": "^6.9.11",
39
- "@types/react": "^18.0.0",
40
- "@types/react-dom": "^18.0.0",
41
- "@umijs/lint": "^4.0.0",
42
- "@vtx/components": "^3.1.166",
43
- "@vtx/ol-map": "^1.0.151",
44
- "@vtx/player": "latest",
45
- "@vtx/utils": "^1.0.20",
46
- "ahooks": "^3.1.5",
47
- "antd": "^4.24.16",
48
- "antd-dayjs-webpack-plugin": "^1.0.6",
49
- "axios": "^0.21.1",
50
- "babel-eslint": "^10.1.0",
51
- "babel-plugin-import": "^1.13.8",
52
- "dayjs": "^1.11.10",
53
- "dumi": "^2.2.13",
54
- "echarts": "^5.3.2",
55
- "echarts-for-react": "3.0.2",
56
- "echarts-liquidfill": "^3.1.0",
57
- "eslint": "^8.23.0",
58
- "father": "^4.1.0",
59
- "husky": "^8.0.1",
60
- "lint-staged": "^13.0.3",
61
- "lodash": "^4.17.21",
62
- "prettier": "^2.7.1",
63
- "prettier-plugin-organize-imports": "^3.0.0",
64
- "prettier-plugin-packagejson": "^2.2.18",
65
- "qs": "^6.0.0",
66
- "react": "^18.0.0",
67
- "react-dom": "^18.0.0",
68
- "stylelint": "^14.9.1"
69
- },
70
- "peerDependencies": {
71
- "react": ">=16.9.0",
72
- "react-dom": ">=16.9.0"
73
- },
74
- "publishConfig": {
75
- "access": "public"
76
- },
77
- "authors": []
78
- }
1
+ {
2
+ "name": "@vtx/modals2",
3
+ "version": "5.0.34",
4
+ "description": "弹窗组件",
5
+ "license": "MIT",
6
+ "module": "lib/index.js",
7
+ "types": "lib/index.d.ts",
8
+ "files": [
9
+ "lib"
10
+ ],
11
+ "scripts": {
12
+ "build": "father build",
13
+ "build:watch": "father dev",
14
+ "dev": "dumi dev",
15
+ "docs:build": "dumi build",
16
+ "docs:preview": "dumi preview",
17
+ "doctor": "father doctor",
18
+ "lint": "npm run lint:es && npm run lint:css",
19
+ "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
20
+ "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
21
+ "prepare": "husky install && dumi setup",
22
+ "prepublishOnly": "npm run build",
23
+ "start": "npm run dev"
24
+ },
25
+ "dependencies": {
26
+ "base-64": "^1.0.0",
27
+ "htmr": "^1.0.2",
28
+ "number-precision": "^1.6.0",
29
+ "react-tagcloud": "^2.3.3"
30
+ },
31
+ "devDependencies": {
32
+ "@ant-design/icons": "4.7.0",
33
+ "@babel/preset-react": "^7.28.5",
34
+ "@babel/runtime": "^7.6.3",
35
+ "@commitlint/cli": "^17.1.2",
36
+ "@commitlint/config-conventional": "^17.1.0",
37
+ "@types/lodash": "^4.14.202",
38
+ "@types/qs": "^6.9.11",
39
+ "@types/react": "^18.0.0",
40
+ "@types/react-dom": "^18.0.0",
41
+ "@umijs/lint": "^4.0.0",
42
+ "@vtx/components": "^3.1.166",
43
+ "@vtx/ol-map": "^1.0.151",
44
+ "@vtx/player": "latest",
45
+ "@vtx/utils": "^1.0.20",
46
+ "ahooks": "^3.1.5",
47
+ "antd": "^4.24.16",
48
+ "antd-dayjs-webpack-plugin": "^1.0.6",
49
+ "axios": "^0.21.1",
50
+ "babel-eslint": "^10.1.0",
51
+ "babel-plugin-import": "^1.13.8",
52
+ "dayjs": "^1.11.10",
53
+ "dumi": "^2.2.13",
54
+ "echarts": "^5.3.2",
55
+ "echarts-for-react": "3.0.2",
56
+ "echarts-liquidfill": "^3.1.0",
57
+ "eslint": "^8.23.0",
58
+ "father": "^4.1.0",
59
+ "husky": "^8.0.1",
60
+ "lint-staged": "^13.0.3",
61
+ "lodash": "^4.17.21",
62
+ "prettier": "^2.7.1",
63
+ "prettier-plugin-organize-imports": "^3.0.0",
64
+ "prettier-plugin-packagejson": "^2.2.18",
65
+ "qs": "^6.0.0",
66
+ "react": "^18.0.0",
67
+ "react-dom": "^18.0.0",
68
+ "stylelint": "^14.9.1"
69
+ },
70
+ "peerDependencies": {
71
+ "react": ">=16.9.0",
72
+ "react-dom": ">=16.9.0"
73
+ },
74
+ "publishConfig": {
75
+ "access": "public"
76
+ },
77
+ "authors": []
78
+ }