wangyifang
/
yxbd-fangke
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

核销

Browse Source
master
lion 1 day ago
parent d1b78f1408
commit a97ff3fb2b
5 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File

62
app/Http/Controllers/Admin/GateController.php
Unescape View File

@ -122,9 +122,50 @@ class GateController extends CommonController
}
$list = $list->paginate($all['page_size'] ?? 20);
$today = Carbon::now()->format('Y-m-d');
$list->getCollection()->transform(function ($visit) use ($today) {
if ((int) $visit->long_time === 1) {
$visit->setAttribute('gate_verify_type', $this->computeLongTermGateVerifyType($visit, $today));
}
return $visit;
});
return $this->success($list);
}
/**
* 长期访客：单条门岗流水的业务日期（与自然日核销口径一致，缺 biz_date 时用创建时间换算应用时区）
*/
protected function gateLogBizDateForLongTerm(GateLog $log): string
{
if (!empty($log->biz_date)) {
return Carbon::parse((string) $log->biz_date)->format('Y-m-d');
}
return Carbon::parse((string) $log->created_at)->timezone(config('app.timezone'))->format('Y-m-d');
}
/**
* 长期访客：门岗建议本次核销 1 进厂 / 2 离厂（与 useCode 长期规则对齐）
*/
protected function computeLongTermGateVerifyType(Visit $visit, string $today): int
{
$latestGateLog = GateLog::where('visit_id', $visit->id)->orderByDesc('id')->first();
if (!$latestGateLog && !empty($visit->code)) {
$latestGateLog = GateLog::where('code', $visit->code)->orderByDesc('id')->first();
}
if (!$latestGateLog) {
return 1;
}
if ((int) $latestGateLog->action === 2) {
return 1;
}
$biz = $this->gateLogBizDateForLongTerm($latestGateLog);
return $biz < $today ? 1 : 2;
}
/**
* @OA\Get(
* path="/api/admin/gate/use-code",
@ -195,18 +236,27 @@ class GateController extends CommonController
if ($today < $check->start_date || $today > $check->end_date) {
return $this->fail([ResponseCode::ERROR_BUSINESS, '当前不在长期访客有效周期内']);
}
// 进/离异以整条预约「最新一条门岗流水」为主：与会话 audit_status「已进厂」一致；
// 昨日进今日离：最后一条仍为进厂时允许核销离厂（biz_date 仍记当日）；
// 当日可先离再进——离后最新为离厂，仍可再核销进厂。
// 长期访客：以「全局最新流水」判断是否仍在厂未离；但以「本条进厂的 biz_date」决定能否核销离厂
// ——昨日进今日第一次操作须先核销进厂（记入今日），不能直接核销离厂；当日先离仍可再核进。
$latestGateLog = GateLog::where('visit_id', $check->id)->orderByDesc('id')->first();
if (!$latestGateLog && !empty($check->code)) {
$latestGateLog = GateLog::where('code', $check->code)->orderByDesc('id')->first();
}
if ((int)$all['type'] === 1 && $latestGateLog && (int)$latestGateLog->action === 1) {
return $this->fail([ResponseCode::ERROR_BUSINESS, '上次进厂尚未离厂，请先核销离厂后再进厂']);
$enterBizDate = $this->gateLogBizDateForLongTerm($latestGateLog);
if ($enterBizDate >= $today) {
return $this->fail([ResponseCode::ERROR_BUSINESS, '今日已进厂尚未离厂，请先核销离厂后再进厂']);
}
// 未离开的进厂业务日早于今日：视为跨日未完成场次，允许再核销一笔「当日进厂」
}
if ((int)$all['type'] === 2 && (!$latestGateLog || (int)$latestGateLog->action !== 1)) {
return $this->fail([ResponseCode::ERROR_BUSINESS, '无有效未离厂的进厂记录，无法核销离厂。请先核销进厂后再离厂']);
if ((int)$all['type'] === 2) {
if (!$latestGateLog || (int)$latestGateLog->action !== 1) {
return $this->fail([ResponseCode::ERROR_BUSINESS, '无有效未离厂的进厂记录，无法核销离厂。请先核销进厂后再离厂']);
}
$enterBizDate = $this->gateLogBizDateForLongTerm($latestGateLog);
if ($enterBizDate !== $today) {
return $this->fail([ResponseCode::ERROR_BUSINESS, '当前未离厂的进厂记录不属于今日，请先核销当日进厂后再离厂']);
}
}
}
$remark = '进厂';

2
public/admin/index.html
Unescape View File

@ -1,3 +1,3 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/admin/favicon.ico><title>BD访客管理系统</title><script>window._AMapSecurityConfig = {
securityJsCode: '68787c7a64e7240670e6a538b326d64b',
}</script><script src="https://webapi.amap.com/maps?v=1.4.11&key=1a9ee0079fcb3c6c64c96dc903989994&plugin=AMap.PlaceSearch"></script><script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script><link href=/admin/static/css/app.1ef65418.css rel=preload as=style><link href=/admin/static/css/chunk-libs.f796b5ca.css rel=preload as=style><link href=/admin/static/js/app.a8fd346e.js rel=preload as=script><link href=/admin/static/js/chunk-elementUI.9eaa9c42.js rel=preload as=script><link href=/admin/static/js/chunk-libs.20882dbc.js rel=preload as=script><link href=/admin/static/css/chunk-libs.f796b5ca.css rel=stylesheet><link href=/admin/static/css/app.1ef65418.css rel=stylesheet></head><body><noscript><strong>We're sorry but BD访客管理系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(e){function t(t){for(var r,c,o=t[0],i=t[1],f=t[2],d=0,l=[];d<o.length;d++)c=o[d],Object.prototype.hasOwnProperty.call(u,c)&&u[c]&&l.push(u[c][0]),u[c]=0;for(r in i)Object.prototype.hasOwnProperty.call(i,r)&&(e[r]=i[r]);h&&h(t);while(l.length)l.shift()();return a.push.apply(a,f||[]),n()}function n(){for(var e,t=0;t<a.length;t++){for(var n=a[t],r=!0,c=1;c<n.length;c++){var o=n[c];0!==u[o]&&(r=!1)}r&&(a.splice(t--,1),e=i(i.s=n[0]))}return e}var r={},c={runtime:0},u={runtime:0},a=[];function o(e){return i.p+"static/js/"+({}[e]||e)+"."+{"chunk-0114cbd5":"c8c3c2cc","chunk-22cea610":"edc10198","chunk-2d0ac22e":"2a30acb1","chunk-698f6f63":"d3208d6c","chunk-2d21065a":"62cc4063","chunk-6bd5056c":"cb197f47","chunk-a6787bf8":"ab263676","chunk-49b4cba1":"4a6dd74b","chunk-4ee7374d":"e7791c5b","chunk-266b78fc":"1a65c775"}[e]+".js"}function i(t){if(r[t])return r[t].exports;var n=r[t]={i:t,l:!1,exports:{}};return e[t].call(n.exports,n,n.exports,i),n.l=!0,n.exports}i.e=function(e){var t=[],n={"chunk-0114cbd5":1,"chunk-22cea610":1,"chunk-698f6f63":1,"chunk-6bd5056c":1,"chunk-49b4cba1":1,"chunk-4ee7374d":1,"chunk-266b78fc":1};c[e]?t.push(c[e]):0!==c[e]&&n[e]&&t.push(c[e]=new Promise((function(t,n){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-0114cbd5":"d6659b52","chunk-22cea610":"3c7f5ad9","chunk-2d0ac22e":"31d6cfe0","chunk-698f6f63":"195a1ac5","chunk-2d21065a":"31d6cfe0","chunk-6bd5056c":"f03cc9f5","chunk-a6787bf8":"31d6cfe0","chunk-49b4cba1":"ae241f74","chunk-4ee7374d":"d28d431e","chunk-266b78fc":"2c7d3fba"}[e]+".css",u=i.p+r,a=document.getElementsByTagName("link"),o=0;o<a.length;o++){var f=a[o],d=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(d===r||d===u))return t()}var l=document.getElementsByTagName("style");for(o=0;o<l.length;o++){f=l[o],d=f.getAttribute("data-href");if(d===r||d===u)return t()}var h=document.createElement("link");h.rel="stylesheet",h.type="text/css",h.onload=t,h.onerror=function(t){var r=t&&t.target&&t.target.src||u,a=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=r,delete c[e],h.parentNode.removeChild(h),n(a)},h.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(h)})).then((function(){c[e]=0})));var r=u[e];if(0!==r)if(r)t.push(r[2]);else{var a=new Promise((function(t,n){r=u[e]=[t,n]}));t.push(r[2]=a);var f,d=document.createElement("script");d.charset="utf-8",d.timeout=120,i.nc&&d.setAttribute("nonce",i.nc),d.src=o(e);var l=new Error;f=function(t){d.onerror=d.onload=null,clearTimeout(h);var n=u[e];if(0!==n){if(n){var r=t&&("load"===t.type?"missing":t.type),c=t&&t.target&&t.target.src;l.message="Loading chunk "+e+" failed.\n("+r+": "+c+")",l.name="ChunkLoadError",l.type=r,l.request=c,n[1](l)}u[e]=void 0}};var h=setTimeout((function(){f({type:"timeout",target:d})}),12e4);d.onerror=d.onload=f,document.head.appendChild(d)}return Promise.all(t)},i.m=e,i.c=r,i.d=function(e,t,n){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)i.d(n,r,function(t){return e[t]}.bind(null,r));return n},i.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/admin/",i.oe=function(e){throw console.error(e),e};var f=window["webpackJsonp"]=window["webpackJsonp"]||[],d=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var h=d;n()})([]);</script><script src=/admin/static/js/chunk-elementUI.9eaa9c42.js></script><script src=/admin/static/js/chunk-libs.20882dbc.js></script><script src=/admin/static/js/app.a8fd346e.js></script></body></html>
}</script><script src="https://webapi.amap.com/maps?v=1.4.11&key=1a9ee0079fcb3c6c64c96dc903989994&plugin=AMap.PlaceSearch"></script><script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script><link href=/admin/static/css/app.1ef65418.css rel=preload as=style><link href=/admin/static/css/chunk-libs.f796b5ca.css rel=preload as=style><link href=/admin/static/js/app.7b49a23e.js rel=preload as=script><link href=/admin/static/js/chunk-elementUI.9eaa9c42.js rel=preload as=script><link href=/admin/static/js/chunk-libs.20882dbc.js rel=preload as=script><link href=/admin/static/css/chunk-libs.f796b5ca.css rel=stylesheet><link href=/admin/static/css/app.1ef65418.css rel=stylesheet></head><body><noscript><strong>We're sorry but BD访客管理系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(e){function t(t){for(var r,c,a=t[0],i=t[1],f=t[2],d=0,l=[];d<a.length;d++)c=a[d],Object.prototype.hasOwnProperty.call(u,c)&&u[c]&&l.push(u[c][0]),u[c]=0;for(r in i)Object.prototype.hasOwnProperty.call(i,r)&&(e[r]=i[r]);h&&h(t);while(l.length)l.shift()();return o.push.apply(o,f||[]),n()}function n(){for(var e,t=0;t<o.length;t++){for(var n=o[t],r=!0,c=1;c<n.length;c++){var a=n[c];0!==u[a]&&(r=!1)}r&&(o.splice(t--,1),e=i(i.s=n[0]))}return e}var r={},c={runtime:0},u={runtime:0},o=[];function a(e){return i.p+"static/js/"+({}[e]||e)+"."+{"chunk-0114cbd5":"c8c3c2cc","chunk-22cea610":"edc10198","chunk-2d0ac22e":"2a30acb1","chunk-604ecf7d":"458cf088","chunk-2d21065a":"62cc4063","chunk-6bd5056c":"cb197f47","chunk-a6787bf8":"ab263676","chunk-49b4cba1":"4a6dd74b","chunk-4ee7374d":"e7791c5b","chunk-266b78fc":"1a65c775"}[e]+".js"}function i(t){if(r[t])return r[t].exports;var n=r[t]={i:t,l:!1,exports:{}};return e[t].call(n.exports,n,n.exports,i),n.l=!0,n.exports}i.e=function(e){var t=[],n={"chunk-0114cbd5":1,"chunk-22cea610":1,"chunk-604ecf7d":1,"chunk-6bd5056c":1,"chunk-49b4cba1":1,"chunk-4ee7374d":1,"chunk-266b78fc":1};c[e]?t.push(c[e]):0!==c[e]&&n[e]&&t.push(c[e]=new Promise((function(t,n){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-0114cbd5":"d6659b52","chunk-22cea610":"3c7f5ad9","chunk-2d0ac22e":"31d6cfe0","chunk-604ecf7d":"f0b703ac","chunk-2d21065a":"31d6cfe0","chunk-6bd5056c":"f03cc9f5","chunk-a6787bf8":"31d6cfe0","chunk-49b4cba1":"ae241f74","chunk-4ee7374d":"d28d431e","chunk-266b78fc":"2c7d3fba"}[e]+".css",u=i.p+r,o=document.getElementsByTagName("link"),a=0;a<o.length;a++){var f=o[a],d=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(d===r||d===u))return t()}var l=document.getElementsByTagName("style");for(a=0;a<l.length;a++){f=l[a],d=f.getAttribute("data-href");if(d===r||d===u)return t()}var h=document.createElement("link");h.rel="stylesheet",h.type="text/css",h.onload=t,h.onerror=function(t){var r=t&&t.target&&t.target.src||u,o=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");o.code="CSS_CHUNK_LOAD_FAILED",o.request=r,delete c[e],h.parentNode.removeChild(h),n(o)},h.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(h)})).then((function(){c[e]=0})));var r=u[e];if(0!==r)if(r)t.push(r[2]);else{var o=new Promise((function(t,n){r=u[e]=[t,n]}));t.push(r[2]=o);var f,d=document.createElement("script");d.charset="utf-8",d.timeout=120,i.nc&&d.setAttribute("nonce",i.nc),d.src=a(e);var l=new Error;f=function(t){d.onerror=d.onload=null,clearTimeout(h);var n=u[e];if(0!==n){if(n){var r=t&&("load"===t.type?"missing":t.type),c=t&&t.target&&t.target.src;l.message="Loading chunk "+e+" failed.\n("+r+": "+c+")",l.name="ChunkLoadError",l.type=r,l.request=c,n[1](l)}u[e]=void 0}};var h=setTimeout((function(){f({type:"timeout",target:d})}),12e4);d.onerror=d.onload=f,document.head.appendChild(d)}return Promise.all(t)},i.m=e,i.c=r,i.d=function(e,t,n){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)i.d(n,r,function(t){return e[t]}.bind(null,r));return n},i.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/admin/",i.oe=function(e){throw console.error(e),e};var f=window["webpackJsonp"]=window["webpackJsonp"]||[],d=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var h=d;n()})([]);</script><script src=/admin/static/js/chunk-elementUI.9eaa9c42.js></script><script src=/admin/static/js/chunk-libs.20882dbc.js></script><script src=/admin/static/js/app.7b49a23e.js></script></body></html>

2
public/admin/static/css/chunk-698f6f63.195a1ac5.css → public/admin/static/css/chunk-604ecf7d.f0b703ac.css
Unescape View File

@ -1 +1 @@
.xy-table-item-label[data-v-3fc28e4f]{width:180px!important}.xy-table-item-content[data-v-3fc28e4f]{width:100%}.img__delete[data-v-3fc28e4f]{-webkit-transform:scale(.8);transform:scale(.8);position:absolute;top:4px;right:4px}[data-v-3fc28e4f] .el-radio__input{vertical-align:super}[data-v-3fc28e4f] .el-radio__label{font-size:32px}.gatewrap[data-v-00f1c22a]{background-color:#fff;position:relative;height:100vh}.gatecode[data-v-00f1c22a]{font-size:32px;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);text-align:left;display:inline-block}.gatecode>div[data-v-00f1c22a]{margin-bottom:40px}.gatecode>div[data-v-00f1c22a]:last-child{margin-bottom:0}.gateRight[data-v-00f1c22a]{position:absolute;right:20px;top:20px;font-size:20px}.gateRight span[data-v-00f1c22a]{margin-right:10px;margin-left:5px}.gateRight span>span[data-v-00f1c22a]{text-decoration:underline;color:#004593}.gateLeft[data-v-00f1c22a]{position:absolute;left:20px;top:20px;font-size:20px;color:#004593}[data-v-00f1c22a] .el-input{width:400px!important}[data-v-00f1c22a] .el-input__inner{font-size:32px;height:45px;width:400px}[data-v-00f1c22a] .gatewrap .el-button{vertical-align:top;height:45px;width:145px;font-size:20px}[data-v-00f1c22a] .el-range-editor .el-range-input{font-size:20px}[data-v-00f1c22a] .el-date-editor .el-range-separator{font-size:20px;line-height:36px}[data-v-00f1c22a] .el-date-editor .el-range__close-icon,[data-v-00f1c22a] .el-date-editor .el-range__icon{font-size:18px;line-height:38px}.gatecode .getButton.el-button[data-v-00f1c22a]{width:100%;font-size:32px;height:70px}
.xy-table-item-label[data-v-4020e7f8]{width:180px!important}.xy-table-item-content[data-v-4020e7f8]{width:100%}.img__delete[data-v-4020e7f8]{-webkit-transform:scale(.8);transform:scale(.8);position:absolute;top:4px;right:4px}[data-v-4020e7f8] .el-radio__input{vertical-align:super}[data-v-4020e7f8] .el-radio__label{font-size:32px}.gatewrap[data-v-00f1c22a]{background-color:#fff;position:relative;height:100vh}.gatecode[data-v-00f1c22a]{font-size:32px;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);text-align:left;display:inline-block}.gatecode>div[data-v-00f1c22a]{margin-bottom:40px}.gatecode>div[data-v-00f1c22a]:last-child{margin-bottom:0}.gateRight[data-v-00f1c22a]{position:absolute;right:20px;top:20px;font-size:20px}.gateRight span[data-v-00f1c22a]{margin-right:10px;margin-left:5px}.gateRight span>span[data-v-00f1c22a]{text-decoration:underline;color:#004593}.gateLeft[data-v-00f1c22a]{position:absolute;left:20px;top:20px;font-size:20px;color:#004593}[data-v-00f1c22a] .el-input{width:400px!important}[data-v-00f1c22a] .el-input__inner{font-size:32px;height:45px;width:400px}[data-v-00f1c22a] .gatewrap .el-button{vertical-align:top;height:45px;width:145px;font-size:20px}[data-v-00f1c22a] .el-range-editor .el-range-input{font-size:20px}[data-v-00f1c22a] .el-date-editor .el-range-separator{font-size:20px;line-height:36px}[data-v-00f1c22a] .el-date-editor .el-range__close-icon,[data-v-00f1c22a] .el-date-editor .el-range__icon{font-size:18px;line-height:38px}.gatecode .getButton.el-button[data-v-00f1c22a]{width:100%;font-size:32px;height:70px}

2
public/admin/static/js/app.a8fd346e.js → public/admin/static/js/app.7b49a23e.js
View File

File diff suppressed because one or more lines are too long

2
public/admin/static/js/chunk-698f6f63.d3208d6c.js → public/admin/static/js/chunk-604ecf7d.458cf088.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save