zhanglinxin 1 年之前
父节点
当前提交
80e0b1bbe2

+ 11 - 10
application/approve/controller/ApproveFlow.php

@@ -94,17 +94,18 @@ class ApproveFlow extends Controller
      */
     protected function _form_filter(&$data)
     {
-        // 编辑
-        if($data['id'] > 0) {
-            if ($this->request->isGet()) {
-                if ($data) {
-                    $data['user_data_text'] = json_decode($data['user_data'], true);
-                    $this->get_item_list = CommonService::get_item_list($data['module']);
-                    $this->user_list = UserService::get_list(1);
-                    $this->user_list_json = json_encode($this->user_list, JSON_UNESCAPED_UNICODE);
-                }
+        if ($this->request->isGet()) {
+            if ($data) {
+                // 编辑获取数据时
+                $data['user_data_text'] = json_decode($data['user_data'], true);
+                $this->get_item_list = CommonService::get_item_list($data['module']);
+                $this->user_list = UserService::get_list(1);
+                $this->user_list_json = json_encode($this->user_list, JSON_UNESCAPED_UNICODE);
             }
-            if ($this->request->isPost()) {
+        }
+        if ($this->request->isPost()) {
+            if ($data) {
+                // 编辑提交数据时
                 if (!isset_full($data, 'user_data')) {
                     $this->error('请添加审批层级');
                 }

+ 0 - 1
application/approve/controller/ApproveInfo.php

@@ -123,7 +123,6 @@ class ApproveInfo extends Controller
     public function edit()
     {
         $this->title = '详情';
-//        $this->_form($this->table, 'form');
         $data = ApproveInfoService::get_detail(input('id') ?:0, [], CommonConstant::IS_WHO_0, 'detail');
         if ($data) {
             // 维修人员

+ 0 - 1
application/approve/controller/ApproveInfoLog.php

@@ -93,7 +93,6 @@ class ApproveInfoLog extends Controller
 
             $this->title = '审批人修改记录详情-'.$this->get_module_list[$data['module']];
             $this->get_type_list = CommonService::get_type_list($data['module']);
-//            p($data);exit;
         }
         return $this->fetch('form', ['vo' => $data['before_text'],'vo2'=>$data['after_text']]);
     }

+ 12 - 10
application/approve/controller/ApproveMaintainUser.php

@@ -77,18 +77,20 @@ class ApproveMaintainUser extends Controller
      */
     protected function _index_page_filter(&$data)
     {
-        foreach ($data as &$value) {
-            $comment_count = !empty($value['log']) ? count($value['log']) : 0;
-            $comment_score = 0;
-            if (!empty($value['log'])) {
-                foreach ($value['log'] as $k => $v) {
-                    $comment_score = bcadd($comment_score, $v['comment_score']);
+        if($data) {
+            foreach ($data as &$value) {
+                $comment_count = !empty($value['log']) ? count($value['log']) : 0;
+                $comment_score = 0;
+                if (!empty($value['log'])) {
+                    foreach ($value['log'] as $k => $v) {
+                        $comment_score = bcadd($comment_score, $v['comment_score']);
+                    }
                 }
+                $log_score = $comment_score > 0 ? bcdiv($comment_score, $comment_count, 1) : 0;
+                $value['comment_count'] = $comment_count;
+                $value['comment_score'] = $comment_score;
+                $value['log_score'] = $log_score;
             }
-            $log_score = $comment_score > 0 ? bcdiv($comment_score, $comment_count, 1) : 0;
-            $value['comment_count'] = $comment_count;
-            $value['comment_score'] = $comment_score;
-            $value['log_score'] = $log_score;
         }
     }
 

+ 47 - 1
application/approve/controller/Goods.php

@@ -17,8 +17,11 @@ namespace app\approve\controller;
 
 use app\common\constant\CommonConstant;
 use app\common\model\Goods as model;
+use app\common\model\GoodsStock;
 use app\common\service\GoodsCategoryService;
 use library\Controller;
+use library\tools\Data;
+use think\Db;
 
 /**
  * 商品
@@ -116,11 +119,54 @@ class Goods extends Controller
     protected function _form_filter(&$data)
     {
         if ($this->request->isGet()) {
+            if($data){
+                // 编辑获取数据时
+                $data['first_classify'] = $data['goods_category_first'];
+                $data['second_classify'] = $data['goods_category_id'];
+                $data['goods_stock'] = GoodsStock::where('goods_id',$data['id'])->select();
+            }
             $this->category_list = GoodsCategoryService::get_list([],1);
-            $this->category_list_json = json_encode($this->category_list, JSON_UNESCAPED_UNICODE);
         }
         if ($this->request->isPost()) {
+            if($data){
+                // 编辑提交数据时
+                $data['goods_category_first'] = $data['first_classify'];
+                $data['goods_category_id'] = $data['second_classify'];
+            }
+        }
+    }
 
+    /**
+     * 表单结果处理
+     * @param boolean $result
+     */
+    protected function _form_result($result)
+    {
+        if ($result && $this->request->isPost()) {
+            list($data) = [$this->request->post()];
+            p($result);
+            p($data);
+            exit;
+//            $data['id'] = $result;
+//            $low_price = 0;
+//            foreach (json_decode($data['lists'], true) as $ko=>$vo){
+//                if($low_price == 0 || $vo[0]['sell_price'] < $low_price )$low_price =  $vo[0]['sell_price'];
+//                Data::save('StoreGoodsItem', [
+//                    'goods_id'          => $data['id'],
+//                    'spec_cover'        => $data['spec_cover'][$ko] ? $data['spec_cover'][$ko] : $vo[0]['spec_cover'],
+//                    'goods_spec'        => $vo[0]['key'],
+//                    'goods_no'          => $vo[0]['sku'],
+//                    'original_price'    => $vo[0]['original_price'],
+//                    'sell_price'        => $vo[0]['sell_price'],
+//                    'virtual'           => $vo[0]['virtual'],
+//                    'status'            => $vo[0]['status'] ? 1 : 0,
+//                    'weight'            => $vo[0]['weight'] ? $vo[0]['weight'] : 0,
+//                ], 'goods_spec', ['goods_id' => $data['id']]);
+//            }
+//            Db::name('StoreGoods')->where(['id'=>$data['id']])->update(['low_price'=>$low_price]);
+//            \app\common\model\StoreGoods::esAdd($result);
+//            \app\common\model\TopSearch::saveData($result,'goods');
+            $this->success('商品编辑成功!', 'javascript:history.back()');
         }
     }
 

+ 2 - 2
application/approve/controller/GoodsCategory.php

@@ -114,8 +114,8 @@ class GoodsCategory extends Controller
     protected function _form_filter(&$data)
     {
         if ($this->request->isGet()) {
-            $cate_list = GoodsCategoryService::get_list([]);
-            $this->cate_list = array_merge([['id' => '0', 'pid' => '-1', 'name' => '顶级']],$cate_list ? $cate_list->toArray() : []);
+            $category_list = GoodsCategoryService::get_list([]);
+            $this->category_list = array_merge([['id' => '0', 'pid' => '-1', 'name' => '顶级']],$category_list ? $category_list->toArray() : []);
         }
         if ($this->request->isPost()) {
 

+ 2 - 0
application/approve/view/approve_flow/form.html

@@ -47,6 +47,7 @@
                 <div class="layui-input-block"></div>
             </div>
             <div class="paramsData">
+                {notempty name='vo.user_data_text'}
                 {foreach name="vo.user_data_text" item="val" key="key"}
                 <div class="layui-form-item paramsItem{$key}">
                     <label class="layui-form-label">第{$key+1}级:</label>
@@ -80,6 +81,7 @@
                     </div>
                 </div>
                 {/foreach}
+            {/notempty}
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label color-green font-w7"></label>

+ 0 - 10
application/approve/view/approve_info/form_3.html

@@ -51,16 +51,6 @@
                     </div>
                 </div>
 
-                {notempty name='vo.data'}
-                <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 border-0" disabled>
-                        <p class="help-block"></p>
-                    </div>
-                </div>
-                {/notempty}
                 {notempty name='vo.module_info.document_text'}
                 <div class="layui-form-item">
                     <label class="layui-form-label color-green font-w7">附件</label>

+ 0 - 10
application/approve/view/approve_info_log/form_3.html

@@ -19,16 +19,6 @@
                                 </div>
                             </div>
 
-                            {notempty name='vo.data'}
-                            <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 border-0" disabled>
-                                    <p class="help-block"></p>
-                                </div>
-                            </div>
-                            {/notempty}
                             {notempty name='vo.module_info.document_text'}
                             <div class="layui-form-item">
                                 <label class="layui-form-label color-green font-w7">附件</label>

+ 160 - 45
application/approve/view/goods/form.html

@@ -9,33 +9,30 @@
     <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
         <div class="layui-card-body">
             {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <input type='hidden' value='{$category_list_json}' id='category_list_json'>
 
             <div class="layui-form-item">
                 <label class="layui-form-label color-green font-w7">商品分类</label>
                 <div class="layui-input-block">
                     <div class="layui-input-inline">
-                        <select class="layui-select" name="goods_category_first" id="c-goods_category_first"
-                                lay-filter="goods_category_first" lay-search>
-                            <option value="">请选择</option>
+                        <select class="layui-select" name="first_classify" id="first_classify" lay-filter="first_classify" lay-search>
+                            <option selected data-first_key="-1" value="0">请选择</option>
                             {foreach $category_list as $kk=>$vv}
-                            {if isset_full_check($vo,'goods_category_first',$vv.id)}
-                            <option selected value="{$vv.id}">{$vv.name}</option>
+                            {if isset_full_check($vo,'first_classify',$vv.id)}
+                            <option selected data-first_key="{$kk}" value="{$vv.id}">{$vv.name}</option>
                             {else}
-                            <option value="{$vv.id}">{$vv.name}</option>
+                            <option data-first_key="{$kk}" value="{$vv.id}">{$vv.name}</option>
                             {/if}
                             {/foreach}
                         </select>
                     </div>
-                    <div class="layui-input-inline c-goods_category_id">
-                        <select class="layui-select" name="goods_category_id" id="c-goods_category_id" lay-filter="goods_category_id">
-                            <option value="">请选择</option>
-                        </select>
-                        <div id="c-goods_category_id_layui"></div>
+                    <div class="layui-input-inline">
+                        <select class="layui-select" name="second_classify" id="second_classify" lay-filter="second_classify" lay-search></select>
                     </div>
-                    <p class="help-block"></p>
+                    <input type="hidden" id="first"  value="{$vo.first_classify|default='-1'}"/>
+                    <input type="hidden" id="second" value="{$vo.second_classify|default='-1'}"/>
                 </div>
             </div>
+
             <div class="layui-form-item">
                 <label class="layui-form-label color-green font-w7">商品编号</label>
                 <div class="layui-input-block">
@@ -64,6 +61,48 @@
                     <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"></div>
+            </div>
+            <div class="paramsData">
+                {notempty name='vo.goods_stock'}
+                {foreach name="vo.goods_stock" item="val" key="key"}
+                <div class="layui-form-item paramsItem{$key}">
+                    <label class="layui-form-label"></label>
+                    <div class="layui-input-block">
+                        <div class="layui-input-inline" style="width: 50px">规格名称</div>
+                        <div class="layui-input-inline">
+                            <input type="text" name="goods_stock[{$key}][name]" placeholder="请输入规格名称"
+                                   value="{$val.name|default=''}" class="layui-input goods_stock_name" required>
+                        </div>
+                        <div class="layui-input-inline" style="width: 50px">库存数量</div>
+                        <div class="layui-input-inline">
+                            <input type="number" name="goods_stock[{$key}][stock]" placeholder="请输入库存数量"
+                                   value="{$val.stock|default=''}" class="layui-input goods_stock_stock" required>
+                        </div>
+                        <div class="layui-input-inline" style="width: 50px">冻结库存</div>
+                        <div class="layui-input-inline">
+                            <input type="number" placeholder="" value="{$val.freeze_stock|default=''}" class="layui-input layui-bg-gray goods_stock_freeze_stock" readonly>
+                        </div>
+                        <div class="layui-input-inline">
+                            <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="delParams('{$key}');">删除</button>
+                        </div>
+                        <input type="hidden" name="goods_stock[{$key}][id]" value="{$val.id|default=''}"
+                               class="goods_stock_id">
+                    </div>
+                </div>
+                {/foreach}
+                {/notempty}
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7"></label>
+                <div class="layui-input-block">
+                    <button type="button" class="layui-btn layui-btn-sm layui-btn-primary" onclick="addParams();">+ 添加规格</button>
+                </div>
+            </div>
+
         </div>
         <div class="hr-line-dashed"></div>
         <div class="layui-form-item text-center">
@@ -79,42 +118,118 @@
 {block name="style"}{/block}
 {block name='script'}
 <script>
-    form.on('select(goods_category_first)', function(data){
-        var value = data.value;
-        var category_list_json = $.parseJSON($("#category_list_json").val());
-        var category_id_json = '';
-        if(value){
-            $.each(category_list_json,function (index,element) {
-                if(element.id == value){
-                    category_id_json = element.childlist;
+    // 商品分类联动 start
+    var sel_second  = {:isset($vo['second_classify']) ? $vo['second_classify']:0};
+    var goods_spec  = {:json_encode($category_list)};
+    first(1);
+    function first(source){
+        // 将其他选择框置空
+        var first_key = $("select[name='first_classify']").find("option:selected").data("first_key")
+        $("#first").val(first_key);
+        $("select[name='second_classify']").html('');
+        // 没有下级不继续
+        if(first_key == -1 || !("childlist" in goods_spec[first_key])){
+            $("#second").val(-1);
+            window.form.render();
+            return true;
+        }else{
+            var second_html = '<option data-second_key="-1" selected value="0">请选择分类</option>';
+            var to_each =  goods_spec[first_key]['childlist'];
+            $.each(to_each,function (ck,cv) {
+                if(source == 1 && sel_second == cv.id){
+                    second_html +='<option selected data-second_key="'+ck+'" value="'+cv.id+'">'+cv.name+'</option>';
+                    $("#second").val(ck);
+                }else{
+                    second_html +='<option data-second_key="'+ck+'" value="'+cv.id+'">'+cv.name+'</option>';
                 }
             })
-            if(category_id_json){
-                var category_id_html = '';
-                var category_id_html2 = '';
-                $.each(category_id_json,function (index,element) {
-                    category_id_html += '<option value='+element.id+'>'+element.name+'</option>';
-                    category_id_html2 += '<dd lay-value='+element.id+' class="">'+element.name+'</dd>';
-                })
-                var html = '<select class="layui-select" name="goods_category_id" id="c-goods_category_id" lay-filter="goods_category_id">' +
-                    '<option value="">请选择</option>'+category_id_html+
-                    '</select>' +
-                    '<div class="layui-unselect layui-form-select">' +
-                    '<div class="layui-select-title">' +
-                    '<input type="text" placeholder="请选择" value="" readonly="" class="layui-input layui-unselect">' +
-                    '<i class="layui-edge"></i>' +
-                    '</div> ' +
-                    '<dl class="layui-anim layui-anim-upbit">'+category_id_html2+'</dl>' +
-                    '</div>';
-                $('.c-goods_category_id').html('');
-                $('.c-goods_category_id').append(html);
-                form.render();
+            $("select[name='second_classify']").html(second_html);
+            second()
+            window.form.render();
+        }
+    }
+    function second(){
+        var first_key  = $("select[name='first_classify']").find("option:selected").data("first_key");
+        var second_key  = $("select[name='second_classify']").find("option:selected").data("second_key");
+        // 将其他选择框置空
+        $("#second").val(second_key);
+        // 没有下级不继续
+        if(second_key == -1 ||  !("childlist" in  goods_spec[first_key]['childlist'][second_key])){
+            $("#third").val(-1);
+            window.form.render();
+            return true;
+        }
+        window.form.render();
+    }
+    // 一级分类监听
+    form.on('select(first_classify)', function(data){
+        var first_key =  data.elem[data.elem.selectedIndex].dataset.first_key;
+        //与之前选择的一样不处理
+        if($("#first").val() == first_key){
+            return true;
+        }
+        first(2);
+    })
+    // 二级分类监听
+    form.on('select(second_classify)', function(data){
+        var second_key  = data.elem[data.elem.selectedIndex].dataset.second_key;
+        //与之前选择的一样不处理
+        if($("#second").val() == second_key){
+            return true;
+        }
+        second()
+    })
+    // 商品分类end
+
+    // 商品规格 start
+    function addParams() {
+        var length = $('.paramsData').children().length;
+        var key = length;
+        var html = '<div class="layui-form-item paramsItem'+key+'"> ' +
+            '<label class="layui-form-label"></label> ' +
+            '<div class="layui-input-block"> ' +
+            '<div class="layui-input-inline" style="width: 50px">规格名称</div>' +
+            '<div class="layui-input-inline">' +
+            '<input type="text" name="goods_stock['+key+'][name]" placeholder="请输入规格名称" value="" class="layui-input goods_stock_name" required>'+
+            '</div> ' +
+            '<div class="layui-input-inline" style="width: 50px">库存数量</div>' +
+            '<div class="layui-input-inline paramsItemvalue paramsItemvalue'+key+'"> ' +
+            '<input type="number" name="goods_stock['+key+'][stock]" placeholder="请输入库存数量" value="" class="layui-input goods_stock_stock" required>' +
+            '</div>' +
+            '<div class="layui-input-inline" style="width: 50px">冻结库存</div>' +
+            '<div class="layui-input-inline">' +
+            '<input type="number" placeholder="" value="0" class="layui-input layui-bg-gray goods_stock_freeze_stock" readonly></div>' +
+            '<div class="layui-input-inline"> ' +
+            '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="delParams('+key+');">删除</button> ' +
+            '</div> ' +
+            '<input type="hidden" name="goods_stock['+key+'][id]" value="" class="goods_stock_id">'+
+            '</div> ' +
+            '</div>';
+        $(".paramsData").append(html);
+        form.render();
+    }
+
+    function delParams(key) {
+        var length = $('.paramsData').children().length;
+        var count = length-1;
+        console.log(length);
+        if(key > 0 && key == count){
+            //删除的是最后一步(不是唯一一步)
+            $(".paramsItem" + key).remove();
+        } else{
+            //删除的是中间的一步,所有步骤序号重新排列
+            $(".paramsItem" + key).remove();
+            for(var i=key;i < length;i++){
+                var ii = i-1;
+                $(".paramsData .layui-form-item").eq(ii).attr("class","layui-form-item paramsItem"+ii);
+                $(".paramsData .layui-form-item").eq(ii).find(".goods_stock_name").attr('name',"goods_stock["+ii+"][name]");
+                $(".paramsData .layui-form-item").eq(ii).find(".goods_stock_stock").attr('name',"goods_stock["+ii+"][stock]");
+                $(".paramsData .layui-form-item").eq(ii).find(".goods_stock_id").attr('name',"goods_stock["+ii+"][id]");
+                $(".paramsData .layui-form-item").eq(ii).find(".layui-btn-danger").attr("onclick","delParams("+ii+");");
             }
         }
-    });
+    }
 
-    $(function(){
-        console.log('121111111111111111111');
-    })
+    // 商品规格 end
 </script>
 {/block}

+ 2 - 2
application/approve/view/goods/index.html

@@ -11,7 +11,7 @@
 {/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")}
@@ -79,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")}

+ 2 - 2
application/approve/view/goods_category/form.html

@@ -13,7 +13,7 @@
                 <label class="layui-form-label color-green font-w7">上级分类</label>
                 <div class="layui-input-block">
                     <select class="layui-select" name="" disabled>
-                        {foreach $cate_list as $k=>$v}
+                        {foreach $category_list as $k=>$v}
                         {eq name='vo.pid' value='$v.id.""'}
                         <option selected value="{$v.id}">{$v.name}</option>
                         {else}
@@ -29,7 +29,7 @@
                 <label class="layui-form-label color-green font-w7">上级分类</label>
                 <div class="layui-input-block">
                     <select class="layui-select" name="pid" required>
-                        {foreach $cate_list as $k=>$v}
+                        {foreach $category_list as $k=>$v}
                         <option value="{$v.id}">{$v.name}</option>
                         {/foreach}
                     </select>

+ 7 - 7
application/approve/view/goods_category/index.html

@@ -7,7 +7,7 @@
 {/if}
 
 {if auth("remove")}
-<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要删除吗?" data-action="{:url('remove')}" data-rule="id#{key}" data-csrf="{:systoken('remove')}">删 除</button>
+<!--<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要删除吗?" data-action="{:url('remove')}" data-rule="id#{key}" data-csrf="{:systoken('remove')}">删 除</button>-->
 {/if}
 
 {/block}
@@ -19,9 +19,9 @@
         {notempty name='list'}
         <thead>
         <tr>
-            <th class='list-table-check-td think-checkbox'>
-                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
-            </th>
+<!--            <th class='list-table-check-td think-checkbox'>-->
+<!--                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>-->
+<!--            </th>-->
             <th class='text-left nowrap'>名称</th>
             <th class='text-left nowrap'>权重</th>
             <th class="text-left nowrap">操作</th>
@@ -31,9 +31,9 @@
         <tbody>
         {foreach $list as $key=>$vo}
         <tr>
-            <td class='list-table-check-td think-checkbox'>
-                <input class="list-check-box" value='{$vo.id}' type='checkbox'>
-            </td>
+<!--            <td class='list-table-check-td think-checkbox'>-->
+<!--                <input class="list-check-box" value='{$vo.id}' type='checkbox'>-->
+<!--            </td>-->
             <td class="text-left nowrap"><span class="color-desc">{$vo.spl|raw}</span>{$vo.name|default='--'}</td>
             <td class='list-table-sort-td'>
                 <input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input">

+ 1 - 0
application/common/service/ApproveInfoService.php

@@ -270,6 +270,7 @@ class ApproveInfoService
                 $data['time'] = $params['time'];
                 $data['reason'] = $params['reason'];
                 $data['document'] = $params['document'];
+                $data['images'] = $params['images'];
                 $data['remark'] = $params['remark'];
                 break;
             case CommonConstant::MODULE_7:

+ 12 - 9
application/user/controller/Member.php

@@ -121,24 +121,27 @@ class Member extends Controller
      */
     protected function _form_filter(&$data)
     {
-        // 编辑
-        if($data['id'] > 0){
-            if($this->request->isGet()) {
+        if($this->request->isGet()) {
+            if($data){
+                // 编辑获取数据时
                 $department_list = UserService::get_department_column();
                 $this->user_list = UserService::get_list(1);
                 // 所属部门
-                $department_ids = explode(',',$data['department']);
+                $department_ids = explode(',', $data['department']);
                 $department_text = '';
-                foreach ($department_ids as $val){
-                    if(array_key_exists($val,$department_list)){
-                        $department_text .= $department_list[$val].',';
+                foreach ($department_ids as $val) {
+                    if (array_key_exists($val, $department_list)) {
+                        $department_text .= $department_list[$val] . ',';
                     }
                 }
                 $data['department_text'] = $department_text;
             }
-            if($this->request->isPost()){
+        }
+        if($this->request->isPost()){
+            if($data) {
+                // 编辑提交数据时
                 if (isset_full($data, 'signature_status')) {
-                    if(!in_array($data['signature_status'],[CommonConstant::SIGNATURE_STATUS_3,CommonConstant::SIGNATURE_STATUS_4])){
+                    if (!in_array($data['signature_status'], [CommonConstant::SIGNATURE_STATUS_3, CommonConstant::SIGNATURE_STATUS_4])) {
                         unset($data['signature_status']);
                     }
                 }