kts-component-invoice-operate 3.2.248 → 3.2.250

package/dist/index.esm.js

@@ -10294,7 +10294,8 @@ var importGoodsDrawer = /*#__PURE__*/(function () {
             between.lineAmountIncludeTax = record.lineAmountIncludeTax;
             between.lineAmountExcludeTax = record.lineAmountExcludeTax;
             between.taxRate = record.taxRate;
-            between.taxAmount = record.taxAmount; // 设置编辑货物
+            between.taxAmount = record.taxAmount;
+            between.mtzlDm = undefined; // 设置编辑货物
 
             editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
 
@@ -10325,22 +10326,41 @@ var importGoodsDrawer = /*#__PURE__*/(function () {
 
 
             if (!s.goodsListState.isTaxIncluded) {
-              _context.next = 29;
+              _context.next = 30;
               break;
             }
 
-            _context.next = 27;
+            _context.next = 28;
             return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
 
-          case 27:
-            _context.next = 31;
+          case 28:
+            _context.next = 32;
             break;
 
-          case 29:
-            _context.next = 31;
+          case 30:
+            _context.next = 32;
             return updateUnitPriceTax(controller, s.goodsListState.form, record);
 
-          case 31:
+          case 32:
+            if (!s.goodsListState.isValidateMeiTan) {
+              _context.next = 38;
+              break;
+            }
+
+            _context.next = 35;
+            return s.goodsListState.verifyMeiTanFn(record);
+
+          case 35:
+            _context.t0 = _context.sent;
+
+            if (!(_context.t0 === true)) {
+              _context.next = 38;
+              break;
+            }
+
+            s.goodsListState.meiTanGoodIndex = [editGood.$index];
+
+          case 38:
           case "end":
             return _context.stop();
         }
@@ -10388,7 +10408,8 @@ var itemBlur = /*#__PURE__*/(function () {
             // 中间数据
             between = _objectSpread2({}, record);
             between.taxClassificationCode = record.taxClassificationCode;
-            between.shorthand = record.shorthand; // 设置编辑货物
+            between.shorthand = record.shorthand;
+            between.mtzlDm = undefined; // 设置编辑货物
 
             editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between); // 导入FORM里
 
@@ -10402,22 +10423,41 @@ var itemBlur = /*#__PURE__*/(function () {
             }
 
             if (!s.goodsListState.isTaxIncluded) {
-              _context.next = 13;
+              _context.next = 14;
               break;
             }
 
-            _context.next = 11;
+            _context.next = 12;
             return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
 
-          case 11:
-            _context.next = 15;
+          case 12:
+            _context.next = 16;
             break;
 
-          case 13:
-            _context.next = 15;
+          case 14:
+            _context.next = 16;
             return updateUnitPriceTax(controller, s.goodsListState.form, record);
 
-          case 15:
+          case 16:
+            if (!s.goodsListState.isValidateMeiTan) {
+              _context.next = 22;
+              break;
+            }
+
+            _context.next = 19;
+            return s.goodsListState.verifyMeiTanFn(record);
+
+          case 19:
+            _context.t0 = _context.sent;
+
+            if (!(_context.t0 === true)) {
+              _context.next = 22;
+              break;
+            }
+
+            s.goodsListState.meiTanGoodIndex = [editGood.$index];
+
+          case 22:
           case "end":
             return _context.stop();
         }
@@ -31279,7 +31319,12 @@ var MeiTanModal = (function () {
   var _React$useState = React.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       mainOption = _React$useState2[0],
-      setMainOption = _React$useState2[1]; // 监听煤炭种类变化
+      setMainOption = _React$useState2[1];
+
+  var _React$useState3 = React.useState(null),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      subOption = _React$useState4[0],
+      setSubOption = _React$useState4[1]; // 监听煤炭种类变化
 
 
   var mtzlDm = Form$2.useWatch('mtzlDm', form);
@@ -31298,8 +31343,9 @@ var MeiTanModal = (function () {
                   mtzlDm: undefined
                 });
                 setMainOption(null);
+                setSubOption(null);
 
-              case 3:
+              case 4:
               case "end":
                 return _context.stop();
             }
@@ -31319,7 +31365,7 @@ var MeiTanModal = (function () {
 
 
   var onFinish = function onFinish(values) {
-    console.log('煤炭种类:', values);
+    // console.log('煤炭种类:', values);
     controller.pipeline( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
         var _s$goodsListState$mei;
@@ -31329,7 +31375,9 @@ var MeiTanModal = (function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                mtzl = values.mtzlDm;
+                mtzl = subOption || mainOption || undefined; //values.mtzlDm;
+
+                console.log('煤炭种类', mtzl);
                 goods = ((_s$goodsListState$mei = s.goodsListState.meiTanGoodIndex) === null || _s$goodsListState$mei === void 0 ? void 0 : _s$goodsListState$mei.map(function (e) {
                   return s.goodsListState.goodsMap.get(e);
                 })) || [];
@@ -31350,7 +31398,7 @@ var MeiTanModal = (function () {
                 s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
                 onClose();
 
-              case 7:
+              case 8:
               case "end":
                 return _context2.stop();
             }
@@ -31372,7 +31420,7 @@ var MeiTanModal = (function () {
       return Promise.reject(new Error('请选择选项')); // callback('请选择选项');
     }
 
-    if (value === '0200') {
+    if (value === '0200' && !subOption) {
       return Promise.reject(new Error('请选择长协煤的子选项'));
     }
 
@@ -31383,17 +31431,18 @@ var MeiTanModal = (function () {
     var value = e.target.value;
     setMainOption(value);
 
-    if (value === 'A' || value === 'C') {
-      form.setFieldsValue({
-        mtzlDm: value
-      });
-    } else if (value === 'B') {
-      form.setFieldsValue({
-        mtzlDm: undefined
-      }); // 清空option，等待选择子选项
+    if (value === '0100' || value === '0300') {
+      //form.setFieldsValue({ mtzlDm: value });
+      setSubOption(null);
     }
   };
 
+  var handleSubOptionChange = function handleSubOptionChange(e) {
+    var value = e.target.value;
+    setSubOption(value);
+    form.validateFields();
+  };
+
   return /*#__PURE__*/React.createElement(Modal$2, {
     title: "\u6E29\u99A8\u63D0\u793A",
     destroyOnClose: true,
@@ -31457,12 +31506,8 @@ var MeiTanModal = (function () {
       color: 'red'
     }
   }, "*"), "\u8BF7\u9009\u62E9\u534F\u8BAE\u671F\u9650\uFF1A"), /*#__PURE__*/React.createElement(Radio$1.Group, {
-    value: mtzlDm,
-    onChange: function onChange(e) {
-      return form.setFieldsValue({
-        mtzlDm: e.target.value
-      });
-    }
+    value: subOption,
+    onChange: handleSubOptionChange
   }, /*#__PURE__*/React.createElement(Space$1, {
     direction: "vertical"
   }, /*#__PURE__*/React.createElement(Radio$1, {

package/dist/index.js

@@ -10304,7 +10304,8 @@ var importGoodsDrawer = /*#__PURE__*/(function () {
             between.lineAmountIncludeTax = record.lineAmountIncludeTax;
             between.lineAmountExcludeTax = record.lineAmountExcludeTax;
             between.taxRate = record.taxRate;
-            between.taxAmount = record.taxAmount; // 设置编辑货物
+            between.taxAmount = record.taxAmount;
+            between.mtzlDm = undefined; // 设置编辑货物
 
             editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
 
@@ -10335,22 +10336,41 @@ var importGoodsDrawer = /*#__PURE__*/(function () {
 
 
             if (!s.goodsListState.isTaxIncluded) {
-              _context.next = 29;
+              _context.next = 30;
               break;
             }
 
-            _context.next = 27;
+            _context.next = 28;
             return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
 
-          case 27:
-            _context.next = 31;
+          case 28:
+            _context.next = 32;
             break;
 
-          case 29:
-            _context.next = 31;
+          case 30:
+            _context.next = 32;
             return updateUnitPriceTax(controller, s.goodsListState.form, record);
 
-          case 31:
+          case 32:
+            if (!s.goodsListState.isValidateMeiTan) {
+              _context.next = 38;
+              break;
+            }
+
+            _context.next = 35;
+            return s.goodsListState.verifyMeiTanFn(record);
+
+          case 35:
+            _context.t0 = _context.sent;
+
+            if (!(_context.t0 === true)) {
+              _context.next = 38;
+              break;
+            }
+
+            s.goodsListState.meiTanGoodIndex = [editGood.$index];
+
+          case 38:
           case "end":
             return _context.stop();
         }
@@ -10398,7 +10418,8 @@ var itemBlur = /*#__PURE__*/(function () {
             // 中间数据
             between = _objectSpread2({}, record);
             between.taxClassificationCode = record.taxClassificationCode;
-            between.shorthand = record.shorthand; // 设置编辑货物
+            between.shorthand = record.shorthand;
+            between.mtzlDm = undefined; // 设置编辑货物
 
             editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between); // 导入FORM里
 
@@ -10412,22 +10433,41 @@ var itemBlur = /*#__PURE__*/(function () {
             }
 
             if (!s.goodsListState.isTaxIncluded) {
-              _context.next = 13;
+              _context.next = 14;
               break;
             }
 
-            _context.next = 11;
+            _context.next = 12;
             return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
 
-          case 11:
-            _context.next = 15;
+          case 12:
+            _context.next = 16;
             break;
 
-          case 13:
-            _context.next = 15;
+          case 14:
+            _context.next = 16;
             return updateUnitPriceTax(controller, s.goodsListState.form, record);
 
-          case 15:
+          case 16:
+            if (!s.goodsListState.isValidateMeiTan) {
+              _context.next = 22;
+              break;
+            }
+
+            _context.next = 19;
+            return s.goodsListState.verifyMeiTanFn(record);
+
+          case 19:
+            _context.t0 = _context.sent;
+
+            if (!(_context.t0 === true)) {
+              _context.next = 22;
+              break;
+            }
+
+            s.goodsListState.meiTanGoodIndex = [editGood.$index];
+
+          case 22:
           case "end":
             return _context.stop();
         }
@@ -31289,7 +31329,12 @@ var MeiTanModal = (function () {
   var _React$useState = React__default['default'].useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       mainOption = _React$useState2[0],
-      setMainOption = _React$useState2[1]; // 监听煤炭种类变化
+      setMainOption = _React$useState2[1];
+
+  var _React$useState3 = React__default['default'].useState(null),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      subOption = _React$useState4[0],
+      setSubOption = _React$useState4[1]; // 监听煤炭种类变化
 
 
   var mtzlDm = ktsComponentsAntdX4.Form.useWatch('mtzlDm', form);
@@ -31308,8 +31353,9 @@ var MeiTanModal = (function () {
                   mtzlDm: undefined
                 });
                 setMainOption(null);
+                setSubOption(null);
 
-              case 3:
+              case 4:
               case "end":
                 return _context.stop();
             }
@@ -31329,7 +31375,7 @@ var MeiTanModal = (function () {
 
 
   var onFinish = function onFinish(values) {
-    console.log('煤炭种类:', values);
+    // console.log('煤炭种类:', values);
     controller.pipeline( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
         var _s$goodsListState$mei;
@@ -31339,7 +31385,9 @@ var MeiTanModal = (function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                mtzl = values.mtzlDm;
+                mtzl = subOption || mainOption || undefined; //values.mtzlDm;
+
+                console.log('煤炭种类', mtzl);
                 goods = ((_s$goodsListState$mei = s.goodsListState.meiTanGoodIndex) === null || _s$goodsListState$mei === void 0 ? void 0 : _s$goodsListState$mei.map(function (e) {
                   return s.goodsListState.goodsMap.get(e);
                 })) || [];
@@ -31360,7 +31408,7 @@ var MeiTanModal = (function () {
                 s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
                 onClose();
 
-              case 7:
+              case 8:
               case "end":
                 return _context2.stop();
             }
@@ -31382,7 +31430,7 @@ var MeiTanModal = (function () {
       return Promise.reject(new Error('请选择选项')); // callback('请选择选项');
     }
 
-    if (value === '0200') {
+    if (value === '0200' && !subOption) {
       return Promise.reject(new Error('请选择长协煤的子选项'));
     }
 
@@ -31393,17 +31441,18 @@ var MeiTanModal = (function () {
     var value = e.target.value;
     setMainOption(value);
 
-    if (value === 'A' || value === 'C') {
-      form.setFieldsValue({
-        mtzlDm: value
-      });
-    } else if (value === 'B') {
-      form.setFieldsValue({
-        mtzlDm: undefined
-      }); // 清空option，等待选择子选项
+    if (value === '0100' || value === '0300') {
+      //form.setFieldsValue({ mtzlDm: value });
+      setSubOption(null);
     }
   };
 
+  var handleSubOptionChange = function handleSubOptionChange(e) {
+    var value = e.target.value;
+    setSubOption(value);
+    form.validateFields();
+  };
+
   return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Modal, {
     title: "\u6E29\u99A8\u63D0\u793A",
     destroyOnClose: true,
@@ -31467,12 +31516,8 @@ var MeiTanModal = (function () {
       color: 'red'
     }
   }, "*"), "\u8BF7\u9009\u62E9\u534F\u8BAE\u671F\u9650\uFF1A"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Radio.Group, {
-    value: mtzlDm,
-    onChange: function onChange(e) {
-      return form.setFieldsValue({
-        mtzlDm: e.target.value
-      });
-    }
+    value: subOption,
+    onChange: handleSubOptionChange
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Space, {
     direction: "vertical"
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Radio, {

package/package.json

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

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

@@ -40,42 +40,139 @@ class MyInvoiceController extends InvoiceController {
       console.log(value, 'onBuyerNameBlur - Blur');
 
       return [
+        // {
+        //   "taxCategoryCode": "1030206030000000000",
+        //   "productName": "醋及醋代用品",
+        //   "shorthand": "调味品",
+        //   "id": null,
+        //   "specification": null,
+        //   "createTime": null,
+        //   "status": 1,
+        //   "versionCode": "48.0",
+        //   "version": "32.0",
+        //   "startTime": "20190401",
+        //   "endTime": null,
+        //   "cargo": null,
+        //   "desc": null,
+        //   "taxRate": "13%",
+        //   "keyword": "食醋、米醋、酒醋、啤酒醋、麦芽醋、酒精醋、水果醋、醋精",
+        //   "summarizedItem": "N",
+        //   "countCode": null,
+        //   "customsItem": null,
+        //   "updateTime": null,
+        //   "hzx": null,
+        //   "children": null,
+        //   "vatspecialManagement": "",
+        //   "pid": "1030206000000000000",
+        //   "vatpolicyBasis": null,
+        //   "vatspecialManagementCode": "",
+        //   "gstpolicyBasisCode": null,
+        //   "gstspecialManagement": null,
+        //   "gstpolicyBasis": null
+        // },
         {
-          "taxCategoryCode": "1030206030000000000",
-          "productName": "醋及醋代用品",
-          "shorthand": "调味品",
-          "id": null,
+          "attributeVOList": null,
+          "productName": '原煤',
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
           "specification": null,
-          "createTime": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.000,
+          "taxId": null,
+          "taxRate": null,
+          "brandName": null,
+          "buyGroupCode": null,
+          "buyGroupId": null,
+          "buyGroupName": null,
+          "categoryId": 2073,
+          "categoryName": "通用",
+          "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+          "createTime": "2021-09-10 15:45:43.0",
+          "enjoyPreferentialPolicies": 0,
+          "factoryCode": null,
+          "factoryId": null,
+          "factoryName": null,
+          "id": 146200,
+          "internalNumber": "发动机盖",
+          "isUalityInspection": null,
+          "name": "原煤",
+          "preferentialPoliciesType": null,
+          "priceAmount": 50,
+          "procurementCycle": 0,
+          "shorthand": "煤炭",
+          "specification": "abc",
+          "spuCode": "6000001738252675",
           "status": 1,
-          "versionCode": "48.0",
-          "version": "32.0",
-          "startTime": "20190401",
-          "endTime": null,
-          "cargo": null,
-          "desc": null,
-          "taxRate": "13%",
-          "keyword": "食醋、米醋、酒醋、啤酒醋、麦芽醋、酒精醋、水果醋、醋精",
-          "summarizedItem": "N",
-          "countCode": null,
-          "customsItem": null,
-          "updateTime": null,
-          "hzx": null,
-          "children": null,
-          "vatspecialManagement": "",
-          "pid": "1030206000000000000",
-          "vatpolicyBasis": null,
-          "vatspecialManagementCode": "",
-          "gstpolicyBasisCode": null,
-          "gstspecialManagement": null,
-          "gstpolicyBasis": null
-        }
+          "taxCategoryCode": "1020101000000000000",
+          "taxExemptionType": "",
+          "taxId": 11,
+          "taxRate": null,
+          "unitId": 30,
+          "unitName": "件",
+          "itemType": "通用",
+          "itemNo": "6000001738252675",
+          "itemName": "原煤",
+          "itemCode": "123123",
+          "itemModelName": "abc",
+          "unit": "件",
+          "priceIncludeTax": 50,
+          "priceExcludeTax": 50,
+          "taxClassificationCode": "1020101000000000000"
+        },
       ]
     };
 
     this.state.autoComplete.onItemNameSearch = async (value: any) => {
       console.log('===> onItemNameSearch')
       const data = [
+         {
+          "attributeVOList": null,
+          "productName": '原煤',
+          "brandName": null,
+          "buyGroupCode": null,
+          "buyGroupId": null,
+          "buyGroupName": null,
+          "categoryId": 2073,
+          "categoryName": "通用",
+          "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+          "createTime": "2021-09-10 15:45:43.0",
+          "enjoyPreferentialPolicies": 0,
+          "factoryCode": null,
+          "factoryId": null,
+          "factoryName": null,
+          "id": 146200,
+          "internalNumber": "发动机盖",
+          "isUalityInspection": null,
+          "name": "原煤",
+          "preferentialPoliciesType": null,
+          "priceAmount": 50,
+          "procurementCycle": 0,
+          "shorthand": "发动机",
+          "specification": "abc",
+          "spuCode": "6000001738252675",
+          "status": 1,
+          "taxCategoryCode": "1020101000000000000",
+          "taxExemptionType": "",
+          "taxId": 11,
+          "taxRate": null,
+          "unitId": 30,
+          "unitName": "件",
+          "itemType": "通用",
+          "itemNo": "6000001738252675",
+          "itemName": "原煤",
+          "itemCode": "123123",
+          "itemModelName": "abc",
+          "unit": "件",
+          "priceIncludeTax": 50,
+          "priceExcludeTax": 50,
+          "taxClassificationCode": "1020101000000000000"
+        },
         {
           "taxCategoryCode": "1090111090000000000",
           "productName": "uuuuuu",

package/src/Invoice/InvoiceController/fns/importGoodsDrawer.ts

@@ -6,7 +6,7 @@ import { countAmountIncludeTax } from '../../tools/calculate';
 /**
  * 删除一个货物
  */
-export default async (s: InvoiceControllerState, record: any, controller:any) => {
+export default async (s: InvoiceControllerState, record: any, controller: any) => {
     Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
 
     // 没用 被编辑的货物 和 form 就退出
@@ -18,7 +18,7 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
     record.lineAmountIncludeTax = undefined;
 
     // 中间数据
-    const between: any = {...record };
+    const between: any = { ...record };
 
     between.itemCode = record.itemCode;
     between.shorthand = record.shorthand;
@@ -32,6 +32,7 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
     between.lineAmountExcludeTax = record.lineAmountExcludeTax;
     between.taxRate = record.taxRate;
     between.taxAmount = record.taxAmount;
+    between.mtzlDm = undefined;
 
     // 设置编辑货物
     const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
@@ -68,6 +69,12 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
     s.goodsListState.isTaxIncluded
         ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
         : await updateUnitPriceTax(controller, s.goodsListState.form, record)
+
+    if (s.goodsListState.isValidateMeiTan) {
+        if (await s.goodsListState.verifyMeiTanFn(record) === true) {
+            s.goodsListState.meiTanGoodIndex = [editGood.$index];
+        }
+    }
 }
 
 /** 货物单价，不含税 */

package/src/Invoice/InvoiceController/fns/itemBlur.ts

@@ -4,17 +4,18 @@ import { InvoiceControllerState, IGood } from '../';
 /**
  * 项目名称智能赋码
  */
-export default async (s: InvoiceControllerState, record: any, controller:any) => {
+export default async (s: InvoiceControllerState, record: any, controller: any) => {
     Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
 
     // 没用 被编辑的货物 和 form 就退出
     if (!s.goodsListState.editGood || !s.goodsListState.form) return;
 
     // 中间数据
-    const between: any = {...record };
+    const between: any = { ...record };
 
     between.taxClassificationCode = record.taxClassificationCode;
     between.shorthand = record.shorthand;
+    between.mtzlDm = undefined;
 
     // 设置编辑货物
     const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
@@ -35,6 +36,12 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
     s.goodsListState.isTaxIncluded
         ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
         : await updateUnitPriceTax(controller, s.goodsListState.form, record)
+        
+    if (s.goodsListState.isValidateMeiTan) {
+        if (await s.goodsListState.verifyMeiTanFn(record) === true) {
+            s.goodsListState.meiTanGoodIndex = [editGood.$index];
+        }
+    }
 }
 
 

package/src/Invoice/_test/importGoods/index.tsx

@@ -28,39 +28,94 @@ class MyInvoiceController extends InvoiceController {
     this.state.autoComplete.onItemNameBlur = async (value: any) => {
       console.log(value, 'onBuyerNameBlur - Blur');
 
-      return new Promise((resolve, reject)=> {
-          resolve([
-            {
-              "taxCategoryCode": "1030206030000000000",
-              "productName": "醋及醋代用品",
-              "shorthand": "调味品",
-              "id": null,
-              "specification": null,
-              "createTime": null,
-              "status": 1,
-              "versionCode": "48.0",
-              "version": "32.0",
-              "startTime": "20190401",
-              "endTime": null,
-              "cargo": null,
-              "desc": null,
-              "taxRate": "13%",
-              "keyword": "食醋、米醋、酒醋、啤酒醋、麦芽醋、酒精醋、水果醋、醋精",
-              "summarizedItem": "N",
-              "countCode": null,
-              "customsItem": null,
-              "updateTime": null,
-              "hzx": null,
-              "children": null,
-              "vatspecialManagement": "",
-              "pid": "1030206000000000000",
-              "vatpolicyBasis": null,
-              "vatspecialManagementCode": "",
-              "gstpolicyBasisCode": null,
-              "gstspecialManagement": null,
-              "gstpolicyBasis": null
-            }
-          ]);
+      return new Promise((resolve, reject) => {
+        resolve([
+          // {
+          //   "taxCategoryCode": "1030206030000000000",
+          //   "productName": "醋及醋代用品",
+          //   "shorthand": "调味品",
+          //   "id": null,
+          //   "specification": null,
+          //   "createTime": null,
+          //   "status": 1,
+          //   "versionCode": "48.0",
+          //   "version": "32.0",
+          //   "startTime": "20190401",
+          //   "endTime": null,
+          //   "cargo": null,
+          //   "desc": null,
+          //   "taxRate": "13%",
+          //   "keyword": "食醋、米醋、酒醋、啤酒醋、麦芽醋、酒精醋、水果醋、醋精",
+          //   "summarizedItem": "N",
+          //   "countCode": null,
+          //   "customsItem": null,
+          //   "updateTime": null,
+          //   "hzx": null,
+          //   "children": null,
+          //   "vatspecialManagement": "",
+          //   "pid": "1030206000000000000",
+          //   "vatpolicyBasis": null,
+          //   "vatspecialManagementCode": "",
+          //   "gstpolicyBasisCode": null,
+          //   "gstspecialManagement": null,
+          //   "gstpolicyBasis": null
+          // },
+          {
+          "attributeVOList": null,
+          "productName": '原煤',
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.000,
+          "taxId": null,
+          "taxRate": null,
+          "brandName": null,
+          "buyGroupCode": null,
+          "buyGroupId": null,
+          "buyGroupName": null,
+          "categoryId": 2073,
+          "categoryName": "通用",
+          "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+          "createTime": "2021-09-10 15:45:43.0",
+          "enjoyPreferentialPolicies": 0,
+          "factoryCode": null,
+          "factoryId": null,
+          "factoryName": null,
+          "id": 146200,
+          "internalNumber": "发动机盖",
+          "isUalityInspection": null,
+          "name": "原煤",
+          "preferentialPoliciesType": null,
+          "priceAmount": 50,
+          "procurementCycle": 0,
+          "shorthand": "煤炭",
+          "specification": "abc",
+          "spuCode": "6000001738252675",
+          "status": 1,
+          "taxCategoryCode": "1020101000000000000",
+          "taxExemptionType": "",
+          "taxId": 11,
+          "taxRate": null,
+          "unitId": 30,
+          "unitName": "件",
+          "itemType": "通用",
+          "itemNo": "6000001738252675",
+          "itemName": "原煤",
+          "itemCode": "123123",
+          "itemModelName": "abc",
+          "unit": "件",
+          "priceIncludeTax": 50,
+          "priceExcludeTax": 50,
+          "taxClassificationCode": "1020101000000000000"
+        },
+        ]);
 
       });
       //
@@ -127,19 +182,74 @@ class MyInvoiceController extends InvoiceController {
           "specialGoodsMark": "",
           "createTime": "2023-03-22 17:09:32",
           "updateTime": "2023-03-22 17:09:32"
-        }
+        },
+        {
+          "attributeVOList": null,
+          "productName": '原煤',
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.000,
+          "taxId": null,
+          "taxRate": null,
+          "brandName": null,
+          "buyGroupCode": null,
+          "buyGroupId": null,
+          "buyGroupName": null,
+          "categoryId": 2073,
+          "categoryName": "通用",
+          "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+          "createTime": "2021-09-10 15:45:43.0",
+          "enjoyPreferentialPolicies": 0,
+          "factoryCode": null,
+          "factoryId": null,
+          "factoryName": null,
+          "id": 146200,
+          "internalNumber": "发动机盖",
+          "isUalityInspection": null,
+          "name": "原煤",
+          "preferentialPoliciesType": null,
+          "priceAmount": 50,
+          "procurementCycle": 0,
+          "shorthand": "煤炭",
+          "specification": "abc",
+          "spuCode": "6000001738252675",
+          "status": 1,
+          "taxCategoryCode": "1020101000000000000",
+          "taxExemptionType": "",
+          "taxId": 11,
+          "taxRate": null,
+          "unitId": 30,
+          "unitName": "件",
+          "itemType": "通用",
+          "itemNo": "6000001738252675",
+          "itemName": "原煤",
+          "itemCode": "123123",
+          "itemModelName": "abc",
+          "unit": "件",
+          "priceIncludeTax": 50,
+          "priceExcludeTax": 50,
+          "taxClassificationCode": "1020101000000000000"
+        },
       ];
 
-      return data.map((item: any) =>{
+      return data.map((item: any) => {
         return {
           ...data,
-          itemName:item.productName,
-          taxClassificationCode:item.taxCategoryCode,
-          itemModelName:item.specification,
-          shorthand:item.shorthand,
-          priceIncludeTax:item.priceAmount,
-          unit:item.unitName,
-          taxRate:item.taxRate,
+          itemName: item.productName,
+          taxClassificationCode: item.taxCategoryCode,
+          itemModelName: item.specification,
+          shorthand: item.shorthand,
+          priceIncludeTax: item.priceAmount,
+          unit: item.unitName,
+          taxRate: item.taxRate,
         }
       })
     };
@@ -147,7 +257,7 @@ class MyInvoiceController extends InvoiceController {
     this.state.goodsListState.endowCode.onSearchTaxClassificationCode = async (value: any) => {
       console.log(value, 'value-onSearchTaxClassificationCode');
 
-      if(value === '1020199000000000000') {
+      if (value === '1020199000000000000') {
         return [
           {
             "taxCategoryCode": "1020199000000000000",
@@ -217,7 +327,7 @@ class MyInvoiceController extends InvoiceController {
 
     this.state.goodsListState.endowCode.onLoadTaxClassificationCode = async (value: any) => {
       console.log(value, 'value-onSearchTaxClassificationCode');
-      if(value === '1020199000000000000') {
+      if (value === '1020199000000000000') {
         return [
           {
             "taxCategoryCode": "1020199000000000000",
@@ -251,7 +361,7 @@ class MyInvoiceController extends InvoiceController {
           },
         ]
       }
-      if(value === '3000000000000000000') {
+      if (value === '3000000000000000000') {
         return [
           {
             "taxCategoryCode": "3060000000000000000",
@@ -464,7 +574,7 @@ class MyInvoiceController extends InvoiceController {
             "gstpolicyBasis": null
           }
         ]
-      } else if(value === '3060000000000000000') {
+      } else if (value === '3060000000000000000') {
         return [
           {
             "taxCategoryCode": "3060100000000000000",
@@ -587,7 +697,7 @@ class MyInvoiceController extends InvoiceController {
             "gstpolicyBasis": null
           }
         ]
-      }else {
+      } else {
         return [
           {
             "taxCategoryCode": "3000000000000000000",
@@ -929,7 +1039,7 @@ const getMok = async (current: number = 1) => {
       "taxCategoryCode": "1010301010000000000",
       "taxExemptionType": "1",
       "taxId": 1,
-      "taxRate":null,
+      "taxRate": null,
       "unitId": null,
       "unitName": null,
       "itemType": "通用",
@@ -969,7 +1079,7 @@ const getMok = async (current: number = 1) => {
       "taxCategoryCode": null,
       "taxExemptionType": null,
       "taxId": null,
-      "taxRate":null,
+      "taxRate": null,
       "unitId": 362,
       "unitName": "年",
       "itemType": "分类cc>1",
@@ -1009,7 +1119,7 @@ const getMok = async (current: number = 1) => {
       "taxCategoryCode": "1060301020100000000",
       "taxExemptionType": null,
       "taxId": null,
-      "taxRate":null,
+      "taxRate": null,
       "unitId": null,
       "unitName": null,
       "itemType": "通用",
@@ -1049,7 +1159,7 @@ const getMok = async (current: number = 1) => {
       "taxCategoryCode": "1010107010000000000",
       "taxExemptionType": "3",
       "taxId": 1,
-      "taxRate":null,
+      "taxRate": null,
       "unitId": 32,
       "unitName": "把",
       "itemType": "通用",
@@ -1089,7 +1199,7 @@ const getMok = async (current: number = 1) => {
       "taxCategoryCode": "1000000000000000000",
       "taxExemptionType": null,
       "taxId": null,
-      "taxRate":null,
+      "taxRate": null,
       "unitId": 11,
       "unitName": "包",
       "itemType": "通用",
@@ -1129,7 +1239,7 @@ const getMok = async (current: number = 1) => {
       "taxCategoryCode": "233WD5FG00911",
       "taxExemptionType": null,
       "taxId": null,
-      "taxRate":null,
+      "taxRate": null,
       "unitId": 11,
       "unitName": "包",
       "itemType": "通用",
@@ -1169,7 +1279,7 @@ const getMok = async (current: number = 1) => {
       "taxCategoryCode": "233WD5FG00911",
       "taxExemptionType": null,
       "taxId": null,
-      "taxRate":null,
+      "taxRate": null,
       "unitId": 11,
       "unitName": "包",
       "itemType": "通用",
@@ -1209,7 +1319,7 @@ const getMok = async (current: number = 1) => {
       "taxCategoryCode": "233WD5FG00911",
       "taxExemptionType": null,
       "taxId": null,
-      "taxRate":null,
+      "taxRate": null,
       "unitId": 11,
       "unitName": "包",
       "itemType": "通用",

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

@@ -12,6 +12,7 @@ export default () => {
   const [form] = Form.useForm();
 
   const [mainOption, setMainOption] = React.useState(null);
+  const [subOption, setSubOption] = React.useState(null);
   // 监听煤炭种类变化
   const mtzlDm = Form.useWatch('mtzlDm', form);
 
@@ -22,6 +23,7 @@ export default () => {
       s.goodsListState.meiTanGoodIndex = [];
       form.setFieldsValue({ mtzlDm: undefined });
       setMainOption(null);
+      setSubOption(null);
     })();
   }, [controller]);
 
@@ -32,10 +34,11 @@ export default () => {
 
   // 表单
   const onFinish = (values: any) => {
-    console.log('煤炭种类:', values);
+    // console.log('煤炭种类:', values);
 
     controller.pipeline(async (s) => {
-      const mtzl = values.mtzlDm;
+      const mtzl = subOption || mainOption || undefined; //values.mtzlDm;
+      console.log('煤炭种类', mtzl)
       const goods = s.goodsListState.meiTanGoodIndex?.map(e => s.goodsListState.goodsMap.get(e)) || [];
       const editGood = s.goodsListState.editGood;
       const editGoodIndex = editGood?.$index;
@@ -55,14 +58,14 @@ export default () => {
   };
 
   // 自定义校验规则
-  const validateOption = (_:any, value: any, callback: any) => {
+  const validateOption = (_: any, value: any, callback: any) => {
     console.log('自定义校验规则:', value);
     if (!value) {
       return Promise.reject(new Error('请选择选项'));
       // callback('请选择选项');
     }
 
-    if (value === '0200') {
+    if (value === '0200' && !subOption) {
       return Promise.reject(new Error('请选择长协煤的子选项'));
     }
 
@@ -72,13 +75,21 @@ export default () => {
   const handleMainOptionChange = (e: any) => {
     const value = e.target.value;
     setMainOption(value);
-    if (value === 'A' || value === 'C') {
-      form.setFieldsValue({ mtzlDm: value });
-    } else if (value === 'B') {
-      form.setFieldsValue({ mtzlDm: undefined }); // 清空option，等待选择子选项
+    if (value === '0100' || value === '0300') {
+      //form.setFieldsValue({ mtzlDm: value });
+      setSubOption(null);
+    } else if (value === '0200') {
+      //form.setFieldsValue({ mtzlDm: undefined }); // 清空option，等待选择子选项
+      // setSubOption(null);
     }
   };
 
+  const handleSubOptionChange = (e: any) => {
+    const value = e.target.value;
+    setSubOption(value);
+    form.validateFields();
+  };
+
   return (
     <Modal
       title="温馨提示"
@@ -132,7 +143,7 @@ export default () => {
                         <div style={{ marginBottom: 8, color: '#666', fontSize: 14 }}>
                           <span style={{ color: 'red' }}>*</span>请选择协议期限：
                         </div>
-                        <Radio.Group value={mtzlDm} onChange={(e) => form.setFieldsValue({ mtzlDm: e.target.value })}>
+                        <Radio.Group value={subOption} onChange={handleSubOptionChange}>
                           <Space direction="vertical">
                             <Radio value="0201">协议期不足半年</Radio>
                             <Radio value="0202">协议期在半年至一年之间</Radio>