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

Merge branch 'main' of https://gitfox.zcorp.cc/git/zentao/zentaopms into main

Browse Source
This commit is contained in:
sunguangming
2024-10-23 03:11:49 +00:00
parent 4080ed2c18 3c2de0d3a6
commit 2c008827a7
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/test/lib/batcheditbranch.ui.class.php
+2 -1
View File
@@ -31,7 +31,8 @@ class batchEditBranchTester extends tester
if ($form->dom->allTab === false)
{
$nameTip = $form->dom->$tipDom->getText();
$nameEmptyTip = sprintf($this->lang->error->notempty, $this->lang->branch->name);
$branchName = sprintf($this->lang->branch->name, $this->lang->branch->common);
$nameEmptyTip = sprintf($this->lang->error->notempty, $branchName);
if ($nameTip === $nameEmptyTip) return $this->success('分支名称必填提示信息正确');
if ($editBranch->name != '' && $form->dom->$tipDom)
{
module/branch/test/lib/createbranch.ui.class.php
+4 -2
View File
@@ -23,10 +23,12 @@ class createBranchTester extends tester
$form->wait(2);
if ($form->dom->createBranchForm)
{
if ($this->checkFormTips('branch')) return $this->success('分支名称必填提示信息正确');
$nameTip = $form->dom->nameTip->getText();
$branchName = sprintf($this->lang->branch->name, $this->lang->branch->common);
$nameEmptyTip = sprintf($this->lang->error->notempty, $branchName);
if ($nameTip == $nameEmptyTip) return $this->success('分支名称必填提示信息正确');
if ($branch->name != '' && $form->dom->nameTip)
{
//分支已存在
$nameTip = str_replace('@branch@', $this->lang->branch->common, $this->lang->branch->existName);
return ($form->dom->nameTip->getText() == $nameTip)
? $this->success('分支已存在提示信息正确')
module/branch/test/lib/editbranch.ui.class.php
+5 -2
View File
@@ -23,8 +23,11 @@ class editBranchTester extends tester
$form->wait(2);
if ($form->dom->zin_branch_edit_1_form)
{
if ($this->checkFormTips('branch')) return $this->success('分支名称必填提示信息正确');
if (isset($editBranch->name) && ($form->dom->nameTip))
$nameTip = $form->dom->nameTip->getText();
$branchName = sprintf($this->lang->branch->name, $this->lang->branch->common);
$nameEmptyTip = sprintf($this->lang->error->notempty, $branchName);
if ($nameTip == $nameEmptyTip) return $this->success('分支名称必填提示信息正确');
if ($editBranch->name != '' && $form->dom->nameTip)
{
//分支已存在
$nameTip = str_replace('@branch@', $this->lang->branch->common, $this->lang->branch->existName);