From c3ae169e32bd4c86be845c8c12167ee5d214b138 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 26 十二月 2023 14:43:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/zymesSrmLayUi

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index fdfdae4..579dda3 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -373,7 +373,11 @@
                                 //闅愯棌id
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                    if (option.cols[0][i + 1]["field"] == '鍥炲浜ゆ湡') {
+                                        option.cols[0][i + 1]["width"] = 120;
+                                    } else {
+                                        option.cols[0][i + 1]["width"] = dataCols[3];
+                                    }
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
@@ -387,7 +391,7 @@
                                 //} else {
                                 //    option.cols[0][i + 1]["width"] = "";
                                 //}
-                                 
+
                                 //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
                                 switch (dataCols[2]) {
                                     case "L":
@@ -464,9 +468,11 @@
                                     default:
                                         if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�' || data[i].name == '鍓╀綑鏀舵枡鏁伴噺' || data[i].name == '鏈埌璐ф暟閲�' || data[i].name == '绱鏀舵枡鏁伴噺' || data[i].name == '鍓╀綑鍏ュ簱鏁伴噺' || data[i].name == '鍏ュ簱鏁伴噺') {
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+                                        } else if (data[i].name == '鍥炲浜ゆ湡') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
                                         } else {
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
-                                        }     
+                                        }
                                 }
                             }
                         }
@@ -584,6 +590,42 @@
                 _cur_page = 1;
                 get_Display(sqlWhere);
             }
+
+            //鐩戝惉鍗曞厓鏍间簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event === 'HSupSendGoodsDateRemark') {
+                    layer.prompt({
+                        formType: 2
+                        , area: ['400px', '50px'] //鑷畾涔夋枃鏈煙瀹介珮
+                        , title: '淇敼璁㈠崟鍙蜂负 銆� ' +  data.鍗曟嵁鍙� + ' 銆� 锛岀墿鏂欎唬鐮佷负 銆� ' + data.鐗╂枡浠g爜 + ' 銆� 鐨勫洖澶嶄氦鏈�'
+                        , value: data.鍥炲浜ゆ湡
+                    }, function (value, index) {
+                        layer.close(index);
+                        //鏇存柊鍥炲浜ゆ湡
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Cg_Poorder/UpdateSupSendGoodsDateRemark",
+                            async: false,
+                            data: { "HInterID": data.hmainid, "HEntryID": data.hsubid, "HSupSendGoodsDateRemark": value},
+                            success: function (result) {
+                                if (result.code == 1) {
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        鍥炲浜ゆ湡: value
+                                    });
+                                } else {
+                                    layer.alert(result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function (result) {
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                        });                       
+                    });
+                }
+            });
+
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
@@ -908,6 +950,7 @@
                         break;
                 };
             });
+
         });
     </script>
 </body>

--
Gitblit v1.9.1