From 395a761c6a2df625180f98b25341298f20122ac0 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 25 六月 2025 13:23:47 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/HouseWithinSetting/CRLogTask.html | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/HTML/views/HouseWithinSetting/CRLogTask.html b/HTML/views/HouseWithinSetting/CRLogTask.html
index 9fd6296..bfe161a 100644
--- a/HTML/views/HouseWithinSetting/CRLogTask.html
+++ b/HTML/views/HouseWithinSetting/CRLogTask.html
@@ -50,6 +50,7 @@
<option value="2">鎵ц瀹屾垚</option>
<option value="3">寮傚父缁撴潫</option>
<option value="4">宸插彇娑�</option>
+ <option value="5">绛夊緟纭</option>
</select>
</div>
</div>
@@ -203,6 +204,8 @@
html = `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">寮傚父缁撴潫</button>`;
} else if(d.Status=='4') {
html = `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">宸插彇娑�</button>`;
+ } else if(d.Status=='5') {
+ html = `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">绛夊緟纭</button>`;
} else {
}
@@ -679,15 +682,14 @@
layer.confirm('纭畾瀹屾垚閫変腑鐨勫嚭搴撲换鍔★紵', function (index) {
var param = {
taskNo: data.TaskNo,
- };
- var postUrl="/BllCheck/FinishCheckTask"
- if(data.OrderType=='3'){
- postUrl='/BllCheck/FinishMoveTask'
- }
- sendData(IP + postUrl, param, 'post', function (res) {
+ TaskStatus:"2",
+ TaskType:data.Type
+ };
+
+ sendData(IP + "/DownApi/ReceiveRenGongSignal", param, 'post', function (res) {
console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
+ if (res.Success == "0") { //鎴愬姛
+ layer.msg(res.Message, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
@@ -698,7 +700,7 @@
});
});
} else { //涓嶆垚鍔�
- layer.msg(res.msg, {
+ layer.msg(res.Message, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { });
--
Gitblit v1.8.0