提交

application/approve/controller/ApproveInfo.php

@@ -21,6 +21,7 @@ use app\common\constant\OfferConstant;
 use app\common\service\ApproveInfoService;
 use app\common\service\CommonService;
 use app\common\model\ApproveInfo as model;
+use app\common\model\ApproveMaintainUser;
 use library\Controller;
 
 /**
@@ -121,12 +122,15 @@ class ApproveInfo extends Controller
      */
     public function edit()
     {
-        $id = input('id');
+        $id = input('id') ?:0;
 
         $this->title = '详情';
 //        $this->_form($this->table, 'form');
         $data = ApproveInfoService::get_detail($id, [], CommonConstant::IS_WHO_0, 'detail');
         if ($data) {
+            // 维修人员
+            $data['maintain_user'] = $data['module'] == CommonConstant::MODULE_8 && $data['module_info']['maintain_user_id'] > 0 ? ApproveMaintainUser::find($data['module_info']['maintain_user_id']) :null;
+
             $this->title = $this->get_module_list[$data['module']] . '详情';
             $this->get_type_list = CommonService::get_type_list($data['module']);
         }

application/approve/controller/GoodsStockLog.php

@@ -15,6 +15,7 @@
 
 namespace app\approve\controller;
 
+use app\common\constant\CommonConstant;
 use app\common\model\GoodsStockLog as model;
 use library\Controller;
 
@@ -34,7 +35,7 @@ class GoodsStockLog extends Controller
      */
     protected function initialize()
     {
-
+        $this->get_goods_stock_log_list = CommonConstant::get_goods_stock_log_list();
     }
 
     /**
@@ -48,10 +49,14 @@ class GoodsStockLog extends Controller
      */
     public function index()
     {
-        $this->goods_id = $goods_id = input('goods_id') ?:0;
-        $this->title = '商品入库记录';
+        $this->type = $type = input('type') ?: 0;
+        $this->goods_id = $goods_id = input('goods_id') ?: 0;
+        $this->title = '商品入库出库记录';
 
-        $data = model::where('goods_id',$goods_id)
+        $data = model::when($type > 0, function ($query) use ($type) {
+            $query->where('type', $type);
+        })
+            ->where('goods_id', $goods_id)
             ->order('id desc');
         self::_init($data);
     }

application/approve/controller/GoodsUseLog.php

@@ -1,59 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://demo.thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\approve\controller;
-
-use app\common\model\GoodsUseLog as model;
-use library\Controller;
-
-/**
- * 商品出库记录
- */
-class GoodsUseLog extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'GoodsUseLog';
-
-    /**
-     * 控制器初始化
-     */
-    protected function initialize()
-    {
-
-    }
-
-    /**
-     * 列表
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function index()
-    {
-        $this->goods_id = $goods_id = input('goods_id') ?:0;
-        $this->title = '商品出库记录';
-
-        $data = model::where('goods_id',$goods_id)
-            ->order('id desc');
-        self::_init($data);
-    }
-
-}

application/approve/view/approve_info/form_1.html

@@ -113,7 +113,7 @@
                     <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">
+                             class="margin-right-10 margin-bottom-10">
                         {/foreach}
                         <p class="help-block"></p>
                     </div>

application/approve/view/approve_info/form_3.html

@@ -78,7 +78,7 @@
                     <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">
+                             class="margin-right-10 margin-bottom-10">
                         {/foreach}
                         <p class="help-block"></p>
                     </div>
@@ -91,7 +91,6 @@
                         <p class="help-block"></p>
                     </div>
                 </div>
-
                 {notempty name='vo.apply'}
                 <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">采购审批单</label>
@@ -103,6 +102,14 @@
                         </p>
                     </div>
                 </div>
+                {else/}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">采购审批单</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="否"
+                               class="layui-input border-0" disabled>
+                    </div>
+                </div>
                 {/notempty}
 
                 {notempty name='vo.stock_goods'}

application/approve/view/approve_info/form_5.html

@@ -92,7 +92,7 @@
                     <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">
+                             class="margin-right-10 margin-bottom-10">
                         {/foreach}
                         <p class="help-block"></p>
                     </div>

application/approve/view/approve_info/form_6.html

@@ -110,7 +110,7 @@
                     <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">
+                             class="margin-right-10 margin-bottom-10">
                         {/foreach}
                         <p class="help-block"></p>
                     </div>

application/approve/view/approve_info/form_7.html

@@ -112,7 +112,7 @@
                     <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">
+                             class="margin-right-10 margin-bottom-10">
                         {/foreach}
                         <p class="help-block"></p>
                     </div>

application/approve/view/approve_info/form_8.html

@@ -80,7 +80,7 @@
                     <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">
+                             class="margin-right-10 margin-bottom-10">
                         {/foreach}
                         <p class="help-block"></p>
                     </div>
@@ -91,6 +91,79 @@
         </div>
     </div>
 
+    {if ($vo.module_info.feedback_status == 1)}
+    <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.maintain_user.name|default='--'}"
+                               class="layui-input border-0" disabled>
+                        <p class="help-block padding-left-10">
+                            <a href="admin.html#{:url('approve_maintain_user/edit')}?id={$vo.maintain_user.id}" target="_blank">查看</a>
+                        </p>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">反馈结果</label>
+                    <div class="layui-input-block">
+                        <textarea class="layui-input border-0" style="height: 100px" disabled>{$vo.module_info.feedback|default='--'}</textarea>
+                        <p class="help-block padding-left-10"></p>
+                    </div>
+                </div>
+                {notempty name='vo.module_info.feedback_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.feedback_images_text as $k=>$v}
+                        <img data-tips-image src="{$v}" style="height: 300px;vertical-align:top"
+                             class="margin-right-10 margin-bottom-10">
+                        {/foreach}
+                        <p class="help-block"></p>
+                    </div>
+                </div>
+                {/notempty}
+
+            </div>
+        </div>
+    </div>
+    {else/}
+    {/if}
+
+    {if ($vo.module_info.comment_status == 1)}
+    <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.module_info.comment_score|default='--'}"
+                               class="layui-input border-0" 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">
+                        <textarea class="layui-input border-0" style="height: 100px" disabled>{$vo.module_info.comment|default='--'}</textarea>
+                        <p class="help-block padding-left-10"></p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    {else/}
+    {/if}
+
     {include file='approve_info/form_approve'}
 
     <div class="hr-line-dashed"></div>

application/approve/view/approve_info/form_9.html

@@ -62,6 +62,14 @@
                         </p>
                     </div>
                 </div>
+                {else/}
+                <div class="layui-form-item">
+                    <label class="layui-form-label color-green font-w7">采购审批单</label>
+                    <div class="layui-input-block">
+                        <input name="" placeholder="" value="否"
+                               class="layui-input border-0" disabled>
+                    </div>
+                </div>
                 {/notempty}
                 <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">合同类型</label>

application/approve/view/goods/form.html

@@ -1,6 +1,8 @@
 {extend name='admin@main'}
 
-{block name="button"}{/block}
+{block name="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">
@@ -8,68 +10,43 @@
         <div class="layui-card-body">
             {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
 
-            {notempty name='vo.id'}
             <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7">类型</label>
+                <label class="layui-form-label color-green font-w7">商品编号</label>
                 <div class="layui-input-block">
-                    <select class="layui-select" name="type" required>
-                        <option value="">请选择</option>
-                        {foreach $get_type_title_list as $k=>$v}
-                        {eq name='vo.type' value='$k.""'}
-                        <option selected value="{$k}">{$v}</option>
-                        {else}
-                        <option value="{$k}">{$v}</option>
-                        {/eq}
-                        {/foreach}
-                    </select>
+                    <input type="text" name="name" placeholder="请输入商品编号" value="{$vo.goods_no|default=''}" class="layui-input" required>
                     <p class="help-block"></p>
                 </div>
             </div>
-            {else/}
             <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7">类型</label>
+                <label class="layui-form-label color-green font-w7">商品名称</label>
                 <div class="layui-input-block">
-                    <select class="layui-select" name="type" required>
-                        {foreach $get_type_title_list as $k=>$v}
-                        <option value="{$k}">{$v}</option>
-                        {/foreach}
-                    </select>
+                    <input type="text" name="mobile" placeholder="请输入商品名称" value="{$vo.goods_name|default=''}" class="layui-input" required>
                     <p class="help-block"></p>
                 </div>
             </div>
-            {/notempty}
-
             <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7">姓名</label>
+                <label class="layui-form-label color-green font-w7">商品品牌</label>
                 <div class="layui-input-block">
-                    <input type="text" name="name" placeholder="请输入姓名" value="{$vo.name|default=''}" class="layui-input" required>
-                    <p class="help-block"></p>
+                    <input type="text" name="birthday" placeholder="请输入商品品牌" value="{$vo.goods_brand|default=''}" class="layui-input" required>
                 </div>
             </div>
             <div class="layui-form-item">
-                <label class="layui-form-label color-green font-w7">手机号码</label>
+                <label class="layui-form-label color-green font-w7">权重</label>
                 <div class="layui-input-block">
-                    <input type="text" name="mobile" placeholder="请输入手机号码" value="{$vo.mobile|default=''}" class="layui-input" required>
+                    <input type="number" name="sort" placeholder="请输入数字" value="{$vo.sort|default='10'}"
+                           class="layui-input" min="0" required>
                     <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 type="text" name="birthday" placeholder="请选择日期" value="{$vo.birthday|default=''}" class="layui-input" required>
-                </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>
+<!--            <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>-->
         </div>
     </form>
 <script>
     window.form.render();
-    //日期时间选择器
-    laydate.render({elem: '[name="birthday"]',type: 'date'})
 </script>
 </div>
 {/block}

application/approve/view/goods/index.html

@@ -2,8 +2,16 @@
 
 {block name="button"}
 
+{if auth("resume")}
+<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要批量启用吗？" data-action="{:url('resume')}" data-rule="id#{key}" data-csrf="{:systoken('resume')}">批量启用</button>
+{/if}
+
+{if auth("forbid")}
+<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要批量禁用吗？" data-action="{:url('forbid')}" data-rule="id#{key}" data-csrf="{:systoken('forbid')}">批量禁用</button>
+{/if}
+
 {if auth("add")}
-<button class='layui-btn layui-btn-sm layui-btn-primary' data-modal='{:url("add")}'>添 加</button>
+<button class='layui-btn layui-btn-sm layui-btn-primary' data-open='{:url("add")}'>添 加</button>
 {/if}
 
 {if auth("remove")}
@@ -61,10 +69,8 @@
             </td>
             <td class='text-left nowrap'>{$vo.create_at|default=''}</td>
             <td class='text-left nowrap'>
-                <a class="layui-btn layui-btn-xs layui-bg-blue"
-                   data-open="{:url('goods_stock_log/index')}?goods_id={$vo.id}">入库记录</a>
                 <a class="layui-btn layui-btn-xs layui-btn-danger"
-                   data-open="{:url('goods_use_log/index')}?goods_id={$vo.id}">出库记录</a>
+                   data-open="{:url('goods_stock_log/index')}?goods_id={$vo.id}">入库出库记录</a>
 
                 {if $vo.status eq 1 and auth("forbid")}
                 <a class="layui-btn layui-btn-xs layui-btn-warm" data-confirm="确定要禁用该账号吗？" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('forbid')}">禁 用</a>
@@ -73,7 +79,7 @@
                 {/if}
 
                 {if auth("edit")}
-                <a class="layui-btn layui-btn-xs" data-modal="{:url('edit')}?id={$vo.id}">编 辑</a>
+                <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">编 辑</a>
                 {/if}
 
                 {if auth("remove")}

application/approve/view/goods_stock_log/index.html

@@ -2,7 +2,7 @@
 
 {block name="button"}
 
-<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' onclick="javascript:history.back()">返回</button>
+<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' data-open="{:url('goods/index')}">返回</button>
 
 {/block}
 
@@ -13,6 +13,7 @@
         {notempty name='list'}
         <thead>
         <tr>
+            <th class='text-left nowrap'>类型</th>
             <th class='text-left nowrap'>商品规格</th>
             <th class='text-left nowrap'>单价</th>
             <th class='text-left nowrap'>数量</th>
@@ -24,6 +25,9 @@
         {foreach $list as $key=>$vo}
         <tr>
             <td class='text-left nowrap'>
+                {$get_goods_stock_log_list[$vo.type]|default='--'}
+            </td>
+            <td class='text-left nowrap'>
                 <p>规格ID：{$vo.stock_id|default='--'}</p>
                 <p class="color-desc">规格名称：{$vo.name|default='--'}</p>
             </td>

application/approve/view/goods_stock_log/index_search.html

@@ -1 +1,29 @@
 
+<fieldset>
+    <legend>条件搜索</legend>
+    <form class="layui-form layui-form-pane form-search" onsubmit="return false" action="{:request()->url()}" method="get" autocomplete="off">
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">类型</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="type">
+                    <option value="">请选择</option>
+                    {foreach $get_goods_stock_log_list as $k=>$v}
+                    {eq name='Think.get.type' value='$k.""'}
+                    <option selected value="{$k}">{$v}</option>
+                    {else}
+                    <option value="{$k}">{$v}</option>
+                    {/eq}
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+            <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
+        </div>
+    </form>
+    <script>
+        form.render();
+        // laydate.render({range: true, elem: '[name="create_at"]'})
+    </script>
+</fieldset>

application/approve/view/goods_use_log/index.html

@@ -1,41 +0,0 @@
-{extend name='admin@main'}
-
-{block name="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">
-    {include file='goods_use_log/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap'>商品规格</th>
-            <th class='text-left nowrap'>数量</th>
-            <th class='text-left nowrap'>创建时间</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left nowrap'>
-                <p>规格ID：{$vo.stock_id|default='--'}</p>
-                <p class="color-desc">规格名称： {$vo.name|default='--'}</p>
-            </td>
-            <td class='text-left nowrap'>
-                {$vo.stock|default='--'}
-            </td>
-            <td class='text-left nowrap'>
-                {$vo.create_at|default='--'}
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-{/block}

application/approve/view/goods_use_log/index_search.html

@@ -1 +0,0 @@
-

application/common/constant/CommonConstant.php

@@ -210,5 +210,17 @@ class CommonConstant
         self::update => 'update',
         self::edit => 'edit',
     ];
+
+    // 商品入库出库记录类型:0=入库,1=出库
+    const STOCK_LOG_TYPE_0 = '0';
+    const STOCK_LOG_TYPE_1 = '1';
+
+    public static function get_goods_stock_log_list()
+    {
+        return [
+            self::STOCK_LOG_TYPE_0 => '入库',
+            self::STOCK_LOG_TYPE_1 => '出库',
+        ];
+    }
 }