kts-component-invoice-operate 3.2.179 → 3.2.181

package/dist/index.esm.js

@@ -24247,7 +24247,7 @@ var Architecture = decorator(Form.create())(function (props) {
     return model === 'readOnly';
   }, [model]); // 注册 form
 
-  controller.useForm('realEstateInfo', form);
+  controller.useForm('serviceDataDtoInfo', form);
   return /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React.createElement("div", {
@@ -24258,7 +24258,13 @@ var Architecture = decorator(Form.create())(function (props) {
     span: 6
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u571F\u5730\u589E\u503C\u7A0E\u9879\u76EE\u7F16\u53F7"
-  }, getFieldDecorator('landNumber', {})(readOnly ? /*#__PURE__*/React.createElement(MyDiv$4, null) : /*#__PURE__*/React.createElement(Input$2, {
+  }, getFieldDecorator('landNumber', {
+    rules: [{
+      max: 16,
+      message: '最多16个字符'
+    }]
+  })(readOnly ? /*#__PURE__*/React.createElement(MyDiv$4, null) : /*#__PURE__*/React.createElement(Input$2, {
+    maxLength: 16,
     autoComplete: 'off',
     placeholder: "\u8BF7\u8F93\u5165"
   })))), /*#__PURE__*/React.createElement(Col$1, {
@@ -26869,14 +26875,15 @@ var DrawerBody$3 = function DrawerBody(props) {
       //     s.value = info.node.taxRate
       //   }
       // });
+      var node = info.node || info;
       actions.setFieldState('taxClassificationCode', /*#__PURE__*/function () {
         var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(s) {
           return _regeneratorRuntime().wrap(function _callee12$(_context12) {
             while (1) {
               switch (_context12.prev = _context12.next) {
                 case 0:
-                  if (info.taxCategoryCode) {
-                    s.value = info.taxCategoryCode;
+                  if (node.taxCategoryCode) {
+                    s.value = node.taxCategoryCode;
                   }
 
                 case 1:
@@ -26897,8 +26904,8 @@ var DrawerBody$3 = function DrawerBody(props) {
             while (1) {
               switch (_context13.prev = _context13.next) {
                 case 0:
-                  if (info.shorthand) {
-                    s.value = info.shorthand;
+                  if (node.shorthand) {
+                    s.value = node.shorthand;
                   }
 
                 case 1:
@@ -26916,24 +26923,26 @@ var DrawerBody$3 = function DrawerBody(props) {
       setOpen(false);
     }, [controller, actions]);
     var onSelect = React.useCallback(function (key, info) {
+      var node = info.node || info;
+
       if (controller.state.goodsListState.isUpdateGoodsTaxRateList) {
-        var _info$node$taxRateLis;
+        var _node$taxRateList;
 
-        if ((_info$node$taxRateLis = info.node.taxRateList) === null || _info$node$taxRateLis === void 0 ? void 0 : _info$node$taxRateLis.length) {
-          setGoodsTaxRateList(info.node.taxRateList);
+        if ((_node$taxRateList = node.taxRateList) === null || _node$taxRateList === void 0 ? void 0 : _node$taxRateList.length) {
+          setGoodsTaxRateList(node.taxRateList);
         }
 
         if (!readOnlyTaxRate) {
           actions.setFieldState('taxRate', /*#__PURE__*/function () {
             var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
-              var _info$node$taxRateLis2;
+              var _node$taxRateList2;
 
               return _regeneratorRuntime().wrap(function _callee14$(_context14) {
                 while (1) {
                   switch (_context14.prev = _context14.next) {
                     case 0:
-                      if (info.node.taxRateList && ((_info$node$taxRateLis2 = info.node.taxRateList) === null || _info$node$taxRateLis2 === void 0 ? void 0 : _info$node$taxRateLis2.length) === 1) {
-                        s.value = info.node.taxRateList[0];
+                      if (node.taxRateList && ((_node$taxRateList2 = node.taxRateList) === null || _node$taxRateList2 === void 0 ? void 0 : _node$taxRateList2.length) === 1) {
+                        s.value = node.taxRateList[0];
                       } else {
                         s.value = undefined;
                       }
@@ -27002,6 +27011,7 @@ var DrawerBody$3 = function DrawerBody(props) {
       onSubmit: onSubmit1,
       onCancel: function onCancel() {
         setOpen(false);
+        setInfo({});
       },
       onSearch: onSearch,
       onLoad: onLoad
@@ -27616,11 +27626,11 @@ var Digtal = function Digtal(props) {
   ), /*#__PURE__*/React.createElement(ImportGoodsDrawer, null), /*#__PURE__*/React.createElement(EndowCodeDrawer, null));
 };
 
-var css_248z$x = ".taxdetailsbox {\n  display: flex;\n  justify-content: flex-start;\n  flex-direction: row;\n}\n.taxdetailsbox .taxrightbox {\n  width: 340px;\n  position: absolute;\n  right: 30px;\n}\n";
+var css_248z$x = ".taxdetailsbox {\n  display: flex;\n  justify-content: flex-start;\n  flex-direction: row;\n}\n.taxdetailsbox .taxrightbox {\n  width: 340px;\n  position: absolute;\n  right: 30px;\n  top: 79px;\n  bottom: 50px;\n  min-height: 300px;\n}\n.taxdetailsbox .taxrightbox .taxdesc {\n  height: calc(100vh - 323px);\n  min-height: 105px;\n  overflow: auto;\n}\n";
 styleInject(css_248z$x);
 
 function TaxClassificationModal(props) {
-  var _props$info2, _props$info3;
+  var _props$info6;
 
   var _Form$useForm = Form$1.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -27692,7 +27702,6 @@ function TaxClassificationModal(props) {
         return;
       }
 
-      props.onCancel && props.onCancel();
       onChildrenDrawerClose();
       props.onSubmit && props.onSubmit((_props$info = props.info) === null || _props$info === void 0 ? void 0 : _props$info.key, _objectSpread2(_objectSpread2({}, props.info), values));
     }).catch(function (errorInfo) {
@@ -27700,6 +27709,16 @@ function TaxClassificationModal(props) {
     });
   };
 
+  React.useEffect(function () {
+    var _props$info2, _props$info3, _props$info4, _props$info5;
+
+    form.setFieldsValue(_objectSpread2(_objectSpread2({}, form.getFieldsValue()), {}, {
+      taxCategoryCode: props === null || props === void 0 ? void 0 : (_props$info2 = props.info) === null || _props$info2 === void 0 ? void 0 : _props$info2.taxCategoryCode,
+      productName: props === null || props === void 0 ? void 0 : (_props$info3 = props.info) === null || _props$info3 === void 0 ? void 0 : _props$info3.productName,
+      shorthand: props === null || props === void 0 ? void 0 : (_props$info4 = props.info) === null || _props$info4 === void 0 ? void 0 : _props$info4.shorthand,
+      taxDesc: props === null || props === void 0 ? void 0 : (_props$info5 = props.info) === null || _props$info5 === void 0 ? void 0 : _props$info5.taxDesc
+    }));
+  }, [props === null || props === void 0 ? void 0 : (_props$info6 = props.info) === null || _props$info6 === void 0 ? void 0 : _props$info6.key]);
   return /*#__PURE__*/React.createElement(Drawer$1, {
     title: "\u5546\u54C1\u548C\u670D\u52A1\u7A0E\u6536\u5206\u7C7B\u7F16\u7801",
     placement: "right",
@@ -27745,16 +27764,10 @@ function TaxClassificationModal(props) {
   }))), /*#__PURE__*/React.createElement(Card, {
     className: "taxrightbox"
   }, /*#__PURE__*/React.createElement(Form$1, _objectSpread2(_objectSpread2({
-    form: form,
-    key: props === null || props === void 0 ? void 0 : (_props$info2 = props.info) === null || _props$info2 === void 0 ? void 0 : _props$info2.key
+    form: form
   }, layout), {}, {
     initialValues: props.info
   }), /*#__PURE__*/React.createElement(Form$1.Item, {
-    rules: [{
-      required: true,
-      message: '请勾选税收分类编码'
-    }],
-    initialValue: (_props$info3 = props.info) === null || _props$info3 === void 0 ? void 0 : _props$info3.taxCategoryCode,
     name: "taxCategoryCode",
     label: "\u7F16\u7801"
   }, /*#__PURE__*/React.createElement(FormReadOnly, null)), /*#__PURE__*/React.createElement(Form$1.Item, {
@@ -27764,7 +27777,8 @@ function TaxClassificationModal(props) {
     name: "shorthand",
     label: "\u7B80\u79F0"
   }, /*#__PURE__*/React.createElement(FormReadOnly, null)), /*#__PURE__*/React.createElement(Form$1.Item, {
-    name: "desc",
+    name: "taxDesc",
+    className: "taxdesc",
     label: "\u8BF4\u660E"
   }, /*#__PURE__*/React.createElement(FormReadOnly, null))))));
 }

package/dist/index.js

@@ -24257,7 +24257,7 @@ var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fun
     return model === 'readOnly';
   }, [model]); // 注册 form
 
-  controller.useForm('realEstateInfo', form);
+  controller.useForm('serviceDataDtoInfo', form);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-real-estate-info-digtal"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -24268,7 +24268,13 @@ var Architecture = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fun
     span: 6
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
     label: "\u571F\u5730\u589E\u503C\u7A0E\u9879\u76EE\u7F16\u53F7"
-  }, getFieldDecorator('landNumber', {})(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$4, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+  }, getFieldDecorator('landNumber', {
+    rules: [{
+      max: 16,
+      message: '最多16个字符'
+    }]
+  })(readOnly ? /*#__PURE__*/React__default['default'].createElement(MyDiv$4, null) : /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Input, {
+    maxLength: 16,
     autoComplete: 'off',
     placeholder: "\u8BF7\u8F93\u5165"
   })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Col, {
@@ -26879,14 +26885,15 @@ var DrawerBody$3 = function DrawerBody(props) {
       //     s.value = info.node.taxRate
       //   }
       // });
+      var node = info.node || info;
       actions.setFieldState('taxClassificationCode', /*#__PURE__*/function () {
         var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(s) {
           return _regeneratorRuntime().wrap(function _callee12$(_context12) {
             while (1) {
               switch (_context12.prev = _context12.next) {
                 case 0:
-                  if (info.taxCategoryCode) {
-                    s.value = info.taxCategoryCode;
+                  if (node.taxCategoryCode) {
+                    s.value = node.taxCategoryCode;
                   }
 
                 case 1:
@@ -26907,8 +26914,8 @@ var DrawerBody$3 = function DrawerBody(props) {
             while (1) {
               switch (_context13.prev = _context13.next) {
                 case 0:
-                  if (info.shorthand) {
-                    s.value = info.shorthand;
+                  if (node.shorthand) {
+                    s.value = node.shorthand;
                   }
 
                 case 1:
@@ -26926,24 +26933,26 @@ var DrawerBody$3 = function DrawerBody(props) {
       setOpen(false);
     }, [controller, actions]);
     var onSelect = React__default['default'].useCallback(function (key, info) {
+      var node = info.node || info;
+
       if (controller.state.goodsListState.isUpdateGoodsTaxRateList) {
-        var _info$node$taxRateLis;
+        var _node$taxRateList;
 
-        if ((_info$node$taxRateLis = info.node.taxRateList) === null || _info$node$taxRateLis === void 0 ? void 0 : _info$node$taxRateLis.length) {
-          setGoodsTaxRateList(info.node.taxRateList);
+        if ((_node$taxRateList = node.taxRateList) === null || _node$taxRateList === void 0 ? void 0 : _node$taxRateList.length) {
+          setGoodsTaxRateList(node.taxRateList);
         }
 
         if (!readOnlyTaxRate) {
           actions.setFieldState('taxRate', /*#__PURE__*/function () {
             var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
-              var _info$node$taxRateLis2;
+              var _node$taxRateList2;
 
               return _regeneratorRuntime().wrap(function _callee14$(_context14) {
                 while (1) {
                   switch (_context14.prev = _context14.next) {
                     case 0:
-                      if (info.node.taxRateList && ((_info$node$taxRateLis2 = info.node.taxRateList) === null || _info$node$taxRateLis2 === void 0 ? void 0 : _info$node$taxRateLis2.length) === 1) {
-                        s.value = info.node.taxRateList[0];
+                      if (node.taxRateList && ((_node$taxRateList2 = node.taxRateList) === null || _node$taxRateList2 === void 0 ? void 0 : _node$taxRateList2.length) === 1) {
+                        s.value = node.taxRateList[0];
                       } else {
                         s.value = undefined;
                       }
@@ -27012,6 +27021,7 @@ var DrawerBody$3 = function DrawerBody(props) {
       onSubmit: onSubmit1,
       onCancel: function onCancel() {
         setOpen(false);
+        setInfo({});
       },
       onSearch: onSearch,
       onLoad: onLoad
@@ -27626,11 +27636,11 @@ var Digtal = function Digtal(props) {
   ), /*#__PURE__*/React__default['default'].createElement(ImportGoodsDrawer, null), /*#__PURE__*/React__default['default'].createElement(EndowCodeDrawer, null));
 };
 
-var css_248z$x = ".taxdetailsbox {\n  display: flex;\n  justify-content: flex-start;\n  flex-direction: row;\n}\n.taxdetailsbox .taxrightbox {\n  width: 340px;\n  position: absolute;\n  right: 30px;\n}\n";
+var css_248z$x = ".taxdetailsbox {\n  display: flex;\n  justify-content: flex-start;\n  flex-direction: row;\n}\n.taxdetailsbox .taxrightbox {\n  width: 340px;\n  position: absolute;\n  right: 30px;\n  top: 79px;\n  bottom: 50px;\n  min-height: 300px;\n}\n.taxdetailsbox .taxrightbox .taxdesc {\n  height: calc(100vh - 323px);\n  min-height: 105px;\n  overflow: auto;\n}\n";
 styleInject(css_248z$x);
 
 function TaxClassificationModal(props) {
-  var _props$info2, _props$info3;
+  var _props$info6;
 
   var _Form$useForm = ktsXui.Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -27702,7 +27712,6 @@ function TaxClassificationModal(props) {
         return;
       }
 
-      props.onCancel && props.onCancel();
       onChildrenDrawerClose();
       props.onSubmit && props.onSubmit((_props$info = props.info) === null || _props$info === void 0 ? void 0 : _props$info.key, _objectSpread2(_objectSpread2({}, props.info), values));
     }).catch(function (errorInfo) {
@@ -27710,6 +27719,16 @@ function TaxClassificationModal(props) {
     });
   };
 
+  React__default['default'].useEffect(function () {
+    var _props$info2, _props$info3, _props$info4, _props$info5;
+
+    form.setFieldsValue(_objectSpread2(_objectSpread2({}, form.getFieldsValue()), {}, {
+      taxCategoryCode: props === null || props === void 0 ? void 0 : (_props$info2 = props.info) === null || _props$info2 === void 0 ? void 0 : _props$info2.taxCategoryCode,
+      productName: props === null || props === void 0 ? void 0 : (_props$info3 = props.info) === null || _props$info3 === void 0 ? void 0 : _props$info3.productName,
+      shorthand: props === null || props === void 0 ? void 0 : (_props$info4 = props.info) === null || _props$info4 === void 0 ? void 0 : _props$info4.shorthand,
+      taxDesc: props === null || props === void 0 ? void 0 : (_props$info5 = props.info) === null || _props$info5 === void 0 ? void 0 : _props$info5.taxDesc
+    }));
+  }, [props === null || props === void 0 ? void 0 : (_props$info6 = props.info) === null || _props$info6 === void 0 ? void 0 : _props$info6.key]);
   return /*#__PURE__*/React__default['default'].createElement(ktsXui.Drawer, {
     title: "\u5546\u54C1\u548C\u670D\u52A1\u7A0E\u6536\u5206\u7C7B\u7F16\u7801",
     placement: "right",
@@ -27755,16 +27774,10 @@ function TaxClassificationModal(props) {
   }))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Card, {
     className: "taxrightbox"
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Form, _objectSpread2(_objectSpread2({
-    form: form,
-    key: props === null || props === void 0 ? void 0 : (_props$info2 = props.info) === null || _props$info2 === void 0 ? void 0 : _props$info2.key
+    form: form
   }, layout), {}, {
     initialValues: props.info
   }), /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
-    rules: [{
-      required: true,
-      message: '请勾选税收分类编码'
-    }],
-    initialValue: (_props$info3 = props.info) === null || _props$info3 === void 0 ? void 0 : _props$info3.taxCategoryCode,
     name: "taxCategoryCode",
     label: "\u7F16\u7801"
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.FormReadOnly, null)), /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
@@ -27774,7 +27787,8 @@ function TaxClassificationModal(props) {
     name: "shorthand",
     label: "\u7B80\u79F0"
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.FormReadOnly, null)), /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
-    name: "desc",
+    name: "taxDesc",
+    className: "taxdesc",
     label: "\u8BF4\u660E"
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.FormReadOnly, null))))));
 }

package/package.json

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

package/src/Invoice/ui/default/EndowCodeDrawer/index.tsx

@@ -379,30 +379,31 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       //     s.value = info.node.taxRate
       //   }
       // });
-      
+      let node = info.node || info;
       actions.setFieldState('taxClassificationCode', async s => {
-        if(info.taxCategoryCode) {
-          s.value = info.taxCategoryCode
+        if(node.taxCategoryCode) {
+          s.value = node.taxCategoryCode
         }
       });
 
       actions.setFieldState('shorthand', async (s) => {
-        if (info.shorthand){
-          s.value = info.shorthand
+        if (node.shorthand){
+          s.value = node.shorthand
         }
       }); 
       setOpen(false);
     }, [controller, actions]);
 
     const onSelect = React.useCallback((key: any, info: any) => { 
+      let node = info.node || info;
       if (controller.state.goodsListState.isUpdateGoodsTaxRateList) {
-        if (info.node.taxRateList?.length) {
-          setGoodsTaxRateList(info.node.taxRateList);
+        if (node.taxRateList?.length) {
+          setGoodsTaxRateList(node.taxRateList);
         }
         if (!readOnlyTaxRate) {
           actions.setFieldState('taxRate', async s => {
-            if (info.node.taxRateList && info.node.taxRateList?.length === 1) {
-              s.value = info.node.taxRateList[0]
+            if (node.taxRateList && node.taxRateList?.length === 1) {
+              s.value = node.taxRateList[0]
             } else {
               s.value = undefined
             }
@@ -453,7 +454,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
           info={info}
           onSelect={onSelect}
           onSubmit={onSubmit1}
-          onCancel={()=> {setOpen(false)}}
+          onCancel={()=> {setOpen(false); setInfo({})}}
           onSearch={onSearch}
           onLoad={onLoad}
         />

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

@@ -36,7 +36,7 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
     const readOnly = React.useMemo(() => model === 'readOnly', [model]);
 
     // 注册 form
-    controller.useForm('realEstateInfo', form);
+    controller.useForm('serviceDataDtoInfo', form);
 
     return (
         <div className="kts-invoice-operate-real-estate-info-digtal">
@@ -45,10 +45,13 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                 <Col span={6} >
                     <Form.Item label='土地增值税项目编号' >
                         {getFieldDecorator('landNumber', {
+                             rules: [
+                                { max: 16, message: '最多16个字符' },
+                            ]
                         })(
                             readOnly
                                 ? <MyDiv />
-                                : <Input autoComplete='off' placeholder="请输入" />
+                                : <Input maxLength={16} autoComplete='off' placeholder="请输入" />
                         )}
                     </Form.Item>
                 </Col>

package/src/TaxClassificationCodeModal/index.less

@@ -6,5 +6,13 @@
       width: 340px;
       position: absolute;
       right: 30px; 
+      top: 79px;
+      bottom: 50px;
+      min-height: 300px;
+      .taxdesc{  
+        height: calc(100vh - 323px);
+        min-height: 105px;
+        overflow:auto
+      }
     }
   }

package/src/TaxClassificationCodeModal/index.tsx

@@ -72,14 +72,22 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
         if(!values.taxCategoryCode){
           message.warn('请选择税收分类编码');
           return; 
-        }
-        props.onCancel && props.onCancel();
+        } 
         onChildrenDrawerClose();
         props.onSubmit && props.onSubmit(props.info?.key, {...props.info,...values});
       }).catch(errorInfo => {
         console.log('errorInfo', errorInfo);
       }); 
-    } 
+    }  
+    React.useEffect(() => {
+      form.setFieldsValue({
+        ...form.getFieldsValue(),
+        taxCategoryCode: props?.info?.taxCategoryCode,
+        productName: props?.info?.productName,
+        shorthand: props?.info?.shorthand,
+        taxDesc: props?.info?.taxDesc, 
+      })
+    },[props?.info?.key])
     return (
       <Drawer
         title="商品和服务税收分类编码"
@@ -123,8 +131,8 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
             </Form.Item>
           </Form>  
           <Card className="taxrightbox">  
-            <Form form={form} key={props?.info?.key} {...layout} initialValues={props.info} >
-              <Form.Item rules={[{ required: true, message: '请勾选税收分类编码' }, ]} initialValue={props.info?.taxCategoryCode} name={"taxCategoryCode"} label="编码">
+            <Form form={form} {...layout} initialValues={props.info} >
+              <Form.Item name={"taxCategoryCode"} label="编码">
                   <FormReadOnly />
                 </Form.Item>
                 <Form.Item name={"productName"} label="货物和劳务名称">
@@ -133,7 +141,7 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
                 <Form.Item name={"shorthand"} label="简称">
                   <FormReadOnly />
                 </Form.Item> 
-                <Form.Item name={"desc"} label="说明">
+                <Form.Item name={"taxDesc"} className="taxdesc" label="说明">
                   <FormReadOnly />
                 </Form.Item> 
               </Form>