Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Remove , at the end of row in the lastest children in company.

Browse Source
This commit is contained in:
liumengyi
2023-11-13 16:55:03 +08:00
parent 73ebe8cdab
commit ab6ac44f0d
4 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/ui/browse.html.php
+5 -5
View File
@@ -14,7 +14,7 @@ featureBar
(
set::current($browseType),
set::linkParams("browseType={key}"),
li(searchToggle(set::open($type == 'bysearch'), set::module('user'))),
li(searchToggle(set::open($type == 'bysearch'), set::module('user')))
);
toolbar
@@ -37,10 +37,10 @@ toolbar
(
array('text' => $lang->user->create, 'url' => helper::createLink('user', 'create', "deptID={$deptID}"), 'className' => '.create-user-btn
'),
array('text' => $lang->user->batchCreate, 'url' => helper::createLink('user', 'batchCreate', "deptID={$deptID}")),
array('text' => $lang->user->batchCreate, 'url' => helper::createLink('user', 'batchCreate', "deptID={$deptID}"))
)
),
set::placement('bottom-end'),
set::placement('bottom-end')
)
)
);
@@ -56,7 +56,7 @@ sidebar
'settingLink' => $settingLink,
'closeLink' => $closeLink,
'showDisplay' => false,
'settingText' => $lang->dept->manage,
'settingText' => $lang->dept->manage
)))
);
$footToolbar = common::hasPriv('user', 'batchEdit') ? array(
@@ -77,7 +77,7 @@ dtable
set::checkable(common::hasPriv('user', 'batchEdit')),
set::fixedLeftWidth('0.2'),
set::footToolbar($footToolbar),
set::footPager(usePager()),
set::footPager(usePager())
);
render();
module/company/ui/dynamic.html.php
+15 -15
View File
@@ -27,8 +27,8 @@ featureBar
set::placeholder($lang->user->common),
set::items($userIdPairs),
set::value($userID),
on::change('changeItem'),
),
on::change('changeItem')
)
),
$this->config->vision == 'rnd' ? li
(
@@ -40,8 +40,8 @@ featureBar
set::placeholder($lang->product->common),
set::items($products),
set::value($productID),
on::change('changeItem'),
),
on::change('changeItem')
)
) : null,
li
(
@@ -53,8 +53,8 @@ featureBar
set::placeholder($lang->project->common),
set::items($projects),
set::value($projectID),
on::change('changeItem'),
),
on::change('changeItem')
)
),
li
(
@@ -66,8 +66,8 @@ featureBar
set::placeholder($lang->execution->common),
set::items($executions),
set::value($executionID),
on::change('changeItem'),
),
on::change('changeItem')
)
),
li
(
@@ -80,10 +80,10 @@ featureBar
set::items($lang->company->order),
set::value($orderBy),
set::required(true),
on::change('changeItem'),
),
on::change('changeItem')
)
),
li(searchToggle(set::module('action'))),
li(searchToggle(set::module('action')))
);
$content = null;
@@ -96,7 +96,7 @@ if(empty($dateGroups))
(
setClass('text-gray'),
$lang->action->noDynamic
),
)
);
}
else
@@ -115,12 +115,12 @@ else
setClass('cursor-pointer leading-5'),
span
(
icon('angle-down text-primary border-2 rounded-full z-10 bg-canvas align-middle'),
icon('angle-down text-primary border-2 rounded-full z-10 bg-canvas align-middle')
),
span
(
setClass('ml-2'),
$isToday ? $lang->today : $date,
$isToday ? $lang->today : $date
),
on::click('toggleCollapse')
),
@@ -134,7 +134,7 @@ else
dynamic
(
set::dynamics($actions),
set::users($accountPairs),
set::users($accountPairs)
)
)
)
module/company/ui/edit.html.php
+17 -17
View File
@@ -23,8 +23,8 @@ formPanel
(
set::name('name'),
set::label($lang->company->name),
set::value($company->name),
),
set::value($company->name)
)
),
formRow
(
@@ -32,8 +32,8 @@ formPanel
(
set::name('phone'),
set::label($lang->company->phone),
set::value($company->phone),
),
set::value($company->phone)
)
),
formRow
(
@@ -41,8 +41,8 @@ formPanel
(
set::name('fax'),
set::label($lang->company->fax),
set::value($company->fax),
),
set::value($company->fax)
)
),
formRow
(
@@ -50,8 +50,8 @@ formPanel
(
set::name('address'),
set::label($lang->company->address),
set::value($company->address),
),
set::value($company->address)
)
),
formRow
(
@@ -59,8 +59,8 @@ formPanel
(
set::name('zipcode'),
set::label($lang->company->zipcode),
set::value($company->zipcode),
),
set::value($company->zipcode)
)
),
formRow
(
@@ -68,8 +68,8 @@ formPanel
(
set::name('website'),
set::label($lang->company->website),
set::value($company->website ? $company->website: 'http://'),
),
set::value($company->website ? $company->website: 'http://')
)
),
formRow
(
@@ -77,8 +77,8 @@ formPanel
(
set::name('backyard'),
set::label($lang->company->backyard),
set::value($company->backyard ? $company->backyard : 'http://'),
),
set::value($company->backyard ? $company->backyard : 'http://')
)
),
formRow
(
@@ -91,9 +91,9 @@ formPanel
set::items($lang->company->guestOptions),
set::value($company->guest),
set::inline(true)
),
),
),
)
)
)
);
render();
module/company/ui/view.html.php
+13 -13
View File
@@ -22,8 +22,8 @@ detailHeader
set('data-toggle', 'modal'),
set('data-size', 'sm'),
$lang->edit
),
),
)
)
);
detailBody
(
@@ -34,45 +34,45 @@ detailBody
item
(
set::name($lang->company->name),
$company->name,
$company->name
),
item
(
set::name($lang->company->phone),
$company->phone,
$company->phone
),
item
(
set::name($lang->company->fax),
$company->fax,
$company->fax
),
item
(
set::name($lang->company->address),
$company->address,
$company->address
),
item
(
set::name($lang->company->zipcode),
$company->zipcode,
$company->zipcode
),
item
(
set::name($lang->company->website),
$company->website,
$company->website
),
item
(
set::name($lang->company->backyard),
$company->backyard,
$company->backyard
),
item
(
set::name($lang->company->guest),
zget($lang->company->guestOptions, $company->guest),
),
),
),
zget($lang->company->guestOptions, $company->guest)
)
)
)
);
render();