提交

application/approve/controller/ApproveFlow.php

@@ -55,6 +55,7 @@ class ApproveFlow extends Controller
     {
         $module = input('module');
         $this->get_item_list = CommonService::get_item_list($module);
+
         $this->title = $this->get_module_list[$module].'审批流程';
         $query = $this->_query($this->table)
             ->field('user_data',true)

application/approve/controller/ApproveInfo.php

@@ -15,8 +15,10 @@
 
 namespace app\approve\controller;
 
+use app\common\constant\ApplyConstant;
 use app\common\constant\CommonConstant;
 use app\common\constant\OfferConstant;
+use app\common\service\ApproveInfoService;
 use app\common\service\CommonService;
 use app\common\model\ApproveInfo as model;
 use library\Controller;
@@ -39,6 +41,8 @@ class ApproveInfo extends Controller
     {
         $this->get_module_list = CommonConstant::get_module_list();
         $this->get_approve_status_list = CommonConstant::get_approve_status_list();
+        $this->get_approve_status_list_admin = CommonConstant::get_approve_status_list_admin();
+        $this->get_pay_type_list = ApplyConstant::get_pay_type_list();
         $this->get_degree_list = OfferConstant::get_degree_list();
     }
 
@@ -66,6 +70,7 @@ class ApproveInfo extends Controller
                 $create_data[] = $key == 0 ? "{$val} 00:00:00" : "{$val} 23:59:59";
             }
         }
+
         $this->title = $this->get_module_list[$this->module] . '列表';
         $this->get_type_list = CommonService::get_type_list($this->module);
 
@@ -95,7 +100,7 @@ class ApproveInfo extends Controller
                 }
             })
             ->with([
-                'approveInfoUser' => function ($query) {
+                'createUser' => function ($query) {
                     $query->field('userid,name,mobile');
                 },
             ])
@@ -154,25 +159,17 @@ class ApproveInfo extends Controller
      */
     public function edit()
     {
-        $this->title = '详情';
-        $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 表单处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _form_filter(&$data)
-    {
-        if ($this->request->isGet()) {
-
-        }
-        if ($this->request->isPost()) {
+        $id = input('id');
 
+        $this->title = '详情';
+//        $this->_form($this->table, 'form');
+        $data = ApproveInfoService::get_detail($id, [], CommonConstant::IS_WHO_0, 'detail');
+        if($data){
+            $this->title = $this->get_module_list[$data['module']] . '详情';
+            $this->get_type_list = CommonService::get_type_list($data['module']);
         }
+//        p($data->toArray());
+        return $this->fetch('form', ['vo' => $data]);
     }
 
 }

application/approve/view/approve_info/form.html

@@ -2,139 +2,36 @@
 
 {block name="button"}
 
-<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' data-open="{:url('index')}">返回</button>
+<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' onclick="javascript:history.back()">返回</button>
 
 {/block}
 
 {block name="content"}
 <div class="think-box-shadow">
-    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-        <div class="layui-tab layui-tab-card think-bg-white">
-            <ul class="layui-tab-title notselect">
-                <li data-type="store-config-type-sms1">个人信息</li>
-            </ul>
-            <div class="layui-tab-content">
-
-                <div class="layui-card-body">
-                    <input type='hidden' value='{$vo.id}' name='id'>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">头像</label>
-                        <div class="layui-input-block">
-                            <img data-tips-image src="{$vo.avatar}" style="width: 100px;height: 100px;vertical-align:top">
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-<!--                    <div class="layui-row margin-bottom-15">-->
-<!--                        <label class="layui-col-xs2 think-form-label">标题</label>-->
-<!--                        <label class="layui-col-xs10">-->
-<!--                            <input name="title" required value='{$vo.title|default=""}' placeholder="请输入标题" class="layui-input">-->
-<!--                        </label>-->
-<!--                    </div>-->
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">昵称</label>
-                        <div class="layui-input-block">
-                            <input name="" placeholder="" value="{$vo.nickname}" class="layui-input layui-bg-gray" disabled>
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">用户姓名</label>
-                        <div class="layui-input-block">
-                            <input name="" placeholder="" value="{$vo.name}" class="layui-input layui-bg-gray" disabled>
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">手机号码</label>
-                        <div class="layui-input-block">
-                            <input name="" placeholder="" value="{$vo.mobile}" class="layui-input layui-bg-gray" disabled>
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">职位</label>
-                        <div class="layui-input-block">
-                            <input name="title" placeholder="请输入职位" value="{$vo.title}" class="layui-input">
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">所在部门</label>
-                        <div class="layui-input-block">
-                            <input name="" placeholder="" value="{$vo.department_text}" class="layui-input layui-bg-gray" disabled>
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">直属主管</label>
-                        <div class="layui-input-block">
-                            <select class="layui-select" name="manager_userid" id="manager_userid">
-                                <option value="">请选择</option>
-                                {foreach $user_list as $k=>$v}
-                                {eq name='vo.manager_userid' value='$v.userid.""'}
-                                <option selected value="{$v.userid}">{$v.name}</option>
-                                {else}
-                                <option value="{$v.userid}">{$v.name}</option>
-                                {/eq}
-                                {/foreach}
-                            </select>
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-
-        {eq name='vo.signature_status' value='1'}
-        {else/}
-        <div class="layui-tab layui-tab-card think-bg-white">
-            <ul class="layui-tab-title notselect">
-                <li data-type="store-config-type-sms1">个人签名</li>
-            </ul>
-            <div class="layui-tab-content">
-
-                <div class="layui-card-body">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">个人签名</label>
-                        <div class="layui-input-block">
-                            <img data-tips-image src="{$vo.signature}" style="height: 300px;vertical-align:top">
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label color-green font-w7">签名状态</label>
-                        <div class="layui-input-block">
-                            {eq name='vo.signature_status' value='2'}
-                            <select class="layui-select" name="signature_status" id="signature_status">
-                                <option value="">请选择</option>
-                                <option value="3">审核通过</option>
-                                <option value="4">审核驳回</option>
-                            </select>
-                            {else/}
-                            <input name="" placeholder="" value="{$get_signature_status_list[$vo.signature_status]}" class="layui-input layui-bg-gray" disabled>
-                            {/eq}
-                            <p class="help-block"></p>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-        {/eq}
-
-        <div class="hr-line-dashed"></div>
-        <div class="layui-form-item text-center">
-            <button class="layui-btn" type='submit'>保存数据</button>
-<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
-        </div>
-    </form>
-<script>
-    window.form.render();
-</script>
+    {switch vo.module}
+    {case 1} {include file='approve_info/form_1'} {/case}
+    {case 2} {include file='approve_info/form_2'} {/case}
+    {case 3} {include file='approve_info/form_3'} {/case}
+    {case 4} {include file='approve_info/form_4'} {/case}
+    {case 5} {include file='approve_info/form_5'} {/case}
+    {case 6} {include file='approve_info/form_6'} {/case}
+    {case 7} {include file='approve_info/form_7'} {/case}
+    {case 8} {include file='approve_info/form_8'} {/case}
+    {case 9} {include file='approve_info/form_9'} {/case}
+    {case 10} {include file='approve_info/form_10'} {/case}
+    {case 11} {include file='approve_info/form_11'} {/case}
+    {default /}
+    {/switch}
 </div>
 {/block}
-{block name="style"}{/block}
+{block name="style"}
+<style>
+    /*隐藏文本框边框*/
+    .hidden-border {
+        border: none;
+    }
+</style>
+{/block}
 {block name='script'}
 <script></script>
 {/block}

application/approve/view/approve_info/form_1.html

@@ -0,0 +1,252 @@
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+    <div class="layui-tab layui-tab-card think-bg-white">
+        <ul class="layui-tab-title notselect">
+            <li data-type="store-config-type-sms1">审批申请信息</li>
+        </ul>
+        <div class="layui-tab-content">
+
+            <div class="layui-card-body">
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.create_user.name|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">审批状态</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.contract'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">合同编号</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.contract as $k=>$v}
+                        <p>{$v.reason}</p>
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申请日期</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.apply_date|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购事由</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.reason|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购类型</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_type_list[$vo.type]|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.apply_goods'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">总金额</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.module_info.total_amount|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">预计申购完成日期</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.module_info.start_time|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.module_info.document_text'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">附件</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.module_info.document_text as $k=>$v}
+                        <p><a href="{$v}" target="_blank">{$v}</a></p>
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                {notempty name='vo.module_info.images_text'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">图片</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.module_info.images_text as $k=>$v}
+                        <img data-tips-image src="{$v}" style="height: 300px;vertical-align:top"
+                             class="margin-right-10">
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">支付方式</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder=""
+                               value="{$get_pay_type_list[$vo.module_info.pay_type]|default='--'}"
+                               class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.apply_goods'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购商品</label>
+                    <div class="layui-input-block">
+                        <table class="layui-table">
+                            {foreach $vo.apply_goods as $k=>$v}
+                            <thead>
+                            <tr>
+                                <td style="width: 20%">商品ID</td>
+                                <td>{$v.goods_id|default='--'}</td>
+                            </tr>
+                            </thead>
+                            <tr>
+                                <td>商品编号</td>
+                                <td>{$v.goods_no|default='--'}</td>
+                            </tr>
+                            <tr>
+                                <td>商品名称</td>
+                                <td>{$v.goods_name|default='--'}</td>
+                            </tr>
+                            <tr>
+                                <td>商品品牌</td>
+                                <td>{$v.goods_brand|default='--'}</td>
+                            </tr>
+                            <tr>
+                                <td>总金额</td>
+                                <td>{$v.total_price|default='--'}</td>
+                            </tr>
+                            <tr>
+                                <td>商品规格</td>
+                                <td>
+                                    <table class="layui-table">
+                                        <tr>
+                                            <td>规格名称</td>
+                                            <td>单价</td>
+                                            <td>数量</td>
+                                        </tr>
+                                        {foreach name="v.goods_stock_text" item="vv"}
+                                        <tr>
+                                            <td>{$vv.name|default='--'}</td>
+                                            <td>{$vv.price|default='--'}</td>
+                                            <td>{$vv.stock|default='--'}</td>
+                                        </tr>
+                                        {/foreach}
+                                    </table>
+                                </td>
+                            </tr>
+                            {/foreach}
+                        </table>
+                    </div>
+                </div>
+                {/notempty}
+
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-tab layui-tab-card think-bg-white">
+        <ul class="layui-tab-title notselect">
+            <li data-type="store-config-type-sms1">审批</li>
+        </ul>
+        <div class="layui-tab-content">
+
+            <div class="layui-card-body">
+                <fieldset class="layui-elem-field layui-field-title">
+                    <legend></legend>
+                </fieldset>
+                <ul class="layui-timeline">
+                    {foreach $vo.approve as $k=>$v}
+                    <li class="layui-timeline-item">
+                        <i class="layui-icon layui-timeline-axis"></i>
+                        <div class="layui-timeline-content layui-text">
+                            <h3 class="layui-timeline-title">{$v.user.name}<span>({if ($v.group == 1)}提交人{else/}{$get_approve_status_list_admin[$v.status]}{/if})</span></h3>
+                            <p>
+                                layui 2.0 的一切准备工作似乎都已到位。发布之弦，一触即发。
+                                <br>不枉近百个日日夜夜与之为伴。因小而大，因弱而强。
+                                <br>无论它能走多远，抑或如何支撑？至少我曾倾注全心，无怨无悔 <i class="layui-icon"></i>
+                            </p>
+                        </div>
+                    </li>
+                    {/foreach}
+<!--                    <li class="layui-timeline-item">-->
+<!--                        <i class="layui-icon layui-timeline-axis"></i>-->
+<!--                        <div class="layui-timeline-content layui-text">-->
+<!--                            <h3 class="layui-timeline-title">8月16日</h3>-->
+<!--                            <p>杜甫的思想核心是儒家的仁政思想，他有<em>“致君尧舜上，再使风俗淳”</em>的宏伟抱负。个人最爱的名篇有：</p>-->
+<!--                            <ul>-->
+<!--                                <li>《登高》</li>-->
+<!--                                <li>《茅屋为秋风所破歌》</li>-->
+<!--                            </ul>-->
+<!--                        </div>-->
+<!--                    </li>-->
+<!--                    <li class="layui-timeline-item">-->
+<!--                        <i class="layui-icon layui-timeline-axis"></i>-->
+<!--                        <div class="layui-timeline-content layui-text">-->
+<!--                            <h3 class="layui-timeline-title">8月15日</h3>-->
+<!--                            <p>-->
+<!--                                中国人民抗日战争胜利日-->
+<!--                                <br>铭记、感恩-->
+<!--                                <br>所有为中华民族浴血奋战的英雄将士-->
+<!--                                <br>永垂不朽-->
+<!--                            </p>-->
+<!--                        </div>-->
+<!--                    </li>-->
+<!--                    <li class="layui-timeline-item">-->
+<!--                        <i class="layui-icon layui-timeline-axis"></i>-->
+<!--                        <div class="layui-timeline-content layui-text">-->
+<!--                            <div class="layui-timeline-title">过去</div>-->
+<!--                        </div>-->
+<!--                    </li>-->
+                </ul>
+
+            </div>
+        </div>
+    </div>
+
+    <div class="hr-line-dashed"></div>
+</form>

application/approve/view/approve_info/form_10.html

@@ -0,0 +1,17 @@
+
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息{$vo.module}</li>
+            </ul>
+            <div class="layui-tab-content">
+
+            </div>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>

application/approve/view/approve_info/form_11.html

@@ -0,0 +1,17 @@
+
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息{$vo.module}</li>
+            </ul>
+            <div class="layui-tab-content">
+
+            </div>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>

application/approve/view/approve_info/form_2.html

@@ -0,0 +1,185 @@
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+    <div class="layui-tab layui-tab-card think-bg-white">
+        <ul class="layui-tab-title notselect">
+            <li data-type="store-config-type-sms1">审批申请信息</li>
+        </ul>
+        <div class="layui-tab-content">
+
+            <div class="layui-card-body">
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.create_user.name|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">审批状态</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.contract'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">合同编号</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.contract as $k=>$v}
+                        <p>{$v.reason}</p>
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申请日期</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.apply_date|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购事由</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.reason|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购类型</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_type_list[$vo.type]|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.apply_goods'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">总金额</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.module_info.total_amount|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">预计申购完成日期</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.module_info.start_time|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.module_info.document_text'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">附件</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.module_info.document_text as $k=>$v}
+                        <p><a href="{$v}" target="_blank">{$v}</a></p>
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                {notempty name='vo.module_info.images_text'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">图片</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.module_info.images_text as $k=>$v}
+                        <img data-tips-image src="{$v}" style="height: 300px;vertical-align:top" class="margin-right-10">
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">支付方式</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_pay_type_list[$vo.module_info.pay_type]|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.apply_goods'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购商品</label>
+                    <div class="layui-input-block">
+                        <table class="layui-table">
+                            {foreach $vo.apply_goods as $k=>$v}
+                            <thead>
+                            <tr>
+                                <td style="width: 20%">商品ID</td>
+                                <td>{$v.goods_id|default='--'}</td>
+                            </tr>
+                            </thead>
+                            <tr>
+                                <td>商品编号</td>
+                                <td>{$v.goods_no|default='--'}</td>
+                            </tr>
+                            <tr>
+                                <td>商品名称</td>
+                                <td>{$v.goods_name|default='--'}</td>
+                            </tr>
+                            <tr>
+                                <td>商品品牌</td>
+                                <td>{$v.goods_brand|default='--'}</td>
+                            </tr>
+                            <tr>
+                                <td>总金额</td>
+                                <td>{$v.total_price|default='--'}</td>
+                            </tr>
+                            <tr>
+                                <td>商品规格</td>
+                                <td>
+                                    <table class="layui-table">
+                                        <tr>
+                                            <td>规格名称</td>
+                                            <td>单价</td>
+                                            <td>数量</td>
+                                        </tr>
+                                        {foreach name="v.goods_stock_text" item="vv"}
+                                        <tr>
+                                            <td>{$vv.name|default='--'}</td>
+                                            <td>{$vv.price|default='--'}</td>
+                                            <td>{$vv.stock|default='--'}</td>
+                                        </tr>
+                                        {/foreach}
+                                    </table>
+                                </td>
+                            </tr>
+                            {/foreach}
+                        </table>
+                    </div>
+                </div>
+                {/notempty}
+
+            </div>
+        </div>
+    </div>
+
+    <div class="hr-line-dashed"></div>
+    <div class="layui-form-item text-center">
+        <!--            <button class="layui-btn" type='submit'>保存数据</button>-->
+        <!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+    </div>
+</form>

application/approve/view/approve_info/form_3.html

@@ -0,0 +1,173 @@
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+    <div class="layui-tab layui-tab-card think-bg-white">
+        <ul class="layui-tab-title notselect">
+            <li data-type="store-config-type-sms1">审批申请信息</li>
+        </ul>
+        <div class="layui-tab-content">
+
+            <div class="layui-card-body">
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">提交人</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.create_user.name|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申请人</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.apply_user.name|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">审批状态</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_approve_status_list[$vo.status]}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">审批编号</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.order_no|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.contract'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">合同编号</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.contract as $k=>$v}
+                        <p>{$v.reason}</p>
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申请日期</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.apply_date|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购事由</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.reason|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购类型</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_type_list[$vo.type]|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.apply_goods'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">总金额</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.module_info.total_amount|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">预计申购完成日期</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$vo.module_info.start_time|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.module_info.document_text'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">附件</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.module_info.document_text as $k=>$v}
+                        <p><a href="{$v}" target="_blank">{$v}</a></p>
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                {notempty name='vo.module_info.images_text'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">图片</label>
+                    <div class="layui-input-block">
+                        {foreach $vo.module_info.images_text as $k=>$v}
+                        <img data-tips-image src="{$v}" style="height: 300px;vertical-align:top" class="margin-right-10">
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">支付方式</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="{$get_pay_type_list[$vo.module_info.pay_type]|default='--'}" class="layui-input hidden-border" disabled>
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+
+                {notempty name='vo.apply_goods'}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">申购商品</label>
+                    <div class="layui-input-block">
+                        <table class="layui-table">
+                            <thead>
+                            <tr>
+                                <td colspan="2"><strong>123456</strong></td>
+                            </tr>
+                            <tr>
+                                <th class="text-left">商品ID</th>
+                                <th class="text-left">商品编号</th>
+                                <th class="text-left">商品名称</th>
+                                <th class="text-left">商品品牌</th>
+                                <th class="text-left">总金额</th>
+                            </tr>
+                            </thead>
+                            {foreach $vo.apply_goods as $k=>$v}
+                            <tr>
+                                <td class="padding-0">
+                                    <input name="" placeholder="" value="{$v.goods_id|default='--'}" class="layui-input border-0" disabled>
+                                </td>
+                                <td class="padding-0">
+                                    <input name="" placeholder="" value="{$v.goods_no|default='--'}" class="layui-input border-0" disabled>
+                                </td>
+                                <td class="padding-0">
+                                    <input name="" placeholder="" value="{$v.goods_name|default='--'}" class="layui-input border-0" disabled>
+                                </td>
+                                <td class="padding-0">
+                                    <input name="" placeholder="" value="{$v.goods_brand|default='--'}" class="layui-input border-0" disabled>
+                                </td>
+                                <td class="padding-0">
+                                    <input name="" placeholder="" value="{$v.total_price|default='--'}" class="layui-input border-0" disabled>
+                                </td>
+                            </tr>
+                            {/foreach}
+                        </table>
+                    </div>
+                </div>
+                {/notempty}
+
+            </div>
+        </div>
+    </div>
+
+    <div class="hr-line-dashed"></div>
+    <div class="layui-form-item text-center">
+        <!--            <button class="layui-btn" type='submit'>保存数据</button>-->
+        <!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+    </div>
+</form>

application/approve/view/approve_info/form_4.html

@@ -0,0 +1,17 @@
+
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息{$vo.module}</li>
+            </ul>
+            <div class="layui-tab-content">
+
+            </div>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>

application/approve/view/approve_info/form_5.html

@@ -0,0 +1,17 @@
+
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息{$vo.module}</li>
+            </ul>
+            <div class="layui-tab-content">
+
+            </div>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>

application/approve/view/approve_info/form_6.html

@@ -0,0 +1,17 @@
+
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息{$vo.module}</li>
+            </ul>
+            <div class="layui-tab-content">
+
+            </div>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>

application/approve/view/approve_info/form_7.html

@@ -0,0 +1,17 @@
+
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息{$vo.module}</li>
+            </ul>
+            <div class="layui-tab-content">
+
+            </div>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>

application/approve/view/approve_info/form_8.html

@@ -0,0 +1,17 @@
+
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息{$vo.module}</li>
+            </ul>
+            <div class="layui-tab-content">
+
+            </div>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>

application/approve/view/approve_info/form_9.html

@@ -0,0 +1,17 @@
+
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-tab layui-tab-card think-bg-white">
+            <ul class="layui-tab-title notselect">
+                <li data-type="store-config-type-sms1">个人信息{$vo.module}</li>
+            </ul>
+            <div class="layui-tab-content">
+
+            </div>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+        <div class="layui-form-item text-center">
+            <button class="layui-btn" type='submit'>保存数据</button>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
+        </div>
+    </form>

application/approve/view/approve_info/index_1.html

@@ -18,8 +18,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_10.html

@@ -18,8 +18,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_11.html

@@ -19,8 +19,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_2.html

@@ -19,8 +19,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_3.html

@@ -16,8 +16,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_4.html

@@ -17,8 +17,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_5.html

@@ -19,8 +19,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_6.html

@@ -19,8 +19,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_7.html

@@ -19,8 +19,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_8.html

@@ -19,8 +19,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/approve/view/approve_info/index_9.html

@@ -18,8 +18,8 @@
     {foreach $list as $key=>$vo}
     <tr>
         <td class='text-left nowrap'>
-            <p>用户姓名：{$vo.approve_info_user.name|default='--'}</p>
-            <p class="color-desc">手机号码：{$vo.approve_info_user.mobile|default="--"}</p>
+            <p>用户姓名：{$vo.create_user.name|default='--'}</p>
+            <p class="color-desc">手机号码：{$vo.create_user.mobile|default="--"}</p>
         </td>
         <td class='text-left nowrap'><strong>{$get_approve_status_list[$vo.status]}</strong></td>
         <td class='text-left nowrap'>{$vo.create_at}</td>

application/common/constant/CommonConstant.php

@@ -161,6 +161,17 @@ class CommonConstant
         ];
     }
 
+    public static function get_approve_status_list_admin()
+    {
+        return [
+            self::STATUS_1 => '待审批',
+            self::STATUS_2 => '审批中',
+            self::STATUS_3 => '审批同意',
+            self::STATUS_4 => '审批驳回',
+            self::STATUS_5 => '审批撤销',
+        ];
+    }
+
     // 用户状态:0=已禁用,1=正常
     const STATUS_FROZEN = '0';
     const STATUS_NORMAL = '1';

application/common/model/ApproveInfo.php

@@ -73,7 +73,7 @@ class ApproveInfo extends Model
     }
 
     // 关联用户 (后台)
-    public function approveInfoUser()
+    public function createUser()
     {
         return $this->belongsTo(User::class, 'user_id', 'userid');
     }

application/common/service/ApproveInfoService.php

@@ -740,7 +740,7 @@ class ApproveInfoService
      *
      * @param integer $id 申请ID
      * @param mixed $user 用户信息
-     * @param string $group 类别:0=审批人,1=提交人 审批详情,我的申请详情/信息
+     * @param string $group 类别:0=审批人/后台,1=提交人 审批详情,我的申请详情/信息
      * @param string $type 类型:detail=详情,info=信息
      **/
     public static function get_detail($id, $user, $group, $type)
@@ -823,17 +823,9 @@ class ApproveInfoService
                 }
                 // 部门列表
                 $department_data = UserService::get_user_department_list($info['department']);
-                // 关联的合同呈批申请
-                $contract = ApproveInfo::field('id,reason')
-                    ->where('module', CommonConstant::MODULE_9)
-                    ->where('status', CommonConstant::STATUS_3)
-                    ->where('is_deleted', CommonConstant::IS_DELETED_0)
-                    ->where('apply_id', $id)
-                    ->select();
                 $info['create_user'] = $create_user;
                 $info['apply_user'] = $apply_user;
                 $info['department_data'] = $department_data;
-                $info['contract'] = $contract;
             }
         } else {
             // 信息
@@ -1053,24 +1045,35 @@ class ApproveInfoService
             switch ($module) {
                 case CommonConstant::MODULE_1:
                     $info['apply_goods'] = [];
+                    $info['contract'] = [];
                     if ($info['type'] == ApplyConstant::TYPE_1) {
                         if ($type == 'detail') {
-                            $info['apply_goods'] = $info->applyGoods()->field('id,info_id,goods_name,total_price,goods_stock')->select();
+                            $info['apply_goods'] = $info->applyGoods()->select();
                         } else {
                             $info->apply_goods;
                         }
                     }
+                    if ($type == 'detail') {
+                        // 关联的合同呈批申请
+                        $contract = ApproveInfo::field('id,reason')
+                            ->where('module', CommonConstant::MODULE_9)
+                            ->where('status', CommonConstant::STATUS_3)
+                            ->where('is_deleted', CommonConstant::IS_DELETED_0)
+                            ->where('apply_id', $info['id'])
+                            ->select();
+                        $info['contract'] = $contract;
+                    }
                     break;
                 case CommonConstant::MODULE_3:
                     if ($type == 'detail') {
-                        $info['stock_goods'] = $info->stockGoods()->field('id,info_id,goods_name,total_price,goods_stock')->select();
+                        $info['stock_goods'] = $info->stockGoods()->select();
                     } else {
                         $info->stock_goods;
                     }
                     break;
                 case CommonConstant::MODULE_4:
                     if ($type == 'detail') {
-                        $info['use_goods'] = $info->useGoods()->field('id,info_id,goods_name,total_price,goods_stock')->select();
+                        $info['use_goods'] = $info->useGoods()->select();
                     } else {
                         $info->use_goods;
                     }

application/common/service/CommonService.php

@@ -22,25 +22,26 @@ class CommonService
      *
      * @param integer $type 合同类型
      **/
-    public static function get_contract_no($type){
+    public static function get_contract_no($type)
+    {
         $options = config('redis.');
         $redis = new Redis($options);
         $key = 'dingtalk_contract_no';
         $key2 = 'dingtalk_contract_no_list';
-        if($redis->handler()->llen($key2) > 0){
+        if ($redis->handler()->llen($key2) > 0) {
             $number = $redis->handler()->lpop($key2);
-        } else{
-            if($redis->has($key)){
+        } else {
+            if ($redis->has($key)) {
                 $number = $redis->get($key);
-            } else{
+            } else {
                 $number = 1;
             }
-            $redis->set($key,$number+1);
+            $redis->set($key, $number + 1);
         }
-        $new_number = filling_method($number,$number);
+        $new_number = filling_method($number, $number);
         $type_no = ContractConstant::get_type_no_list()[$type];
         $date = date('Ymd');
-        $data = 'SET'.$type_no.$date.$new_number;
+        $data = 'SET' . $type_no . $date . $new_number;
         return $data;
     }
 
@@ -49,11 +50,12 @@ class CommonService
      *
      * @param string $contract_no 合同编号
      **/
-    public static function set_contract_no($contract_no){
+    public static function set_contract_no($contract_no)
+    {
         $options = config('redis.');
         $redis = new Redis($options);
         $key2 = 'dingtalk_contract_no_list';
-        return $redis->handler()->rpush($key2,substr($contract_no, 13));
+        return $redis->handler()->rpush($key2, substr($contract_no, 13));
     }
 
     /**
@@ -76,7 +78,8 @@ class CommonService
      *
      * @param mixed $user 用户信息
      **/
-    public static function isMaintain($user){
+    public static function isMaintain($user)
+    {
         if (in_array($user['title'], MaintainConstant::get_type_title_list())) {
             return true;
         }
@@ -106,9 +109,10 @@ class CommonService
      *
      * @param integer $module
      **/
-    public static function get_item_list($module){
+    public static function get_item_list($module)
+    {
         $get_item_list = [];
-        switch ($module){
+        switch ($module) {
             case CommonConstant::MODULE_5:
                 $get_item_list = EvectionConstant::get_type_list();
                 break;
@@ -127,7 +131,8 @@ class CommonService
      *
      * @param integer $module
      **/
-    public static function get_type_list($module){
+    public static function get_type_list($module)
+    {
         $list = [];
         switch ($module) {
             case CommonConstant::MODULE_1:
@@ -144,11 +149,12 @@ class CommonService
                 break;
             case CommonConstant::MODULE_8:
                 $list = MaintainConstant::get_type_list();
-            break;
+                break;
             case CommonConstant::MODULE_9:
                 $list = ContractConstant::get_type_list();
                 break;
         }
         return $list;
     }
+
 }

application/user/view/member/form.html

@@ -2,7 +2,7 @@
 
 {block name="button"}
 
-<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' data-open="{:url('index')}">返回</button>
+<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' onclick="javascript:history.back()">返回</button>
 
 {/block}
 
@@ -20,7 +20,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label color-green font-w7">头像</label>
                         <div class="layui-input-block">
-                            <img data-tips-image src="{$vo.avatar}" style="width: 100px;height: 100px;vertical-align:top">
+                            <img data-tips-image src="{$vo.avatar}" style="height: 100px;vertical-align:top">
                             <p class="help-block"></p>
                         </div>
                     </div>