From 9a674ac4db328b5e7cad50a79fae442b3f968b65 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Fri, 19 Jul 2024 15:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A7=92=E8=89=B2=E3=80=81?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=AE=A2=E5=8D=95=E7=9A=84vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.Mvc/Views/RoleManager/Index.cshtml   |  23 +-
 .../Views/WmsInboundOrderTbls/index.cshtml    | 203 +++++++++---------
 OpenAuth.Mvc/wwwroot/userJs/roles.js          |  47 ++--
 .../wwwroot/userJs/wmsinboundordertbls.js     |  68 +++---
 4 files changed, 156 insertions(+), 185 deletions(-)

diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
index 24cb2727..640b441e 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
@@ -1,14 +1,15 @@
 @section header
 {
-     <link rel="stylesheet" href="/css/treetable.css" />
-    <link rel="stylesheet" href="/js/dtree/dtree.css" />
-    <link rel="stylesheet" href="/js/dtree/font/dtreefont.css" />
+    <link rel="stylesheet" href="/css/treetable.css"/>
+    <link rel="stylesheet" href="/js/dtree/dtree.css"/>
+    <link rel="stylesheet" href="/js/dtree/font/dtreefont.css"/>
 }
-<blockquote class="layui-elem-quote news_search toolList" id ="menus">
+
+<blockquote class="layui-elem-quote news_search toolList" id="menus">
 </blockquote>
 
 <div class="layui-row">
-    <table class="layui-hide" id="mainList"  lay-filter="list" lay-size="sm"></table>
+    <table class="layui-hide" id="mainList" lay-filter="list" lay-size="sm"></table>
     <script type="text/html" id="Status">
         {{# if(d.Status == 0){ }}
         <span class="layui-badge layui-bg-blue">启用</span>
@@ -21,18 +22,16 @@
     </script>
 </div>
 
-
-
 <!--角色添加/编辑窗口-->
 <div id="divEdit" style="display: none">
-    <form class="layui-form layui-form-pane" action=""  id="formEdit">
+    <form class="layui-form layui-form-pane" action="" id="formEdit" lay-filter="formEdit">
 
-        <input type="hidden" name="Id" v-model="tmp.Id" />
+        <input type="hidden" name="Id"/>
 
         <div class="layui-form-item">
             <label class="layui-form-label">角色名称</label>
             <div class="layui-input-block">
-                <input type="text" name="Name" v-model="tmp.Name" required lay-verify="required"
+                <input type="text" name="Name" required lay-verify="required"
                        placeholder="请输入角色名称" autocomplete="off" class="layui-input">
             </div>
         </div>
@@ -40,7 +39,7 @@
         <div class="layui-form-item" pane>
             <label class="layui-form-label">禁用</label>
             <div class="layui-input-block">
-                <input type="checkbox" name="Status" v-model="tmp.Status" lay-skin="switch" value="1">
+                <input type="checkbox" name="Status" lay-skin="switch" value="1">
             </div>
         </div>
         <div class="layui-form-item">
@@ -53,4 +52,4 @@
 </div>
 
 <script type="text/javascript" src="/layui/layui.js"></script>
-<script type="text/javascript" src="/userJs/roles.js?v=1"></script>
\ No newline at end of file
+<script type="text/javascript" src="/userJs/roles.js?v2"></script>
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Views/WmsInboundOrderTbls/index.cshtml b/OpenAuth.Mvc/Views/WmsInboundOrderTbls/index.cshtml
index 0980a3ad..59484e69 100644
--- a/OpenAuth.Mvc/Views/WmsInboundOrderTbls/index.cshtml
+++ b/OpenAuth.Mvc/Views/WmsInboundOrderTbls/index.cshtml
@@ -1,7 +1,8 @@
 @section header
 {
-    <link rel="stylesheet" href="/css/treetable.css" />
+    <link rel="stylesheet" href="/css/treetable.css"/>
 }
+
 <blockquote class="layui-elem-quote news_search toolList" id="menus">
 </blockquote>
 
@@ -20,124 +21,124 @@
         {{# } }}
     </script>
 
-</div>  
+</div>
 
 <!--添加/编辑窗口-->
 <div id="divEdit" style="display: none">
-    <form class="layui-form" action=""  id="formEdit">
-    <input type="hidden" name="Id" v-model="tmp.Id" />
-    <div class="layui-form-item">
-        <label class="layui-form-label">相关单据号</label>
-        <div class="layui-input-block">
-            <input type="text" name="ExternalNo" v-model="tmp.ExternalNo"  
-                placeholder="相关单据号" autocomplete="off" class="layui-input">
+    <form class="layui-form" action="" id="formEdit" lay-filter="formEdit">
+        <input type="hidden" name="Id"/>
+        <div class="layui-form-item">
+            <label class="layui-form-label">单据号</label>
+            <div class="layui-input-block">
+                <input type="text" name="ExternalNo"
+                       placeholder="单据号" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">相关单据类型</label>
-        <div class="layui-input-block">
-            <input type="text" name="ExternalType" v-model="tmp.ExternalType"  
-                placeholder="相关单据类型" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">单据类型</label>
+            <div class="layui-input-block">
+                <input type="text" name="ExternalType"
+                       placeholder="单据类型" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">入库通知单状态 </label>
-        <div class="layui-input-block">
-            <input type="radio" name="Status" value="1" title="value1" checked>
-            <input type="radio" name="Status" value="0" title="value2">
+        <div class="layui-form-item">
+            <label class="layui-form-label">状态 </label>
+            <div class="layui-input-block">
+                <input type="radio" name="Status" value="1" title="已完成" checked>
+                <input type="radio" name="Status" value="0" title="正常">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">入库类型 </label>
-        <div class="layui-input-block">
-            <input type="text" name="OrderType" v-model="tmp.OrderType"  
-                placeholder="入库类型 " autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">入库类型 </label>
+            <div class="layui-input-block">
+                <input type="text" name="OrderType"
+                       placeholder="入库类型 " autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">商品类别</label>
-        <div class="layui-input-block">
-            <input type="text" name="GoodsType" v-model="tmp.GoodsType"  
-                placeholder="商品类别" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品类别</label>
+            <div class="layui-input-block">
+                <input type="text" name="GoodsType"
+                       placeholder="商品类别" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">采购单号</label>
-        <div class="layui-input-block">
-            <input type="text" name="PurchaseNo" v-model="tmp.PurchaseNo"  
-                placeholder="采购单号" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">采购单号</label>
+            <div class="layui-input-block">
+                <input type="text" name="PurchaseNo"
+                       placeholder="采购单号" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">仓库编号</label>
-        <div class="layui-input-block">
-            <input type="text" name="StockId" v-model="tmp.StockId"  
-                placeholder="仓库编号" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">仓库编号</label>
+            <div class="layui-input-block">
+                <input type="text" name="StockId"
+                       placeholder="仓库编号" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">货主编号(固定值CQM)</label>
-        <div class="layui-input-block">
-            <input type="text" name="OwnerId" v-model="tmp.OwnerId"  
-                placeholder="货主编号(固定值CQM)" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">货主</label>
+            <div class="layui-input-block">
+                <input type="text" name="OwnerId"
+                       placeholder="货主编号(固定值CQM)" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">承运人编号</label>
-        <div class="layui-input-block">
-            <input type="text" name="ShipperId" v-model="tmp.ShipperId"  
-                placeholder="承运人编号" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">承运人</label>
+            <div class="layui-input-block">
+                <input type="text" name="ShipperId"
+                       placeholder="承运人编号" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">供应商编号</label>
-        <div class="layui-input-block">
-            <input type="text" name="SupplierId" v-model="tmp.SupplierId"  
-                placeholder="供应商编号" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">供应商</label>
+            <div class="layui-input-block">
+                <input type="text" name="SupplierId"
+                       placeholder="供应商编号" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">预定入库时间</label>
-        <div class="layui-input-block">
-            <input type="text" name="ScheduledInboundTime" v-model="tmp.ScheduledInboundTime"  
-                placeholder="预定入库时间" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">入库时间</label>
+            <div class="layui-input-block">
+                <input type="text" name="ScheduledInboundTime"
+                       placeholder="预定入库时间" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">备注</label>
-        <div class="layui-input-block">
-            <input type="text" name="Remark" v-model="tmp.Remark"  
-                placeholder="备注" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">备注</label>
+            <div class="layui-input-block">
+                <input type="text" name="Remark"
+                       placeholder="备注" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">有效标志</label>
-        <div class="layui-input-block">
-            <input type="checkbox" name="Enable" v-model="tmp.Enable" lay-skin="switch" value="1">
+        <div class="layui-form-item">
+            <label class="layui-form-label">有效标志</label>
+            <div class="layui-input-block">
+                <input type="checkbox" name="Enable" lay-skin="switch" value="1">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">承运方式</label>
-        <div class="layui-input-block">
-            <input type="text" name="TransferType" v-model="tmp.TransferType"  
-                placeholder="承运方式" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">承运方式</label>
+            <div class="layui-input-block">
+                <input type="text" name="TransferType"
+                       placeholder="承运方式" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">是否入保税库(0:否,1:是)</label>
-        <div class="layui-input-block">
-            <input type="checkbox" name="InBondedArea" v-model="tmp.InBondedArea" lay-skin="switch" value="1">
+        <div class="layui-form-item">
+            <label class="layui-form-label">是否入保税库</label>
+            <div class="layui-input-block">
+                <input type="checkbox" name="InBondedArea" lay-skin="switch" value="1">
+            </div>
         </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">销退箱数</label>
-        <div class="layui-input-block">
-            <input type="text" name="ReturnBoxNum" v-model="tmp.ReturnBoxNum"  
-                placeholder="销退箱数" autocomplete="off" class="layui-input">
+        <div class="layui-form-item">
+            <label class="layui-form-label">销退箱数</label>
+            <div class="layui-input-block">
+                <input type="text" name="ReturnBoxNum"
+                       placeholder="销退箱数" autocomplete="off" class="layui-input">
+            </div>
         </div>
-    </div>
 
-    <div class="layui-form-item">
+        <div class="layui-form-item">
             <div class="layui-input-block">
                 <button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
                 <button type="reset" class="layui-btn layui-btn-primary">重置</button>
@@ -147,6 +148,4 @@
 </div>
 
 <script type="text/javascript" src="/layui/layui.js"></script>
-<script type="text/javascript" src="/userJs/wmsinboundordertbls.js?v3.2.1"></script>
-
-
+<script type="text/javascript" src="/userJs/wmsinboundordertbls.js?v4"></script>
\ No newline at end of file
diff --git a/OpenAuth.Mvc/wwwroot/userJs/roles.js b/OpenAuth.Mvc/wwwroot/userJs/roles.js
index ef5a9c42..3df9c7c2 100644
--- a/OpenAuth.Mvc/wwwroot/userJs/roles.js
+++ b/OpenAuth.Mvc/wwwroot/userJs/roles.js
@@ -1,6 +1,6 @@
 layui.config({
     base: "/js/"
-}).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth','utils'], function () {
+}).use(['form','ztree', 'layer', 'jquery', 'table','droptree','openauth','utils'], function () {
     var form = layui.form,
         layer = layui.layer,
         $ = layui.jquery;
@@ -9,6 +9,11 @@ layui.config({
     var toplayer = (top == undefined || top.layer === undefined) ? layer : top.layer;  //顶层的LAYER
    
     $("#menus").loadMenus("Role");
+    var initVal={  //初始化的值
+        Id: "",
+        Name: '',
+        Status: 0, // Assuming 1 is true and 0 is false for radio buttons
+    }
 
     //主列表加载，角色后台没有分页，直接前端分页
     var config= {};  //table的参数，如搜索key，点击tree的id
@@ -40,9 +45,7 @@ layui.config({
 
     //添加（编辑）对话框
     var editDlg = function() {
-        var vm;
-        var update = false;  //是否为更新
-        var show = function (data) {
+        var show = function (update, data) {
             var title = update ? "编辑信息" : "添加";
             layer.open({
                 title: title,
@@ -50,29 +53,11 @@ layui.config({
                 type: 1,
                 content: $('#divEdit'),
                 success: function() {
-                     if(vm == undefined){
-                        vm = new Vue({
-                            el: "#formEdit",
-                            data(){
-                                return {
-                                    tmp:data  //使用一个tmp封装一下，后面可以直接用vm.tmp赋值
-                                }
-                            },
-                            watch:{
-                                tmp(val){
-                                    this.$nextTick(function () {
-                                        form.render();  //刷新select等
-                                    })
-                                }
-                            },
-                            mounted(){
-                                form.render();
-
-                            }
-                        });
-                       }else{
-                        vm.tmp = Object.assign({}, vm.tmp,data)
-                       }
+                    if (data == undefined) {
+                        form.val("formEdit", initVal);
+                    } else {
+                        form.val("formEdit", data);
+                    }
                 },
                 end: mainList
             });
@@ -94,14 +79,10 @@ layui.config({
         }
         return {
             add: function() { //弹出添加
-                update = false;
-                show({
-                    Id: ''
-                });
+                show(false);
             },
             update: function(data) { //弹出编辑框
-                update = true;
-                show(data);
+                show(true,data);
             }
         };
     }();
diff --git a/OpenAuth.Mvc/wwwroot/userJs/wmsinboundordertbls.js b/OpenAuth.Mvc/wwwroot/userJs/wmsinboundordertbls.js
index 80b7ebd9..7b307249 100644
--- a/OpenAuth.Mvc/wwwroot/userJs/wmsinboundordertbls.js
+++ b/OpenAuth.Mvc/wwwroot/userJs/wmsinboundordertbls.js
@@ -1,6 +1,6 @@
 layui.config({
     base: "/js/"
-}).use(['form', 'vue', 'ztree', 'layer', 'jquery', 'cookie','table', 'droptree', 'openauth', 'utils'], function () {
+}).use(['form', 'ztree', 'layer', 'jquery', 'cookie','table', 'droptree', 'openauth', 'utils'], function () {
     var form = layui.form,
         layer = layui.layer,
         $ = layui.jquery;
@@ -10,6 +10,25 @@
 
     $("#menus").loadMenus("WmsInboundOrderTbl");
 
+    var initVal = {  //初始化的值
+        Id: "",
+        ExternalNo: '',
+        ExternalType: '',
+        Status: 0, // Assuming 1 is true and 0 is false for radio buttons
+        OrderType: '',
+        GoodsType: '',
+        PurchaseNo: '',
+        StockId: '',
+        OwnerId: '',
+        ShipperId: '',
+        SupplierId: '',
+        ScheduledInboundTime: '',
+        Remark: '',
+        Enable: 0,
+        TransferType: '',
+        InBondedArea: 0,
+        ReturnBoxNum: ''
+    }
 
     //加载表头
     $.getJSON('/WmsInboundOrderTbls/Load',
@@ -56,9 +75,7 @@
  
     //添加（编辑）对话框
     var editDlg = function () {
-        var vm;
-        var update = false;  //是否为更新
-        var show = function (data) {
+        var show = function (update, data) {
             var title = update ? "编辑信息" : "添加";
             layer.open({
                 title: title,
@@ -66,32 +83,11 @@
                 type: 1,
                 content: $('#divEdit'),
                 success: function () {
-                     if(vm == undefined){
-                        vm = new Vue({
-                            el: "#formEdit",
-                            data(){
-                                return {
-                                    tmp:data  //使用一个tmp封装一下，后面可以直接用vm.tmp赋值
-                                }
-                            },
-                            watch:{
-                                tmp(val){
-                                    this.$nextTick(function () {
-                                        form.render();  //刷新select等
-                                        layui.droptree("/Applications/GetList", "#AppName", "#AppId", false);
-
-                                   })
-                                }
-                            },
-                            mounted(){
-                                form.render();
-                                layui.droptree("/Applications/GetList", "#AppName", "#AppId", false);
-
-                            }
-                        });
-                       }else{
-                        vm.tmp = Object.assign({}, vm.tmp,data)
-                       }
+                    if (data == undefined) {
+                        form.val("formEdit", initVal);
+                    } else {
+                        form.val("formEdit", data);
+                    }
                 },
                 end: mainList
             });
@@ -113,15 +109,11 @@
                 });
         }
         return {
-            add: function () { //弹出添加
-                update = false;
-                show({
-                    Id: ''
-                });
+            add: function() { //弹出添加
+                show(false);
             },
-            update: function (data) { //弹出编辑框
-                update = true;
-                show(data);
+            update: function(data) { //弹出编辑框
+                show(true,data);
             }
         };
     }();