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 |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 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 b7c748b..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 },
               {
@@ -360,6 +376,12 @@
             }
           }
         );
+        formatUserSelInPut(
+          coreHelper,
+          form,
+          "selOfflinedisSelUserID",
+         ""
+        );
         dropdown.render({
           elem: "#SeCooperationIntent",
           data: [
@@ -397,6 +419,10 @@
               title: "灏忓崠閮�",
               id: 103,
             },
+            {
+              title: "鍏朵粬",
+              id: 104,
+            },
           ],
           click: function (obj) {
             this.elem.val(obj.title);

--
Gitblit v1.9.1