tplus-components-touch 3.39.6 → 3.39.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -96,7 +96,7 @@ var _default = (0, _mobxReact.observer)(_class = function (_React$Component) {
|
|
|
96
96
|
|
|
97
97
|
var viewInfo = this.props.viewInfo;
|
|
98
98
|
// const { getFieldProps, getFieldError,setFieldsValue } = this.props.form;
|
|
99
|
-
var isShouldUseAndroidKeyBoard = viewInfo.Title == '会员姓名';
|
|
99
|
+
var isShouldUseAndroidKeyBoard = viewInfo.Title == '会员姓名' || viewInfo.Title == '收货人' || viewInfo.Title == '详细地址';
|
|
100
100
|
|
|
101
101
|
var _this = this;
|
|
102
102
|
return _react2.default.createElement(
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["tplus-components-touch/components/commonForm/formControl/index.js"],"names":["FormItem","Item","observer","props","context","useKb","setFieldsValue","form","current","viewInfo","_this","Keyboard","close","changeVal","open","v","value","getNewValue","input","changed","state","isShouldUseAndroidKeyBoard","Title","required","AllowNone","message","Format","ReadOnly","el","MaxLength","React","Component"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AAGA;;;;AACA;;;;AAEA;;;;AAJA,IAAMA,WAAW,eAAKC,IAAtB;AAGA;;mBAECC,mB;;;AAGG,sBAAYC,KAAZ,EAAkBC,OAAlB,EAA0B;AAAA;;AAAA,+IAChBD,KADgB;;AAAA,eAO1BE,KAP0B,GAOpB,YAAI;AAAA,gBACEC,cADF,GACqB,OAAKH,KAAL,CAAWI,IAAX,CAAgBC,OADrC,CACEF,cADF;;AAEN,gBAAIG,WAAU,OAAKN,KAAL,CAAWM,QAAzB;AACA,gBAAMC,cAAN;AACAC,+BAASC,KAAT;AAJM,gBAKEC,SALF,GAKgB,OAAKV,KALrB,CAKEU,SALF;;AAMNF,+BAASG,IAAT,CAAc,UAACC,CAAD,EAAK;AACf,oBAAIC,QAAML,mBAASM,WAAT,CAAqBP,MAAMQ,KAAN,CAAYA,KAAjC,EAAuCR,MAAMQ,KAAN,CAAYA,KAAZ,CAAkBF,KAAzD,EAA+DD,CAA/D,CAAV;AACA,oBAAMI,UAAU,EAAhB;AACAA,wBAAQV,SAAS,WAAT,CAAR,IAA+BO,KAA/B;AACAV,+BAAea,OAAf;AACAN,6BAAaA,UAAUM,OAAV,CAAb;AACH,aAND;AAOH,SApByB;;AAEtB,eAAKC,KAAL,GAAW;AACPJ,mBAAM;AADC,SAAX;AAFsB;AAKzB;;;;iCAiBO;AAAA;;AACJ,gBAAIP,WAAU,KAAKN,KAAL,CAAWM,QAAzB;AACA;AACA,gBAAMY,6BAA8BZ,SAASa,KAAT,IAAkB,
|
|
1
|
+
{"version":3,"sources":["tplus-components-touch/components/commonForm/formControl/index.js"],"names":["FormItem","Item","observer","props","context","useKb","setFieldsValue","form","current","viewInfo","_this","Keyboard","close","changeVal","open","v","value","getNewValue","input","changed","state","isShouldUseAndroidKeyBoard","Title","required","AllowNone","message","Format","ReadOnly","el","MaxLength","React","Component"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AAGA;;;;AACA;;;;AAEA;;;;AAJA,IAAMA,WAAW,eAAKC,IAAtB;AAGA;;mBAECC,mB;;;AAGG,sBAAYC,KAAZ,EAAkBC,OAAlB,EAA0B;AAAA;;AAAA,+IAChBD,KADgB;;AAAA,eAO1BE,KAP0B,GAOpB,YAAI;AAAA,gBACEC,cADF,GACqB,OAAKH,KAAL,CAAWI,IAAX,CAAgBC,OADrC,CACEF,cADF;;AAEN,gBAAIG,WAAU,OAAKN,KAAL,CAAWM,QAAzB;AACA,gBAAMC,cAAN;AACAC,+BAASC,KAAT;AAJM,gBAKEC,SALF,GAKgB,OAAKV,KALrB,CAKEU,SALF;;AAMNF,+BAASG,IAAT,CAAc,UAACC,CAAD,EAAK;AACf,oBAAIC,QAAML,mBAASM,WAAT,CAAqBP,MAAMQ,KAAN,CAAYA,KAAjC,EAAuCR,MAAMQ,KAAN,CAAYA,KAAZ,CAAkBF,KAAzD,EAA+DD,CAA/D,CAAV;AACA,oBAAMI,UAAU,EAAhB;AACAA,wBAAQV,SAAS,WAAT,CAAR,IAA+BO,KAA/B;AACAV,+BAAea,OAAf;AACAN,6BAAaA,UAAUM,OAAV,CAAb;AACH,aAND;AAOH,SApByB;;AAEtB,eAAKC,KAAL,GAAW;AACPJ,mBAAM;AADC,SAAX;AAFsB;AAKzB;;;;iCAiBO;AAAA;;AACJ,gBAAIP,WAAU,KAAKN,KAAL,CAAWM,QAAzB;AACA;AACA,gBAAMY,6BAA8BZ,SAASa,KAAT,IAAkB,MAAlB,IAA4Bb,SAASa,KAAT,IAAkB,KAA9C,IAAuDb,SAASa,KAAT,IAAkB,MAA7G;;AAEA,gBAAMZ,QAAM,IAAZ;AACA,mBACI;AAAC,wBAAD;AAAA,kBAAU,OAAOD,SAASa,KAA1B,EAAiC,MAAMb,SAAS,WAAT,CAAvC,EAA8D,OAAO,CAAC,EAACc,UAAU,CAACd,SAASe,SAArB,EAAgCC,SAAS;AAAA;AAAA;AAAM,0DAAC,eAAD,IAAO,MAAK,QAAZ,GAAN;AAA4B;AAAA;AAAA;AAAA;AAAUhB,yCAASa;AAAnB;AAA5B,yBAAzC,EAAD,CAArE;AACI;AACI,iCAAY,EADhB;AAEI,0BAAMb,SAASiB,MAAT,KAAkB,UAAlB,GAA6B,UAA7B,GAAwC,MAFlD;AAGI,8BAAUjB,SAASkB,QAHvB;AAII,yBAAK,aAACC,EAAD,EAAM;AACPlB,8BAAMQ,KAAN,GAAcU,EAAd;AACH,qBANL;AAOI,qCAAgBP,6BAA2B,wBAA3B,GAAoD,EAApE,CAPJ;AAQI,6BAAS,mBAAI;AACT,+BAAKhB,KAAL;AACH,qBAVL;AAWI,+BAAWI,SAASoB,SAAT,IAAsB;AACjC;AACA;AACA;AACA;AACA;AACA;AAjBJ,sBAkBI,QAAQ,kBAAI;AAAElB,2CAASC,KAAT;AAAkB;AAlBpC;AADJ,aADJ;AAwBH;;;EAtDwBkB,gBAAMC,S","file":"index.js","sourcesContent":["import React from 'react';\nimport { Input, Form } from 'antd';\nconst FormItem = Form.Item;\nimport Ticon from '../../ticon';\nimport Keyboard from '../../keyboard';\n// import './style.less';\nimport {observer} from 'mobx-react';\n@observer\nexport default class extends React.Component{\n\n constructor(props,context){\n super(props)\n this.state={\n value:11\n }\n }\n\n useKb=()=>{\n const { setFieldsValue } = this.props.form.current;\n let viewInfo= this.props.viewInfo;\n const _this=this;\n Keyboard.close();\n const { changeVal } = this.props;\n Keyboard.open((v)=>{\n let value=Keyboard.getNewValue(_this.input.input,_this.input.input.value,v);\n const changed = {}\n changed[viewInfo['FieldName']]=value;\n setFieldsValue(changed);\n changeVal && changeVal(changed)\n })()\n }\n\n render(){\n let viewInfo= this.props.viewInfo;\n // const { getFieldProps, getFieldError,setFieldsValue } = this.props.form;\n const isShouldUseAndroidKeyBoard = viewInfo.Title == '会员姓名' || viewInfo.Title == '收货人' || viewInfo.Title == '详细地址';\n\n const _this=this;\n return (\n <FormItem label={viewInfo.Title} name={viewInfo['FieldName']} rules={[{required: !viewInfo.AllowNone, message: <span><Ticon type=\"tanhao\"/><span>请输入{viewInfo.Title}</span></span>}]} >\n <Input\n placeholder=\"\"\n type={viewInfo.Format==='PassWord'?'password':'text'}\n disabled={viewInfo.ReadOnly}\n ref={(el)=>{\n _this.input = el;\n }}\n className = {`${isShouldUseAndroidKeyBoard?'android_focus_keyboard':''}`}\n onFocus={()=>{\n this.useKb()\n }}\n maxLength={viewInfo.MaxLength || '-'}\n // suffix={\n // <Ticon type='jianpan2' onClick={()=>{\n // _this.input.input.focus();\n // }}\n // ></Ticon>\n // }\n onBlur={()=>{ Keyboard.close();}}\n />\n </FormItem>\n )\n }\n}\n"]}
|
|
@@ -463,17 +463,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
463
463
|
} else {
|
|
464
464
|
item.badge = { text: '', position: '', className: '' };
|
|
465
465
|
}
|
|
466
|
-
if (!item.IsPresent) {
|
|
467
|
-
discountRetailTotalAount += item.RetailPrice * item.Quantity;
|
|
468
|
-
}
|
|
469
466
|
if (item.PromotionDetails && item.PromotionDetails.length > 0) {
|
|
470
467
|
count++;
|
|
471
468
|
}
|
|
472
469
|
item.InventoryName = item.Inventory.Name;
|
|
473
470
|
item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
|
|
474
|
-
|
|
471
|
+
if (!item.IsPresent) {
|
|
472
|
+
discountPrototypeTotalAmount += item.DetailDiscountAmount;
|
|
473
|
+
item.TotalDiscount = item.DetailDiscountAmount;
|
|
474
|
+
} else {
|
|
475
|
+
item.TotalDiscount = 0;
|
|
476
|
+
}
|
|
475
477
|
//item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
|
|
476
|
-
item.TotalDiscount = item.DetailDiscountAmount;
|
|
477
478
|
item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
|
|
478
479
|
item.UnitName = item.Unit.Name;
|
|
479
480
|
item.nQuantity = (0, _utils.getRoundValue)(item.Quantity, quantityPrecision);
|
|
@@ -484,7 +485,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
484
485
|
dataSource: dataSource,
|
|
485
486
|
discountTotalAmount: (0, _utils.getFixedNumber)(_this2.props.amount),
|
|
486
487
|
discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountPrototypeTotalAmount),
|
|
487
|
-
discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + discountPrototypeTotalAmount)
|
|
488
|
+
discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + parseFloat(discountPrototypeTotalAmount))
|
|
488
489
|
});
|
|
489
490
|
return count;
|
|
490
491
|
};
|
|
@@ -1216,10 +1217,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
1216
1217
|
};
|
|
1217
1218
|
|
|
1218
1219
|
_this2.onTabsClick = function (key, bookType) {
|
|
1220
|
+
var _this2$store3 = _this2.store,
|
|
1221
|
+
paymode = _this2$store3.paymode,
|
|
1222
|
+
brefund = _this2$store3.brefund,
|
|
1223
|
+
boriginReturn = _this2$store3.boriginReturn;
|
|
1224
|
+
|
|
1219
1225
|
var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
|
|
1220
1226
|
PayStyle = _enumController$getEn9.PayStyle,
|
|
1221
1227
|
Differentiate = _enumController$getEn9.Differentiate;
|
|
1222
1228
|
|
|
1229
|
+
if (key === PayStyle.djq && Math.Minus(paymode.received, paymode.amount) > 0) {
|
|
1230
|
+
_modalWraper2.default.info({
|
|
1231
|
+
title: '提示',
|
|
1232
|
+
content: '实收金额已大于应收金额，不允许使用优惠券',
|
|
1233
|
+
okText: '确定',
|
|
1234
|
+
okType: 'primary'
|
|
1235
|
+
});
|
|
1236
|
+
return;
|
|
1237
|
+
}
|
|
1223
1238
|
if (key === PayStyle.hyczk) {
|
|
1224
1239
|
var isProhibitMeStorageCard = _this2.props.isProhibitMeStorageCard;
|
|
1225
1240
|
|
|
@@ -1232,10 +1247,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
1232
1247
|
var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
|
|
1233
1248
|
MultiPay = _enumController$getEn10.MultiPay;
|
|
1234
1249
|
|
|
1235
|
-
var _this2$store3 = _this2.store,
|
|
1236
|
-
paymode = _this2$store3.paymode,
|
|
1237
|
-
brefund = _this2$store3.brefund,
|
|
1238
|
-
boriginReturn = _this2$store3.boriginReturn;
|
|
1239
1250
|
var noAlreadyWarn = _this2.state.noAlreadyWarn;
|
|
1240
1251
|
|
|
1241
1252
|
if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
|
|
@@ -1722,6 +1733,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
1722
1733
|
|
|
1723
1734
|
_modalWraper2.default.confirm({
|
|
1724
1735
|
className: 'tplus-confirm-modal',
|
|
1736
|
+
zIndex: 1007,
|
|
1725
1737
|
content: _react2.default.createElement(
|
|
1726
1738
|
'div',
|
|
1727
1739
|
{ className: 'unReturn' },
|