Bladeren bron

Merge remote-tracking branch 'origin/master'

lyh 3 jaren geleden
bovenliggende
commit
c0d3dd1bb4
3 gewijzigde bestanden met toevoegingen van 99 en 81 verwijderingen
  1. 1 0
      apps/config/models.py
  2. 1 1
      apps/config/views.py
  3. 97 80
      uis/views/config/index.html

+ 1 - 0
apps/config/models.py

@@ -5,6 +5,7 @@ from django.db import models
 class Config(models.Model):
     KEY_CONSIGNEE_NAME = "consignee_name"       # 收货人姓名
     KEY_CONSIGNEE_TEL = "consignee_tel"         # 收货人电话
+    GODOWNENTRY_PROCESS = "godownentry_process"         # 收货人电话
 
     property = models.CharField(max_length=100, verbose_name=u'属性')
     value = models.TextField(verbose_name=u'值')

+ 1 - 1
apps/config/views.py

@@ -43,4 +43,4 @@ def config_save(request):
 def config_list(request):
     rows = Config.objects.filter()
     serializer = ConfigSerializer(rows, many=True)
-    return JSONResponse(serializer.data)
+    return JSONResponse(serializer.data)

+ 97 - 80
uis/views/config/index.html

@@ -1,14 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8">
-  <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">
-  <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-   <style type="text/css">
+    <meta charset="utf-8">
+    <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">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <style type="text/css">
         .input {
             width: 70%;
             border-radius: 2px;
@@ -24,92 +25,108 @@
 </head>
 <body>
 
-  <div class="layui-fluid">
+<div class="layui-fluid">
     <div class="layui-card">
         <div class="layui-card-body" pad15>
             <form class="layui-form" action="" lay-filter="component-form-element">
-              <div class="layui-row layui-col-space10 layui-form-item">
-                <div>
-                  <label><font color='red' size="4">*</font>收货人姓名:</label>
-                  <input type="text" name="consignee_name" lay-verify="required" autocomplete="off" class="input">
+                <div class="layui-row layui-col-space10 layui-form-item">
+                    <div>
+                        <label><font color='red' size="4">*</font>收货人姓名:</label>
+                        <input type="text" name="consignee_name" lay-verify="required" autocomplete="off" class="input">
+                    </div>
+                    <div>
+                        <label><font color='red' size="4">*</font>收货人电话:</label>
+                        <input type="text" name="consignee_tel" lay-verify="required" autocomplete="off" class="input">
+                    </div>
+                    <div>
+                        <label class="layui-form-label"><font color='red' size="4">*</font>原料、耗材入库流程:</label>
+                        <div class="layui-input-block">
+                            <input type="checkbox" name="godownentry_process" lay-skin="switch" lay-text="简易流程|标准流程" checked=""
+                                   value="1">
+                            <div class="layui-word-aux">简易流程:添加入库单,自动生成合同,自动审核合同。付款时,自动生成付款单,自动审核付款单,同时创建收支单</div>
+                            <div class="layui-word-aux">标准流程:采购合同、付款需要人工添加、审核。</div>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-input-block">
+                            <button class="layui-btn" lay-submit lay-filter="component-form-element">保存</button>
+                        </div>
+                    </div>
                 </div>
-                <div>
-                    <label ><font color='red' size="4">*</font>收货人电话:</label>
-                    <input type="text" name="consignee_tel" lay-verify="required" autocomplete="off" class="input">
-                </div>
-              <div class="layui-form-item">
-                <div class="layui-input-block">
-                  <button class="layui-btn" lay-submit lay-filter="component-form-element">保存</button>
-                </div>
-              </div>
-              </div>
             </form>
-          </div>
         </div>
-      </div>
+    </div>
+</div>
 
 
-  <script src="../../layuiadmin/layui/layui.js"></script>
-  <script>
-  layui.config({
-    base: '../../../layuiadmin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index' //主入口模块
-  }).use(['index', 'form', 'utils'], function(){
-    var $ = layui.$
-    ,admin = layui.admin
-    ,element = layui.element
-    ,form = layui.form;
-    form.render(null, 'component-form-element');
-    element.render('breadcrumb', 'breadcrumb');
+<script src="../../layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'form', 'utils'], function () {
+        var $ = layui.$
+            , admin = layui.admin
+            , element = layui.element
+            , form = layui.form;
+        form.render(null, 'component-form-element');
+        element.render('breadcrumb', 'breadcrumb');
 
-    admin.req({
-        url: '/config/data/',
-        done: function (res) {
-            var data = res.data;
-            var edit_data = {};
-            for(var i in data) {
-                if (data[i].property === 'consignee_name'){
-                    edit_data['consignee_name'] = data[i].value;
-                }else if (data[i].property === 'consignee_tel') {
-                    edit_data['consignee_tel'] = data[i].value;
+        admin.req({
+            url: '/config/data/',
+            done: function (res) {
+                var data = res.data;
+                var edit_data = {};
+                for (var i in data) {
+                    if (data[i].property === 'consignee_name') {
+                        edit_data['consignee_name'] = data[i].value;
+                    } else if (data[i].property === 'consignee_tel') {
+                        edit_data['consignee_tel'] = data[i].value;
+                    } else if (data[i].property === 'godownentry_process') {
+                        edit_data['godownentry_process'] = parseInt(data[i].value);
+                    }
                 }
+                form.val("component-form-element", edit_data);
+                form.render();
             }
-            form.val("component-form-element", edit_data);
-            form.render();
-        }
-    });
+        });
 
-    form.on('submit(component-form-element)', function(data){
-      var save_data = [];
-      if (data.field['consignee_name']){
-          save_data.push({key: 'consignee_name', value: data.field['consignee_name']})
-      }
-      if (data.field['consignee_tel']){
-          save_data.push({key: 'consignee_tel', value: data.field['consignee_tel']})
-      }
-      admin.req({
-        url: '/config/save/'
-        ,data: {data: JSON.stringify(save_data)}
-        ,type: 'post'
-        ,done: function(res){
-            layer.open({
-                 type: 1
-                ,content: '<div style="padding: 20px 100px;">保存成功</div>'
-                ,btn: '关闭'
-                ,btnAlign: 'c' //按钮居中
-                ,shade: 0 //不显示遮罩
-                ,yes: function(){
-                  layer.closeAll();
+        form.on('submit(component-form-element)', function (data) {
+            var save_data = [];
+            if (data.field['consignee_name']) {
+                save_data.push({key: 'consignee_name', value: data.field['consignee_name']})
+            }
+            if (data.field['consignee_tel']) {
+                save_data.push({key: 'consignee_tel', value: data.field['consignee_tel']})
+            }
+            if (data.field['godownentry_process']) {
+                save_data.push({key: 'godownentry_process', value: data.field['godownentry_process']})
+            } else {
+                save_data.push({key: 'godownentry_process', value: '0'})
+            }
+            admin.req({
+                url: '/config/save/'
+                , data: {data: JSON.stringify(save_data)}
+                , type: 'post'
+                , done: function (res) {
+                    layer.open({
+                        type: 1
+                        , content: '<div style="padding: 20px 100px;">保存成功</div>'
+                        , btn: '关闭'
+                        , btnAlign: 'c' //按钮居中
+                        , shade: 0 //不显示遮罩
+                        , yes: function () {
+                            layer.closeAll();
+                        }
+                    });
                 }
             });
-        }
-      });
 
-      return false;
-    });
+            return false;
+        });
 
-  });
-  </script>
+    });
+</script>
 </body>
-</html>
+</html>