@vtx/modals2 6.0.0-beta.2 → 6.0.0-beta.20

package/lib/vtx-kh-modal/components/Record/index.js

@@ -1,205 +1 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { translateLocaleText } from "./../../../hooks/useTranslation.js";
-/**
- * 考核信息-列表
- */
-
-import { VtxImage } from '@vtx/components';
-import { useSetState } from 'ahooks';
-import dayjs from 'dayjs';
-import { VmFactor, VmFilter, VmTable, VmWrapper } from "../../../_components";
-import useSettings from "../../../_hooks/useSettings";
-import { BaseService, ReocrdService } from "../../api2";
-import "./index.less";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-var List = function List(props) {
-  var _useSettings = useSettings(),
-    isDark = _useSettings.isDark;
-  var id = props.id;
-  var _useSetState = useSetState({
-      pagination: {
-        current: 1,
-        pageSize: 10,
-        total: 0
-      },
-      startDate: dayjs().startOf('M'),
-      endDate: dayjs(),
-      checkActivityCode: '1',
-      sort: ''
-    }),
-    _useSetState2 = _slicedToArray(_useSetState, 2),
-    state = _useSetState2[0],
-    setState = _useSetState2[1];
-  var pagination = state.pagination,
-    startDate = state.startDate,
-    endDate = state.endDate,
-    checkActivityCode = state.checkActivityCode,
-    sort = state.sort;
-  var _BaseService$useKhInf = BaseService.useKhInfo(id, startDate.format('YYYY-MM-DD'), endDate.format('YYYY-MM-DD'), checkActivityCode === '1' ? '' : checkActivityCode),
-    khRes = _BaseService$useKhInf.khRes;
-  var _ReocrdService$useRec = ReocrdService.useRecordInfo(id, startDate.format('YYYY-MM-DD'), endDate.format('YYYY-MM-DD'), checkActivityCode === '1' ? '' : checkActivityCode, pagination.current - 1, sort),
-    records = _ReocrdService$useRec.records,
-    loading = _ReocrdService$useRec.loading;
-  var columns = [{
-    title: translateLocaleText("t('vtxkhmodal.image')"),
-    dataIndex: 'photos',
-    key: 'photos',
-    width: 120,
-    render: function render(text) {
-      var photos = JSON.parse(text || '[]');
-      var a = [].concat(_toConsumableArray(photos), _toConsumableArray(photos), _toConsumableArray(photos), _toConsumableArray(photos));
-      return (photos === null || photos === void 0 ? void 0 : photos.length) > 0 ? /*#__PURE__*/_jsx(VtxImage.PreviewGroup, {
-        children: a.map(function (ele, index) {
-          return /*#__PURE__*/_jsx(VtxImage, {
-            src: "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(ele.id),
-            style: {
-              width: 80,
-              height: 80,
-              visibility: index > 0 ? 'hidden' : 'visible'
-            },
-            alt: ele.name
-          }, index);
-        })
-      }) : '--';
-    }
-  }, {
-    title: translateLocaleText("t('vtxkhmodal.hours')"),
-    dataIndex: 'checkDate',
-    key: 'checkDate',
-    width: 150,
-    ellipsis: true
-  }, {
-    title: translateLocaleText("t('vtxkhmodal.assessmentActivity')"),
-    dataIndex: 'checkActivityName',
-    key: 'checkActivityName',
-    width: 200
-  }, {
-    title: translateLocaleText("t('vtxkhmodal.assessor')"),
-    dataIndex: 'checkUserName',
-    key: 'checkUserName'
-  }, {
-    title: translateLocaleText("t('vtxkhmodal.group')"),
-    dataIndex: 'ruleGroupName',
-    key: 'ruleGroupName'
-  }, {
-    title: translateLocaleText("t('vtxkhmodal.assessmentStandard')"),
-    dataIndex: 'ruleName',
-    key: 'ruleName',
-    width: 150
-  }, {
-    title: translateLocaleText("t('vtxkhmodal.score')"),
-    dataIndex: 'deductPoints',
-    key: 'deductPoints',
-    align: 'right'
-  }];
-  var pageChange = function pageChange(page) {
-    setState({
-      pagination: _objectSpread(_objectSpread({}, pagination), {}, {
-        current: page
-      })
-    });
-  };
-  var tableProps = {
-    pagination: _objectSpread(_objectSpread({}, pagination), {}, {
-      total: records.total,
-      defaultPageSize: 10,
-      onChange: pageChange
-    }),
-    height: 384,
-    loading: loading,
-    dataSource: records.rows,
-    onChange: function onChange(_pagination, _filters, sorter) {
-      if (sorter.order) {
-        var order = sorter.order === 'ascend' ? 'asc' : 'desc';
-        setState({
-          sort: "".concat(sorter.field, ",").concat(order)
-        });
-      } else {
-        setState({
-          sort: ''
-        });
-      }
-    }
-  };
-  var filterChange = function filterChange(dateValue) {
-    setState({
-      startDate: dateValue[0],
-      endDate: dateValue[1]
-    });
-  };
-  return /*#__PURE__*/_jsxs(VmWrapper, {
-    title: translateLocaleText("t('vtxkhmodal.details')"),
-    filterType: "rangePicker",
-    dateValue: [startDate, endDate],
-    filterChange: filterChange,
-    extraLeft: /*#__PURE__*/_jsx(VmFilter.VMSelect, {
-      options: [{
-        value: '1',
-        label: translateLocaleText("t('export.all')")
-      }, {
-        value: 'RCDC',
-        label: translateLocaleText("t('vtxkhmodal.day')")
-      }, {
-        value: 'ZXDC',
-        label: translateLocaleText("t('vtxkhmodal.specialSupervision')")
-      }, {
-        value: 'DSFCP',
-        label: translateLocaleText("t('vtxkhmodal.thirdPartyEvaluation')")
-      }, {
-        value: 'RCXC',
-        label: translateLocaleText("t('vtxkhmodal.day2')")
-      }],
-      style: {
-        width: 132
-      },
-      value: checkActivityCode,
-      onChange: function onChange(e) {
-        return setState({
-          checkActivityCode: e
-        });
-      }
-    }),
-    children: [/*#__PURE__*/_jsx("div", {
-      className: "kh-record-summary",
-      children: [{
-        name: translateLocaleText("t('vtxkhmodal.times')"),
-        value: khRes === null || khRes === void 0 ? void 0 : khRes.monthCheckTims,
-        key: 'count',
-        unit: translateLocaleText("t('common.timesUnit')"),
-        fontType: 'blue'
-      }, {
-        name: translateLocaleText("t('vtxkhmodal.totalDeductedPoints')"),
-        value: khRes === null || khRes === void 0 ? void 0 : khRes.monthDeductPoint,
-        key: 'subtract',
-        unit: translateLocaleText("t('vtxkhmodal.scoreUnit')"),
-        fontType: 'red'
-      }].map(function (ele) {
-        return /*#__PURE__*/_jsx(VmFactor, _objectSpread(_objectSpread({}, ele), {}, {
-          img: require("../../imgs/".concat(ele.key).concat(isDark ? '' : '_light', ".png")),
-          unitStyle: {
-            fontSize: 14
-          }
-        }), ele.key);
-      })
-    }), /*#__PURE__*/_jsx(VmTable, _objectSpread({
-      columns: columns,
-      rowKey: "id"
-    }, tableProps))]
-  });
-};
-export default List;
+export { default } from "../../../_components/vm-appraisal-info";

package/lib/vtx-qyry-modal/index.js

@@ -92,7 +92,7 @@ var VtxQyryModal = function VtxQyryModal(props) {
   }
   return /*#__PURE__*/_jsx(VtxBaseModal, {
     id: id,
-    type: "staff",
+    type: "qyry",
     title: title,
     subTitle: subTitle,
     visible: visible,

package/lib/vtx-restaurant-modal/components/Calendar/index.js

@@ -73,7 +73,7 @@ var CalendarContent = function CalendarContent(_ref) {
           children: [/*#__PURE__*/_jsx("div", {
             children: collectItem !== null && collectItem !== void 0 && collectItem.weighTime ? dayjs(collectItem.weighTime).format('HH:mm:ss') : '--' || '--'
           }), /*#__PURE__*/_jsx(VmTag, {
-            title: '已收集',
+            title: translateLocaleText("t('vtxrestaurantmodal.collected')"),
             type: 'green'
           })]
         }), /*#__PURE__*/_jsxs("div", {
@@ -81,13 +81,13 @@ var CalendarContent = function CalendarContent(_ref) {
           style: {
             height: 14
           },
-          children: [collectItem === null || collectItem === void 0 ? void 0 : collectItem.trashNum, "\u6876 / ", collectItem === null || collectItem === void 0 ? void 0 : collectItem.netWeight, "kg"]
+          children: [collectItem === null || collectItem === void 0 ? void 0 : collectItem.trashNum, translateLocaleText("t('common.unit.bucket')"), " / ", collectItem === null || collectItem === void 0 ? void 0 : collectItem.netWeight, "kg"]
         }), /*#__PURE__*/_jsx("div", {
           className: 'cc_restaurant_calendar-content-item',
           children: collectItem === null || collectItem === void 0 ? void 0 : collectItem.carCode
         })]
       }) : null, isEmpty(collectList) && isAfter && isCollect ? /*#__PURE__*/_jsx(VmTag, {
-        title: '未收集',
+        title: translateLocaleText("t('vtxrestaurantmodal.notCollected')"),
         type: 'yellow',
         style: {
           width: '100%'

package/lib/vtx-restaurant-modal/components/DetailInfo/index.js

@@ -33,6 +33,7 @@ var DetailInfo = function DetailInfo() {
       return item.dataKey !== 'location';
     }).map(function (item) {
       var formItem = getFormItem(item, info);
+      if (!formItem) return null;
       if (item.dataKey === RestaurantConfigureEnum.DIVISION_NAME) {
         formItem.isAddress = false;
       }
@@ -58,6 +59,8 @@ var DetailInfo = function DetailInfo() {
           });
         }
       } : {});
+    }).filter(function (item) {
+      return !!item;
     });
   };
   var _ref = info !== null && info !== void 0 && (_info$location = info.location) !== null && _info$location !== void 0 && _info$location.lngLats ? info.location.lngLats.split(',') : [],

package/lib/vtx-restaurant-modal/components/SignAndContract/ContactDetail.js

@@ -19,7 +19,7 @@ var Content = function Content(_ref) {
     id: id
   });
   var infoData = [{
-    label: '合同编号',
+    label: translateLocaleText("t('vtxrestaurantmodal.contractNumber')"),
     value: data.contractNumber,
     key: 'contractNumber'
   }, {
@@ -48,8 +48,13 @@ var Content = function Content(_ref) {
     value: data.time,
     key: 'time'
   }] : []), [{
-    label: '运输量',
-    value: data.garbageType === 'fqyz' ? "".concat(data.trafficWeek || '-', "\u516C\u65A4/\u5468\uFF0C").concat(data.trafficMonth || '-') : "".concat(data.trafficDay || '-', "\u516C\u65A4/\u5929"),
+    label: translateLocaleText("t('vtxrestaurantmodal.transportVolume')"),
+    value: data.garbageType === 'fqyz' ? translateLocaleText("t('vtxrestaurantmodal.transportVolumeWeekMonthValue')", {
+      week: data.trafficWeek || '-',
+      month: data.trafficMonth || '-'
+    }) : translateLocaleText("t('vtxrestaurantmodal.transportVolumeDayValue')", {
+      day: data.trafficDay || '-'
+    }),
     key: 'trafficDay'
   }], _toConsumableArray(data.garbageType === 'fqyz' ? [{
     label: translateLocaleText("t('vtxrestaurantmodal.times2')"),
@@ -60,39 +65,47 @@ var Content = function Content(_ref) {
     value: data.time,
     key: 'time'
   }, {
-    label: '费用支付方式',
+    label: translateLocaleText("t('vtxrestaurantmodal.paymentMethod')"),
     value: data.paymentMethod,
     key: 'paymentMethod'
   }] : [{
-    label: '签约金额',
-    value: "".concat(data.contractAmount || '-', "\u5143/\u5E74"),
+    label: translateLocaleText("t('vtxrestaurantmodal.contractAmount')"),
+    value: translateLocaleText("t('common.value.yuanPerYear')", {
+      value: data.contractAmount || '-'
+    }),
     key: 'contractAmount'
   }]), [{
-    label: '甲方未按规定分类违约金',
-    value: "".concat(data.classifyPenalty || '-', "\u5143/\u5428"),
+    label: translateLocaleText("t('vtxrestaurantmodal.firstPartyClassificationPenalty')"),
+    value: translateLocaleText("t('common.value.yuanPerTon')", {
+      value: data.classifyPenalty || '-'
+    }),
     key: 'classifyPenalty'
   }], _toConsumableArray(data.garbageType === 'fqyz' ? [{
-    label: '协议违反解约期限',
-    value: "".concat(data.terminationPeriod || '-', "\u5929"),
+    label: translateLocaleText("t('vtxrestaurantmodal.agreementViolationTerminationPeriod')"),
+    value: translateLocaleText("t('common.value.days')", {
+      value: data.terminationPeriod || '-'
+    }),
     key: 'terminationPeriod'
   }] : [{
     label: translateLocaleText("t('vtxrestaurantmodal.otherUnitItems')"),
-    value: "".concat(data.transferOtherPenalty || '-', "\u5143/\u6B21"),
+    value: translateLocaleText("t('common.value.yuanPerTimes')", {
+      value: data.transferOtherPenalty || '-'
+    }),
     key: 'terminationPeriod'
   }]));
   var columns = [{
-    title: '容量',
+    title: translateLocaleText("t('vtxrestaurantmodal.capacity')"),
     dataIndex: 'capacity',
     align: 'center'
   }, {
-    title: '桶数',
+    title: translateLocaleText("t('vtxrestaurantmodal.bucketCount')"),
     dataIndex: 'barrelage',
     align: 'center'
   }];
   var token = getVtxToken('token');
   return /*#__PURE__*/_jsx("div", {
     children: /*#__PURE__*/_jsx(VmWrapper, {
-      title: "\u5408\u540C\u4FE1\u606F",
+      title: translateLocaleText("t('vtxrestaurantmodal.contractInformation')"),
       rightContent: /*#__PURE__*/_jsxs(Space, {
         children: [/*#__PURE__*/_jsx(Button, {
           onClick: function onClick() {
@@ -125,7 +138,7 @@ var Content = function Content(_ref) {
           width: "50%",
           ellipsis: true
         }), /*#__PURE__*/_jsx(VmTitle, {
-          title: '免费桶配置'
+          title: translateLocaleText("t('vtxrestaurantmodal.freeBucketConfiguration')")
         }), /*#__PURE__*/_jsx(VmTable, {
           columns: columns,
           dataSource: [{
@@ -139,22 +152,26 @@ var Content = function Content(_ref) {
           pagination: false
         }), /*#__PURE__*/_jsx(VmInfoCollection, {
           data: [{
-            label: '押金',
-            value: "".concat(data.deposit || '-', "\u5143"),
+            label: translateLocaleText("t('vtxrestaurantmodal.deposit')"),
+            value: translateLocaleText("t('common.value.yuan')", {
+              value: data.deposit || '-'
+            }),
             key: 'deposit'
           }].concat(_toConsumableArray(data.garbageType === 'ccfqw' ? [{
-            label: '配小桶',
-            value: "".concat(data.keg || '-', "\u4E2A"),
+            label: translateLocaleText("t('vtxrestaurantmodal.smallBucketConfiguration')"),
+            value: translateLocaleText("t('common.value.count')", {
+              value: data.keg || '-'
+            }),
             key: 'keg'
           }] : [])),
           horizontal: true,
           width: "50%",
           ellipsis: true
         }), /*#__PURE__*/_jsx(VmTitle, {
-          title: '甲方信息'
+          title: translateLocaleText("t('vtxrestaurantmodal.firstPartyInformation')")
         }), /*#__PURE__*/_jsx(VmInfoCollection, {
           data: [{
-            label: '签字',
+            label: translateLocaleText("t('vtxrestaurantmodal.signature')"),
             value: data.firstSign,
             key: 'firstSign',
             render: data.firstSign ? function () {
@@ -165,7 +182,7 @@ var Content = function Content(_ref) {
                   src: "/cloudFile/common/downloadFile?id=".concat(data === null || data === void 0 ? void 0 : data.firstSign, "&token=").concat(token),
                   maskClassName: 'maskClass'
                 },
-                alt: "\u7B7E\u5B57",
+                alt: translateLocaleText("t('vtxrestaurantmodal.signature')"),
                 style: {
                   width: 100,
                   height: 100
@@ -173,16 +190,16 @@ var Content = function Content(_ref) {
               });
             } : undefined
           }, {
-            label: '签章',
+            label: translateLocaleText("t('vtxrestaurantmodal.signatureSeal')"),
             value: data.firstSignature,
             key: 'firstSignature',
             componentType: 'image'
           }, {
-            label: '法定代表人',
+            label: translateLocaleText("t('vtxrestaurantmodal.legalRepresentative')"),
             value: data.firstRepresentative,
             key: 'firstRepresentative'
           }, {
-            label: '委托代理人',
+            label: translateLocaleText("t('vtxrestaurantmodal.authorizedAgent')"),
             value: data.firstProxy,
             key: 'firstProxy'
           }, {
@@ -191,7 +208,7 @@ var Content = function Content(_ref) {
             key: 'firstMailingAddress',
             isAddress: true
           }, {
-            label: '联系电话',
+            label: translateLocaleText("t('vtxrestaurantmodal.contactPhone')"),
             value: data.firstPhone,
             key: 'firstPhone',
             isAddress: true
@@ -200,10 +217,10 @@ var Content = function Content(_ref) {
           width: "50%",
           ellipsis: true
         }), /*#__PURE__*/_jsx(VmTitle, {
-          title: '乙方信息'
+          title: translateLocaleText("t('vtxrestaurantmodal.secondPartyInformation')")
         }), /*#__PURE__*/_jsx(VmInfoCollection, {
           data: [{
-            label: '签字',
+            label: translateLocaleText("t('vtxrestaurantmodal.signature')"),
             value: data.secondSign,
             key: 'secondSign',
             render: data.secondSign ? function () {
@@ -214,7 +231,7 @@ var Content = function Content(_ref) {
                   src: "/cloudFile/common/downloadFile?id=".concat(data === null || data === void 0 ? void 0 : data.secondSign, "&token=").concat(token),
                   maskClassName: 'maskClass'
                 },
-                alt: "\u7B7E\u5B57",
+                alt: translateLocaleText("t('vtxrestaurantmodal.signature')"),
                 style: {
                   width: 100,
                   height: 100
@@ -222,16 +239,16 @@ var Content = function Content(_ref) {
               });
             } : undefined
           }, {
-            label: '签章',
+            label: translateLocaleText("t('vtxrestaurantmodal.signatureSeal')"),
             value: data.collectSignature,
             key: 'collectSignature',
             componentType: 'image'
           }, {
-            label: '法定代表人',
+            label: translateLocaleText("t('vtxrestaurantmodal.legalRepresentative')"),
             value: data.secondRepresentative,
             key: 'secondRepresentative'
           }, {
-            label: '委托代理人',
+            label: translateLocaleText("t('vtxrestaurantmodal.authorizedAgent')"),
             value: data.secondProxy,
             key: 'secondProxy'
           }, {
@@ -240,7 +257,7 @@ var Content = function Content(_ref) {
             key: 'secondMailingAddress',
             isAddress: true
           }, {
-            label: '联系电话',
+            label: translateLocaleText("t('vtxrestaurantmodal.contactPhone')"),
             value: data.secondPhone,
             key: 'secondPhone',
             isAddress: true

package/lib/vtx-restaurant-modal/components/SignAndContract/index.js

@@ -123,7 +123,7 @@ var SignAndContract = function SignAndContract() {
     dataIndex: 'signTime',
     width: 120
   }, {
-    title: '运输量',
+    title: translateLocaleText("t('vtxrestaurantmodal.transportVolume')"),
     dataIndex: 'trafficDay',
     align: 'right',
     width: 120
@@ -167,7 +167,7 @@ var SignAndContract = function SignAndContract() {
       children: [/*#__PURE__*/_jsx(Col, {
         span: 24,
         children: /*#__PURE__*/_jsx(VmWrapper, {
-          title: '签约信息',
+          title: translateLocaleText("t('vtxrestaurantmodal.signingInformation')"),
           children: /*#__PURE__*/_jsx(VmInfoCollection, {
             data: dataSource,
             horizontal: true,
@@ -178,7 +178,7 @@ var SignAndContract = function SignAndContract() {
       }), /*#__PURE__*/_jsx(Col, {
         span: 24,
         children: /*#__PURE__*/_jsx(VmWrapper, {
-          title: '合同信息',
+          title: translateLocaleText("t('vtxrestaurantmodal.contractInformation')"),
           children: /*#__PURE__*/_jsx(VmTable, _objectSpread(_objectSpread({
             columns: columns
           }, tableProps), {}, {

package/lib/vtx-restaurant-modal/config.js

@@ -163,7 +163,11 @@ export var RestaurantConfigureEnum = {
   /**
    * 证件图片
    */
-  PAPER_FILE_IDS: 'paperFileIds'
+  PAPER_FILE_IDS: 'paperFileIds',
+  /**
+   * 排序号
+   */
+  ORDER_INDEX: 'orderIndex'
 };
 export var getFormItem = function getFormItem(item, data) {
   var _formItemMap;
@@ -192,7 +196,8 @@ export var getFormItem = function getFormItem(item, data) {
     businessTime = data.businessTime,
     trashBinLocationPhoto = data.trashBinLocationPhoto,
     signedStatusValue = data.signedStatusValue,
-    suggestCollectTime = data.suggestCollectTime;
+    suggestCollectTime = data.suggestCollectTime,
+    orderIndex = data.orderIndex;
   var dataKey = item.dataKey;
   var formItemMap = (_formItemMap = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.CODE, {
     label: "t('vtxrestaurantmodal.unit')",
@@ -256,7 +261,7 @@ export var getFormItem = function getFormItem(item, data) {
   }), RestaurantConfigureEnum.REGISTER_MONEY, {
     label: "t('vtxrestaurantmodal.registerMoney')",
     value: registerMoney
-  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.ESTABLISHED_TIME, {
+  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.ESTABLISHED_TIME, {
     label: "t('vtxrestaurantmodal.enterpriseHours')",
     value: establishedTime
   }), RestaurantConfigureEnum.SUGGEST_COLLECT_TIME, {
@@ -277,6 +282,9 @@ export var getFormItem = function getFormItem(item, data) {
     label: "t('vtxrestaurantmodal.image2')",
     value: paperFileIds,
     type: 'img'
+  }), RestaurantConfigureEnum.ORDER_INDEX, {
+    label: '排序号',
+    value: orderIndex
   }));
   return formItemMap[dataKey];
 };

package/lib/vtx-road-modal/components/BaseInfo/Work.js

@@ -20,6 +20,7 @@ import { VmEmpty, VmProgress, VmTable, VmTag, VmWrapper } from "../../../_compon
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
 import { translateLocaleText } from "./../../../hooks/useTranslation.js";
+import { buildIframeQuery } from "../../utils/url";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Work = function Work(props) {
   var id = props.id,
@@ -127,7 +128,14 @@ var Work = function Work(props) {
           if (prefixList.length === 2) {
             prefix = "/".concat(prefixList[0]);
           }
-          var src = "".concat(prefix, "/carHistory/#/zyqsHistory?carId=").concat(record.carId, "&theme=").concat(theme === 'blue' ? 'dark' : theme, "&startTime=").concat(dayjs(date).format('YYYY-MM-DD 00:00:00'), "&endTime=").concat(dayjs(date).format('YYYY-MM-DD 23:59:59'), "&").concat(location.href.split('?')[1], "&roadId=").concat(record.roadId);
+          var query = buildIframeQuery(location.href.split('?')[1], {
+            carId: record.carId,
+            theme: theme === 'blue' ? 'dark' : theme,
+            startTime: dayjs(date).format('YYYY-MM-DD 00:00:00'),
+            endTime: dayjs(date).format('YYYY-MM-DD 23:59:59'),
+            roadId: record.roadId
+          });
+          var src = "".concat(prefix, "/carHistory/#/zyqsHistory?").concat(query);
           setIframeModalInfo({
             title: translateLocaleText("t('vtxroadmodal.vehicleTrack')"),
             visible: true,

package/lib/vtx-road-modal/components/LaneBaseInfo/Work.js

@@ -18,6 +18,7 @@ import { useMemo, useState } from 'react';
 import { VmBarCharts, VmEmpty, VmProgress, VmTable, VmTag, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { LaneService } from "../../api";
+import { buildIframeQuery } from "../../utils/url";
 import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var getPercentInfo = function getPercentInfo(percent) {
@@ -220,7 +221,13 @@ var Work = function Work(props) {
           if (prefixList.length === 2) {
             prefix = "/".concat(prefixList[0]);
           }
-          var src = "".concat(prefix, "/carHistory/#/zyqsLaneHistory?carId=").concat(record.workCarId, "&theme=").concat(theme === 'blue' ? 'dark' : theme, "&startTime=").concat(dayjs(date).format('YYYY-MM-DD 00:00:00'), "&endTime=").concat(dayjs(date).format('YYYY-MM-DD 23:59:59'), "&").concat(location.href.split('?')[1]);
+          var query = buildIframeQuery(location.href.split('?')[1], {
+            carId: record.workCarId,
+            theme: theme === 'blue' ? 'dark' : theme,
+            startTime: dayjs(day).format('YYYY-MM-DD 00:00:00'),
+            endTime: dayjs(day).format('YYYY-MM-DD 23:59:59')
+          });
+          var src = "".concat(prefix, "/carHistory/#/zyqsLaneHistory?").concat(query);
           setIframeModalInfo({
             title: translateLocaleText("t('vtxroadmodal.vehicleTrack')"),
             visible: true,

package/lib/vtx-road-modal/components/LaneCalendar/index.js

@@ -58,6 +58,9 @@ var Calendar = function Calendar(_ref) {
   }
   var dateCellRender = function dateCellRender(value) {
     var date = dayjs(value).format('YYYY-MM-DD');
+    if (dayjs().isBefore(dayjs(value))) {
+      return null;
+    }
     var info = calendarInfo[date];
     var _ref2 = info || {},
       planMileage = _ref2.planMileage,