From 7a3a4f8012a72f80d8dd62064a76655c803da864 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 29 五月 2024 12:42:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
index cb860c3..a1cd7ce 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
@@ -104,7 +104,7 @@
<script type="text/html" id="LAY-app-CoreCmsDistribution-tableBox-bar">
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="qrcode">灏忕▼搴忕爜</a> -->
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="achievement">涓氱哗</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="achievement">鎺ㄥ箍璐�</a>
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">鏌ョ湅</a>
<a class="layui-btn layui-btn-xs" lay-event="edit">瀹℃牳</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#CoreCmsDistributionTbDelDrop{{d.LAY_NUM}}" no-shade="true">鍒犻櫎</a>
@@ -122,7 +122,7 @@
</div>
</script>
-
+<script src="/views/liao.js"></script>
<script>
var indexData;
var debug = layui.setter.debug;
@@ -190,9 +190,9 @@
{ field: 'profession', title: '琛屼笟', sort: false, width: 100 },
// { field: 'qq', title: 'qq鍙�', sort: false, width: 90 },
{ field: 'sales', title: '骞磋惀涓氶(鍏�)', sort: false, width: 100 },
- { field: 'storeName', title: '搴楅摵鍚嶇О', sort: false },
+ { field: 'storeName', title: '搴楅摵鍚嶇О', sort: false,width: 133 },
- { field: 'storeCoordinate', title: '搴楅摵鍧愭爣', sort: false },
+ // { field: 'storeCoordinate', title: '搴楅摵鍧愭爣', sort: false },
// {
// field: 'storeLogo', title: 'Logo', sort: false, width: 60, templet: function (d) {
// if (d.storeLogo) {
@@ -202,6 +202,26 @@
// }
// }
// },
+ { field: 'schoolName', title: '瀛︽牎鍚嶇О', sort: false,width: 133 },
+ {
+ field: 'idCradNumber', title: '韬唤璇�', width: 120, sort: false,
+ templet: function (d) {
+ if (d.idCradNumber) {
+
+ var listimg= d.idCradNumber.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: 'storeBanner', title: '闂ㄥご鍥剧墖', sort: false, width: 100, templet: function (d) {
if (d.storeBanner) {
@@ -211,7 +231,11 @@
}
}
},
- { field: 'DistributionAchievementTotals', title: '鍘嗗彶涓氱哗鎬诲拰(鍏�)', sort: false, width: 100 },
+ { field: 'distributionAchievementTotals', title: '鍘嗗彶鎺ㄥ箍璐规�诲拰(鍏�)', sort: false, width: 133 },
+ { field: 'distributionYingLingTotals', title: '搴旈浣ｉ噾(鍏�)', sort: false, width: 133 },
+ { field: 'distributionKeLingTotals', title: '鍙浣ｉ噾(鍏�)', sort: false, width: 133 },
+ { field: 'distributionYiJieSuanTotals', title: '宸茬粨绠椾剑閲�(鍏�)', sort: false, width: 133 },
+
//{ field: 'storeDesc', title: '搴楅摵绠�浠�', sort: false, width: 105 },
{
field: 'verifyStatus', title: '瀹℃牳鐘舵��', sort: false, width: 80, templet: function (data) {
@@ -222,6 +246,7 @@
}
}
},
+
{ field: 'createTime', title: '鍒涘缓鏃堕棿', width: 130, sort: false },
{ field: 'updateTime', title: '鏇存柊鏃堕棿', width: 130, sort: false },
{ field: 'verifyTime', title: '瀹℃牳鏃堕棿', width: 130, sort: false },
@@ -276,7 +301,7 @@
admin.popup({
shadeClose: false,
title: '鍒涘缓鏁版嵁',
- area: ['640px', '300px'],
+ area: ['640px', '500px'],
id: 'LAY-popup-CoreCmsDistribution-create',
success: function (layero, index) {
view(this.id).render('distribution/distributor/create', { data: e.data }).done(function () {
@@ -284,7 +309,10 @@
form.on('submit(LAY-app-CoreCmsDistribution-createForm-submit)',
function (data) {
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
-
+ field.areaCode = GetAreaCodeFormFileid(
+ field,
+ "CreatDistrbutorSelAreaCode"
+ );
if (debug) { console.log(field); } //寮�鍚皟璇曡繑鍥炴暟鎹�
//鎻愪氦 Ajax 鎴愬姛鍚庯紝鍏抽棴褰撳墠寮瑰眰骞堕噸杞借〃鏍�
coreHelper.Post("Api/CoreCmsDistribution/DoCreate", field, function (e) {
@@ -365,6 +393,15 @@
function doDetails(obj) {
coreHelper.Post("Api/CoreCmsDistribution/GetDetails", { id: obj.data.id }, function (e) {
if (e.code === 0) {
+ debugger
+ if(e.data.model.idCradNumber)
+ {
+
+ lisimg=e.data.model.idCradNumber.split(',');
+ e.data.lisimg1=lisimg[0];
+
+ e.data.lisimg2=lisimg[1];
+ }
admin.popup({
shadeClose: false,
title: '鏌ョ湅璇︽儏',
@@ -385,15 +422,15 @@
}
//鎵ц棰勮鎿嶄綔
function achievement(obj) {
- coreHelper.Post("Api/CoreCmsDistribution/GetDetails", { id: obj.data.id }, function (e) {
+ coreHelper.Post("Api/CoreCmsDistribution/GetDetailsAchievement", { id: obj.data.id }, function (e) {
if (e.code === 0) {
admin.popup({
shadeClose: false,
title: '鏌ョ湅璇︽儏',
area: ['700px', '550px'],
- id: 'LAY-popup-CoreCmsDistribution-details',
+ id: 'LAY-popup-CoreCmsDistribution-detailsAchievement',
success: function (layero, index) {
- view(this.id).render('distribution/distributor/details', { data: e.data }).done(function () {
+ view(this.id).render('distribution/distributor/achievementdetails', { data: e.data }).done(function () {
form.render();
});
// 绂佹寮圭獥鍑虹幇婊氬姩鏉�
--
Gitblit v1.9.1