From 1cb49b04ae6709e6054c328f5ed12bff9ca014c8 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 12 十一月 2024 09:21:57 +0800
Subject: [PATCH] no message

---
 CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html |   75 ++++++++++++++++++++++++++++---------
 1 files changed, 57 insertions(+), 18 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 ae497a8..0901797 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
@@ -66,7 +66,7 @@
             <div class="layui-inline">
                 <div class="layui-input-inline">
                     <select name="gradeId">
-                        <option value="">璇烽�夋嫨鍒嗛攢绛夌骇</option>
+                        <option value="">璇烽�夋嫨缁忛攢绛夌骇</option>
                         {{# layui.each(indexData.grades, function(index, item){ }}
                         <option value="{{ item.id }}">{{ item.name }}</option>
                         {{# }); }}
@@ -104,9 +104,9 @@
 
 <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-xs {{d.verifyStatus!=1?'layui-btn-danger' :''}} " lay-event="edit">{{d.verifyStatus==1?'淇敼' :'瀹℃牳'}} </a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#CoreCmsDistributionTbDelDrop{{d.LAY_NUM}}" no-shade="true">鍒犻櫎</a>
     <div class="dropdown-menu-nav dropdown-popconfirm dropdown-top-right layui-hide" id="CoreCmsDistributionTbDelDrop{{d.LAY_NUM}}"
          style="max-width: 200px; white-space: normal; min-width: auto; margin-left: 10px;">
@@ -122,7 +122,7 @@
     </div>
 
 </script>
-
+<script src="/views/liao.js"></script>
 <script>
     var indexData;
     var debug = layui.setter.debug;
@@ -176,7 +176,7 @@
                             },
                             { field: 'name', title: '缁忛攢鍟嗗悕绉�', sort: false, width: 105 },
                             {
-                                field: 'gradeId', title: '鍒嗛攢绛夌骇', sort: false, width: 90, templet: function (data) {
+                                field: 'gradeId', title: '缁忛攢绛夌骇', sort: false, width: 90, templet: function (data) {
                                     for (var i = 0; i < d.data.grades.length; i++) {
                                         if (d.data.grades[i].id == data.gradeId) {
                                             return d.data.grades[i].name;
@@ -184,15 +184,16 @@
                                     }
                                 }
                             },
-                            //{ field: 'gradeId', title: '鍒嗛攢绛夌骇', sort: false, width: 105 },
+                            //{ field: 'gradeId', title: '缁忛攢绛夌骇', sort: false, width: 105 },
                             { field: 'mobile', title: '鎵嬫満鍙�', sort: false, width: 100 },
                           // { field: 'weixin', title: '寰俊鍙�', sort: false, width: 100 },
                           { 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: 'sales', title: '骞磋惀涓氶(鍏�)', sort: true, width: 100 },
+                            { field: 'storeName', title: '搴楅摵鍚嶇О', sort: false, width: 133 },
+                            { field: 'address', title: '鍦板潃', sort: false, width: 270 },
 
-                            { field: 'storeCoordinate', title: '搴楅摵鍧愭爣', sort: false },
+                           // { field: 'storeCoordinate', title: '搴楅摵鍧愭爣', sort: false },
                            // {
                             //    field: 'storeLogo', title: 'Logo', sort: false, width: 60, templet: function (d) {
                             //        if (d.storeLogo) {
@@ -201,7 +202,28 @@
                               //          return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + setter.noImagePicUrl + '")><image style="max-width:30px;max-height:30px;" src="' + setter.noImagePicUrl + '" /></a>';
                                //     }
                              //   }
-                          //  },
+                            //  },
+                            { field: 'schoolName', title: '瀛︽牎鍚嶇О', sort: true, 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 +233,11 @@
                                     }
                                 }
                             },
-                            { field: 'DistributionAchievementTotals', title: '鍘嗗彶涓氱哗鎬诲拰(鍏�)', sort: false, width: 100 },
+                            { field: 'distributionAchievementTotals', title: '鍘嗗彶鎺ㄥ箍璐规�诲拰(鍏�)', sort: false, width: 133 },
+                            { field: 'distributionYingLingTotals', title: '搴旈浣i噾(鍏�)', sort: false, width: 133 },
+                            { field: 'distributionKeLingTotals', title: '鍙浣i噾(鍏�)', 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 +248,7 @@
                                     }
                                 }
                             },
+
                             { field: 'createTime', title: '鍒涘缓鏃堕棿', width: 130, sort: false },
                             { field: 'updateTime', title: '鏇存柊鏃堕棿', width: 130, sort: false },
                             { field: 'verifyTime', title: '瀹℃牳鏃堕棿', width: 130, sort: false },
@@ -276,7 +303,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 +311,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) {
@@ -319,7 +349,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '缂栬緫鏁版嵁',
-                                area: ['640px', '300px'],
+                                area: ['640px', '350px'],
                                 id: 'LAY-popup-CoreCmsDistribution-edit',
                                 success: function (layero, index) {
                                     view(this.id).render('distribution/distributor/edit', { data: e.data }).done(function () {
@@ -365,10 +395,19 @@
                 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: '鏌ョ湅璇︽儏',
-                                area: ['700px', '550px'],
+                                area: ['700px', '600px'],
                                 id: 'LAY-popup-CoreCmsDistribution-details',
                                 success: function (layero, index) {
                                     view(this.id).render('distribution/distributor/details', { data: e.data }).done(function () {
@@ -385,15 +424,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