修改

app/admin/view/department/add.html

@@ -26,7 +26,7 @@
 		{if $permission == 1}
 		<tr>
 			<td class="layui-td-gray">单位类型：<font>*</font></td>
-			<td id="radio_type">
+			<td id="radio_type" colspan="3">
 				<input type="radio" name="type" value="-1" title="系统方" checked>
 				<input type="radio" name="type" value="0" title="财政局">
 				<input type="radio" name="type" value="1" title="业主">
@@ -36,9 +36,9 @@
 		{/if}
 
 		<tr class ="entrust-unit-row" id="entrust_show" style="display: none">
-			<td class="layui-td-gray-2 get-entrust">委托单位</td>
+			<td class="layui-td-gray-2 get-entrust">归属财政单位</td>
 			<td colspan="3">
-				<input type="text" name="entrust_unit_name" placeholder="请选择委托单位(仅业主选择)" autocomplete="off" class="layui-input get-entrust">
+				<input type="text" name="entrust_unit_name" placeholder="请选择委托单位（仅业主选择）" autocomplete="off" class="layui-input get-entrust">
 				<input type="hidden" name="entrust_unit" value="">
 			</td>
 		</tr>

app/admin/view/index/main_proprietor.html

@@ -802,9 +802,9 @@
             elem: '#cost_project',
             id: "cost_project",
             title: '待审核任务',
-            toolbar: '#toolbarDemo',
+            // toolbar: '#toolbarDemo',
             url: '/admin/project.audit/proprietor_list',
-            page: true,
+            page: false,
             limit: 20,
 
             parseData: function(res) { // 数据解析回调函数

app/admin/view/institution/datalist.html

@@ -43,49 +43,63 @@
 			page: true,
 			limit: 20,
 			cellMinWidth: 80,
+			parseData: function(res) { // 数据解析回调函数
+				// 在这里可以获取数据总数
+				allcount =  res.count;
+				return {
+					code: res.code, // 数据状态码
+					msg: res.msg, // 状态信息
+					count: res.count, // 数据总数
+					data: res.data // 当前页数据
+				};
+			},
+
 			cols: [
 				[
 				{
 					fixed: 'left',
 					field: 'id',
-					title: '部门ID',
+					title: '编号',
 					align: 'center',
-
+					width: 80,
+					templet: function(d){
+							return allcount - (d.LAY_NUM-1);
+					}
 				},{
 					field: 'title',
 					title: '送审单位',
 					align: 'center',
-
+					width: 400,
 				},{
 					field: 'leader',
 					title: '负责人',
 					align: 'center',
-
+					width: 150,
 				},{
 					field: 'username',
 					title: '负责人账号',
 					align: 'center',
-
+					width: 200,
 				},{
 					field: 'phone',
 					title: '电话',
 					align: 'center',
-
+					width: 150,
 				},{
 					field: 'landline',
 					title: '座机',
 					align: 'center',
-
+					width: 150,
 				},{
 					field: 'address',
 					title: '地址',
 					align: 'center',
-
+					width: 400,
 				},{
 					field: 'ProprietorNum',
 					title: '业主人员',
 					align: 'center',
-
+					width: 150,
 				},{
 					fixed: 'right',
 					field: 'right',

app/admin/view/project/cost/datalist.html

@@ -8,7 +8,7 @@
             <div class="layui-input-inline" style="width:100px;">
                 <select name="project_status" lay-filter="status">
                     <option value="">项目状态</option>
-                    <option value="1">财政局立项中</option>
+                    <option value="1">立项中</option>
                     <option value="2">审批中</option>
                     <option value="3">待接收</option>
                     <option value="4">分配中</option>
@@ -17,9 +17,6 @@
                     <option value="7">退审中</option>
                     <option value="8">已归档</option>
                     <option value="9">已退审</option>
-                    <option value="100">立项中</option>
-                    <option value="101">审核中</option>
-                    <option value="102">待接收</option>
                 </select>
             </div>
 

app/admin/view/project/cost/edit_first.html

@@ -430,14 +430,17 @@
 <!--      财评直接创建时-->
       {if $field.project_time == 1 }
         {if $detail.project_start_time != null}
-        <th colspan="8" style="text-align: left; padding-left: 3.5vw;">{$detail.project_start_time|date="Y-m-d"} 至 {$detail.project_end_time|date="Y-m-d"}</th>
+        <th class="form-title">项目周期 <font style="color: red !important;">*</font></th>
+        <th colspan="2" style="text-align: left; padding-left: 3.5vw;">{$detail.project_start_time|date="Y-m-d"} 至 {$detail.project_end_time|date="Y-m-d"}</th>
         {else/}
-        <th colspan="8" style="text-align: left; padding-left: 3.5vw;"> </th>
+        <!-- <th colspan="2" style="text-align: left; padding-left: 3.5vw;"> </th> -->
         {/if}
+        <th class="form-title">项目周期 <font style="color: red !important;">*</font></th>
         <th id="date" colspan="2">
         <div class="layui-input-inline" style="width: 47%;">
           <input type="text" id="start_time" name="project_start_time" readonly lay-verify="required" lay-reqText="请选择开始时间" placeholder="请选择" {if $field_edit.project_time_edit != 1} disabled {/if} class="layui-input" value="{if $detail.project_start_time ==null}  {else/} {$detail.project_start_time|date='Y-m-d'}{/if}">
         </div>
+        -
         <div class="layui-input-inline" style="width: 47%;">
           <input type="text" id="end_time" name="project_end_time" readonly lay-verify="required" lay-reqText="请选择结束时间" placeholder="请选择" {if $field_edit.project_time_edit != 1} disabled {/if} class="layui-input" value="{if $detail.project_end_time ==null} {else/} {$detail.project_end_time|date='Y-m-d'}{/if}">
         </div>
@@ -524,7 +527,7 @@
       {/if}
 
       {if $detail.project_status==1}
-      <th class="form-title">审批人 <font style="color: red !important;">*</font></th>
+      <th class="form-title">审批人（一）<font style="color: red !important;">*</font></th>
       <th colspan="2">
         <select name="entrust_approver" lay-verify="required" lay-reqText="请选择审批人">
           <option value="">请选择审批人</option>
@@ -534,9 +537,10 @@
           {/volist}
         </select>
       </th>
-    <th colspan="2">
+      <th class="form-title">审批人（二）</th>
+      <th colspan="2">
         <select name="entrust_second_approver"  lay-reqText="请选择审批人">
-          <option value="">请选择第二审批人(可选)</option>
+          <option value="">请选择第二审批人（可选）</option>
           {dump($person)}
           {volist name="person" id="v"}
           <option value="{$v.id}" {eq name="$detail.entrust_second_approver" value="$v.id"} selected="" {/eq} {if!isset($detail.entrust_second_approver)}name=""{/if}>{$v.nickname}</option>

app/admin/view/project/cost_proprietor/datalist.html

@@ -8,34 +8,34 @@
             <div class="layui-input-inline" style="width:100px;">
                 <select name="project_status" lay-filter="status">
                     <option value="">项目状态</option>
-                    <option value="1">财政局立项中</option>
-                    <option value="2">审批中</option>
-                    <option value="3">待接收</option>
+                    <option value="1">财评立项中</option>
+                    <option value="2">财评审批中</option>
+                    <option value="3">公司待接收</option>
                     <option value="4">分配中</option>
                     <option value="5">作业中</option>
                     <option value="6">归档中</option>
                     <option value="7">退审中</option>
                     <option value="8">已归档</option>
                     <option value="9">已退审</option>
-                    <option value="100">立项中</option>
-                    <option value="101">审核中</option>
-                    <option value="102">待接收</option>
+                    <option value="100">业主立项中</option>
+                    <option value="101">业主审核中</option>
+                    <option value="102">财评待接收</option>
                 </select>
             </div>
 
-            <div class="layui-input-inline">
+            <div class="layui-input-inline" style="width:100px;">
                 <select id="province" lay-filter="province" name="province">
                     <option value="">省</option>
                 </select>
 
             </div>
-            <div class="layui-input-inline">
+            <div class="layui-input-inline" style="width:100px;">
                 <select id="city" lay-filter="city" name="city">
                     <option value="">市</option>
                 </select>
 
             </div>
-            <div class="layui-input-inline">
+            <div class="layui-input-inline" style="width:100px;">
                 <select id="area" lay-filter="area" name="area">
                     <option value="">县</option>
                 </select>
@@ -144,11 +144,11 @@
 
                             var html = '';
                             if (item.project_status === 1) {
-                                html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800">财政局立项中</span> ';
+                                html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffaa64 !important">财评立项中</span> ';
                             } else if (item.project_status === 2) {
-                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #b30095">审批中</span> ';
+                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #b30095 !important">财评审批中</span> ';
                             } else if (item.project_status === 3) {
-                                html = '<span class="layui-badge layui-bg-green" style="background-color: #d37000">待接收</span> ';
+                                html = '<span class="layui-badge layui-bg-green" style="background-color: #769fcd !important">公司待接收</span> ';
                             } else if (item.project_status === 4) {
                                 html = '<span class="layui-badge" style="background-color: #005fa8">分配中</span> ';
                             } else if (item.project_status === 5) {
@@ -163,11 +163,11 @@
                                 html = '<span class="layui-badge" style="background-color: #d81e06">已退审</span> ';
                             }else if(item.project_status === 0){
                                 if(item.proprietor_status===0){
-                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800">立项中</span> '
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800 !important">业主立项中</span> '
                                 }else if(item.proprietor_status===1){
-                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800">审核中</span> '
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #b30095 !important"">业主审核中</span> '
                                 }else if(item.proprietor_status===2){
-                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800">待接收</span> '
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #b88230 !important">财评待接收</span> '
                                 }
 
                             }