图号管理

Code/src/MineTec.ProManager.Application/UserInfo/Dto/SetUserDel.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MineTec.ProManager.UserInfo.Dto
+{
+    public class SetUserDel 
+    {
+        public string id { get; set; } //账号id
+        public int isdelete { get; set; } //是否删除 1是 0否
+    }
+}

Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs

@@ -2,7 +2,6 @@
 using Abp.Application.Services.Dto;
 using Abp.Collections.Extensions;
 using Abp.Domain.Repositories;
-using MineTec.ProManager.Commd;
 using MineTec.ProManager.UserInfo.Dto;
 using System;
 using System.Collections.Generic;

Pages/api/init.json

@@ -1,7 +1,7 @@
 {
   "homeInfo": {
     "title": "首页",
-    "href": "page/welcome.html?t=1"
+    "href": "page/welcome.html"
   },
   "logoInfo": {
     "title": "ProManager",
@@ -10,52 +10,56 @@
   },
   "menuInfo": [
     {
-      "title": "图号管理",
-      "icon": "fa fa-sort-numeric-asc",
+      "title": "图文管理",
+      "icon": "fa fa-book",
       "href": "",
       "target": "_self",
       "child": [
         {
-          "title": "图标列表",
-          "href": "page/icon.html",
-          "icon": "fa fa-dot-circle-o",
-          "target": "_self"
+          "title": "编码库管理",
+          "href": "",
+          "icon": "fa fa-sort-numeric-asc",
+          "target": "_self",
+          "child": [
+            {
+              "title": "图号编码管理",
+              "href": "page/404.html",
+              "icon": "fa fa-spinner",
+              "target": "_self"
+            },
+            {
+              "title": "产品编码管理",
+              "href": "page/404.html",
+              "icon": "fa fa-product-hunt",
+              "target": "_self"
+            },
+            {
+              "title": "物料特征码管理",
+              "href": "page/404.html",
+              "icon": "fa fa-cart-plus",
+              "target": "_self"
+            }
+          ]
         },
         {
-          "title": "图标选择",
-          "href": "page/icon-picker.html",
-          "icon": "fa fa-adn",
-          "target": "_self"
-        },
-        {
-          "title": "颜色选择",
-          "href": "page/color-select.html",
-          "icon": "fa fa-dashboard",
-          "target": "_self"
-        },
-        {
-          "title": "下拉选择",
-          "href": "page/table-select.html",
-          "icon": "fa fa-angle-double-down",
-          "target": "_self"
-        },
-        {
-          "title": "文件上传",
-          "href": "page/upload.html",
-          "icon": "fa fa-arrow-up",
-          "target": "_self"
-        },
-        {
-          "title": "富文本编辑器",
-          "href": "page/editor.html",
-          "icon": "fa fa-edit",
-          "target": "_self"
-        },
-        {
-          "title": "省市县区选择器",
-          "href": "page/area.html",
-          "icon": "fa fa-rocket",
-          "target": "_self"
+          "title": "产品图库管理",
+          "href": "",
+          "icon": "fa fa-tasks",
+          "target": "_self",
+          "child": [
+            {
+              "title": "图库信息管理",
+              "href": "page/404.html",
+              "icon": "fa fa-info-circle",
+              "target": "_self"
+            },
+            {
+              "title": "图库文件管理",
+              "href": "page/404.html",
+              "icon": "fa fa-file",
+              "target": "_self"
+            }
+          ]
         }
       ]
     },

Pages/index.html

@@ -144,7 +144,7 @@
                 clearUrl: "api/clear.json", // 缓存清理接口
                 urlHashLocation: true,      // 是否打开hash定位
                 bgColorDefault: false,      // 主题默认配置
-                multiModule: true,          // 是否开启多模块
+                multiModule: false,          // 是否开启多模块
                 menuChildOpen: false,       // 是否默认展开菜单
                 loadingTime: 0,             // 初始化加载时间
                 pageAnim: true,             // iframe窗口动画

Pages/page/UserList.html

@@ -156,15 +156,18 @@
             table.on('tool(currentTableFilter)', function (obj) {
                 var data = obj.data;
                 if (obj.event === 'edit') {
-
+                    layui.sessionData('editUser', {
+                        key: 'SelUserID',
+                        value: data.id,
+                    });
                     var index = layer.open({
                         title: '编辑用户',
                         type: 2,
                         shade: 0.2,
                         maxmin: true,
                         shadeClose: true,
-                        area: ['100%', '100%'],
-                        content: '../page/table/edit.html',
+                        area: ['50%', '70%'],
+                        content: '../page/table/editUser.html',
                     });
                     $(window).on("resize", function () {
                         layer.full(index);
@@ -184,28 +187,50 @@
                     var apiUrl = GetWebApiUrl();
                     //删除所选的账户信息，更新isdelete字段为1
                     for (let index = 0; index < data.length; index++) {
+                        //获取用户数据
                         $.ajax({
-                            url: apiUrl + "/api/services/app/UserInfo/Update", //请求的url地址
+                            url: apiUrl + "/api/services/app/UserInfo/Get", //请求的url地址
                             dataType: "json", //返回格式为json
                             //async: false,//请求是否异步，默认为异步，这也是ajax重要特性
-                            contentType: 'application/json',
-                            data: JSON.stringify({
-                                id: data[index].id,
-                                isDelete: 1
-                            }), //参数值
-                            type: "PUT", //请求方式
+                            data: { id: data[index].id, }, //参数值
+                            type: "GET", //请求方式
                             success: function (req) {
                                 //请求成功时处理
-                                layer.msg('删除成功', { time: 1000 }, function () {
-                                    window.location.reload();
+                                var UserInfo = req.result;
+                                var CurrUserInfo = layui.sessionData('CurrUserInfo');
+                                UserInfo.isDelete = 1;
+                                UserInfo.updateTime = getDatetime();
+                                UserInfo.updateUserID = CurrUserInfo.data.userid;
+                                UserInfo.updateUserName = CurrUserInfo.data.userName;
+                                //更新iddelete=1
+                                $.ajax({
+                                    url: apiUrl + "/api/services/app/UserInfo/Update", //请求的url地址
+                                    dataType: "json", //返回格式为json
+                                    //async: false,//请求是否异步，默认为异步，这也是ajax重要特性
+                                    contentType: 'application/json',
+                                    data: JSON.stringify(UserInfo), //参数值
+                                    type: "PUT", //请求方式
+                                    success: function (req) {
+                                        //请求成功时处理
+                                        layer.msg('删除成功', { time: 1000 }, function () {
+                                            window.location.reload();
+                                        });
+                                    },
+                                    error: function () {
+                                        /*错误信息处理*/
+                                        layer.alert("用户名：" + data[index].userName + " 删除失败，请重试！");
+                                        return false;
+                                    },
                                 });
+
                             },
                             error: function () {
                                 /*错误信息处理*/
-                                layer.alert("用户名：" + data[index].userName + " 删除失败，请重试！");
+                                layer.msg("获取用户信息失败，请重试！");
                                 return false;
                             },
                         });
+
                     }
                     return false;
                 });
@@ -217,29 +242,49 @@
                 layer.confirm('确认删除吗？', function () {
                     var apiUrl = GetWebApiUrl();
                     //删除所选的账户信息，更新isdelete字段为1
+                    //获取用户数据
                     $.ajax({
-                        url: apiUrl + "/api/services/app/UserInfo/Update", //请求的url地址
+                        url: apiUrl + "/api/services/app/UserInfo/Get", //请求的url地址
                         dataType: "json", //返回格式为json
                         //async: false,//请求是否异步，默认为异步，这也是ajax重要特性
-                        contentType: 'application/json',
-                        data: JSON.stringify({
-                            id: data.id,
-                            isDelete: 1
-                        }), //参数值
-                        type: "PUT", //请求方式
+                        data: { id: data.id, }, //参数值
+                        type: "GET", //请求方式
                         success: function (req) {
                             //请求成功时处理
-                            layer.msg('删除成功', { time: 1000 }, function () {
-                                window.location.reload();
+                            var UserInfo = req.result;
+                            var CurrUserInfo = layui.sessionData('CurrUserInfo');
+                            UserInfo.isDelete = 1;
+                            UserInfo.updateTime = getDatetime();
+                            UserInfo.updateUserID = CurrUserInfo.data.userid;
+                            UserInfo.updateUserName = CurrUserInfo.data.userName;
+                            //更新iddelete=1
+                            $.ajax({
+                                url: apiUrl + "/api/services/app/UserInfo/Update", //请求的url地址
+                                dataType: "json", //返回格式为json
+                                //async: false,//请求是否异步，默认为异步，这也是ajax重要特性
+                                contentType: 'application/json',
+                                data: JSON.stringify(UserInfo), //参数值
+                                type: "PUT", //请求方式
+                                success: function (req) {
+                                    //请求成功时处理
+                                    layer.msg('删除成功', { time: 1000 }, function () {
+                                        window.location.reload();
+                                    });
+                                },
+                                error: function () {
+                                    /*错误信息处理*/
+                                    layer.alert("用户名：" + data.userName + " 删除失败，请重试！");
+                                    return false;
+                                },
                             });
+
                         },
                         error: function () {
                             /*错误信息处理*/
-                            layer.alert("用户名：" + data.userName + " 删除失败，请重试！");
+                            layer.msg("获取用户信息失败，请重试！");
                             return false;
                         },
                     });
-
                     return false;
                 });
             }

Pages/page/table/addUser.html

@@ -105,7 +105,7 @@
                             workNo: data.field.workno,
                             account: data.field.account,
                             PassWord: password,
-                            userName: data.field.userName,
+                            userName: data.field.username,
                             sex: data.field.sex,
                             deptName: data.field.deptname,
                             postName: data.field.postname,

Pages/page/table/editUser.html

@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>layui</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../css/public.css" media="all">
+    <style>
+        body {
+            background-color: #ffffff;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-form layuimini-form" lay-filter="editUser">
+        <div class="layui-form-item">
+            <label class="layui-form-label required">工号</label>
+            <div class="layui-input-block">
+                <input type="text" name="workno" lay-verify="required" lay-reqtext="工号不能为空" placeholder="请输入工号" value=""
+                    class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">账号</label>
+            <div class="layui-input-block">
+                <input type="text" name="account" lay-verify="required" lay-reqtext="账号不能为空" placeholder="请输入账号"
+                    value="" maxlength="20" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">密码</label>
+            <div class="layui-input-block">
+                <input type="password" name="password" lay-verify="required" lay-reqtext="密码不能为空" placeholder="请输入密码"
+                    value="" class="layui-input">
+                <tip>密码最大长度为20位。</tip>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">用户名</label>
+            <div class="layui-input-block">
+                <input type="text" name="username" lay-verify="required" lay-reqtext="用户名不能为空" placeholder="请输入用户名"
+                    value="" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">性别</label>
+            <div class="layui-input-block">
+                <input type="radio" name="sex" value="1" title="男">
+                <input type="radio" name="sex" value="0" title="女" checked="">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">部门</label>
+            <div class="layui-input-block">
+                <input type="text" name="deptname" lay-verify="required" lay-reqtext="部门不能为空" placeholder="请输入部门"
+                    value="" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">岗位</label>
+            <div class="layui-input-block">
+                <input type="text" name="postname" lay-verify="required" lay-reqtext="岗位不能为空" placeholder="请输入岗位"
+                    value="" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">手机号</label>
+            <div class="layui-input-block">
+                <input type="number" name="phonenum" lay-verify="required" lay-reqtext="手机号不能为空" placeholder="请输入手机号"
+                    value="" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+            </div>
+        </div>
+    </div>
+    <script src="../../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
+    <script src="../../js/md5/md5.js" charset="utf-8"></script>
+    <script src="../../js/PublicParameters/PublicParameters.js" charset="utf-8"></script>
+    <script>
+        layui.use(['form'], function () {
+            var form = layui.form,
+                layer = layui.layer,
+                $ = layui.$;
+
+            var SelUserID = layui.sessionData('editUser').SelUserID;
+            if (SelUserID == '' || SelUserID == null || SelUserID == undefined) {
+                layer.msg('无法获取当前选择用户ID，请重试！', { time: 1000 }, function () {
+                    // 关闭弹出层
+                    var iframeIndex = parent.layer.getFrameIndex(window.name);
+                    // 刷新父页面
+                    window.parent.location.reload();
+                    parent.layer.close(iframeIndex);
+                });
+                return false;
+            }
+            else {
+                //获取用户数据
+                $.ajax({
+                    url: apiUrl + "/api/services/app/UserInfo/Get", //请求的url地址
+                    dataType: "json", //返回格式为json
+                    //async: false,//请求是否异步，默认为异步，这也是ajax重要特性
+                    data: { id: SelUserID }, //参数值
+                    type: "GET", //请求方式
+                    success: function (req) {
+                        //请求成功时处理
+                        var data = req.result;
+                        //在浏览器session加入当前用户信息
+                        layui.sessionData('CurUser', {
+                            key: 'data',
+                            value: { data }
+                        });
+                        //加载时赋值
+                        form.val("editUser", { //formTest 即 class="layui-form" 所在元素属性 lay-filter="" 对应的值
+                            "workno": data.workNo,// "name": "value"
+                            "account": data.account,
+                            "password": data.passWord,
+                            "username": data.userName,
+                            "sex": data.sex,
+                            "deptname": data.deptName,
+                            "postname": data.postName,
+                            "phonenum": data.cellPhoneNum,
+                        });
+                    },
+                    error: function () {
+                        /*错误信息处理*/
+                        layer.msg("获取用户信息失败，请重试！");
+                        return false;
+                    },
+                });
+            }
+
+            //监听提交
+            form.on('submit(saveBtn)', function (data) {
+                layer.confirm('确认保存吗？', function () {
+                    var apiUrl = GetWebApiUrl();
+                    var password = b64_md5(data.field.password);
+                    var CurrUserInfo = layui.sessionData('CurrUserInfo');
+                    var CurUser = layui.sessionData('CurUser').data.data;
+                    CurUser.workNo = data.field.workno;
+                    CurUser.account = data.field.account;
+                    if (data.field.password != CurUser.passWord) {
+                        CurUser.passWord = password;
+                    }
+                    CurUser.userName = data.field.username;
+                    CurUser.sex = data.field.sex;
+                    CurUser.deptName = data.field.deptname;
+                    CurUser.postName = data.field.postname;
+                    CurUser.cellPhoneNum = data.field.phonenum;
+                    CurUser.updateTime = getDatetime();
+                    CurUser.updateUserID = CurrUserInfo.data.userid;
+                    CurUser.updateUserName = CurrUserInfo.data.userName;
+
+                    $.ajax({
+                        url: apiUrl + "/api/services/app/UserInfo/Update", //请求的url地址
+                        dataType: "json", //返回格式为json
+                        //async: false,//请求是否异步，默认为异步，这也是ajax重要特性
+                        contentType: 'application/json',
+                        data: JSON.stringify(CurUser), //参数值
+                        type: "PUT", //请求方式
+                        success: function (req) {
+                            //请求成功时处理
+                            layer.msg('保存成功', { time: 1000 }, function () {
+                                // 关闭弹出层
+                                var iframeIndex = parent.layer.getFrameIndex(window.name);
+                                // 刷新父页面
+                                window.parent.location.reload();
+                                parent.layer.close(iframeIndex);
+                            });
+                        },
+                        error: function () {
+                            /*错误信息处理*/
+                            layer.alert("保存失败，请重试！");
+                            return false;
+                        },
+                    });
+                });
+                return false;
+            });
+
+        });
+    </script>
+</body>
+
+</html>