新增页面修改

config/field.php

@@ -114,6 +114,12 @@ return [
     'SupplierType' => [
         1 => '正式',
         2 => '临时',
-        3 => '待转正',
+    ],
+    //TT（电汇）、支票、信用卡、其他
+    'SettlementType' => [
+        1 => 'TT（电汇）',
+        2 => '支票',
+        3 => '信用卡',
+        0 => '其他',
     ]
 ];
\ No newline at end of file

resources/views/script/SupplierListScript.blade.php

 <script>
-    layui.use(['table', 'form', 'element', 'layer', 'Split', 'admin'], function () {
+    layui.use(['table', 'form', 'element', 'layer', 'Split', 'admin','index'], function () {
         let $ = layui.jquery;
         let Split = layui.Split;
         // 水平分割，需要分割的元素(id)、默认大小(百分比)、最小值(单位px)
         Split(['#s1', '#s2', '#s3', '#s4', '#s5', '#s6'], {sizes: [9, 12, 12, 12, 12, 43], minSize: 70});
         let table = layui.table;
         let form = layui.form;
+        let index = layui.index;
         let admin = layui.admin;
 
         let initCondition = {source_type: 'all'};
@@ -228,15 +229,22 @@
 
         //新增供应商弹窗
         $("#add_supplier").click(function () {
-            layer.open({
-                type: 2,
-                content: '/supplier/AddSupplier?view=iframe',
-                area: ['1000px', '97%'],
+            // layer.open({
+            //     type: 2,
+            //     content: '/supplier/AddSupplier?view=iframe',
+            //     area: ['1000px', '97%'],
+            //     title: '新增供应商',
+            //     offset: ['10px'],
+            //     end: function () {
+            //         table.reload('list');
+            //         supplierStatistics();
+            //     }
+            // });
+            index.openTab({
                 title: '新增供应商',
-                offset: ['10px'],
-                end: function () {
-                    table.reload('list');
-                    supplierStatistics();
+                url: '/supplier/AddSupplier?view=iframe',
+                end: function() {
+                    // insTb.reload();
                 }
             });
         })

resources/views/web/supplier/SupplierBase.blade.php

@@ -18,16 +18,20 @@
     <form class="layui-form" action="">
         @endif
         <?php
+        $supplierType = config('field.SupplierType');
         $option = ['required' => true];
-        //正式供应商不允许修改供应商类型了
-        if (!empty($supplier) && $supplier['supplier_type'] == \App\Model\SupplierChannelModel::SUPPLIER_TYPE_OFFICIAL) {
+        //正式供应商不允许修改供应商类型了或者是竞调供应商is_type=1也不允许修改供应商
+        if ((!empty($supplier) && $supplier['supplier_type'] == \App\Model\SupplierChannelModel::SUPPLIER_TYPE_OFFICIAL) || (!empty($supplier) && $supplier['is_type'] == 1)) {
             $option['disable'] = true;
+            $supplierType[3] = '待转正';
         }
         ?>
+
         <div class="layui-form-item">
             @inject('singleSelectPresenter','App\Presenters\SingleSelectPresenter')
-            {!! $singleSelectPresenter->render('supplier_type','供应商类别',!empty($supplier)?array_get($supplier,'supplier_type',0):'1',config('field.SupplierType'),$option) !!}
+            {!! $singleSelectPresenter->render('supplier_type','供应商类别',!empty($supplier)?array_get($supplier,'supplier_type',0):'1',$supplierType,$option) !!}
         </div>
+
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="require">*</span>供应商名称 : </label>
             <div class="layui-input-block">
@@ -350,8 +354,8 @@
                     </div>
                     <div class="layui-col-md4" style="margin-top: 30px">
                         <div class="layui-row" style="text-align: right">
-                            <button type="button" class="layui-btn layui-btn submit-loading" id="apply_audit_button" lay-submit
-                                    lay-filter="addAndApplySupplier">申请审核
+                            <button type="button" class="layui-btn layui-btn submit-loading" id="apply_audit_button"
+                                    lay-submit lay-filter="addAndApplySupplier">申请审核
                             </button>
                             <button type="button" class="layui-btn layui-btn submit-loading" lay-submit
                                     lay-filter="addSupplier">确认