kts-component-invoice-operate 3.2.177 → 3.2.179

package/dist/Invoice/ui/digtal/FreightList/index.d.ts

@@ -4,8 +4,9 @@ export interface IGoodsListProps {
     /** 产品最大数 */
     goodMax?: number;
     addressOptions: any[];
+    vehicleTypeList: any[];
     /**
-     * 建筑服务地址数据字段名
+     * 地址数据字段名
      */
     fieldNames?: any;
 }

package/dist/index.esm.js

@@ -759,7 +759,7 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
       var _validateFields2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var _this3 = this;
 
-        var _errors, _values, arr, i, key, _yield$_validateField, errors, values, _this$state$goodsList;
+        var _errors, _values, arr, i, key, _yield$_validateField, errors, values, _this$state$goodsList, _this$state$freightLi;
 
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
@@ -817,7 +817,30 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                 _errors.set('goodsList', _context.t0.errors);
 
               case 27:
-                _values.set('goodsList', this.state.goodsListState.goodsList.slice()); // 金额（含税）
+                _values.set('goodsList', this.state.goodsListState.goodsList.slice()); //货物运输列表
+
+
+                if (!this.state.freightListState.form) {
+                  _context.next = 37;
+                  break;
+                }
+
+                _context.prev = 29;
+                _context.next = 32;
+                return (_this$state$freightLi = this.state.freightListState.form) === null || _this$state$freightLi === void 0 ? void 0 : _this$state$freightLi.validateFields();
+
+              case 32:
+                _context.next = 37;
+                break;
+
+              case 34:
+                _context.prev = 34;
+                _context.t1 = _context["catch"](29);
+
+                _errors.set('freightList', _context.t1.errors);
+
+              case 37:
+                _values.set('freightList', this.state.freightListState.goodsList.slice()); // 金额（含税）
 
 
                 _values.set('lineAmountIncludeTax', function () {
@@ -863,12 +886,12 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                   values: _values
                 });
 
-              case 33:
+              case 43:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this, [[19, 24]]);
+        }, _callee, this, [[19, 24], [29, 34]]);
       }));
 
       function validateFields() {
@@ -25698,7 +25721,7 @@ var Main$4 = decorator(Form.create())(function (props) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                s.freightListState.area = props.addressOptions;
+                s.freightListState.vehicleTypeList = props.vehicleTypeList;
 
               case 1:
               case "end":
@@ -25712,8 +25735,7 @@ var Main$4 = decorator(Form.create())(function (props) {
         return _ref3.apply(this, arguments);
       };
     }());
-  }, [props.addressOptions]); // 跟新 货物
-
+  }, [props.vehicleTypeList]);
   React.useEffect(function () {
     controller.run( /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
@@ -25721,12 +25743,9 @@ var Main$4 = decorator(Form.create())(function (props) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                s.freightListState.goodsMap = new Map();
-                goodsList.forEach(function (e) {
-                  s.freightListState.goodsMap.set(e.$index, e);
-                });
+                s.freightListState.area = props.addressOptions;
 
-              case 2:
+              case 1:
               case "end":
                 return _context4.stop();
             }
@@ -25738,19 +25757,21 @@ var Main$4 = decorator(Form.create())(function (props) {
         return _ref4.apply(this, arguments);
       };
     }());
-  }, [controller, goodsList]);
-  /** props 产品最大数 更新 */
+  }, [props.addressOptions]); // 跟新 货物
 
   React.useEffect(function () {
-    controller.pipeline( /*#__PURE__*/function () {
+    controller.run( /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(s) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                s.freightListState.goodMax = props.goodMax;
+                s.freightListState.goodsMap = new Map();
+                goodsList.forEach(function (e) {
+                  s.freightListState.goodsMap.set(e.$index, e);
+                });
 
-              case 1:
+              case 2:
               case "end":
                 return _context5.stop();
             }
@@ -25761,6 +25782,30 @@ var Main$4 = decorator(Form.create())(function (props) {
       return function (_x6) {
         return _ref5.apply(this, arguments);
       };
+    }());
+  }, [controller, goodsList]);
+  /** props 产品最大数 更新 */
+
+  React.useEffect(function () {
+    controller.pipeline( /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(s) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
+              case 0:
+                s.freightListState.goodMax = props.goodMax;
+
+              case 1:
+              case "end":
+                return _context6.stop();
+            }
+          }
+        }, _callee6);
+      }));
+
+      return function (_x7) {
+        return _ref6.apply(this, arguments);
+      };
     }())();
   }, [controller, props.goodMax]); // 注册 form
   //  controller.useForm('freightInfo', form);

package/dist/index.js

@@ -769,7 +769,7 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
       var _validateFields2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var _this3 = this;
 
-        var _errors, _values, arr, i, key, _yield$_validateField, errors, values, _this$state$goodsList;
+        var _errors, _values, arr, i, key, _yield$_validateField, errors, values, _this$state$goodsList, _this$state$freightLi;
 
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
@@ -827,7 +827,30 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                 _errors.set('goodsList', _context.t0.errors);
 
               case 27:
-                _values.set('goodsList', this.state.goodsListState.goodsList.slice()); // 金额（含税）
+                _values.set('goodsList', this.state.goodsListState.goodsList.slice()); //货物运输列表
+
+
+                if (!this.state.freightListState.form) {
+                  _context.next = 37;
+                  break;
+                }
+
+                _context.prev = 29;
+                _context.next = 32;
+                return (_this$state$freightLi = this.state.freightListState.form) === null || _this$state$freightLi === void 0 ? void 0 : _this$state$freightLi.validateFields();
+
+              case 32:
+                _context.next = 37;
+                break;
+
+              case 34:
+                _context.prev = 34;
+                _context.t1 = _context["catch"](29);
+
+                _errors.set('freightList', _context.t1.errors);
+
+              case 37:
+                _values.set('freightList', this.state.freightListState.goodsList.slice()); // 金额（含税）
 
 
                 _values.set('lineAmountIncludeTax', function () {
@@ -873,12 +896,12 @@ var InvoiceControllerForm = /*#__PURE__*/function (_GreyReactBox) {
                   values: _values
                 });
 
-              case 33:
+              case 43:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this, [[19, 24]]);
+        }, _callee, this, [[19, 24], [29, 34]]);
       }));
 
       function validateFields() {
@@ -25708,7 +25731,7 @@ var Main$4 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                s.freightListState.area = props.addressOptions;
+                s.freightListState.vehicleTypeList = props.vehicleTypeList;
 
               case 1:
               case "end":
@@ -25722,8 +25745,7 @@ var Main$4 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
         return _ref3.apply(this, arguments);
       };
     }());
-  }, [props.addressOptions]); // 跟新 货物
-
+  }, [props.vehicleTypeList]);
   React__default['default'].useEffect(function () {
     controller.run( /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(s) {
@@ -25731,12 +25753,9 @@ var Main$4 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                s.freightListState.goodsMap = new Map();
-                goodsList.forEach(function (e) {
-                  s.freightListState.goodsMap.set(e.$index, e);
-                });
+                s.freightListState.area = props.addressOptions;
 
-              case 2:
+              case 1:
               case "end":
                 return _context4.stop();
             }
@@ -25748,19 +25767,21 @@ var Main$4 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
         return _ref4.apply(this, arguments);
       };
     }());
-  }, [controller, goodsList]);
-  /** props 产品最大数 更新 */
+  }, [props.addressOptions]); // 跟新 货物
 
   React__default['default'].useEffect(function () {
-    controller.pipeline( /*#__PURE__*/function () {
+    controller.run( /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(s) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                s.freightListState.goodMax = props.goodMax;
+                s.freightListState.goodsMap = new Map();
+                goodsList.forEach(function (e) {
+                  s.freightListState.goodsMap.set(e.$index, e);
+                });
 
-              case 1:
+              case 2:
               case "end":
                 return _context5.stop();
             }
@@ -25771,6 +25792,30 @@ var Main$4 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function
       return function (_x6) {
         return _ref5.apply(this, arguments);
       };
+    }());
+  }, [controller, goodsList]);
+  /** props 产品最大数 更新 */
+
+  React__default['default'].useEffect(function () {
+    controller.pipeline( /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(s) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
+              case 0:
+                s.freightListState.goodMax = props.goodMax;
+
+              case 1:
+              case "end":
+                return _context6.stop();
+            }
+          }
+        }, _callee6);
+      }));
+
+      return function (_x7) {
+        return _ref6.apply(this, arguments);
+      };
     }())();
   }, [controller, props.goodMax]); // 注册 form
   //  controller.useForm('freightInfo', form);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.177",
+  "version": "3.2.179",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

package/src/Invoice/Invoice-digtal/_test/freight/index.tsx

@@ -6,7 +6,7 @@ import 'antd/dist/antd.css';
 export default () => {
 
     const controller = React.useMemo(() => new Invoice.InvoiceController(), []);
-    const area=React.useMemo(() => [
+    const area = React.useMemo(() => [
         {
             "code": "11",
             "name": "北京市",
@@ -14545,12 +14545,12 @@ export default () => {
     React.useEffect(() => {
         controller.run(async s => {
             // await controller.run(async s => { s.model = 'readOnly' }); // 设置只读
-            controller.state.freightListState.vehicleTypeList = [
-                { label: '铁路运输', value: 'RAILWAY' }
-            ];
-            controller.state.freightListState.area=area;
-            controller.state.freightListState.addressFieldNames={label:'name',value:'name',children:'children'}
-            controller.state.freightListState.goodsList=[{$index:'222',type:'RAILWAY',itemName:'咖啡机',licensePlate:'渝bkb190',origin:['北京','市辖区','东城区'],destination:['北京','市辖区','东城区']}]
+            // controller.state.freightListState.vehicleTypeList = [
+            //     { label: '铁路运输', value: 'RAILWAY' }
+            // ];
+            // controller.state.freightListState.area=area;
+            // controller.state.freightListState.addressFieldNames={label:'name',value:'name',children:'children'}
+            controller.state.freightListState.goodsList = [{ $index: '222', type: 'RAILWAY', itemName: '咖啡机', licensePlate: '渝bkb190', origin: ['北京', '市辖区', '东城区'], destination: ['北京', '市辖区', '东城区'] }]
         })
     }, [])
 
@@ -14558,7 +14558,18 @@ export default () => {
         <Invoice
             invoiceType='digtal'
             controller={controller}
-            specialInfor={<Invoice.FreightList />}
+            specialInfor={<Invoice.FreightList
+                vehicleTypeList={[
+                    { label: '铁路运输', value: 'RAILWAY' }
+                ]}
+                addressOptions={area}
+                fieldNames={{
+                    label: 'name',
+                    value: 'name',
+                    children: 'children'
+                }}
+            />
+            }
         />
     )
 };

package/src/Invoice/InvoiceController/InvoiceControllerForm/index.ts

@@ -45,8 +45,18 @@ export default class InvoiceControllerForm extends GreyReactBox<InvoiceControlle
         _errors.set('goodsList', error.errors);
       }
     }
-
+    
     _values.set('goodsList', this.state.goodsListState.goodsList.slice());
+    //货物运输列表
+    if (this.state.freightListState.form) {
+      try {
+        await this.state.freightListState.form?.validateFields()
+      } catch (error: any) {
+        _errors.set('freightList', error.errors);
+      }
+    }
+
+    _values.set('freightList', this.state.freightListState.goodsList.slice());
 
     // 金额（含税）
     _values.set('lineAmountIncludeTax', (() => {

package/src/Invoice/ui/digtal/FreightList/index.tsx

@@ -26,9 +26,9 @@ export interface IGoodsListProps {
   goodMax?: number;
 
   addressOptions: any[];
-
+  vehicleTypeList:any[];
   /**
-   * 建筑服务地址数据字段名
+   * 地址数据字段名
    */
   fieldNames?: any;
 
@@ -68,6 +68,11 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
       s.freightListState.addressFieldNames = props.fieldNames
     });
   }, [props.fieldNames])
+  React.useEffect(() => {
+    controller.run(async (s) => {
+      s.freightListState.vehicleTypeList = props.vehicleTypeList
+    });
+  }, [props.vehicleTypeList])
   React.useEffect(() => {
     controller.run(async (s) => {
       s.freightListState.area = props.addressOptions