diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/common/vendor.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/common/vendor.js
index 26ee969..a5f9d38 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -10058,8 +10058,8 @@ var ENV_CONFIG = {
// 正式环境
production: {
name: '正式环境',
- apiBaseUrl: 'http://erp_test.lvqianmeiye.com',
- // apiBaseUrl: 'https://erp.lvqianmeiye.com',
+ // apiBaseUrl: 'http://erp_test.lvqianmeiye.com',
+ apiBaseUrl: 'https://erp.lvqianmeiye.com',
// apiBaseUrl: 'http://lvqian.antissoft.com',
description: '生产环境服务器'
}
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/components/SignaturePad.wxml b/绿纤uni-app/unpackage/dist/dev/mp-weixin/components/SignaturePad.wxml
index e3c5e5a..f1b083f 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/components/SignaturePad.wxml
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/components/SignaturePad.wxml
@@ -1 +1 @@
-{{infoTitle}}{{item.name}}{{item.type}}{{"数量:"+item.count}}{{amountLabel+":"}}{{"¥"+(pxInfo.actualPrice||'0.00')}}离店前,请检查一下是否带好了:手机、钥匙、钱包和那份美丽的心情。请在上方区域进行签字
\ No newline at end of file
+{{infoTitle}}{{item.name}}{{item.type}}{{"数量:"+item.count}}{{amountLabel+":"}}{{"¥"+(pxInfo.actualPrice||'0.00')}}离店前,请检查一下是否带好了:手机、钥匙、钱包和那份美丽的心情。请在上方区域进行签字
\ No newline at end of file
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/purchase-list/purchase-list.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/purchase-list/purchase-list.js
index 70418e3..e414c2f 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/purchase-list/purchase-list.js
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/purchase-list/purchase-list.js
@@ -453,9 +453,14 @@ var _default = {
params = {
currentPage: _this2.currentPage,
pageSize: _this2.pageSize
- }; // 添加门店过滤(默认当前登录人的门店)
- // params.createUserStoreId = this.newuserInfo&&this.newuserInfo.mdid?this.newuserInfo.mdid:'暂无'
- params.createUser = _this2.newuserInfo && _this2.newuserInfo.id ? _this2.newuserInfo.id : '暂无';
+ };
+ if (_this2.newuserInfo.gw == '店助' || _this2.newuserInfo.gw == '店长') {
+ params.createUserStoreId = _this2.newuserInfo && _this2.newuserInfo.mdid ? _this2.newuserInfo.mdid : '暂无';
+ } else {
+ if (_this2.userInfo && _this2.userInfo.userId) {
+ params.createUser = _this2.newuserInfo && _this2.newuserInfo.id ? _this2.newuserInfo.id : '暂无';
+ }
+ }
// 添加购买时间范围参数
if (_this2.dateRange && _this2.dateRange.length === 2) {
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js
index bad1bb6..a7aa318 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js
@@ -2422,14 +2422,14 @@ var _default = {
submitOrder: function submitOrder() {
var _this22 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() {
- var totalPxPrice, i, px, orderData, syamount, supplementinfo, result, jsj, _totalPxPrice, _i4, _px3, hyqz, memberinfo, kdrqValue, _orderData, _result;
+ var totalPxPrice, i, px, zdyjRounded, totalPxPriceRounded, orderData, syamount, supplementinfo, result, jsj, _totalPxPrice, _i4, _px3, _zdyjRounded, _totalPxPriceRounded, hyqz, memberinfo, kdrqValue, _orderData, _result;
return _regenerator.default.wrap(function _callee22$(_context22) {
while (1) {
switch (_context22.prev = _context22.next) {
case 0:
_context22.prev = 0;
if (!_this22.removeid) {
- _context22.next = 40;
+ _context22.next = 41;
break;
}
console.log(_objectSpread({}, _this22.formData));
@@ -2456,19 +2456,22 @@ var _default = {
px = _this22.pxList[i];
totalPxPrice += parseFloat(px.actualPrice) || 0;
}
- console.error(totalPxPrice, _this22.formData.zdyj);
- if (!(Number(_this22.formData.zdyj) < totalPxPrice)) {
- _context22.next = 15;
+ // 将两个值都四舍五入到两位小数后再比较,避免浮点数精度问题
+ zdyjRounded = Math.round(Number(_this22.formData.zdyj) * 100) / 100;
+ totalPxPriceRounded = Math.round(totalPxPrice * 100) / 100;
+ if (!(zdyjRounded < totalPxPriceRounded)) {
+ _context22.next = 16;
break;
}
uni.showToast({
- title: '整单业绩要大于等于品项之和的总价',
- icon: 'none'
+ title: "\u6574\u5355\u4E1A\u7EE9(".concat(_this22.formData.zdyj, ")\u8981\u5927\u4E8E\u7B49\u4E8E\u54C1\u9879\u4E4B\u548C\u7684\u603B\u4EF7(").concat(totalPxPriceRounded.toFixed(2), ")"),
+ icon: 'none',
+ duration: 3000
});
return _context22.abrupt("return");
- case 15:
+ case 16:
if (_this22.formData.fkfs) {
- _context22.next = 18;
+ _context22.next = 19;
break;
}
uni.showToast({
@@ -2476,7 +2479,7 @@ var _default = {
icon: 'none'
});
return _context22.abrupt("return");
- case 18:
+ case 19:
orderData = _objectSpread(_objectSpread({}, _this22.removeinfo), {}, {
zdyj: _this22.formData.zdyj,
sfyj: _this22.formData.sfyj,
@@ -2493,14 +2496,14 @@ var _default = {
lqKdKdjlbDeductList: _this22.deductList
});
if (!(_this22.removeinfo && _this22.removeinfo.supplementBillingId)) {
- _context22.next = 29;
+ _context22.next = 30;
break;
}
syamount = 0;
console.error(_this22.removeinfo);
- _context22.next = 24;
+ _context22.next = 25;
return _lx.default.GetBillingDebtInfo(_this22.removeinfo.supplementBillingId);
- case 24:
+ case 25:
supplementinfo = _context22.sent;
console.error(supplementinfo);
if (supplementinfo.code == 200) {
@@ -2508,16 +2511,16 @@ var _default = {
}
orderData.supplementAmount = Number(_this22.formData.sfyj) > Number(syamount) ? syamount : _this22.formData.sfyj;
console.error(orderData.supplementAmount);
- case 29:
+ case 30:
// return
console.error(_objectSpread({}, orderData));
_this22.issubmitOrder = false;
uni.showLoading({
title: '正在提交...'
});
- _context22.next = 34;
+ _context22.next = 35;
return _lx.default.UpdateForNoDelete(orderData);
- case 34:
+ case 35:
result = _context22.sent;
uni.hideLoading();
if (result.code == 200) {
@@ -2539,17 +2542,17 @@ var _default = {
});
}
_this22.issubmitOrder = true;
- _context22.next = 82;
+ _context22.next = 85;
break;
- case 40:
+ case 41:
// 提取金三角名称
jsj = _this22.extractJsjNames(); // 验证表单
if (!_this22.isactivity) {
- _context22.next = 45;
+ _context22.next = 46;
break;
}
if (_this22.selectedValues.activityId) {
- _context22.next = 45;
+ _context22.next = 46;
break;
}
uni.showToast({
@@ -2557,9 +2560,9 @@ var _default = {
icon: 'none'
});
return _context22.abrupt("return");
- case 45:
+ case 46:
if (_this22.selectedValues.kdhy) {
- _context22.next = 48;
+ _context22.next = 49;
break;
}
uni.showToast({
@@ -2567,9 +2570,9 @@ var _default = {
icon: 'none'
});
return _context22.abrupt("return");
- case 48:
+ case 49:
if (toString(_this22.formData.zdyj)) {
- _context22.next = 51;
+ _context22.next = 52;
break;
}
uni.showToast({
@@ -2577,31 +2580,35 @@ var _default = {
icon: 'none'
});
return _context22.abrupt("return");
- case 51:
+ case 52:
if (_this22.validatePxList()) {
- _context22.next = 53;
+ _context22.next = 54;
break;
}
return _context22.abrupt("return");
- case 53:
+ case 54:
// 整单业绩要大于等于品项之和的总价
_totalPxPrice = 0;
for (_i4 = 0; _i4 < _this22.pxList.length; _i4++) {
_px3 = _this22.pxList[_i4];
_totalPxPrice += parseFloat(_px3.actualPrice) || 0;
}
- if (!(Number(_this22.formData.zdyj) < _totalPxPrice)) {
- _context22.next = 58;
+ // 将两个值都四舍五入到两位小数后再比较,避免浮点数精度问题
+ _zdyjRounded = Math.round(Number(_this22.formData.zdyj) * 100) / 100;
+ _totalPxPriceRounded = Math.round(_totalPxPrice * 100) / 100;
+ if (!(_zdyjRounded < _totalPxPriceRounded)) {
+ _context22.next = 61;
break;
}
uni.showToast({
- title: '整单业绩要大于等于品项之和的总价',
- icon: 'none'
+ title: "\u6574\u5355\u4E1A\u7EE9(".concat(_this22.formData.zdyj, ")\u8981\u5927\u4E8E\u7B49\u4E8E\u54C1\u9879\u4E4B\u548C\u7684\u603B\u4EF7(").concat(_totalPxPriceRounded.toFixed(2), ")"),
+ icon: 'none',
+ duration: 3000
});
return _context22.abrupt("return");
- case 58:
+ case 61:
if (_this22.formData.fkfs) {
- _context22.next = 61;
+ _context22.next = 64;
break;
}
uni.showToast({
@@ -2609,7 +2616,7 @@ var _default = {
icon: 'none'
});
return _context22.abrupt("return");
- case 61:
+ case 64:
// 验证会员签字
// if (!this.memberSignature) {
// uni.showToast({
@@ -2620,12 +2627,12 @@ var _default = {
// }
hyqz = [];
if (!_this22.memberSignature) {
- _context22.next = 68;
+ _context22.next = 71;
break;
}
- _context22.next = 65;
+ _context22.next = 68;
return _this22.newUploadBase64Image();
- case 65:
+ case 68:
memberinfo = _context22.sent;
console.error(memberinfo);
if (memberinfo) {
@@ -2635,7 +2642,7 @@ var _default = {
url: memberinfo.url
});
}
- case 68:
+ case 71:
// 收集表单数据
// 处理开单日期:如果用户设置了日期则使用设置的日期,否则使用当前时间
kdrqValue = _this22.utils.gettime();
@@ -2684,9 +2691,9 @@ var _default = {
});
// 这里需要根据实际API调整
- _context22.next = 78;
+ _context22.next = 81;
return _lx.default.submitLqKdKdjlb(_orderData);
- case 78:
+ case 81:
_result = _context22.sent;
uni.hideLoading();
if (_result.code == 200) {
@@ -2704,11 +2711,11 @@ var _default = {
});
}
_this22.issubmitOrder = true;
- case 82:
- _context22.next = 90;
+ case 85:
+ _context22.next = 93;
break;
- case 84:
- _context22.prev = 84;
+ case 87:
+ _context22.prev = 87;
_context22.t0 = _context22["catch"](0);
uni.hideLoading();
console.error('提交失败:', _context22.t0);
@@ -2717,12 +2724,12 @@ var _default = {
icon: 'none'
});
_this22.issubmitOrder = true;
- case 90:
+ case 93:
case "end":
return _context22.stop();
}
}
- }, _callee22, null, [[0, 84]]);
+ }, _callee22, null, [[0, 87]]);
}))();
},
// 清空表单
diff --git a/绿纤uni-app/unpackage/dist/dev/mp-weixin/project.private.config.json b/绿纤uni-app/unpackage/dist/dev/mp-weixin/project.private.config.json
index e9894c2..6e7cee7 100644
--- a/绿纤uni-app/unpackage/dist/dev/mp-weixin/project.private.config.json
+++ b/绿纤uni-app/unpackage/dist/dev/mp-weixin/project.private.config.json
@@ -11,6 +11,13 @@
"scene": null
},
{
+ "name": "pages/web/web",
+ "pathName": "pages/web/web",
+ "query": "url=https%253A%252F%252Ferp.lvqianmeiye.com%252Fhtml%252FdailyReport.html",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
"name": "pagesA/reimbursement-form/reimbursement-form",
"pathName": "pagesA/reimbursement-form/reimbursement-form",
"query": "",
diff --git a/绿纤日报/dailyReport.html b/绿纤日报/dailyReport.html
index 67a7f46..a66f531 100644
--- a/绿纤日报/dailyReport.html
+++ b/绿纤日报/dailyReport.html
@@ -101,22 +101,24 @@
padding: 16px 20px;
box-shadow: 0 4px 16px 0 rgba(76, 175, 80, 0.08);
border: 1px solid #e8f5e9;
- display: flex;
- align-items: flex-end;
- gap: 12px;
+ /* display: flex;
+ align-items: flex-end; */
+ /* gap: 12px; */
/* min-width: 280px; */
width: 100%;
box-sizing: border-box;
}
.date-input-wrapper {
- width: 47%;
+ width: 100%;
position: relative;
- /* flex: 1; */
+ flex: 1;
+ margin-top: 12px;
}
.query-button {
- margin-left: 16px;
+ width: 100%;
+ /* margin-left: 16px; */
padding: 12px 32px;
background: linear-gradient(120deg, #43e97b 0%, #38f9d7 100%);
border: none;
@@ -636,17 +638,7 @@
padding: 8px 4px;
}
- .date-filter-card {
- min-width: auto;
- width: 100%;
- /* max-width: 320px; */
- flex-wrap: wrap;
- }
-
- .date-input-wrapper {
- width: 100%;
- /* margin-bottom: 12px; */
- }
+
.query-button {
width: 100%;
@@ -696,8 +688,11 @@
-->
-
+
+
+
+