From 564bf7ab6a639c2c4557d35b8fd9b51dca60a738 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 13:32:34 +0800
Subject: [PATCH] #规则完善
---
src/main/webapp/views/plan/plan_more.html | 214 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 165 insertions(+), 49 deletions(-)
diff --git a/src/main/webapp/views/plan/plan_more.html b/src/main/webapp/views/plan/plan_more.html
index 0d9891c..68e1c92 100644
--- a/src/main/webapp/views/plan/plan_more.html
+++ b/src/main/webapp/views/plan/plan_more.html
@@ -39,19 +39,27 @@
</style>
<!-- 姝ｆ枃寮�濮� -->
<form class="layui-form" id="formAdvForm" lay-filter="formAdvForm" style="height: 100%">
- <div class="layui-fluid" style="padding-bottom: 75px;">
+ <div class="layui-fluid" style="padding-bottom: 75px;height: 100%; overflow: scroll;box-sizing: border-box">
<!-- 鏍囬 -->
<div class="layui-card">
<div class="layui-card-header" style="padding-top: 5px; padding-bottom: 5px">
<div>
- <i class="layui-icon" style="font-size: 20px;color: #1890ff;font-weight: bold"></i>
+ <i class="layui-icon" style="font-size: 20px;color: #1890ff;font-weight: bold"></i>
<span id="form-name" style="margin: 0 6px;font-size: 18px;font-weight: bold;letter-spacing: 1px"></span>
- <span style="opacity: .5;font-size: small;margin-left: 5px">璺熻釜椤圭洰</span>
+ <span style="opacity: .5;font-size: small;margin-left: 5px">鍞墠瑙勫垝鐢宠鍗�</span>
</div>
+ </div>
+ <div class="layui-card-body" style="padding: 30px 20px">
+
+ <div class="layui-tab layui-steps">
+ <ul class="layui-tab-title" id="stepBox">
+ </ul>
+ </div>
+
</div>
</div>
<div class="layui-row">
- <!-- 鍩烘湰淇℃伅 -->
+ <!-- 鏁版嵁 -->
<div class="layui-col-md9">
<div class="layui-card">
<div class="layui-card-header">
@@ -59,59 +67,115 @@
</div>
<div class="layui-card-body">
+ <!-- 鍩烘湰淇℃伅 -->
<div class="layui-form-item layui-row">
<input name="id" type="hidden" />
<div class="layui-inline layui-col-md6">
- <label class="layui-form-label">椤圭洰浠ｅ彿:</label>
+ <label class="layui-form-label">瑙勫垝鍗曞彿:</label>
<div class="layui-input-block">
<input name="uuid" class="layui-input" disabled />
</div>
</div>
<div class="layui-inline layui-col-md6">
- <label class="layui-form-label">鐢叉柟鍗曚綅:</label>
+ <label class="layui-form-label">鐢宠鏃ユ湡 :</label>
+ <div class="layui-input-block">
+ <input name="appleTime$" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md6">
+ <label class="layui-form-label">璺熻釜椤圭洰:</label>
+ <div class="layui-input-block">
+ <input name="orderId$" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md6">
+ <label class="layui-form-label">瀹㈡埛鍚嶇О:</label>
<div class="layui-input-block">
<input name="cstmrId$" class="layui-input" disabled />
</div>
</div>
<div class="layui-inline layui-col-md6">
- <label class="layui-form-label">椤圭洰鎬婚噾棰�:</label>
+ <label class="layui-form-label">涓氬姟鍛�:</label>
<div class="layui-input-block">
- <input name="money" class="layui-input" disabled />
+ <input name="userId$" class="layui-input" disabled />
</div>
</div>
<div class="layui-inline layui-col-md6">
- <label class="layui-form-label">鎵�灞炲叕鍙�:</label>
+ <label class="layui-form-label">瀹℃壒鐘舵��:</label>
<div class="layui-input-block">
- <input name="company$" class="layui-input" disabled/>
+ <input name="settle$" class="layui-input" disabled/>
</div>
</div>
<div class="layui-inline layui-col-md6">
- <label class="layui-form-label">鐪佸競鍖�:</label>
+ <label class="layui-form-label">涓氬姟绫诲瀷:</label>
<div class="layui-input-block">
- <input name="pcd$" class="layui-input" disabled />
+ <input name="planType$" class="layui-input" disabled />
</div>
</div>
- <div class="layui-inline layui-col-md6">
- <label class="layui-form-label">椤圭洰鍦板潃:</label>
- <div class="layui-input-block">
- <input name="addr" class="layui-input" disabled />
- </div>
- </div>
- <div class="layui-inline layui-col-md6">
- <label class="layui-form-label">璐熻矗浜�:</label>
- <div class="layui-input-block">
- <input name="director$" class="layui-input" disabled />
- </div>
- </div>
- <div class="layui-inline layui-col-md6">
- <label class="layui-form-label">澶囨敞:</label>
- <div class="layui-input-block">
- <input name="remarks" class="layui-input" disabled />
- </div>
- </div>
+ </div>
+ <!-- 鍏朵粬 -->
+ <div class="layui-form-item layui-row">
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend style="font-size: 13px">鍏朵粬</legend>
+ </fieldset>
+ <div id="customizeBox" class="formDes">
+ </div>
+ </div>
+
+ <!-- 鍞墠瑙勫垝 -->
+ <div class="layui-form-item layui-row">
+ <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-md6">
+ <label class="layui-form-label">瑙勫垝鍛�:</label>
+ <div class="layui-input-block">
+ <input name="planner" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md6">
+ <label class="layui-form-label">瀹屾垚鏃堕棿:</label>
+ <div class="layui-input-block">
+ <input name="finishTime$" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md6">
+ <label class="layui-form-label">鏇存敼鏂规:</label>
+ <div class="layui-input-block">
+ <input name="change" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md6">
+ <label class="layui-form-label">鏇存敼娆℃暟:</label>
+ <div class="layui-input-block">
+ <input name="changeTime" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md6">
+ <label class="layui-form-label">鏇存敼鍘熷洜:</label>
+ <div class="layui-input-block">
+ <input name="changeReason" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md6">
+ <label class="layui-form-label">瑙勬牸濂栭噾:</label>
+ <div class="layui-input-block">
+ <input name="planBonus" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md6">
+ <label class="layui-form-label">缁勯暱濂栭噾:</label>
+ <div class="layui-input-block">
+ <input name="planLeaderBonus" class="layui-input" disabled />
+ </div>
+ </div>
+ </div>
+
+ <!-- 绯荤粺淇℃伅 -->
+ <div class="layui-form-item layui-row">
+ <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-md6">
<label class="layui-form-label">娣诲姞浜哄憳:</label>
@@ -142,8 +206,19 @@
</div>
</div>
</div>
- <!-- 璺熻繘浜� -->
+ <!-- 鍔ㄦ�� -->
<div class="layui-col-md3" style="width: 24%;margin-left: 1%">
+ <!-- 鏃堕棿绾� -->
+ <div class="layui-card">
+ <div class="layui-card-header">
+ <span>鍞墠瑙勫垝娓呭崟</span>
+ </div>
+ <div class="layui-card-body">
+ <ul class="layui-timeline" id="timelineBox">
+ </ul>
+ </div>
+ </div>
+ <!-- 璺熻繘浜� -->
<div class="layui-card">
<div class="layui-card-header">
<span>璺熻繘浜�</span>
@@ -187,20 +262,51 @@
</form>
</script>
+<script type="text/template" id="stepTpl">
+ {{#each list}}
+ <li id="step-{{step}}" style="pointer-events: none">
+ <i class="layui-icon layui-icon-ok">{{step}}</i>
+ <span class="layui-steps-title">{{title}}</span>
+ {{# if username}}
+ <span class="layui-steps-content">{{username}}</span>
+ {{ else }}
+ <span class="layui-steps-content"> </span>
+ {{/if}}
+ </li>
+ {{/each}}
+</script>
+
+<script type="text/template" id="timelineTpl">
+ {{#each list}}
+ <li class="layui-timeline-item">
+ <i class="layui-icon layui-timeline-axis"></i>
+ <div class="layui-timeline-content layui-text">
+ <h4 class="layui-timeline-title" style="display: inline;margin-right: 10px;">{{title}}</h4>
+ <span>{{time}}</span>
+ <p>
+ {{msg}}
+ </p>
+ </div>
+ </li>
+ {{/each}}
+</script>
+
<script>
- var orderId = top.orderByMore;
+ var planId = top.planByMore;
$('.layui-layer-close').hide();
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
- }).use(['form', 'table', 'laydate', 'notice', 'xmSelect'], function () {
+ steps: 'steps/steps',
+ }).use(['form', 'table', 'laydate', 'notice', 'xmSelect', 'steps'], function () {
var $ = layui.jquery;
var form = layui.form;
var table = layui.table;
var laydate = layui.laydate;
var notice = layui.notice;
var xmSelect = layui.xmSelect;
+ var steps = layui.steps;
form.render('select');
@@ -208,19 +314,29 @@
function init(){
notice.msg('姝ｅ湪杞藉叆鏁版嵁......', {icon: 4, position: "topRight"});
$.ajax({
- url: baseUrl + "/order/" + orderId + "/auth",
+ url: baseUrl + "/plan/" + planId + "/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
notice.destroy();
if (res.code === 200) {
- let order = res.data;
- top.orderByMore = null;
- $("#form-name").html(order.name);
+ let plan = res.data;
+ top.planByMore = null;
+ $("#form-name").html(plan.name);
+ // 杩涘害姝ラ鍥�
+ let template0 = Handlebars.compile($('#stepTpl').html());
+ $('#stepBox').html(template0({list: JSON.parse(plan.settleMsg)}));
+ $('#step-' + Number(plan.step)).addClass("layui-this");
+
+ let template1 = Handlebars.compile($('#timelineTpl').html());
+ $('#timelineBox').html(template1({list: JSON.parse(plan.settleMsg)}));
+ // 琛ュ厖html
+ $('#customizeBox').html(plan.formHtml);
// 璁惧鏄庣粏
- form.val('formAdvForm', order);
+ form.val('formAdvForm', plan);
+ top.convertDisabled($('#formAdvForm :input'), true);
// 璺熻繘浜�
- initFollowers(order.id);
+ initFollowers(plan.id);
layDateRender();
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
@@ -241,15 +357,15 @@
layDateRender();
// 娓叉煋璺熻繘浜烘ā鍧�
- function initFollowers(orderId) {
- if (!orderId) {
+ function initFollowers(planId) {
+ if (!planId) {
return;
}
$.ajax({
- url: baseUrl+"/order/followers/table/auth",
+ url: baseUrl+"/plan/followers/table/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- orderId: orderId
+ planId: planId
},
method: 'GET',
success: function (res) {
@@ -274,17 +390,17 @@
case "del":
let loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/order/followers/remove/auth",
+ url: baseUrl+"/plan/followers/remove/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- orderId: orderId,
+ planId: planId,
userId: data.userId
},
method: 'POST',
success: function (res) {
layer.close(loadIndex);
if (res.code === 200){
- initFollowers(orderId);
+ initFollowers(planId);
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
@@ -324,10 +440,10 @@
}
let loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/order/followers/add/auth",
+ url: baseUrl+"/plan/followers/add/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- orderId: orderId,
+ planId: planId,
followerIds: selectList.map(function (d) {
return d.value;
})
@@ -336,7 +452,7 @@
success: function (res) {
if (res.code === 200){
layer.close(loadIndex);
- initFollowers(orderId);
+ initFollowers(planId);
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
--
Gitblit v1.9.1