王智 / spare · 提交

转到一个项目

作者 杨育虎
提交 68366c0b723b612aef4552a1482a77bc06ad0c98 1 个父辈 85a1abf5

2

内嵌 并排对比
正在显示 8 个修改的文件 包含 144 行增加 和 78 行删除
<?php
return [
'Id' => 'ID',
'Company_holder' => '公司持有人',
'Company_name' => '公司名称',
'Credit' => '信用代码',
'Paragraph' => '公司税号',
'Company_address' => '公司地址',
'Address_con' => '详细地址',
'Invoice_address' => '开票地址',
'Bank_name' => '银行名称',
'Bank_num' => '银行账号',
'Company_tel' => '注册电话',
'Register_tel' => '公司电话',
'Type_id' => '类型',
'Industry_id' => '行业',
'Status' => '团队审核状态',
'Status 0' => '未通过',
'Status 1' => '通过',
'Status 2' => '审核中',
'Business_avatar' => '营业执照',
'Createtime' => '创建时间',
'Updatetime' => '更改时间',
'User.username' => '公司持有人',
'Type.type' => '类型',
'Id' => 'ID',
'Company_holder' => '公司持有人',
'Company_name' => '公司名称',
'Credit' => '信用代码',
'Company_address' => '公司地址',
'Address_con' => '详细地址',
'Invoice_address' => '开票地址',
'Bank_name' => '银行名称',
'Bank_num' => '银行账号',
'Company_tel' => '注册电话',
'Type_id' => '类型',
'Industry_id' => '行业',
'Status' => '团队审核状态',
'Status 0' => '未通过',
'Status 1' => '通过',
'Status 2' => '审核中',
'Business_avatar' => '营业执照',
'Createtime' => '创建时间',
'Updatetime' => '更改时间',
'Paragraph' => '税号',
'Register_tel' => '公司电话',
'User.username' => '用户名',
'Type.type' => '类型',
'Industry.industry' => '行业'
];
... ...
<?php
return [
'Id' => 'ID',
'Invoice_code' => '发票代码',
'Invoice_num' => '发票号码',
'Shopping' => '快递公司',
'Shop_order' => '快递单号',
'Invoice_status' => '发票状态',
'Invoice_status 1' => '未开票',
'Invoice_status 2' => '已开票',
'Invoice_status 3' => '已发出',
'Invoice_status 4' => '已完成',
'Createtime' => '创建时间',
'Updatetime' => '更改时间',
'User_id' => '用户ID',
'Order_sn' => '订单编号',
'Invoice_type' => '发票类型',
'Invoice_type 1' => '专业发票',
'Invoice_type 2' => '普通发票',
'Invoice_head' => '发票抬头类型',
'Invoice_head 1' => '企业单位',
'Invoice_head 2' => '个人',
'Invoice_head_name' => '发票抬头',
'Company_code' => '公司信用代码',
'Bank_name' => '开户银行',
'Bank_num' => '开户行账号',
'Company_tel' => '注册电话',
'Invoice_address' => '开票地址',
'Invoice_people' => '收票人',
'Mobile' => '手机号码',
'Address' => '收票地址',
'Address_con' => '详细地址',
'User.username' => '用户名'
'Id' => 'ID',
'Invoice_code' => '发票代码',
'Invoice_num' => '发票号码',
'Shopping' => '快递公司',
'Shop_order' => '快递单号',
'Invoice_status' => '发票状态',
'Invoice_status 1' => '未开票',
'Invoice_status 2' => '已开票',
'Invoice_status 3' => '已发出',
'Invoice_status 4' => '已完成',
'Createtime' => '创建时间',
'Updatetime' => '更改时间',
'User_id' => '用户ID',
'Order_sn' => '订单编号',
'Invoice_type' => '发票类型',
'Invoice_type 1' => '专业发票',
'Invoice_type 2' => '普通发票',
'Invoice_head' => '发票抬头类型',
'Invoice_head 1' => '企业单位',
'Invoice_head 2' => '个人',
'Invoice_head_name' => '公司名称',
'Company_code' => '公司信用代码',
'Bank_name' => '开户银行',
'Bank_num' => '开户行账号',
'Company_tel' => '注册电话',
'Invoice_address' => '开票地址',
'Invoice_people' => '收票人',
'Mobile' => '手机号码',
'Address' => '收票地址',
'Address_con' => '详细地址',
'Paragraph' => '税号',
'Register_tel' => '公司电话',
'Invoice_head_people' => '抬头名称',
'User.username' => '用户名'
];
... ...
... ... @@ -3,7 +3,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Company_holder')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-company_holder" data-source="user/index" data-field="username" class="form-control selectpage" name="row[company_holder]" type="number">
<input id="c-company_holder" class="form-control" name="row[company_holder]" type="number">
</div>
</div>
<div class="form-group">
... ... @@ -57,13 +57,13 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type_id" data-rule="required" data-field="type" data-source="type/index" class="form-control selectpage" name="row[type_id]" type="text" value="">
<input id="c-type_id" data-rule="required" data-source="type/index" class="form-control selectpage" name="row[type_id]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Industry_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-industry_id" data-rule="required" data-field="industry" data-source="industry/index" class="form-control selectpage" name="row[industry_id]" type="text" value="">
<input id="c-industry_id" data-rule="required" data-source="industry/index" class="form-control selectpage" name="row[industry_id]" type="text" value="">
</div>
</div>
<div class="form-group">
... ... @@ -92,6 +92,18 @@
<ul class="row list-inline plupload-preview" id="p-business_avatar"></ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Paragraph')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-paragraph" data-rule="required" class="form-control" name="row[paragraph]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Register_tel')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-register_tel" data-rule="required" class="form-control" name="row[register_tel]" type="text">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -3,7 +3,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Company_holder')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-company_holder" data-source="user/index" data-field="username" class="form-control selectpage" name="row[company_holder]" type="number" value="{$row.company_holder|htmlentities}">
<input id="c-company_holder" class="form-control" name="row[company_holder]" type="number" value="{$row.company_holder|htmlentities}">
</div>
</div>
<div class="form-group">
... ... @@ -57,13 +57,13 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type_id" data-rule="required" data-field="type" data-source="type/index" class="form-control selectpage" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
<input id="c-type_id" data-rule="required" data-source="type/index" class="form-control selectpage" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Industry_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-industry_id" data-rule="required" data-field="industry" data-source="industry/index" class="form-control selectpage" name="row[industry_id]" type="text" value="{$row.industry_id|htmlentities}">
<input id="c-industry_id" data-rule="required" data-source="industry/index" class="form-control selectpage" name="row[industry_id]" type="text" value="{$row.industry_id|htmlentities}">
</div>
</div>
<div class="form-group">
... ... @@ -92,6 +92,18 @@
<ul class="row list-inline plupload-preview" id="p-business_avatar"></ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Paragraph')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-paragraph" data-rule="required" class="form-control" name="row[paragraph]" type="text" value="{$row.paragraph|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Register_tel')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-register_tel" data-rule="required" class="form-control" name="row[register_tel]" type="text" value="{$row.register_tel|htmlentities}">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -75,7 +75,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Invoice_head_name')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-invoice_head_name" data-rule="required" class="form-control" name="row[invoice_head_name]" type="text">
<input id="c-invoice_head_name" class="form-control" name="row[invoice_head_name]" type="text">
</div>
</div>
<div class="form-group">
... ... @@ -132,6 +132,24 @@
<input id="c-address_con" data-rule="required" class="form-control" name="row[address_con]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Paragraph')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-paragraph" class="form-control" name="row[paragraph]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Register_tel')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-register_tel" class="form-control" name="row[register_tel]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Invoice_head_people')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-invoice_head_people" class="form-control" name="row[invoice_head_people]" type="text">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -75,7 +75,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Invoice_head_name')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-invoice_head_name" data-rule="required" class="form-control" name="row[invoice_head_name]" type="text" value="{$row.invoice_head_name|htmlentities}">
<input id="c-invoice_head_name" class="form-control" name="row[invoice_head_name]" type="text" value="{$row.invoice_head_name|htmlentities}">
</div>
</div>
<div class="form-group">
... ... @@ -132,6 +132,24 @@
<input id="c-address_con" data-rule="required" class="form-control" name="row[address_con]" type="text" value="{$row.address_con|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Paragraph')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-paragraph" class="form-control" name="row[paragraph]" type="text" value="{$row.paragraph|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Register_tel')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-register_tel" class="form-control" name="row[register_tel]" type="text" value="{$row.register_tel|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Invoice_head_people')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-invoice_head_people" class="form-control" name="row[invoice_head_people]" type="text" value="{$row.invoice_head_people|htmlentities}">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -25,26 +25,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
[
{checkbox: true},
{field: 'id', title: __('Id')},
// {field: 'company_holder', title: __('Company_holder')},
{field: 'company_name', title: __('Company_name'),operate: 'LIKE'},
{field: 'user.username', title: __('User.username')},
{field: 'company_holder', title: __('Company_holder')},
{field: 'company_name', title: __('Company_name')},
{field: 'credit', title: __('Credit')},
{field: 'company_address', title: __('Company_address')},
{field: 'address_con', title: __('Address_con')},
{field: 'invoice_address', title: __('Invoice_address')},
{field: 'bank_name', title: __('Bank_name')},
{field: 'bank_num', title: __('Bank_num')},
{field: 'credit', title: __('Credit')},
{field: 'paragraph', title: __('Paragraph')},
{field: 'company_tel', title: __('Company_tel')},
{field: 'register_tel', title: __('Register_tel')},
// {field: 'type_id', title: __('Type_id')},
// {field: 'industry_id', title: __('Industry_id')},
{field: 'type_id', title: __('Type_id')},
{field: 'industry_id', title: __('Industry_id')},
{field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
{field: 'type.type', title: __('Type.type')},
{field: 'industry.industry', title: __('Industry.industry')},
{field: 'business_avatar', title: __('Business_avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'paragraph', title: __('Paragraph')},
{field: 'register_tel', title: __('Register_tel')},
{field: 'user.username', title: __('User.username')},
{field: 'type.type', title: __('Type.type')},
{field: 'industry.industry', title: __('Industry.industry')},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
... ...
... ... @@ -25,14 +25,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
[
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'order_sn', title: __('Order_sn')},
{field: 'user.username', title: __('User.username')},
{field: 'invoice_code', title: __('Invoice_code')},
{field: 'invoice_num', title: __('Invoice_num')},
{field: 'shopping', title: __('Shopping')},
{field: 'shop_order', title: __('Shop_order')},
{field: 'invoice_status', title: __('Invoice_status'), searchList: {"1":__('Invoice_status 1'),"2":__('Invoice_status 2'),"3":__('Invoice_status 3'),"4":__('Invoice_status 4')}, formatter: Table.api.formatter.status},
// {field: 'user_id', title: __('User_id')},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'user_id', title: __('User_id')},
{field: 'order_sn', title: __('Order_sn')},
{field: 'invoice_type', title: __('Invoice_type'), searchList: {"1":__('Invoice_type 1'),"2":__('Invoice_type 2')}, formatter: Table.api.formatter.normal},
{field: 'invoice_head', title: __('Invoice_head'), searchList: {"1":__('Invoice_head 1'),"2":__('Invoice_head 2')}, formatter: Table.api.formatter.normal},
{field: 'invoice_head_name', title: __('Invoice_head_name')},
... ... @@ -40,13 +41,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'bank_name', title: __('Bank_name')},
{field: 'bank_num', title: __('Bank_num')},
{field: 'company_tel', title: __('Company_tel')},
// {field: 'invoice_address', title: __('Invoice_address')},
{field: 'invoice_address', title: __('Invoice_address')},
{field: 'invoice_people', title: __('Invoice_people')},
{field: 'mobile', title: __('Mobile')},
{field: 'address', title: __('Address')},
{field: 'address_con', title: __('Address_con')},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'paragraph', title: __('Paragraph')},
{field: 'register_tel', title: __('Register_tel')},
{field: 'invoice_head_people', title: __('Invoice_head_people')},
{field: 'user.username', title: __('User.username')},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
... ...