测试、修改

app/admin/view/project/audit/datalist_proprietor.html

@@ -117,7 +117,7 @@
                     field: 'project_name',
                     title: '项目名称',
                     align: 'center',
-                    width: 100,
+                    width: 400,
                     templet: function (d) {
                         return '<div style="text-align:left">' + d.project_name + '</div>'
                     }

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

@@ -187,34 +187,23 @@
         </tr>
 <!--        添加送审业主-->
          <tr>
-            <th class="form-title">送审业主 <font style="color: red !important;">*</font></th>
-             <th colspan="2">
-                 <input type="text" name="sent_review_unit_name" autocomplete="off"
-                         value="" lay-reqText="请输入送审单位" placeholder="请输入评审单位" class="layui-input proprietor_picker">
-                 <input type="hidden" name="sent_review_unit" value="">
-                 <input type="hidden" name="sent_review_head_phone" value="">
-                 <input type="hidden" name="sent_review_head" value="">
-                 <input type="hidden" name="sent_review_head_name" value="">
-             </th>
-
-<!--            <th colspan="2">-->
-<!--                 <select name="sent_review_head" lay-reqText="请选择送审业主">-->
-<!--                    <option value="">请选择送审业主(暂时没设置成必选)</option>-->
-<!--                    {volist name="$proprietor" id="v"}-->
-<!--                    <option value="{$v.id}">{$v.nickname}</option>-->
-<!--                    {/volist}-->
-<!--                </select>-->
-<!--            </th>-->
-        </tr>
+            <th class="form-title">业主单位 <font style="color: red !important;">*</font></th>
+            <th colspan="2">
+                <input type="text" name="sent_review_unit_name" autocomplete="off"
+                        value="" lay-reqText="请输入业主单位" placeholder="请输入业主单位" class="layui-input proprietor_picker">
+                <input type="hidden" name="sent_review_unit" value="">
+                <input type="hidden" name="sent_review_head_phone" value="">
+                <input type="hidden" name="sent_review_head" value="">
+                <input type="hidden" name="sent_review_head_name" value="">
+            </th>
 
-        <tr>
             <th class="form-title">评审单位 <font style="color: red !important;">*</font></th>
             <th colspan="2">
                 <input type="text" name="review_unit_name" autocomplete="off" readonly value="" lay-verify="required" lay-reqText="请输入评审单位" placeholder="请输入评审单位" class="layui-input customer-picker">
                 <input type="hidden" name="review_unit" value="">
             </th>
 
-            <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>
@@ -223,9 +212,22 @@
                     {/volist}
                 </select>
             </th>
+
+<!--            <th colspan="2">-->
+<!--                 <select name="sent_review_head" lay-reqText="请选择送审业主">-->
+<!--                    <option value="">请选择送审业主(暂时没设置成必选)</option>-->
+<!--                    {volist name="$proprietor" id="v"}-->
+<!--                    <option value="{$v.id}">{$v.nickname}</option>-->
+<!--                    {/volist}-->
+<!--                </select>-->
+<!--            </th>-->
+        </tr>
+
+        <tr>
+            <th class="form-title">审批人（二）</th>
             <th colspan="2">
                 <select name="entrust_second_approver" lay-reqText="请选择审批人">
-                    <option value="">请选择第二审批人(可选)</option>
+                    <option value="">请选择第二审批人（可选）</option>
                     {volist name="person" id="v"}
                     <option value="{$v.id}">{$v.nickname}</option>
                     {/volist}

app/admin/view/project/cost_company/project_report.html

@@ -67,22 +67,30 @@
                 {
                     field: 'status', title: '审批状态', align: 'center', width: 150, templet: function (d) {
                         var abc = '';
-                        if (d.status == 0) {
+                        if(d.status==0){
                             abc = "<span>未审核（新建）</span>";
-                        } else if (d.status == 1) {
-                            abc = "<span>已通过（新建）</span>";
-                        } else if (d.status == 2) {
+                        }else if(d.status==1){
+                            abc = "<span>财政局已通过，待业主审核（新建）</span>";
+                        }else if(d.status==2){
                             abc = "<span>已拒绝（新建）</span>";
-                        } else if (d.status == 3) {
+                        }else if(d.status==3){
                             abc = "<span>未审核（删除）</span>";
-                        } else if (d.status == 4) {
-                            abc = "<span>已通过（删除）</span>";
-                        } else if (d.status == 5) {
+                        }else if(d.status==4){
+                            abc = "<span>财政局已通过，待业主审核（删除）</span>";
+                        }else if(d.status==5){
                             abc = "<span>已拒绝（删除）</span>";
-                        } else if (d.status == 6) {
+                        }else if(d.status==6){
                             abc = "<span>未审核（内部）</span>";
-                        } else if (d.status == 7) {
+                        }else if(d.status==7){
                             abc = "<span>已拒绝（内部）</span>";
+                        }else if (d.status ==8){
+                            abc = "<span>业主已通过（新建）</span>";
+                        }else if (d.status ==9){
+                            abc = "<span>业主拒绝（新建）</span>";
+                        }else if (d.status == 10) {
+                            abc = "<span>业主已通过（删除）</span>";
+                        } else if (d.status == 11) {
+                            abc = "<span>业主已拒绝（删除）</span>";
                         }
                         return abc;
                     }

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

@@ -297,34 +297,37 @@
         height: 5.5vh;
     }
 
-    .filelist {
+    .filelist{
         width: 100%;
         overflow: auto;
-        justify-content: flex-start;
+        justify-content:flex-start;
         align-content: space-between;
-        flex-direction: column-reverse;
+        /* flex-direction: column-reverse; */
         flex-wrap: wrap;
         display: flex;
-
     }
 
-    .filelist li {
-        padding: 0.5vw 0.8vw 0.5vw 0.8vw;
+    .filelist li{
+        padding: 0.5vw 0.7vw 0.5vw 0.7vw;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
         display: inline-block;
         border-right: 1px solid #e2e2e2;
-        float: left;
     }
 
 
-    .filelist p {
+    .filelist p{
         margin: 3px 0 5px 0;
-        width: 7vw;
+        width: 8vw;
+        text-align: center;
         overflow: hidden;
         text-overflow: ellipsis;
-        text-align: center;
+    }
+
+    .filelist img{
+        width: 95px;
+        height: 95px;
     }
 
     #filesBox2 li {
@@ -438,6 +441,19 @@
         </tr>
 
         <tr>
+            <th colspan="9" class="fujianimg" >
+                <div id="filesBox2">
+                    <div class="filelist" id="filesBigBox">
+                        <ul id="filesBox">
+                            <div id="nofile" class="layui-data-none">暂无附件</div>
+                        </ul>
+                    </div>
+
+                </div>
+            </th>
+        </tr>
+
+        <!-- <tr>
             <th colspan="9" class="fujianimg" style="padding: 9px 0;">
                 <div id="filesBox2">
                     <div class="filelist" id="filesBigBox">
@@ -449,7 +465,7 @@
                     {/empty}
                 </div>
             </th>
-        </tr>
+        </tr> -->
 
     </table>
 

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

@@ -40,12 +40,12 @@
             </div>
 
 
-            <div id="time_date" class="layui-input-inline">
-                <div class="layui-input-inline">
+            <div id="time_date" class="layui-input-inline" style="margin: 0;">
+                <div class="layui-input-inline" style="width:150px;">
                     <input type="text" id="start_time" name="project_start_time" readonly  placeholder="请选择" class="layui-input" value="">
                 </div>
                 <div class="layui-input-inline">-</div>
-                <div class="layui-input-inline">
+                <div class="layui-input-inline" style="width:150px;">
                     <input type="text" id="end_time" name="project_end_time" readonly   placeholder="请选择" class="layui-input" value="">
                 </div>
             </div>

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

@@ -22,8 +22,8 @@
             <span>{$vo.maker}</span><span
                 class="{if $vo.unit_type==2}log_commentary{else}log_company{/if}">{$vo.unit_name}</span><span>{$vo.create_time|date="y-m-d H:i"}</span>
         </div>
-        <div class="log_content">
-            <div style="word-wrap:break-word;padding: 5px 10px;">
+        <div class="log_content" style="width: fit-content;">
+            <div style="word-wrap:break-word;padding: 5px 10px;width: fit-content;">
                 {$vo.content}
             </div>
             {if !empty($vo.thumb)}

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

@@ -38,6 +38,46 @@
      .heading th, .form td{
         height: 36px;
      }
+
+     .heading-1 td{
+        border-color: #e2e2e2;
+        display: flex;
+        justify-content: center;
+     }
+
+     #filesBox2 .layui-table-tool{
+      display: none;
+      }
+      
+      #filesBox2 .layui-table-view .layui-table{
+          width: 100% !important;
+      }
+      
+      #filesBox2 .layui-table-cell{
+          display: flex;
+          align-items: center;
+          justify-content: center;
+      }
+      
+      .laytable-cell-1-0-1, .laytable-cell-1-0-2{
+            justify-content: flex-start !important;
+        }
+      
+      .laytable-cell-1-0-0 span, .laytable-cell-1-0-1 span, .laytable-cell-1-0-2 span, .laytable-cell-1-0-3 span, .laytable-cell-1-0-4 span, th>.laytable-cell-1-0-5 span{
+          display: flex;
+          font: 14px red;
+          font-weight: 600;
+          color: #5f5f5f;
+        
+      }
+      #tabniubi tr:first-child th{
+          border-right: 1px solid #e2e2e2 !important;
+      }
+      
+      #filesBox2 th:sixth-child{
+          border-right: none !important;
+      }
+
     </style>
 </head>
 <body>
@@ -304,13 +344,10 @@
             <th colspan="9" class="forleft">相关附件</th>
         </tr>
         <tr>
-            <th colspan="9" class="forleft fujianimg">
-                <ul id="filesBox" style="height: 140px;display: flex;flex-flow: wrap;overflow: scroll;">
-                    {:fileCard($file_array)}
-                </ul>
-                {empty name="$file_array" }
-                <div class="layui-data-none">暂无附件</div>
-                {/empty}
+            <th colspan="9" class="fujianimg" style="padding: 0px 0;">
+                <div id="filesBox2">
+                  <table class="layui-hide" id="get_file" lay-filter="get_file"></table>
+                </div>
             </th>
         </tr>
 
@@ -380,6 +417,56 @@
 
         function first(){
 
+            let table = layui.table;
+                //项目任务
+                var allcount;
+                parent.layui.get_fileTable = table.render({
+                    elem: '#get_file',
+                    title: '文档列表',
+                    toolbar: '#toolbarget_file',
+                    cellMinWidth: 80,
+                    parseData: function (res) { // 数据解析回调函数
+                        // 在这里可以获取数据总数
+                        allcount = res.data.length;
+                        return {
+                            code: res.code, // 数据状态码
+                            msg: res.msg, // 状态信息
+                            count: res.count, // 数据总数
+                            data: res.data // 当前页数据
+                        };
+                    },
+                    // className: 'layui-table-testcss', // 用于给表格主容器追加 css 类名
+                    // lineStyle: 'height: 151px;', // 定义表格的多行样式
+                    url: "/admin/project.api/get_file",
+                    where: {'id': project_id},
+                    page: true, //开启分页
+                    limit: 20,
+                    cols: [[
+                        {field: 'id', title: '序号', width: 80, align: 'center',
+                            templet: function (d) {
+        					        console.log(allcount,d.LAY_NUM)
+                                    return allcount - (d.LAY_NUM - 1);
+                                
+                                }
+                        },
+                        {field: 'name', title: '附件名称', align: 'left',
+                        },
+                        {field: 'remark', title: '附件说明', align: 'left',
+                        },
+        
+                        {field: 'admin_name', title: '上传人', align: 'center', width: 150},
+                        {field: 'create_time', title: '上传时间', align: 'center', width: 100},
+                        {field: 'right', fixed: 'right', title: '操作', width: 150, align: 'center',
+                            templet: function (d) {
+                                var html = '<div class="layui-btn-group">';
+                                var btn1 = `<a href="https://view.officeapps.live.com/op/view.aspx?src=${d.filepath}" target="_blank" class="layui-btn layui-btn-xs">预览</a>`;
+                                var btn2 = `<a class="layui-btn layui-btn-xs layui-bg-blue" href="${d.filepath}" download="${d.name}" lay-event="">下载</a>`;
+                                return html + btn1 + btn2 +'</div>';
+                            }
+                        }
+                    ]]
+                });
+
             layui.use(['form', 'jquery'], function () {
                 var form = layui.form;
                 const $ = layui.jquery;

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

@@ -27,18 +27,10 @@
             limit: 20,
             cols: [[ //表头
                 {field: 'nickname', fixed: 'left', title: '成员姓名', width: 200, align: 'center', rowspan: 2},
-                {field: 'unit_name', title: '所在单位', align: 'center', width: 200, rowspan: 2},
+                {field: 'unit_name', title: '所在单位', align: 'center', width: 450, rowspan: 2},
                 {field: 'unit_type', title: '单位类型', align: 'center', width: 200, rowspan: 2},
                 {field: 'mobile', title: '手机号码', align: 'center', rowspan: 2},
                 {field: 'email', title: '单位邮箱', align: 'center', rowspan: 2},
-                {
-                    // title: '操作', fixed: 'right', align: 'center', width: 150, rowspan: 2, templet: function (d) {
-                    //     // var html = '<span class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">移除</span>';
-                    //
-                    //
-                    //     return html;
-                    // }
-                }
             ]]
         });
 

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

@@ -348,24 +348,24 @@
 
             <li class="layui-this" lay-id="11">项目概览</li>
 
-            {if $project_five.project_comments == 1}
-            <li lay-id="22" data-id="1">作业日志</li>
+            {if $project_five.project_user == 1}
+            <li data-load="" data-id="4">项目人员</li>
             {/if}
 
-            {if $project_five.project_record == 1}
-            <li data-load="" data-id="2">工作记录</li>
+            {if $project_five.project_report == 1}
+            <li data-load="" data-id="5">项目报告</li>
             {/if}
 
             {if $project_five.project_contact == 1}
             <li data-load="" data-id="3">联系函</li>
             {/if}
 
-            {if $project_five.project_user == 1}
-            <li data-load="" data-id="4">项目人员</li>
+            {if $project_five.project_comments == 1}
+            <li lay-id="22" data-id="1">作业日志</li>
             {/if}
 
-            {if $project_five.project_report == 1}
-            <li data-load="" data-id="5">项目报告</li>
+            {if $project_five.project_record == 1}
+            <li data-load="" data-id="2">工作记录</li>
             {/if}
 
             <li data-load="" data-id="6">预约看现场</li>
@@ -382,31 +382,25 @@
                 {include file="/project/cost_proprietor/project_overview"/}
             </div>
 
-
             <div class="layui-tab-item" >
-                {include file="/project/cost_proprietor/project_comments"/}
+                {include file="/project/cost_proprietor/project_user" /}
+                
             </div>
 
-
-
             <div class="layui-tab-item">
-                {include file="/project/cost_proprietor/project_record" /}
+                {include file="/project/cost_proprietor/project_report" /}
             </div>
 
-<!--            联系函-->
-
             <div class="layui-tab-item">
                 {include file="/project/cost_proprietor/project_contact" /}
             </div>
 
-
             <div class="layui-tab-item">
-                {include file="/project/cost_proprietor/project_user" /}
+                {include file="/project/cost_proprietor/project_comments"/}
             </div>
 
-
             <div class="layui-tab-item">
-                {include file="/project/cost_proprietor/project_report" /}
+                {include file="/project/cost_proprietor/project_record" /}
             </div>
 
             <div class="layui-tab-item">

app/admin/view/project/projectlog/index.html

@@ -1,4 +1,8 @@
-
+<style>
+    .footer{
+        display: none;
+    }
+</style>
 
 <div class="layui-form p-4" style="height: 80vh;overflow: auto">
     {volist name="project_log" id="vo"}

app/admin/view/project/report/add.html

@@ -138,7 +138,7 @@
                 </select>
             </th>
 
-            <th class="layui-th-gray">五级级审核人</th>
+            <th class="layui-th-gray">五级审核人</th>
             <th colspan="2">
                 <select name="fifth">
                     <option value="">请选择审核人，可空</option>