From b478031d19c13092dc5f86e6d4f7fc114ea9a85d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 11 三月 2024 13:28:29 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/HouseWithinSetting/CRLogTask.html | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/HTML/views/HouseWithinSetting/CRLogTask.html b/HTML/views/HouseWithinSetting/CRLogTask.html
index 349212a..26d6a65 100644
--- a/HTML/views/HouseWithinSetting/CRLogTask.html
+++ b/HTML/views/HouseWithinSetting/CRLogTask.html
@@ -130,7 +130,7 @@
}}
{{ GetBtn1(d) }}
</script>
-
+
<!-- 浠诲姟绫诲瀷 -->
<script type="text/html" id="TypeButton">
{{#
@@ -141,6 +141,26 @@
html = `<p>鍑哄簱</p>`;
} else if(d.Type=='2') {
html = `<p>绉诲簱</p>`;
+ } else {
+
+ }
+ return html;
+
+ }}
+ </script>
+
+ <!-- 鍗曟嵁绫诲瀷 -->
+ <script type="text/html" id="OrderTypeButton">
+ {{#
+ var html = ``;
+ if(d.OrderType=='0'){
+ html = `<p>鍏ュ簱鍗�</p>`;
+ } else if(d.OrderType=='1') {
+ html = `<p>鍑哄簱鍗�</p>`;
+ } else if(d.OrderType=='2') {
+ html = `<p>鐩樼偣鍗�</p>`;
+ } else if(d.OrderType=='3') {
+ html = `<p>绉诲簱鍗�</p>`;
} else {
}
@@ -271,6 +291,12 @@
width: 95,
align: 'center',
templet: '#TypeButton',
+ }, {
+ field: 'OrderType',
+ title: '鍗曟嵁绫诲瀷',
+ width: 95,
+ align: 'center',
+ templet: '#OrderTypeButton',
}, {
field: 'IsSuccess',
title: '鏄惁涓嬪彂鎴愬姛',
@@ -620,7 +646,11 @@
var param = {
taskNo: data.TaskNo
};
- sendData(IP + "/BllCheck/CancelCheckTask", param, 'post', function (res) {
+ var postUrl="/BllCheck/CancelCheckTask"
+ if(data.OrderType=='3'){
+ postUrl='/BllCheck/CancelMoveTask'
+ }
+ sendData(IP + postUrl, param, 'post', function (res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
@@ -646,7 +676,11 @@
var param = {
taskNo: data.TaskNo,
};
- sendData(IP + "/BllCheck/FinishCheckTask", param, 'post', function (res) {
+ var postUrl="/BllCheck/FinishCheckTask"
+ if(data.OrderType=='3'){
+ postUrl='/BllCheck/FinishMoveTask'
+ }
+ sendData(IP + postUrl, param, 'post', function (res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
--
Gitblit v1.8.0