Commit a90855fa by 杨树贤

修复

parent ba38bc7d
...@@ -223,7 +223,7 @@ class SupplierFilter ...@@ -223,7 +223,7 @@ class SupplierFilter
//搜索是否有供应商账号 //搜索是否有供应商账号
if (!empty($map['has_supplier_account'])) { if (!empty($map['has_supplier_account'])) {
$supplierIds = SupplierAccountModel::query()->pluck('supplier_id')->toArray(); $supplierIds = SupplierAccountModel::query()->where('a_status', 1)->pluck('supplier_id')->toArray();
$query->whereIn('supplier_id', $supplierIds); $query->whereIn('supplier_id', $supplierIds);
} }
......
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
align: 'center', align: 'center',
width: 120, width: 120,
templet: function (data) { templet: function (data) {
return data.yunxin_account ? '是' : '否'; return data.yunxin_account ? ( data.yunxin_account.a_status == 1?'是':'否') : '否';
} }
}, },
//通过芯链上传合同 //通过芯链上传合同
......
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<div class="layui-inline"> <div class="layui-inline">
<?php $multiTransformableSelectPresenter = app('App\Presenters\Filter\MultiTransformableSelectPresenter'); ?> <?php $multiTransformableSelectPresenter = app('App\Presenters\Filter\MultiTransformableSelectPresenter'); ?>
<?php echo $multiTransformableSelectPresenter->render(['has_cooperation_agreement'=>'平台合作协议'], <?php echo $multiTransformableSelectPresenter->render(['has_cooperation_agreement'=>'平台合作协议'],
['has_cooperation_agreement'=>[1=>'是',-1=>'否']]); ?> ['has_cooperation_agreement'=>[1=>'有',-1=>'无']]); ?>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<?php $statusPresenter = app('App\Presenters\StatusPresenter'); ?> <?php $statusPresenter = app('App\Presenters\StatusPresenter'); ?>
<?php echo $statusPresenter->render('has_order_contract','通过芯链上传合同','',[1=>'有',-1=>'无']); ?> <?php echo $statusPresenter->render('has_order_contract','通过芯链上传合同','',[1=>'是',-1=>'否']); ?>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment