From 5dfdb0d5eee1357a76bd6594d01e650f0035fefd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 01 三月 2022 09:16:54 +0800
Subject: [PATCH] #
---
src/main/webapp/views/issue/issue_detl.html | 74 +++++++++++++++++++++++++++---------
src/main/java/com/zy/sc/manager/controller/IssueController.java | 10 +++++
src/main/java/com/zy/sc/common/web/UploadController.java | 12 +++++-
3 files changed, 75 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/sc/common/web/UploadController.java b/src/main/java/com/zy/sc/common/web/UploadController.java
index 5417ed8..cf252da 100644
--- a/src/main/java/com/zy/sc/common/web/UploadController.java
+++ b/src/main/java/com/zy/sc/common/web/UploadController.java
@@ -46,7 +46,7 @@
public R sensorUpload(MultipartFile file, @RequestParam("issueId") Long issueId) {
Issue issue = issueService.selectById(issueId);
if (null == issue) {
- return R.error("璁惧涓嶅瓨鍦�");
+ return R.error("鏁呴殰涓嶅瓨鍦�");
}
String img = issue.getImg();
JSONArray jsonArray = JSON.parseArray(img);
@@ -66,6 +66,14 @@
String upload = ossService.upload(inputStream,file.getOriginalFilename());
if (Cools.isEmpty(upload)) {
return R.error("涓婁紶OSS鏈嶅姟澶辫触");
+ }
+ jsonArray.add(upload);
+ // 鎸佷箙鍖�
+ issue.setImg(jsonArray.toJSONString());
+ issue.setUpdateBy(getUserId());
+ issue.setUpdateTime(new Date());
+ if (!issueService.updateById(issue)) {
+ return R.error("涓婁紶鍥剧墖澶辫触");
}
return R.ok(Cools.add("src", upload));
}
@@ -91,7 +99,7 @@
issue.setUpdateBy(getUserId());
issue.setUpdateTime(new Date());
if (!issueService.updateById(issue)) {
- return R.error("淇濇寔鏁版嵁搴撳け璐�");
+ return R.error("鍒犻櫎鍥剧墖澶辫触");
}
return R.ok("鍒犻櫎鎴愬姛");
}
diff --git a/src/main/java/com/zy/sc/manager/controller/IssueController.java b/src/main/java/com/zy/sc/manager/controller/IssueController.java
index 1ae2c09..cd186f5 100644
--- a/src/main/java/com/zy/sc/manager/controller/IssueController.java
+++ b/src/main/java/com/zy/sc/manager/controller/IssueController.java
@@ -78,6 +78,16 @@
return R.ok();
}
+ @RequestMapping(value = "/issue/process/auth")
+ @ManagerAuth
+ public R process(Issue issue){
+ if (Cools.isEmpty(issue) || null==issue.getId()){
+ return R.error();
+ }
+ issueService.updateById(issue);
+ return R.ok();
+ }
+
@RequestMapping(value = "/issue/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
diff --git a/src/main/webapp/views/issue/issue_detl.html b/src/main/webapp/views/issue/issue_detl.html
index 74ac4c7..1082787 100644
--- a/src/main/webapp/views/issue/issue_detl.html
+++ b/src/main/webapp/views/issue/issue_detl.html
@@ -76,15 +76,6 @@
<!-- 姝ｆ枃寮�濮� -->
<form class="layui-form" id="formAdvForm" lay-filter="formAdvForm">
<div class="layui-fluid" style="padding-bottom: 75px;">
- <!-- 瀹氫綅 -->
-<!-- <div class="layui-card">-->
-<!-- <div class="layui-card-header">瀹氫綅</div>-->
-<!-- <div class="layui-card-body">-->
-<!-- <div class="upload-box clear">-->
-<!-- <div id="map" style="width: 100%; height: 200px"></div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
<!-- 鍥剧墖 -->
<div class="layui-card">
<div class="layui-card-header">鍥剧墖</div>
@@ -109,6 +100,7 @@
<div class="layui-card-body">
<div class="layui-form-item layui-row">
+ <input name="id" type="hidden" />
<div class="layui-inline layui-col-md4">
<label class="layui-form-label">鏁呴殰缂栧彿:</label>
<div class="layui-input-block">
@@ -140,27 +132,42 @@
</div>
</div>
<div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鍙戠敓鏃ユ湡:</label>
+ <div class="layui-input-block">
+ <input name="startTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off" disabled/>
+ </div>
+ </div>
+ <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+ <legend style="font-size: 13px">璇疯ˉ鍏�</legend>
+ </fieldset>
+ <div class="layui-inline layui-col-md4">
<label class="layui-form-label">瑙ｅ喅浜哄憳:</label>
<div class="layui-input-block">
<input name="dealer" placeholder="璇疯緭鍏�..." class="layui-input" />
</div>
</div>
+<!-- <div class="layui-inline layui-col-md4">-->
+<!-- <label class="layui-form-label">鏇存柊鏃ユ湡:</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="lastTime" name="lastTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off"/>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline layui-col-md4">
- <label class="layui-form-label">鍙戠敓鏃ユ湡:</label>
+ <label class="layui-form-label">娴佺▼:</label>
<div class="layui-input-block">
- <input name="startTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off" disabled/>
+ <select name="settle">
+ <option value="2">鎻愪氦</option>
+ <option value="3">宸茶</option>
+ <option value="4">浣滀笟</option>
+ <option value="5">瀹屾垚</option>
+ <option value="6">鍙栨秷</option>
+ </select>
</div>
</div>
<div class="layui-inline layui-col-md4">
<label class="layui-form-label">澶勭悊鏃ユ湡:</label>
<div class="layui-input-block">
<input id="endTime" name="endTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off"/>
- </div>
- </div>
- <div class="layui-inline layui-col-md4">
- <label class="layui-form-label">鏇存柊鏃ユ湡:</label>
- <div class="layui-input-block">
- <input id="lastTime" name="lastTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off"/>
</div>
</div>
</div>
@@ -178,6 +185,9 @@
<textarea name="title" placeholder="鏈煡" class="layui-textarea" disabled></textarea>
</div>
</div>
+ <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+ <legend style="font-size: 13px">璇疯ˉ鍏�</legend>
+ </fieldset>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">鏁呴殰鍘熷洜:</label>
<div class="layui-input-block">
@@ -349,8 +359,34 @@
init();
return false;
});
- form.on('submit(save)', function (data) {
- alert(1)
+ form.on('submit(save)', function (elem) {
+ let data = elem.field;
+ let param = {
+ id: Number(data.id),
+ uuid: data.uuid,
+ dealer: data.dealer,
+ endTime: data.endTime,
+ lastTime: data.lastTime,
+ reason: data.reason,
+ deal: data.deal,
+ settle: Number(data.settle)
+ }
+ $.ajax({
+ url: baseUrl + "/issue/process/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: param,
+ contentType:'application/json;charset=UTF-8',
+ success: function (res) {
+ if (res.code === 200) {
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
return false;
});
--
Gitblit v1.9.1