LD 5 лет назад
Родитель
Сommit
4ce79eaaf4

+ 1 - 1
database/migrations/2020_06_12_135349_change_rejected_bills_add_custom_fields.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddFieldsRejectedBills extends Migration
+class ChangeRejectedBillsAddCustomFields extends Migration
 {
     /**
      * Run the migrations.

+ 3 - 2
database/migrations/2020_06_12_135840_create_custom_fields_table.php

@@ -25,9 +25,10 @@ class CreateCustomFieldsTable extends Migration
             $table->string('condition_value')->nullable()->comment('条件字段值,用来作为定义该字段权限和显示名的依据');
             $table->timestamps();
         });
-        CustomField::create(['table'=>'rejected_bills','field'=>'common_01','present_name'=>'寄件方省','authority_name'=>'退货管理-查询-客户定义-爱奇艺','condition_field'=>'id_owner','condition_value'=>'66']);
-        CustomField::create(['table'=>'rejected_bills','field'=>'common_02','present_name'=>'退件重量','authority_name'=>'退货管理-查询-客户定义-爱奇艺','condition_field'=>'id_owner','condition_value'=>'66']);
         if(!Authority::where('name','退货管理-查询-客户定义-爱奇艺')->first())(new Authority(['name'=>'退货管理-查询-客户定义-爱奇艺','alias_name'=>'退货管理-查询-客户定义-爱奇艺']))->save();
+        $authority=Authority::where('name','退货管理-查询-客户定义-爱奇艺')->first();
+        CustomField::create(['table'=>'rejected_bills','field'=>'common_01','present_name'=>'寄件方省','authority_id'=>$authority['id'],'condition_field'=>'id_owner','condition_value'=>'66']);
+        CustomField::create(['table'=>'rejected_bills','field'=>'common_02','present_name'=>'退件重量','authority_id'=>$authority['id'],'condition_field'=>'id_owner','condition_value'=>'66']);
     }
 
     /**

Разница между файлами не показана из-за своего большого размера
+ 342 - 216
public/js/app.js


Некоторые файлы не были показаны из-за большого количества измененных файлов