From 29a928860314d79adfbd6fd564b916ea9e834a4e Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 31 五月 2023 22:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/static/images/txm.jpg | 0
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 56 +++++----
igds-web/src/main/resources/static/admin/inout/in-sample.js | 75 +++++++++---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 12 -
igds-web/src/main/resources/templates/admin/inout/in-sample.html | 169 ++++++++++++++++-----------
5 files changed, 191 insertions(+), 121 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index 7dec757..71f1e23 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -2,6 +2,7 @@
import ch.qos.logback.classic.pattern.ClassNameOnlyAbbreviator;
import com.bstek.bdf2.core.business.IUser;
+import com.bstek.bdf2.core.model.DefaultDept;
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.common.manager.CommonManager;
import com.ld.igds.constant.BizType;
@@ -739,6 +740,8 @@
view.addObject("bizType", BizType.INOUT_IN.getCode());
view.addObject("type", InoutConstant.TYPE_IN);
view.addObject("deptId", deptId);
+ DefaultDept dept = commonManager.getSubDept(user, deptId);
+ view.addObject("deptName", dept.getName());
//鍏ュ簱娴佺▼
String inoutProgress = inoutCommonManager.getInoutProgressConf(user.getCompanyId(), deptId, InoutConstant.TYPE_IN);
@@ -791,12 +794,7 @@
*/
@RequestMapping("/update-sample")
public PageResponse<InoutCheckData> updateSample(@RequestBody InoutCheckData data) {
- try {
- return inoutManager.updateSampleData(data);
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父:{}", e);
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴寮傚父锛�" + e.getMessage(), null);
- }
+
+ return inoutManager.updateSampleData(data);
}
}
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 0a0dac8..a3e5e3d 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -1107,34 +1107,40 @@
}
@Transactional(rollbackFor = Exception.class)
- public PageResponse<InoutCheckData> updateSampleData(InoutCheckData data) throws Exception {
+ public PageResponse<InoutCheckData> updateSampleData(InoutCheckData data){
- // 鑾峰彇涓氬姟鏁版嵁淇℃伅
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- InoutData curData = inoutService.inoutProgressQuery(param);
- if (null == curData) {
+ try {
+ // 鑾峰彇涓氬姟鏁版嵁淇℃伅
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ InoutData curData = inoutService.inoutProgressQuery(param);
+ if (null == curData) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "娌℃湁鑾峰彇鍒板叆搴撲笟鍔℃暟鎹俊鎭紝鏇存柊澶辫触", data);
+ }
+ if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
+ }
+
+ //鎵︽牱淇℃伅
+ curData.setSampleTime(data.getSampleTime());
+ curData.setSampleType(data.getSampleType());
+ curData.setSampleUser(data.getSampleUser());
+
+ String msg = inoutService.updateSampleData(curData);
+
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
+ } catch (Exception e) {
+ log.error("鍚庡彴寮傚父:{}", e);
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "娌℃湁鑾峰彇鍒板叆搴撲笟鍔℃暟鎹俊鎭紝鏇存柊澶辫触", data);
+ "鍚庡彴寮傚父锛�" + e.getMessage(), null);
}
- if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
- }
-
- //鎵︽牱淇℃伅
- curData.setSampleTime(data.getSampleTime());
- curData.setSampleType(data.getSampleType());
- curData.setSampleUser(data.getSampleUser());
-
- String msg = inoutService.updateSampleData(curData);
-
- if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
- }
-
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
}
}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-sample.js b/igds-web/src/main/resources/static/admin/inout/in-sample.js
index 3538deb..525ebf8 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-sample.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-sample.js
@@ -1,5 +1,6 @@
//褰撳墠鑺傜偣 鍏ュ簱璐ㄦ
var layer;
+var laydate;
var form;
var table;
var page = 1;
@@ -12,7 +13,7 @@
layer = layui.layer;
form = layui.form;
table = layui.table;
- var laydate = layui.laydate;
+ laydate = layui.laydate;
laydate.render({
elem: '#start',
@@ -27,9 +28,10 @@
});
laydate.render({
- elem: '#foodYear',
+ elem: '#sampleTime',
theme: '#7b8e9f',
- type: 'year',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ type: 'datetime'
});
// 鍒濆鍖栬〃鍗曟暟鎹�
@@ -342,38 +344,72 @@
});
}
-//闅愯棌淇℃伅--鏇挎崲涓�*
-function replaceStr(str) {
- if (!str) {
- return "";
- }
- var split = str.split("");
+/**
+ * 鏃堕棿绛�
+ */
+function getTime() {
- if (split.length == 1) {
- return "*";
+ var now = new Date();
+ var time = now.toLocaleString('chinese', {
+ hour12: false
+ });
+ return time;
+}
+
+function formatDateTime(date, format) {
+ const o = {
+ 'M+': date.getMonth() + 1, // 鏈堜唤
+ 'd+': date.getDate(), // 鏃�
+ 'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, // 灏忔椂
+ 'H+': date.getHours(), // 灏忔椂
+ 'm+': date.getMinutes(), // 鍒�
+ 's+': date.getSeconds(), // 绉�
+ 'q+': Math.floor((date.getMonth() + 3) / 3), // 瀛ｅ害
+ S: date.getMilliseconds(), // 姣
+ a: date.getHours() < 12 ? '涓婂崍' : '涓嬪崍', // 涓婂崍/涓嬪崍
+ A: date.getHours() < 12 ? 'AM' : 'PM', // AM/PM
+ };
+ if (/(y+)/.test(format)) {
+ format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
}
- if (split.length == 2 || split.length == 3) {
- return str.slice(0, 1) + "**"
+ for (let k in o) {
+ if (new RegExp('(' + k + ')').test(format)) {
+ format = format.replace(
+ RegExp.$1,
+ RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+ );
+ }
}
- return str.slice(0, 1) + "***" + str.slice(split.length - 1);
+ return format;
}
function showDetail(obj) {
- curSampleData = obj.data;
+ curSampleData = null;
+ var nowTime = formatDateTime(new Date(), "yyyy-MM-dd HH:mm:ss");
+ $("#printTime").html(nowTime);
+ curSampleData = obj.data;
+ if(!curSampleData.sampleTime){
+ curSampleData.sampleTime = nowTime;
+ }
+ if(!curSampleData.sampleUser){
+ curSampleData.sampleUser = sampleUser;
+ }
// 璧嬪��
form.val("form-detail", curSampleData);
form.render();
layer.open({
type: 1,
- title: "鎵︽牱淇℃伅",
- area: ['900px', '400px'],
+ title: "鎵︽牱绠＄悊淇℃伅",
+ area: ['900px', '520px'],
shade: 0,
content: $('#checkDetail'),
btnAlign: 'c',
- btn: ['淇濆瓨鎻愪氦', '鍏抽棴鍙栨秷'],
+ btn: ['淇濆瓨骞舵墦鍗�', '淇濆瓨鎻愪氦','鍏抽棴鍙栨秷'],
yes: function () {
+ layer.alert("鏉″舰鐮佸緟纭畾锛�");
+ }, btn2: function () {
// 鏇存柊鍒伴〉闈�
var data = form.val("form-detail");
obj.update(data);
@@ -381,7 +417,8 @@
Object.assign(curSampleData, data);
submit();
- }, btn2: function () {
+
+ }, btn3: function () {
layer.closeAll();
},
closeBtn: 0
diff --git a/igds-web/src/main/resources/static/images/txm.jpg b/igds-web/src/main/resources/static/images/txm.jpg
new file mode 100644
index 0000000..0451946
--- /dev/null
+++ b/igds-web/src/main/resources/static/images/txm.jpg
Binary files differ
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-sample.html b/igds-web/src/main/resources/templates/admin/inout/in-sample.html
index 66fcc91..95629ae 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-sample.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-sample.html
@@ -106,6 +106,10 @@
padding: 10px;
color: blue;
}
+
+ .input_ba {
+ background: #e7eaec !important;
+ }
</style>
</head>
@@ -307,7 +311,7 @@
//userId
var userId = [[${loginUser.username}]];
- var checkUser = [[${loginUser.cname}]];
+ var sampleUser = [[${loginUser.cname}]];
var companyId = [[${loginUser.companyId}]];
//鍝佺
@@ -319,6 +323,7 @@
//鎵�灞炲垎搴�
var deptId = [[${deptId}]];
+ var deptName = [[${deptName}]];
var inoutProgress = [[${inoutProgress}]];
@@ -339,79 +344,103 @@
<!-- 鍖栭獙淇℃伅锛屽寘鎷熀鏈俊鎭拰鍖栭獙缁撴灉 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
<!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
- <form class="layui-form" id="form-detail" lay-filter="form-detail">
-
- <div class="layui-col-xs6" style="display: none;">
- <div class="layui-form-item">
- <label class="layui-form-label">闅愯棌瀛楁-娴佹按缂栧彿</label>
- <div class="layui-input-block">
- <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label">璐ㄦ鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" name="checkId" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label">杞� 鐗� 鍙�</label>
- <div class="layui-input-block">
- <input type="text" name="plateNum" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label">鐧昏鏃堕棿</label>
- <div class="layui-input-block">
- <input type="text" name="registerTime" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label red">鎵︽牱浜哄憳</label>
- <div class="layui-input-block">
- <input type="text" name="sampleUser" autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label red">鎵︽牱鏃堕棿</label>
- <div class="layui-input-block">
- <input type="text" name="sampleTime" autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6">
- <div class="layui-form-item">
- <label class="layui-form-label red">鎵︽牱鏂瑰紡</label>
- <div class="layui-input-block">
- <input type="radio" name="sampleType" value="0" title="浜哄伐" checked>
- <input type="radio" name="sampleType" value="1" title="鑷姩">
- <input type="radio" name="sampleType" value="2" title="鏅鸿兘闅忔満">
- </div>
- </div>
- </div>
+ <div style="height: 100%; width: 55%; float: left">
<div class="layui-col-xs12">
<blockquote class="layui-elem-quote">
- <div>
- <span style="font-weight: bold; margin-right: 10px;">澶囨敞锛氭墻鏍锋椂闂撮渶鏅氫簬鐧昏鏃堕棿</span>
- </div>
+ <span style="font-weight: bold; margin-right: 10px;">鎵︽牱淇℃伅</span>
</blockquote>
</div>
- </form>
+ <form class="layui-form" id="form-detail" lay-filter="form-detail">
+ <div class="layui-col-xs12" style="display: none;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">闅愯棌瀛楁-娴佹按缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ㄦ鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="checkId" autocomplete="off"
+ class="layui-input input_ba" disabled="">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">杞� 鐗� 鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" autocomplete="off"
+ class="layui-input input_ba" disabled="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐧昏鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="text" name="registerTime" autocomplete="off"
+ class="layui-input input_ba" disabled="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label red">鎵︽牱浜哄憳</label>
+ <div class="layui-input-block">
+ <input type="text" name="sampleUser" autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label red">鎵︽牱鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="text" name="sampleTime" placeholder="璇烽�夋嫨"
+ autocomplete="off" class="layui-input rkbk-search-input bg-date" id="sampleTime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label red">鎵︽牱鏂瑰紡</label>
+ <div class="layui-input-block">
+ <input type="radio" name="sampleType" value="0" title="浜哄伐" checked>
+ <input type="radio" name="sampleType" value="1" title="鑷姩">
+ <input type="radio" name="sampleType" value="2" title="鏅鸿兘闅忔満">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12" style="margin-bottom: 10px">
+ <div style="padding-left: 50px; color: #2ab5ad;">
+ <span style="font-weight: bold; margin-right: 10px;">澶囨敞锛氭墻鏍锋椂闂撮渶鏅氫簬鐧昏鏃堕棿</span>
+ </div>
+ </div>
+ </form>
+ </div>
+ <div style="height: 100%; width: 42%; float: right">
+ <div class="layui-col-xs12">
+ <blockquote class="layui-elem-quote">
+ <span style="font-weight: bold; margin-right: 10px;">鎵撳嵃淇℃伅</span>
+ </blockquote>
+ <div style="text-align: center; margin-top: 10px">
+ <img style="max-width: 100px;" th:src="@{/static/images/login-app-code.png}"/>
+ </div>
+ <div style="text-align: center; margin-top: 10px">
+ <img style="max-width: 220px;" th:src="@{/static/images/txm.jpg}"/>
+ </div>
+ <div style="text-align: center; font-size: 16px; margin-top: 10px">
+ <span th:text="${deptName}"></span>
+ </div>
+ <div style="text-align: center; font-size: 14px; margin-top: 10px">
+ <span id="printTime">2023-05-31 17:30:30</span>
+ </div>
+ </div>
+ </div>
</div>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
--
Gitblit v1.9.3