Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/controller/measure_controller.js

@@ -140,7 +140,7 @@ module.exports = app => {
                 if (!stage) {
                     throw '提交数据错误';
                 }
-                if (stage.status !== auditConst.status.uncheck) {
+                if (stage.status === auditConst.status.checked) {
                     throw '该计量期当前不可编辑';
                 }
                 if (ctx.session.sessionUser.accountId !== stage.user_id) {

app/view/dashboard/index.ejs

@@ -219,7 +219,7 @@
                                                         <%- acChange.statusString[nc.cu_status]%>
                                                     </div>
                                                 </div>
-                                                <p class="mt-1 mb-0"><%- nc.cu_name %><small class="ml-1 text-muted"><%- (nc.cu_role ? '- ' + nc.cu_role : '') %></small>
+                                                <p class="mt-1 mb-0"><%- nc.cu_name %><small class="ml-1 text-muted"><%- (nc.cu_jobs ? '- ' + nc.cu_jobs : '') %></small>
                                                     <span class="pull-right text-muted"><%- nc.cu_time.toLocaleString() %></span>
                                                 </p>
                                             </div>