Pārlūkot izejas kodu

燎原报修更改

lijiangwei 4 gadi atpakaļ
vecāks
revīzija
ffdf58df4d

+ 11 - 69
uis/api/tenant.json

@@ -1,77 +1,19 @@
 {
     "code": 0,
     "msg": "",
-    "count": 10,
+    "count": 1,
     "data": [
         {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": false
-        },
-        {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": false
-        },
-        {
-            "name": "河南大学",
-            "create_user": "李四",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": false
-        },
-        {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": false
-        },
-        {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": false
-        },
-        {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": true
-        },
-        {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": false
-        },
-        {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": true
-        },
-        {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": true
-        },
-        {
-            "name": "郑州大学",
-            "create_user": "张三",
-            "create_time": "2020-10-28",
-            "admin_account": "测试数据",
-            "show": true
+            "company": "郑州燎原",
+            "code": "测试代码",
+            "username": "张三",
+            "phone": "13456869595",
+            "due_date": "2020-12-12",
+            "apply_date": "2020-12-12",
+            "check_status": "1",
+            "check_status_text": "已审核",
+            "renew_time": "2020-12-12 15:52:52",
+            "renew_amount": "100.00"
         }
     ]
 }

+ 15 - 0
uis/api/user.json

@@ -0,0 +1,15 @@
+{
+    "code": 0,
+    "msg": "",
+    "count": 1,
+    "data": [
+        {
+            "name": "张三",
+            "phone": "13456869595",
+            "role": "管理员",
+            "tenant": "测试数据",
+            "repaire_count": 12,
+            "maintain_count": 10
+        }
+    ]
+}

+ 56 - 11
uis/zzlyadmin/tenant/edit.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>添租户信息</title>
+  <title>添租户信息</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -19,16 +19,43 @@
 
           <div class="layui-card-body">
             <form class="layui-form" action="" lay-filter="component-form-element">
-              <div class="layui-row layui-col-space10 layui-form-item">
-
-                <div class="layui-col-lg6">
-                  <label class="layui-form-label"><font color='red' size="4">*</font>名称:</label>
-                  <div class="layui-input-block">
-                    <input type="text" name="name" lay-verify="required" placeholder="请输入租户名称" autocomplete="off" class="layui-input">
-                  </div>
-                </div>
-                <button class="layui-btn" id="id_user_save" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
+            <!-- 单位名称 -->
+             <div class="layui-form-item">
+               <label class="layui-form-label"><font color='red' size="4">*</font>单位名称:</label>
+              <div class="layui-input-block">
+                <input type="text" name="company" lay-verify="required" placeholder="请输入单位名称" autocomplete="off" class="layui-input">
               </div>
+            </div>
+
+            <div class="layui-form-item">
+              <label class="layui-form-label"><font color='red' size="4">*</font>组织代码:</label>
+              <div class="layui-input-block">
+                <input type="text" name="code" lay-verify="required" placeholder="请输入组织代码" autocomplete="off" class="layui-input">
+              </div>
+            </div>
+
+            <div class="layui-form-item">
+              <label class="layui-form-label"><font color='red' size="4">*</font>联系人姓名:</label>
+              <div class="layui-input-block">
+                <input type="text" name="username" lay-verify="required" placeholder="请输入联系人姓名" autocomplete="off" class="layui-input">
+              </div>
+            </div>
+
+            <div class="layui-form-item">
+              <label class="layui-form-label "><font color='red' size="4">*</font>联系人电话:</label>
+              <div class="layui-input-block">
+                <input type="text" name="phone" lay-verify="required" placeholder="请输入联系人电话" autocomplete="off" class="layui-input">
+              </div>
+            </div>
+
+            <div class="layui-form-item">
+              <label class="layui-form-label"><font color='red' size="4">*</font>联系人电话:</label>
+              <div class="layui-input-block">
+                <input type="text" name="phone" lay-verify="required" placeholder="请输入联系人电话" autocomplete="off" class="layui-input">
+              </div>
+            </div>
+
+            <button class="layui-btn" id="id_user_save" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
             </form>
           </div>
         </div>
@@ -44,8 +71,9 @@
   }).extend({
     index: 'lib/index',
     formSelects: 'formSelects-v4'
-  }).use(['index', 'form', 'utils'], function(){
+  }).use(['index', 'form', 'utils', 'laydate'], function(){
     var $ = layui.$
+    ,laydate = layui.laydate
     ,admin = layui.admin
     ,form = layui.form;
     var id = layui.view.getParameterByName('id');
@@ -57,9 +85,26 @@
         form.val("component-form-element", editdata);
     }
 
+    //执行一个laydate实例
+      laydate.render({
+        elem: '#due_date' //指定元素
+        ,type: 'date'
+      });
+     laydate.render({
+        elem: '#apply_date' //指定元素
+        ,type: 'date'
+      });
+
+     laydate.render({
+     elem: '#renew_time'
+     ,type: 'datetime'
+     });
+
     form.on('submit(component-form-element)', function(data){
       //layer.msg(JSON.stringify(data.field));
       var submitData = data.field;
+
+      return;
       if (id) {
           var url = '/admin/tenant/'+id+'/';
           var type = 'put';

+ 17 - 9
uis/zzlyadmin/tenant/index.html

@@ -33,7 +33,10 @@
                 <div style="float:right;">
                     <form class="layui-form" lay-filter="query-form-element">
                         <div class="seach_items">
-                            <input type="text"  name="name" autocomplete="off" class="layui-input" placeholder="名称"/>
+                            <input type="text"  name="company" autocomplete="off" class="layui-input" placeholder="单位名称"/>
+                        </div>
+                        <div class="seach_items">
+                            <input type="text"  name="name" autocomplete="off" class="layui-input" placeholder="联系人姓名"/>
                         </div>
                         <div class="seach_items">
                             <button class="layui-btn" lay-submit lay-filter="query-form-element"><i class="layui-icon layui-icon-search"></i>查询</button>
@@ -90,12 +93,17 @@
 
     table.render({
       elem: '#datagrid'
-      ,url: '/admin/tenant/'
+      ,url: '../../api/tenant.json'
       ,cols: [[
-        {field:'name', title:'名称',width: 200}
-       ,{field:'create_user_name', title:'添加人',width: 150}
-       ,{field:'create_time', title:'添加时间',width: 150}
-       ,{field:'username', title:'管理员账号',width: 200}
+        {field:'company', title:'单位名称',width: 200}
+       ,{field:'code', title:'组织代码',width: 150}
+       ,{field:'username', title:'联系人姓名',width: 200}
+       ,{field:'phone', title:'联系人电话',width: 200}
+       ,{field:'due_date', title:'租户到期日期',width: 200}
+       ,{field:'apply_date', title:'申请日期',width: 200}
+       ,{field:'check_status_text', title:'审核状态',width: 200}
+       ,{field:'renew_time', title:'续费时间',width: 200}
+       ,{field:'renew_amount', title:'续费金额',width: 200}
         ,{title: "操作", width:300, align:'left', fixed: 'right', toolbar: '#datagrid-operate-bar'}
       ]]
       ,page: true
@@ -121,7 +129,7 @@
           type: 2,
           title: '修改',
           shadeClose: false,
-          area: ['550px', '250px'],
+          area: ['700px', '450px'],
           btn: ['保存', '取消'],
           yes: function (index, dom) {
             layui.submitChild();
@@ -160,7 +168,7 @@
           type: 2,
           title: "添加超级管理员",
           shadeClose: false,
-          area: ['550px', '300px'],
+          area: ['450px', '300px'],
           btn: ['保存', '取消'],
           yes: function(index, dom) {
             layui.submitChild();
@@ -178,8 +186,8 @@
           type: 2,
           title: '添加',
           shadeClose: false,
-          area: ['450px', '250px'],
           btn: ['保存', '取消'],
+          area: ['700px', '450px'],
           yes: function (index, dom) {
             layui.submitChild();
             },

+ 19 - 16
uis/zzlyadmin/user/edit.html

@@ -19,31 +19,34 @@
 
           <div class="layui-card-body">
             <form class="layui-form" action="" lay-filter="component-form-element">
-              <div class="layui-row layui-col-space10 layui-form-item">
+              <div class="layui-form-item">
+                  <label class="layui-form-label"><font color='red' size="4">*</font>姓名:</label>
+                  <div class="layui-input-block">
+                    <input type="text" name="name" lay-verify="required" placeholder="请输入姓名" autocomplete="off" class="layui-input">
+                  </div>
+              </div>
 
-                <div class="layui-col-lg6">
-                  <label class="layui-form-label"><font color='red' size="4">*</font>账号:</label>
+              <div class="layui-form-item">
+                  <label class="layui-form-label"><font color='red' size="4">*</font>手机号:</label>
                   <div class="layui-input-block">
-                    <input type="text" name="username" lay-verify="required" placeholder="请输入用户名" autocomplete="off" class="layui-input">
+                    <input type="text" name="phone" lay-verify="required" placeholder="请输入手机号" autocomplete="off" class="layui-input">
                   </div>
-                </div>
+              </div>
 
-                  <div class="layui-col-lg6">
-                    <label class="layui-form-label">密码:</label>
-                    <div class="layui-input-block">
-                      <input type="password" name="password" placeholder="请输入密码" autocomplete="off" class="layui-input">
-                        <div class="layui-word-aux">默认密码:1111</div>
-                    </div>
+              <div class="layui-form-item">
+                  <label class="layui-form-label"><font color='red' size="4">*</font>角色:</label>
+                  <div class="layui-input-block">
+                    <input type="text" name="role" lay-verify="required" placeholder="请输入角色" autocomplete="off" class="layui-input">
                   </div>
+              </div>
 
-                  <div class="layui-col-lg6">
-                  <label class="layui-form-label">是否激活:</label>
+              <div class="layui-form-item">
+                  <label class="layui-form-label"><font color='red' size="4">*</font>租户:</label>
                   <div class="layui-input-block">
-                    <input type="checkbox" name="is_active" lay-skin="switch" lay-text="是|否" checked="" value="1">
+                    <input type="text" name="tenant" lay-verify="required" placeholder="请输入租户" autocomplete="off" class="layui-input">
                   </div>
-                </div>
-                <button class="layui-btn" id="id_user_save" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
               </div>
+              <button class="layui-btn" id="id_user_save" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
             </form>
           </div>
         </div>

+ 11 - 4
uis/zzlyadmin/user/index.html

@@ -34,7 +34,10 @@
                 <div style="float:right;">
                     <form class="layui-form" lay-filter="query-form-element">
                         <div class="seach_items">
-                            <input type="text"  name="username" autocomplete="off" class="layui-input" placeholder="账号"/>
+                            <input type="text"  name="name" autocomplete="off" class="layui-input" placeholder="姓名"/>
+                        </div>
+                        <div class="seach_items">
+                            <input type="text"  name="phone" autocomplete="off" class="layui-input" placeholder="手机号"/>
                         </div>
                         <div class="seach_items">
                             <button class="layui-btn" lay-submit lay-filter="query-form-element"><i class="layui-icon layui-icon-search"></i>查询</button>
@@ -71,10 +74,14 @@
     var data=[{'username':1001,'date_joined':2020},{'username':1002,'date_joined':2022},]
     table.render({
       elem: '#datagrid'
-      ,url: '/admin/user/'
+      ,url: '../../api/user.json'
       ,cols: [[
-        {field:'username', title:'账号',width: 100}
-       ,{field:'date_joined', title:'注册时间',width: 200}
+        {field:'name', title:'姓名',width: 100}
+       ,{field:'phone', title:'手机号',width: 200}
+       ,{field:'role', title:'角色',width: 200}
+       ,{field:'tenant', title:'租户',width: 200}
+       ,{field:'repaire_count', title:'报修次数',width: 200}
+       ,{field:'maintain_count', title:'维修次数',width: 200}
         ,{width:140, align:'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}
       ]]
       ,page: true