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/baifenbingfa/offlinedistributor/index.html | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
index 98d8d61..b47519f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
@@ -109,7 +109,16 @@
/>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label" for="CooperationIntent">鍦版帹浜哄憳</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <select lay-search="" name="pUserID" id="selOfflinedisSelUserID">
+ <option value="">璇烽�夋嫨鍦版帹浜�</option>
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-inline">
<button
class="layui-btn layui-btn-sm"
@@ -236,6 +245,13 @@
title: "淇℃伅鏀堕泦鏃堕棿",
width: 130,
sort: false,
+ templet: function (d) {
+ if(isDateTimeString(d.collectionTime)){
+ return util.toDateString(d.collectionTime, "yyyy-MM-dd");
+ }else{
+ return "";
+ }
+ }
},
{ field: "category", title: "绫诲埆", sort: false, width: 105 },
{
@@ -251,14 +267,35 @@
sort: false,
width: 105,
},
+
{ field: "school", title: "瀛︽牎鍚嶇О", sort: false, width: 105 },
{ field: "dealerName", title: "缁忛攢鍟嗗悕绉�", sort: false ,width: 105},
+ {
+ field: 'storeLogoUrl', title: '搴楁嫑', width: 120, sort: false,
+ templet: function (d) {
+ if (d.storeLogoUrl) {
+
+ var listimg= d.storeLogoUrl.split(",")
+ var str="";
+ listimg.forEach((value,index)=>
+ {
+ str+= '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + value + '")><image style="max-width:30px;max-height:30px; margin-left: 5px;" src="' + value + '" /></a>'
+
+ })
+
+ return str;
+ } else {
+ return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + setter.noImagePicUrl + '")><image style="max-width:30px;max-height:30px; margin-left: 5px;" src="' + setter.noImagePicUrl + '" /></a>';
+ }
+ }
+ },
{
field: "contactPerson",
title: "鑱旂郴浜哄鍚�",
sort: false,
width: 105,
},
+
{
field: "phoneNumber",
title: "鑱旂郴鐢佃瘽",
@@ -279,6 +316,7 @@
width: 105,
templet: "#OffdismeetingCountTmp",
},
+
{
field: "money",
title: "璁㈣揣璁板綍",
@@ -338,6 +376,12 @@
}
}
);
+ formatUserSelInPut(
+ coreHelper,
+ form,
+ "selOfflinedisSelUserID",
+ ""
+ );
dropdown.render({
elem: "#SeCooperationIntent",
data: [
@@ -374,6 +418,10 @@
{
title: "灏忓崠閮�",
id: 103,
+ },
+ {
+ title: "鍏朵粬",
+ id: 104,
},
],
click: function (obj) {
@@ -414,8 +462,23 @@
"submit(LAY-app-OfflineDistributor-createForm-submit)",
function (data) {
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
-
+ field.storeLogoUrl="";
field.isdelete = field.isdelete == "on";
+ if((!!field.storeLogoUrl1)&&(!!field.storeLogoUrl2))
+ {
+ field.storeLogoUrl=field.storeLogoUrl1+","+field.storeLogoUrl2;
+ }
+ else
+ if(!!field.storeLogoUrl1)
+ {
+ field.storeLogoUrl=field.storeLogoUrl1;
+ }
+ else if(!!field.storeLogoUrl2)
+ {
+ field.storeLogoUrl=field.storeLogoUrl2;
+ };
+
+
field.region = GetAreaCodeFormFileid(
field,
"CreatofflinedisRegion"
@@ -487,7 +550,25 @@
"submit(LAY-app-OfflineDistributor-editForm-submit)",
function (data) {
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ debugger
+ field.storeLogoUrl="";
+ if((!!field.storeLogoUrl1)&&(!!field.storeLogoUrl2))
+ {
+ field.storeLogoUrl=field.storeLogoUrl1+","+field.storeLogoUrl2;
+ }
+ else
+ if(!!field.storeLogoUrl1)
+ {
+ field.storeLogoUrl=field.storeLogoUrl1;
+ }
+ else if(!!field.storeLogoUrl2)
+ {
+ field.storeLogoUrl=field.storeLogoUrl2;
+ };
+
+
+
field.isdelete = field.isdelete == "on";
field.region = GetAreaCodeFormFileid(
field,
--
Gitblit v1.9.1