Sfoglia il codice sorgente

Merge branch 'master' of http://smartcost.f3322.net:3000/caiaolin/Calculation

MaiXinRong 6 anni fa
parent
commit
4d7dac8b23
3 ha cambiato i file con 58 aggiunte e 13 eliminazioni
  1. 39 1
      app/controller/setting_controller.js
  2. 1 0
      app/router.js
  3. 18 12
      app/view/setting/info.ejs

+ 39 - 1
app/controller/setting_controller.js

@@ -48,12 +48,22 @@ module.exports = app => {
                 // 数据规则
                 const rule = ctx.service.project.rule('saveInfo');
                 const jsValidator = await this.jsValidator.convert(rule).build();
-
+                const officeName = officeList[salesmanData.office];
+                var date = new Date(projectData.create_time*1000);//如果date为10位不需要乘1000
+                var Y = date.getFullYear() + '-';
+                var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
+                var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';
+                var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+                var m = (date.getMinutes() <10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+                var s = (date.getSeconds() <10 ? '0' + date.getSeconds() : date.getSeconds());
+                const dateStr = Y+M+D+h+m+s;
                 const renderData = {
                     projectData,
                     salesmanData,
+                    officeName,
                     officeList,
                     jsValidator,
+                    dateStr
                 };
                 await this.layout('setting/info.ejs', renderData);
             } catch (error) {
@@ -247,6 +257,34 @@ module.exports = app => {
                 ctx.body = {err: 1, msg: err.toString(), data: null};
             }
         }
+
+        /** update porject info
+         * @author wangfeng
+         * @date 2018-10-12 15:48:05
+         * @param ctx
+         * @returns {Promise<void>}
+         */
+        async updateinfo(ctx){
+            try {
+                const projectId = ctx.params.id;
+                const responseData = {
+                    err: 0, msg: '', data: null,
+                }
+                const conditionData = {
+                    id:projectId
+                }
+                 const data = ctx.request.body;
+                 const result = await ctx.service.project.update(data, conditionData);
+                 if (!result) {
+                     throw '提交数据失败'
+                 }
+
+                ctx.redirect('/setting/info');
+            } catch (err) {
+                console.log(err);
+                ctx.body = {err: 1, msg: err.toString(), data: null};
+            }
+        }
     }
 
     return SettingController;

+ 1 - 0
app/router.js

@@ -29,6 +29,7 @@ module.exports = app => {
      */
     // 项目信息
     app.get('/setting/info', sessionAuth, 'settingController.info');
+    app.post('/setting/updateinfo/:id', sessionAuth, 'settingController.updateinfo');
     // 账号设置
     app.get('/setting/user', sessionAuth, 'settingController.user');
     // 标段自定义类别

+ 18 - 12
app/view/setting/info.ejs

@@ -3,7 +3,7 @@
     <div class="panel-title">
         <div class="title-main">
             <h2>项目信息
-                <a href="#" class="btn btn-primary btn-sm pull-right">保存修改</a>
+                <a href="#" class="btn btn-primary btn-sm pull-right" onclick="updateinfo()">保存修改</a>
             </h2>
         </div>
     </div>
@@ -11,40 +11,46 @@
         <div class="c-body">
             <div class="row">
                 <div class="col-5">
-                    <form>
+                    <form id="info-form" action="/<%= ctx.controllerName %>/updateinfo/<%= projectData.id === undefined ? 0 : projectData.id %>?_csrf=<%= ctx.csrf %>" method="post">
                         <div class="form-group">
                             <label>项目编号</label>
-                            <input class="form-control" value="170002" type="text" readonly>
+                            <input class="form-control" value="<%= projectData.code%>" type="text" readonly>
                         </div>
                         <div class="form-group">
                             <label>项目名称</label>
-                            <input class="form-control" placeholder="请输入项目名称" value="项目A" type="text">
+                            <input class="form-control" name="name" id="name" placeholder="请输入项目名称" value="<%= projectData.name%>" type="text">
                         </div>
                         <div class="form-group">
                             <label>管理员</label>
-                            <input class="form-control" value="158****4017(陈特)" type="text" readonly>
+                            <input class="form-control" value="<%= projectData.user_account %>" type="text" readonly>
                         </div>
                         <div class="form-group">
                             <label>销售负责人</label>
                             <div class="card w-50">
                                 <div class="card-body">
-                                    <h4 class="card-title">张三</h4>
-                                    <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
+                                    <h4 class="card-title"><%= salesmanData.username %></h4>
+                                    <h6 class="card-subtitle mb-2 text-muted" ><%= officeName%></h6>
                                 </div>
                                 <ul class="list-group list-group-flush">
-                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
-                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
-                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
+                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="腾讯QQ"><i class="fa fa-qq"></i> <%=salesmanData.qq%></li>
+                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="手机号码"><i class="fa fa-tablet"></i> <%=salesmanData.telephone%></li>
+                                    <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="固定电话"><i class="fa fa-phone"></i> <%=salesmanData.fixedphone%></li>
                                 </ul>
                             </div>
                         </div>
                         <div class="form-group">
                             <label>创建时间</label>
-                            <input class="form-control" value="2017-06-05" type="text" readonly>
+                            <input class="form-control" value=<%= dateStr%> type="text" readonly>
                         </div>
                     </form>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>
+<script type="text/javascript">
+    function updateinfo()
+    {
+        $("#info-form").submit();
+    }
+</script>