From 9173f6e5b34a12c01804676d76842031e9ec6724 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 26 六月 2024 11:52:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html
index 6178db8..34cf868 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html
@@ -81,6 +81,7 @@
<th>鍟嗗搧缂栫爜</th>
<th>璐у搧缂栫爜</th>
<th>璐拱鏁伴噺</th>
+ <th>鏄惁瀹氬埗</th>
<th>宸查��鏁伴噺</th>
<th>宸插彂鏁伴噺</th>
<th>鍙戣揣鏁伴噺</th>
@@ -92,6 +93,11 @@
<td>{{item.bn}}</td>
<td>{{item.sn}}</td>
<td>{{item.nums}}</td>
+ {{#if (item.isCustomizable == true){}}
+ <td style="color: red;" >鏄�</td>
+ {{#}else{}}
+ <td >鍚�</td>
+ {{#}}}
<td>{{item.reshipNums}}</td>
<td>{{item.sendNums}}</td>
<td>
@@ -107,7 +113,7 @@
<div class="layui-inline">
<label class="layui-form-label">鐗╂祦鍏徃</label>
<div class="layui-input-inline layui-inline-4">
- <select name="logiCode" lay-verify="required" lay-reqText="璇烽�夋嫨鐗╂祦鍏徃" lay-search lay-filter="logiCodefilter">
+ <select name="logiCode" lay-verify="required" lay-reqText="璇烽�夋嫨鐗╂祦鍏徃" lay-search lay-filter="logiCodefilter" id="SelWUliuId">
<option value="">鎼滅储閫夋嫨鐗╂祦鍏徃</option>
{{# layui.each(d.params.data.logistics, function(index, item){ }}
<option value="{{item.logiCode}}">{{item.logiName}}</option>
@@ -115,7 +121,7 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <!-- <div class="layui-inline" >
<label class="layui-form-label">鐩存挱鐗╂祦</label>
<div class="layui-input-inline layui-inline-4">
<select name="deliveryCompanyId" lay-verify="required" lay-reqText="鐩存挱鐗╂祦" lay-search>
@@ -123,6 +129,18 @@
<option value="OTHERS" selected="selected">鏃犵墿娴�</option>
{{# layui.each(d.params.data.deliveryCompany, function(index, item){ }}
<option value="{{item.deliveryId}}">{{item.deliveryName}}</option>
+ {{# }); }}
+ </select>
+ </div>
+ </div> -->
+
+ <div class="layui-inline" id="SelXiaoyuanDiali_" >
+ <label class="layui-form-label ">閫夋嫨鏍″洯浠ｇ悊</label>
+ <div class="layui-input-inline layui-inline-4">
+ <select name="sendDistributionID" lay-reqText="閫夋嫨鏍″洯浠ｇ悊" lay-search id="selXiaoYuanDaiLiInputID">
+ <option value="">閫夋嫨鏍″洯浠ｇ悊</option>
+ {{# layui.each(d.params.data.distributors, function(index, item){ }}
+ <option value="{{item.id}}">{{item.name}}</option>
{{# }); }}
</select>
</div>
@@ -163,7 +181,17 @@
, coreHelper = layui.coreHelper;
form.on('select(logiCodefilter)', function (data) {
- if (data.value == 'benditongcheng' || data.value == 'shangmenziti') {
+ if(data.value=="Distributor")
+ {
+ $('#SelXiaoyuanDiali_').show();
+ $('#selXiaoYuanDaiLiInputID').attr('lay-verify', 'required')
+ form.render(null, 'LAY-app-CoreCmsOrder-shipForm');
+ }
+ else{
+ $('#SelXiaoyuanDiali_').hide();
+ $('#selXiaoYuanDaiLiInputID').removeAttr('lay-verify')
+ }
+ if (data.value == 'benditongcheng' || data.value == 'shangmenziti'||data.value=='Distributor') {
$('#logiNo').val('鏃�');
} else {
var logiNoVal = $('#logiNo').val();
@@ -254,6 +282,11 @@
}
//閲嶈浇form
+ if($("#SelWUliuId").val()!="Distributor")
+ {
+ $('#SelXiaoyuanDiali_').hide();
+ $('#selXiaoYuanDaiLiInputID').attr('lay-verify', '')
+ }
form.render(null, 'LAY-app-CoreCmsOrder-shipForm');
})
};
--
Gitblit v1.9.1