Skip to content

T
traffic-front
Commit 68f30e0a authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

fixed admin issue

parent 56feda01
Show whitespace changes
Inline Side-by-side
Showing with 214 additions and 142 deletions
atms-dao/src/main/java/pwc/taxtech/atms/dpo/EnterpriseAccountDto.java
View file @ 68f30e0a
...@@ -77,6 +77,8 @@ public class EnterpriseAccountDto { ...@@ -77,6 +77,8 @@ public class EnterpriseAccountDto {
private Date updateTime; private Date updateTime;
private String stdParentCode;
/** /**
* @return the id * @return the id
*/ */
...@@ -88,7 +90,7 @@ public class EnterpriseAccountDto { ...@@ -88,7 +90,7 @@ public class EnterpriseAccountDto {
* @param id the id to set * @param id the id to set
*/ */
public void setId(String id) { public void setId(String id) {
id = id; this.id = id;
} }
/** /**
...@@ -529,4 +531,11 @@ public class EnterpriseAccountDto { ...@@ -529,4 +531,11 @@ public class EnterpriseAccountDto {
} }
public String getStdParentCode() {
return stdParentCode;
}
public void setStdParentCode(String stdParentCode) {
this.stdParentCode = stdParentCode;
}
} }
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml
View file @ 68f30e0a
...@@ -29,30 +29,9 @@ ...@@ -29,30 +29,9 @@
</delete> </delete>
<insert id="batchInsert" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig"> <insert id="batchInsert" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig">
INSERT INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG INSERT ALL
(ID, <foreach collection="list" item="item">
CELL_TEMPLATE_ID, INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG VALUES
REPORT_TEMPLATE_ID,
DATA_SOURCE_TYPE,
FORMULA,
FORMULA_DESCRIPTION,
ACCOUNT_CODES,
INVOICE_TYPE,
TAX_RATE,
INVOICE_AMOUNT_TYPE,
MODEL_IDS,
CREATE_BY,
CREATE_TIME,
UPDATE_BY,
UPDATE_TIME,
INVOICE_CATEGORY,
FORMULA_DATA_SOURCE,
VALIDATION,
VALIDATION_DESCRIPTION,
VOUCHER_KEYWORD
)
VALUES
<foreach collection="list" item="item" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<choose> <choose>
<when test="item.id != null"> <when test="item.id != null">
...@@ -213,33 +192,13 @@ ...@@ -213,33 +192,13 @@
</choose> </choose>
</trim> </trim>
</foreach> </foreach>
SELECT 1 FROM DUAL
</insert> </insert>
<insert id="batchInsert2" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig"> <insert id="batchInsert2" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig">
INSERT INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG INSERT ALL
(ID, <foreach collection="list" item="item" >
CELL_TEMPLATE_ID, INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG VALUES
REPORT_TEMPLATE_ID,
DATA_SOURCE_TYPE,
FORMULA,
FORMULA_DESCRIPTION,
ACCOUNT_CODES,
INVOICE_TYPE,
TAX_RATE,
INVOICE_AMOUNT_TYPE,
MODEL_IDS,
CREATE_BY,
CREATE_TIME,
UPDATE_BY,
UPDATE_TIME,
INVOICE_CATEGORY,
FORMULA_DATA_SOURCE,
VALIDATION,
VALIDATION_DESCRIPTION,
VOUCHER_KEYWORD
)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=INTEGER}, #{item.cellTemplateId,jdbcType=INTEGER}, (#{item.id,jdbcType=INTEGER}, #{item.cellTemplateId,jdbcType=INTEGER},
#{item.reportTemplateId,jdbcType=INTEGER}, #{item.reportTemplateId,jdbcType=INTEGER},
#{item.dataSourceType,jdbcType=INTEGER}, #{item.formula,jdbcType=VARCHAR}, #{item.dataSourceType,jdbcType=INTEGER}, #{item.formula,jdbcType=VARCHAR},
...@@ -254,5 +213,6 @@ ...@@ -254,5 +213,6 @@
#{item.validation,jdbcType=VARCHAR}, #{item.validation,jdbcType=VARCHAR},
#{item.validationDescription,jdbcType=VARCHAR}, #{item.voucherKeyword,jdbcType=VARCHAR}) #{item.validationDescription,jdbcType=VARCHAR}, #{item.voucherKeyword,jdbcType=VARCHAR})
</foreach> </foreach>
SELECT 1 FROM DUAL
</insert> </insert>
</mapper> </mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateExtendsMapper.xml
View file @ 68f30e0a
...@@ -2,25 +2,9 @@ ...@@ -2,25 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.CellTemplateMapper"> <mapper namespace="pwc.taxtech.atms.dao.CellTemplateMapper">
<insert id="batchInsert2"> <insert id="batchInsert2">
INSERT INTO INSERT ALL
CELL_TEMPLATE ( <foreach collection="list" item="item">
ID, INTO CELL_TEMPLATE VALUES
REPORT_TEMPLATE_ID,
ROW_INDEX,
ROW_NAME,
COLUMN_INDEX,
COLUMN_NAME,
COMMENT,
CREATE_TIME,
UPDATE_TIME,
COPY_FROM_ID,
DATA_TYPE,
IS_READ_ONLY,
CREATE_BY,
UPDATE_BY
)
VALUES
<foreach collection="list" item="item" separator=",">
( (
#{item.id,jdbcType=INTEGER}, #{item.id,jdbcType=INTEGER},
#{item.reportTemplateId,jdbcType=INTEGER}, #{item.reportTemplateId,jdbcType=INTEGER},
...@@ -38,6 +22,7 @@ ...@@ -38,6 +22,7 @@
#{item.updateBy,jdbcType=VARCHAR} #{item.updateBy,jdbcType=VARCHAR}
) )
</foreach> </foreach>
SELECT 1 FROM DUAL
</insert> </insert>
</mapper> </mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/EnterpriseAccountExtendsMapper.xml
View file @ 68f30e0a
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.EnterpriseAccountMapper"> <mapper namespace="pwc.taxtech.atms.dao.EnterpriseAccountMapper">
<resultMap id="EnterpriseAccountDto" type="pwc.taxtech.atms.dpo.EnterpriseAccountDto">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="CODE" jdbcType="VARCHAR" property="code" />
<result column="NAME" jdbcType="VARCHAR" property="name" />
<result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode" />
<result column="FULL_NAME" jdbcType="VARCHAR" property="fullName" />
<result column="ACCT_PROP" jdbcType="DECIMAL" property="acctProp" />
<result column="SUB_PROP" jdbcType="DECIMAL" property="subProp" />
<result column="ACCT_LEVEL" jdbcType="DECIMAL" property="acctLevel" />
<result column="DIRECTION" jdbcType="DECIMAL" property="direction" />
<result column="IS_LEAF" jdbcType="DECIMAL" property="isLeaf" />
<result column="RULE_TYPE" jdbcType="DECIMAL" property="ruleType" />
<result column="IS_ACTIVE" jdbcType="DECIMAL" property="isActive" />
<result column="STD_CODE" jdbcType="VARCHAR" property="stdCode" />
<result column="STD_NAME" jdbcType="VARCHAR" property="stdName" />
<result column="STD_PARENT_CODE" jdbcType="VARCHAR" property="stdParentCode" />
<result column="STD_DIRECTION" jdbcType="VARCHAR" property="stdDirection" />
<result column="STD_ACCT_PROP" jdbcType="VARCHAR" property="stdAcctProp" />
<result column="STD_FULL_NAME" jdbcType="VARCHAR" property="stdFullName" />
</resultMap>
<select id="getDto" resultType="pwc.taxtech.atms.dpo.EnterpriseAccountDto">
<select id="getDto" resultMap="EnterpriseAccountDto">
SELECT SELECT
EA.ID, EA.ID,
EA.CODE AS CODE, EA.CODE AS CODE,
......
atms-web/src/main/webapp/app/admin/basicData/financialData/basicDataInfrastructure/basic-data-infrastructure.html
View file @ 68f30e0a
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<!--<div class="tab" ng-show="orangizationStructureShow" ui-sref-active="active"><a ui-sref=".orangizationStructureManage"><span>{{'OrangizationStructureTabTitle' | translate }}</span></a></div> <!--<div class="tab" ng-show="orangizationStructureShow" ui-sref-active="active"><a ui-sref=".orangizationStructureManage"><span>{{'OrangizationStructureTabTitle' | translate }}</span></a></div>
<div class="tab" ui-sref-active="active" ng-show="businessUnitShow"><a ui-sref=".businessUnit"><span>{{'BusinessUnitTitle'| translate}}</span></a></div> <div class="tab" ui-sref-active="active" ng-show="businessUnitShow"><a ui-sref=".businessUnit"><span>{{'BusinessUnitTitle'| translate}}</span></a></div>
<div class="tab" ui-sref-active="active" ng-show="areaManageShow"><a ui-sref=".regionManage"><span>{{'RegionTabTitle' | translate }}</span></a></div>--> <div class="tab" ui-sref-active="active" ng-show="areaManageShow"><a ui-sref=".regionManage"><span>{{'RegionTabTitle' | translate }}</span></a></div>-->
<div class="tab" ui-sref-active="active" ng-show="enterpriseAccountSetShow"><a ui-sref=".enterpriseAccountManage"><span>{{'EnterpriceAccountTabTitle' | translate }}</span></a></div> <div class="tab" ui-sref-active="active" ng-show="enterpriseAccountSetShow"><a ui-sref=".enterpriseAccountManage"><span>{{'EnterpriseAccountTabTitle' | translate }}</span></a></div>
<!--<div class="tab" ui-sref-active="active"><a ui-sref=".wordLibraryManage"><span>{{'WordLibraryTitle'| translate}}</span></a></div>--> <!--<div class="tab" ui-sref-active="active"><a ui-sref=".wordLibraryManage"><span>{{'WordLibraryTitle'| translate}}</span></a></div>-->
<div class="tab" ui-sref-active="active" ng-show="customerListShow"><a ui-sref=".customerListManage"><span>{{'CustomerTitle'| translate}}</span></a></div> <div class="tab" ui-sref-active="active" ng-show="customerListShow"><a ui-sref=".customerListManage"><span>{{'CustomerTitle'| translate}}</span></a></div>
<!--<div class="tab" ui-sref-active="active"><a ui-sref=".productManage"><span>产品清单</span></a></div>--> <!--<div class="tab" ui-sref-active="active"><a ui-sref=".productManage"><span>产品清单</span></a></div>-->
......
atms-web/src/main/webapp/app/admin/basicData/financialData/enterpriseAccountManage/enterprise-account-manage.ctrl.js
View file @ 68f30e0a
...@@ -1798,12 +1798,12 @@ ...@@ -1798,12 +1798,12 @@
columnDefs: [{ columnDefs: [{
field: 'code', field: 'code',
name: $translate.instant('EnterpriceAccountCode'), name: $translate.instant('EnterpriseAccountCode'),
width: '15%', width: '15%',
cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.code}}">{{row.entity.code}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.code}}">{{row.entity.code}}</span></div>'
}, { }, {
field: 'name', field: 'name',
name: $translate.instant('EnterpriceAccountName'), name: $translate.instant('EnterpriseAccountName'),
width: '31%', width: '31%',
cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>'
}, { }, {
......
atms-web/src/main/webapp/app/admin/basicData/financialData/enterpriseAccountManage/enterprise-account-manage.html
View file @ 68f30e0a
...@@ -5,30 +5,56 @@ ...@@ -5,30 +5,56 @@
</div> </div>
<p>{{'CurentSystemNoEnterpriseAccountSet' | translate}}</p> <p>{{'CurentSystemNoEnterpriseAccountSet' | translate}}</p>
<p> <p>
<button type="button" class="btn btn-primary" ng-class="{false:'no-permission'}[hasAddPermission]" ng-disabled="!hasAddPermission" ng-click="newAccountSetModal()"><i class="material-icons button-icons">add_circle_outline</i>{{'AddEnterpriceAccountSetTitle' | translate}}</button> <button type="button" class="btn btn-primary" ng-class="{false:'no-permission'}[hasAddPermission]"
ng-disabled="!hasAddPermission" ng-click="newAccountSetModal()"><i
class="material-icons button-icons">add_circle_outline</i>{{'AddEnterpriceAccountSetTitle' |
translate}}
</button>
</p> </p>
</div> </div>
<div class="row enterprise-account-set" ng-show="hasEnterpriseAccountSet"> <div class="row enterprise-account-set" ng-show="hasEnterpriseAccountSet">
<div class="col-sm-8 left"> <div class="col-sm-8 left">
<span translate="SelectEnterpriseAccountSet"></span><span>：</span> <span translate="SelectEnterpriseAccountSet"></span><span>：</span>
<select class="form-control account-set-select" style="width:330px;" id='enterpriseAccountSetSelect' name="enterpriseAccountSetSelect" ng-change="changeEnterpriseAccountSet()" ng-model="enterpriseAccountSetSelectID" required> <select class="form-control account-set-select" style="width:330px;" id='enterpriseAccountSetSelect'
<option ng-repeat="x in enterpriseAccountSetList" value="{{x.id}}" title="{{x.name}}">{{x.name | limitString:33}}</option> name="enterpriseAccountSetSelect" ng-change="changeEnterpriseAccountSet()"
ng-model="enterpriseAccountSetSelectID" required>
<option ng-repeat="x in enterpriseAccountSetList" value="{{x.id}}" title="{{x.name}}">{{x.name |
limitString:33}}
</option>
</select> </select>
<button type="button" class="btn btn-in-grid" ng-class="{false:'no-permission'}[hasEditPermission]" ng-disabled="!hasEditPermission" ng-click="editEnterpriseAccountSet()"><i class="material-icons middle">create</i> {{'Edit' | translate }}</button> <button type="button" class="btn btn-in-grid" ng-class="{false:'no-permission'}[hasEditPermission]"
ng-disabled="!hasEditPermission" ng-click="editEnterpriseAccountSet()"><i
class="material-icons middle">create</i> {{'Edit' | translate }}
</button>
</div> </div>
<div class="col-sm-4 right"> <div class="col-sm-4 right">
<button type="button" class="btn btn-in-grid" ng-class="{false:'no-permission'}[hasAddPermission]" ng-disabled="!hasAddPermission" ng-click="newAccountSetModal()"><i class="material-icons middle">add_circle_outline</i> {{'AddEnterpriseAccountSet' | translate }}</button> <button type="button" class="btn btn-in-grid" ng-class="{false:'no-permission'}[hasAddPermission]"
<button type="button" class="btn btn-in-grid inline-div" ng-click="downEntepriseAccountTemplate()"> <i class="fa fa-download" aria-hidden="true"></i>下载模板</button> ng-disabled="!hasAddPermission" ng-click="newAccountSetModal()"><i class="material-icons middle">add_circle_outline</i>
<export-button style="float: right; margin-right: 1px; margin-top: 9px;"><export-button> {{'AddEnterpriseAccountSet' | translate }}
</div> </button>
<button type="button" class="btn btn-in-grid inline-div" ng-click="downEntepriseAccountTemplate()"><i
class="fa fa-download" aria-hidden="true"></i>下载模板
</button>
<export-button style="float: right; margin-right: 1px; margin-top: 9px;">
<export-button>
</div>
</div> </div>
<div class="enterprise-account-list-wrap" id="enterprise-account-list-wrap" ng-show="hasEnterpriseAccountSet"> <div class="enterprise-account-list-wrap" id="enterprise-account-list-wrap" ng-show="hasEnterpriseAccountSet">
<div class="row list-title"> <div class="row list-title">
<!--<button type="button" type="file" class="btn btn-secondary" ng-model="file" ngf-select="overlayUpload()" accept=".xls,.xlsx"> {{'ImportEnterpriceAccountList' | translate }}</button>--> <!--<button type="button" type="file" class="btn btn-secondary" ng-model="file" ngf-select="overlayUpload()" accept=".xls,.xlsx"> {{'ImportEnterpriceAccountList' | translate }}</button>-->
<button type="button" class="btn btn-secondary" ng-class="{false:'no-permission'}[hasEditPermission]" ng-disabled="!hasEditPermission" ng-click="popupImport()"> {{'ImportEnterpriceAccountList' | translate }}</button> <button type="button" class="btn btn-secondary" ng-class="{false:'no-permission'}[hasEditPermission]"
<button type="button" class="btn btn-in-grid" ng-class="{false:'no-permission'}[hasEditPermission]" ng-disabled="!hasEditPermission" ng-click="newModel()"><i class="material-icons middle">add_circle_outline</i> {{'Add' | translate }}</button> ng-disabled="!hasEditPermission" ng-click="popupImport()"> {{'ImportEnterpriseAccountList' |
<button type="button" class="btn btn-in-grid" ng-class="{false:'no-permission'}[hasEditPermission]" ng-disabled="!hasEditPermission" ng-click="load()"><i class="material-icons middle">create</i> {{'Edit' | translate }}</button> translate }}
</button>
<button type="button" class="btn btn-in-grid" ng-class="{false:'no-permission'}[hasEditPermission]"
ng-disabled="!hasEditPermission" ng-click="newModel()"><i class="material-icons middle">add_circle_outline</i>
{{'Add' | translate }}
</button>
<button type="button" class="btn btn-in-grid" ng-class="{false:'no-permission'}[hasEditPermission]"
ng-disabled="!hasEditPermission" ng-click="load()"><i class="material-icons middle">create</i>
{{'Edit' | translate }}
</button>
<!--<button type="button" class="btn btn-in-grid" ng-click="modifyIsActive()"><i class="material-icons middle">remove_circle</i> {{ isActiveBtStr }}</button>--> <!--<button type="button" class="btn btn-in-grid" ng-click="modifyIsActive()"><i class="material-icons middle">remove_circle</i> {{ isActiveBtStr }}</button>-->
<div class="alert alert-danger alert-dismissable" ng-show="ImportErrorTag"> <div class="alert alert-danger alert-dismissable" ng-show="ImportErrorTag">
<div class="glyphicon glyphicon-exclamation-sign" ng-click="toggleErrorTab()" title="点击展开或折叠错误列表"> <div class="glyphicon glyphicon-exclamation-sign" ng-click="toggleErrorTab()" title="点击展开或折叠错误列表">
...@@ -39,36 +65,46 @@ ...@@ -39,36 +65,46 @@
</div> </div>
</div> </div>
<div class="input-group search-warp" style="margin-right:10px;"> <div class="input-group search-warp" style="margin-right:10px;">
<input type="text" class="form-control" ng-model="searchEASText" ng-keyup="search()" placeholder="{{'Search' | translate}}"> <input type="text" class="form-control" ng-model="searchEASText" ng-keyup="search()"
placeholder="{{'Search' | translate}}">
<span class="glyphicon glyphicon-search input-group-addon"></span> <span class="glyphicon glyphicon-search input-group-addon"></span>
</div> </div>
</div> </div>
<!-- standardAccount Data List ng-show="gridOptions.data.length > 0" --> <!-- standardAccount Data List ng-show="gridOptions.data.length > 0" -->
<div class="import-result"> <div class="import-result">
<div id="enterpriseAccountUIGrid" ui-grid="gridOptions" ui-grid-selection ui-grid-resize-columns ng-style="getEnterpriseAccountUIGridHeight()"></div> <div id="enterpriseAccountUIGrid" ui-grid="gridOptions" ui-grid-selection ui-grid-resize-columns
ng-style="getEnterpriseAccountUIGridHeight()"></div>
</div> </div>
</div> </div>
<div class="org-list"> <div class="org-list">
<div class="org-result-list"> <div class="org-result-list">
<div class="row list-title"> <div class="row list-title">
<div class="text" translate="UseEnterpriseAccountOrgList"></div> <div class="text" translate="UseEnterpriseAccountOrgList"></div>
<button type="button" class="btn btn-in-grid right-part" ng-class="{false:'no-permission'}[hasEditPermission]" ng-disabled="!hasEditPermission" ng-click="newRelevantOrgList()"><i class="material-icons middle">add_circle_outline</i> {{'Add' | translate }}</button> <button type="button" class="btn btn-in-grid right-part"
ng-class="{false:'no-permission'}[hasEditPermission]" ng-disabled="!hasEditPermission"
ng-click="newRelevantOrgList()"><i class="material-icons middle">add_circle_outline</i> {{'Add'
| translate }}
</button>
</div> </div>
<!-- 关联机构列表 --> <!-- 关联机构列表 -->
<div id="enterpriseAccountOrgUIGrid" ui-grid="orgGridOptions" ui-grid-selection ui-grid-resize-columns ng-style="getEnterpriseAccountUIGridHeight()"></div> <div id="enterpriseAccountOrgUIGrid" ui-grid="orgGridOptions" ui-grid-selection ui-grid-resize-columns
ng-style="getEnterpriseAccountUIGridHeight()"></div>
</div> </div>
</div> </div>
<!--error list--> <!--error list-->
<div class="error-wrap" id="enterprise-account-error-wrap"> <div class="error-wrap" id="enterprise-account-error-wrap">
<div class="cust-table-cont" ng-show="ImportErrorTab"> <div class="cust-table-cont" ng-show="ImportErrorTab">
<div id="enterpriseAccountUIGrid" ui-grid="errorGridOptions" ui-grid-selection ng-style="getGridHeight()"></div> <div id="enterpriseAccountUIGrid" ui-grid="errorGridOptions" ui-grid-selection
ng-style="getGridHeight()"></div>
</div> </div>
</div> </div>
<div> <div>
<div id="topIcon" ng-show="ImportErrorTag" ng-click="toggleErrorTab()"> <div id="topIcon" ng-show="ImportErrorTag" ng-click="toggleErrorTab()">
<img src="../../../../app-resources/images/collapse.png" /> <img src="../../../../app-resources/images/collapse.png"/>
</div> </div>
<div class="error-line" ng-show="ImportErrorTag" id="content-resizer" resizer="horizontal" resizer-top="#enterprise-account-list-wrap" resizer-bottom="#enterprise-account-error-wrap" resizer-max="430" bottom-min="0" bottom-max="500" icon="topIcon" icon-diff="10"> <div class="error-line" ng-show="ImportErrorTag" id="content-resizer" resizer="horizontal"
resizer-top="#enterprise-account-list-wrap" resizer-bottom="#enterprise-account-error-wrap"
resizer-max="430" bottom-min="0" bottom-max="500" icon="topIcon" icon-diff="10">
</div> </div>
</div> </div>
<!-- 添加 --> <!-- 添加 -->
...@@ -76,43 +112,55 @@ ...@@ -76,43 +112,55 @@
<div class="modal-dialog" style="width:610px;height:200px;" role="document"> <div class="modal-dialog" style="width:610px;height:200px;" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" ng-if="isAdd">{{'AddEnterpriceAccountTitle' | translate }}</div> <div class="modal-title" ng-if="isAdd">{{'AddEnterpriseAccountTitle' | translate }}</div>
<div class="modal-title" ng-if="!isAdd">{{'EditEnterpriceAccountTitle' | translate}}</div> <div class="modal-title" ng-if="!isAdd">{{'EditEnterpriseAccountTitle' | translate}}</div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form class="form-horizontal" id="addEnterpriceAccountForm"> <form class="form-horizontal" id="addEnterpriceAccountForm">
<div class="form-group"> <div class="form-group">
<label for="code" class="col-sm-3 control-label">{{'EnterpriceAccountCode' | translate}}：</label> <label for="code" class="col-sm-3 control-label">{{'EnterpriseAccountCode' |
translate}}：</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input class="form-control" id="code" name="code" ng-model="editModel.code" placeholder="" ng-blur="codeChange(editModel.code)" maxlength="50" required> <input class="form-control" id="code" name="code" ng-model="editModel.code"
placeholder="" ng-blur="codeChange(editModel.code)" maxlength="50" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="name" class="col-sm-3 control-label">{{'EnterpriceAccountName' | translate}}：</label> <label for="name" class="col-sm-3 control-label">{{'EnterpriseAccountName' |
translate}}：</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input class="form-control" id="name" name="name" ng-model="editModel.name" placeholder="" maxlength="100" required> <input class="form-control" id="name" name="name" ng-model="editModel.name"
placeholder="" maxlength="100" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="selectStandardAccount" class="col-sm-3 control-label">{{'StandardAccountSuperiorAccount' | translate}}：</label> <label for="selectStandardAccount" class="col-sm-3 control-label">{{'StandardAccountSuperiorAccount'
| translate}}：</label>
<div class="col-sm-9"> <div class="col-sm-9">
<!-- <select class="form-control" ng-change="parentChange()" id='selectStandardAccount' name="selectStandardAccount" ng-model="selectStandardAccountID"> <!-- <select class="form-control" ng-change="parentChange()" id='selectStandardAccount' name="selectStandardAccount" ng-model="selectStandardAccountID">
<option ng-repeat="x in enterpriceAccountList" value="{{x.id}}" title="{{x.selectValue}}">{{x.selectValue | limitString:33}}</option> <option ng-repeat="x in enterpriceAccountList" value="{{x.id}}" title="{{x.selectValue}}">{{x.selectValue | limitString:33}}</option>
</select> --> </select> -->
<input class="form-control" readonly value="{{editModel.parentCode }} {{ editModel.parentFullName}}"></input> <input class="form-control" readonly
value="{{editModel.parentCode }} {{ editModel.parentFullName}}"></input>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="selectDirection" class="col-sm-3 control-label">{{'StandardAccountDirection' | translate}}：</label> <label for="selectDirection" class="col-sm-3 control-label">{{'StandardAccountDirection' |
translate}}：</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select class="form-control w120" id='selectDirection' name="selectDirection" ng-model="selectDirection" ng-options="x.name for x in directionList" required></select> <select class="form-control w120" id='selectDirection' name="selectDirection"
ng-model="selectDirection" ng-options="x.name for x in directionList"
required></select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="selectAcctProp" class="col-sm-3 control-label">{{'StandardAccountAccountTypes' | translate}}：</label> <label for="selectAcctProp" class="col-sm-3 control-label">{{'StandardAccountAccountTypes' |
translate}}：</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select class="form-control w120" id='selectAcctProp' name="selectAcctProp" ng-model="selectAcctProp" ng-options="x.name for x in acctPropList" required></select> <select class="form-control w120" id='selectAcctProp' name="selectAcctProp"
ng-model="selectAcctProp" ng-options="x.name for x in acctPropList"
required></select>
</div> </div>
</div> </div>
</form> </form>
...@@ -129,22 +177,26 @@ ...@@ -129,22 +177,26 @@
<div class="modal-dialog" style="width:480px;height:200px;" role="document"> <div class="modal-dialog" style="width:480px;height:200px;" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" ng-if="isAdd">{{'AddEnterpriceAccountSetTitle' | translate }}</div> <div class="modal-title" ng-if="isAdd">{{'AddEnterpriseAccountSetTitle' | translate }}</div>
<div class="modal-title" ng-if="!isAdd">{{'EditEnterpriceAccountSetTitle' | translate}}</div> <div class="modal-title" ng-if="!isAdd">{{'EditEnterpriseAccountSetTitle' | translate}}</div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form class="form-horizontal" id="addEnterpriceAccountSetForm"> <form class="form-horizontal" id="addEnterpriceAccountSetForm">
<input type="hidden" id="enterpriseAccountSetID" value="{{editModel.id}}" /> <input type="hidden" id="enterpriseAccountSetID" value="{{editModel.id}}"/>
<div class="form-group"> <div class="form-group">
<label for="code" class="col-sm-2 control-label">{{'EnterpriceAccountSetName' | translate}}：</label> <label for="code" class="col-sm-2 control-label">{{'EnterpriseAccountSetName' |
translate}}：</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input class="form-control" id="enterpriseAccountSetName" name="name" ng-model="editModel.name" maxlength="50" placeholder="" required> <input class="form-control" id="enterpriseAccountSetName" name="name"
ng-model="editModel.name" maxlength="50" placeholder="" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="code" class="col-sm-2 control-label">{{'EnterpriceAccountSetCode' | translate}}：</label> <label for="code" class="col-sm-2 control-label">{{'EnterpriseAccountSetCode' |
translate}}：</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input class="form-control" id="enterpriseAccountSetCode" name="code" ng-model="editModel.code" maxlength="50" placeholder="" required> <input class="form-control" id="enterpriseAccountSetCode" name="code"
ng-model="editModel.code" maxlength="50" placeholder="" required>
</div> </div>
</div> </div>
<!--<div class="form-group"> <!--<div class="form-group">
...@@ -154,77 +206,95 @@ ...@@ -154,77 +206,95 @@
</div> </div>
</div>--> </div>-->
<div class="form-group" ng-show="isAdd"> <div class="form-group" ng-show="isAdd">
<label for="selectDirection" class="col-sm-2 control-label">{{'SelectAccountSet' | translate}}：</label> <label for="selectDirection" class="col-sm-2 control-label">{{'SelectAccountSet' |
translate}}：</label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-control" type="text" name="fileName" readonly placeholder="" ng-required="isAdd" title="{{file ? file.name : ''}}"> <div class="form-control" type="text" name="fileName" readonly placeholder=""
ng-required="isAdd" title="{{file ? file.name : ''}}">
{{file ? file.name : '' | limitString :25}} {{file ? file.name : '' | limitString :25}}
</div> </div>
</div> </div>
<div class="col-sm-2"> <div class="col-sm-2">
<button type="button" type="file" ngf-select ng-model="file" accept=".xls,.xlsx" class="btn btn-secondary browse">{{'Browse' | translate }}</button> <button type="button" type="file" ngf-select ng-model="file" accept=".xls,.xlsx"
class="btn btn-secondary browse">{{'Browse' | translate }}
</button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" ng-click="saveEnterpriseAccountSet()">{{'Confirm' | translate }}</button> <button type="button" class="btn btn-primary" ng-click="saveEnterpriseAccountSet()">{{'Confirm' |
translate }}
</button>
<button type="button" class="btn btn-third" data-dismiss="modal">{{'Cancel' | translate }}</button> <button type="button" class="btn btn-third" data-dismiss="modal">{{'Cancel' | translate }}</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--导入模态框--> <!--导入模态框-->
<div class="modal fade" id="importEnterpriceAccountSetPop" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal fade" id="importEnterpriceAccountSetPop" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog" style="width:610px;height:100px;" role="document"> <div class="modal-dialog" style="width:610px;height:100px;" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title"> {{'ImportEnterpriceAccountList' | translate }}</div> <div class="modal-title"> {{'ImportEnterpriseAccountList' | translate }}</div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form class="form-horizontal" id="importEnterpriceAccountSetForm"> <form class="form-horizontal" id="importEnterpriseAccountSetForm">
<div class="form-group"> <div class="form-group">
<label for="import" class="col-sm-2 control-label">{{'SelectCustomerFileTitle' | translate}}：</label> <label for="import" class="col-sm-2 control-label">{{'SelectCustomerFileTitle' |
translate}}：</label>
<div class="col-sm-5"> <div class="col-sm-5">
<div class="form-control" type="text" name="fileName" readonly placeholder="" ng-required="isAdd" title="{{file ? file.name : ''}}"> <div class="form-control" type="text" name="fileName" readonly placeholder=""
ng-required="isAdd" title="{{file ? file.name : ''}}">
{{file ? file.name : '' | limitString :20}} {{file ? file.name : '' | limitString :20}}
</div> </div>
</div> </div>
<div class="col-sm-5"> <div class="col-sm-5">
<button type="button" type="file" ngf-select ng-model="file" accept=".xls,.xlsx" class="btn btn-not-important browse inline-div">{{'Browse' | translate }}</button> <button type="button" type="file" ngf-select ng-model="file" accept=".xls,.xlsx"
class="btn btn-not-important browse inline-div">{{'Browse' | translate }}
</button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class="modal-footer" style="padding-left:113px;"> <div class="modal-footer" style="padding-left:113px;">
<button type="button" class="btn btn-primary" ng-disabled="!file" ng-click="overlayUpload()">{{'ImportOverwrite' | translate }}</button> <button type="button" class="btn btn-primary" ng-disabled="!file" ng-click="overlayUpload()">
<button type="button" class="btn btn-secondary" ng-disabled="!file" ng-click="importAppend()">{{'ImportAppend' | translate }}</button> {{'ImportOverwrite' | translate }}
</button>
<button type="button" class="btn btn-secondary" ng-disabled="!file" ng-click="importAppend()">
{{'ImportAppend' | translate }}
</button>
<button type="button" class="btn btn-third" data-dismiss="modal">{{'Cancel' | translate }}</button> <button type="button" class="btn btn-third" data-dismiss="modal">{{'Cancel' | translate }}</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- 添加关联机构模态框 --> <!-- 添加关联机构模态框 -->
<div class="modal fade" id="addEnterpriceAccountSetRelevantOrg" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal fade" id="addEnterpriceAccountSetRelevantOrg" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog" style="width:50em;height:200px;" role="document"> <div class="modal-dialog" style="width:50em;height:200px;" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" ng-if="isAdd">{{'AddRelevantOrg' | translate }}</div> <div class="modal-title" ng-if="isAdd">{{'AddRelevantOrg' | translate }}</div>
<div class="modal-title" ng-if="!isAdd">{{'EditEnterpriceAccountSetTitle' | translate}}</div> <div class="modal-title" ng-if="!isAdd">{{'EditEnterpriseAccountSetTitle' | translate}}</div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form class="form-horizontal" id="addEnterpriceAccountSetRelevantOrgForm"> <form class="form-horizontal" id="addEnterpriceAccountSetRelevantOrgForm">
<input type="hidden" value="{{editModel.id}}" /> <input type="hidden" value="{{editModel.id}}"/>
<div class="form-group"> <div class="form-group">
<label for="code" class="col-sm-2 control-label">{{'EnterpriceAccountSetName' | translate}}：</label> <label for="code" class="col-sm-2 control-label">{{'EnterpriseAccountSetName' |
translate}}：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<label class="control-label ellipsis" title="{{editModel.name}}" style="width: none;">{{editModel.name}}</label> <label class="control-label ellipsis" title="{{editModel.name}}" style="width: none;">{{editModel.name}}</label>
</div> </div>
</div> </div>
<!-- 关联机构 --> <!-- 关联机构 -->
<div class="form-group" ng-if="isAdd"> <div class="form-group" ng-if="isAdd">
<label for="selectStandardAccount" class="col-sm-2 control-label">{{'RelationOrg' | translate}}：</label> <label for="selectStandardAccount" class="col-sm-2 control-label">{{'RelationOrg' |
translate}}：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<table> <table>
<tr ng-repeat="x in editModel.enterpriseAccountSetOrgList" class="relavant-tr"> <tr ng-repeat="x in editModel.enterpriseAccountSetOrgList" class="relavant-tr">
...@@ -232,25 +302,33 @@ ...@@ -232,25 +302,33 @@
<!-- 机构名称 --> <!-- 机构名称 -->
<!-- <org-selector selected-org-name="x.organizationName" selected-org-id="x.organizationID" component-selected-org="x.componentSelectedOrg" name="organization" is-show-all=false item-max-length="22"></org-selector> --> <!-- <org-selector selected-org-name="x.organizationName" selected-org-id="x.organizationID" component-selected-org="x.componentSelectedOrg" name="organization" is-show-all=false item-max-length="22"></org-selector> -->
<org-search-selector selected-org-name="x.organizationName" selected-org-id="x.organizationID" selected-org-model="x.componentSelectedOrg" name="organization"></org-search-selector> <org-search-selector selected-org-name="x.organizationName"
selected-org-id="x.organizationID"
selected-org-model="x.componentSelectedOrg"
name="organization"></org-search-selector>
</td> </td>
<td><span translate="EffectiveDateCol"></span></td> <td><span translate="EffectiveDateCol"></span></td>
<td> <td>
<!-- 有效时间 --> <!-- 有效时间 -->
<input type="text" class="form_datetime form-control" name="effectiveDate" id="{{x.fromID}}" ng-model="x.effectiveDateStr" /> <input type="text" class="form_datetime form-control" name="effectiveDate"
id="{{x.fromID}}" ng-model="x.effectiveDateStr"/>
</td> </td>
<td><span translate="ExpiredDateTo"></span></td> <td><span translate="ExpiredDateTo"></span></td>
<td> <td>
<!-- 失效时间 --> <!-- 失效时间 -->
<input type="text" class="form_datetime form-control" name="expiredDate" id="{{x.toID}}" ng-model="x.expiredDateStr" /> <input type="text" class="form_datetime form-control" name="expiredDate"
id="{{x.toID}}" ng-model="x.expiredDateStr"/>
</td> </td>
<td> <td>
<span ng-click="deleteEnterpriseAccountSetOrg(x)" class="ng-scope"><i class="material-icons button-icons middle delete red-color">delete</i></span> <span ng-click="deleteEnterpriseAccountSetOrg(x)" class="ng-scope"><i
class="material-icons button-icons middle delete red-color">delete</i></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="6"> <td colspan="6">
<label class="control-label" style="width:19px;" ng-click="addEnterpriseAccountSetOrg()"><i class="material-icons middle" style="font-size:18px;">add_circle_outline</i></label> <label class="control-label" style="width:19px;"
ng-click="addEnterpriseAccountSetOrg()"><i
class="material-icons middle" style="font-size:18px;">add_circle_outline</i></label>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -259,7 +337,9 @@ ...@@ -259,7 +337,9 @@
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" ng-click="addRelevantOrgList()">{{'Confirm' | translate }}</button> <button type="button" class="btn btn-primary" ng-click="addRelevantOrgList()">{{'Confirm' |
translate }}
</button>
<button type="button" class="btn btn-third" data-dismiss="modal">{{'Cancel' | translate }}</button> <button type="button" class="btn btn-third" data-dismiss="modal">{{'Cancel' | translate }}</button>
</div> </div>
</div> </div>
...@@ -267,7 +347,8 @@ ...@@ -267,7 +347,8 @@
</div> </div>
<!-- 修改关联机构模态框 --> <!-- 修改关联机构模态框 -->
<div class="modal fade" id="updateEnterpriceAccountSetRelevantOrg" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal fade" id="updateEnterpriceAccountSetRelevantOrg" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog" style="width:50em;height:200px;" role="document"> <div class="modal-dialog" style="width:50em;height:200px;" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -275,33 +356,41 @@ ...@@ -275,33 +356,41 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form class="form-horizontal" id="updateEnterpriceAccountSetRelevantOrgForm"> <form class="form-horizontal" id="updateEnterpriceAccountSetRelevantOrgForm">
<input type="hidden" value="{{editModel.id}}" /> <input type="hidden" value="{{editModel.id}}"/>
<div class="form-group"> <div class="form-group">
<label for="code" class="col-sm-2 control-label">{{'EnterpriceAccountSetName' | translate}}：</label> <label for="code" class="col-sm-2 control-label">{{'EnterpriceAccountSetName' |
translate}}：</label>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label" style="width: none;">{{editModel.name}}</label> <label class="control-label" style="width: none;">{{editModel.name}}</label>
</div> </div>
</div> </div>
<!-- 关联机构 --> <!-- 关联机构 -->
<div class="form-group" ng-if="!isAdd"> <div class="form-group" ng-if="!isAdd">
<label for="selectStandardAccount" class="col-sm-2 control-label">{{'RelationOrg' | translate}}：</label> <label for="selectStandardAccount" class="col-sm-2 control-label">{{'RelationOrg' |
translate}}：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<table> <table>
<tr ng-repeat="x in editModel.enterpriseAccountSetOrgList" class="relavant-tr"> <tr ng-repeat="x in editModel.enterpriseAccountSetOrgList" class="relavant-tr">
<td> <td>
<!-- 机构名称 --> <!-- 机构名称 -->
<!--<org-selector selected-org-name="x.organizationName" selected-org-id="x.organizationID" component-selected-org="x.componentSelectedOrg" name="organization" is-show-all=false item-max-length="22"></org-selector>--> <!--<org-selector selected-org-name="x.organizationName" selected-org-id="x.organizationID" component-selected-org="x.componentSelectedOrg" name="organization" is-show-all=false item-max-length="22"></org-selector>-->
<org-search-selector selected-org-name="x.organizationName" selected-org-id="x.organizationID" selected-org-model="x.componentSelectedOrg" edit-org-id="x.organizationID" name="organization"></org-search-selector> <org-search-selector selected-org-name="x.organizationName"
selected-org-id="x.organizationID"
selected-org-model="x.componentSelectedOrg"
edit-org-id="x.organizationID"
name="organization"></org-search-selector>
</td> </td>
<td><span translate="EffectiveDate"></span></td> <td><span translate="EffectiveDate"></span></td>
<td> <td>
<!-- 有效时间 --> <!-- 有效时间 -->
<input type="text" class="form_datetime form-control" name="effectiveDate" id="{{x.fromID}}" ng-model="x.effectiveDateStr" /> <input type="text" class="form_datetime form-control" name="effectiveDate"
id="{{x.fromID}}" ng-model="x.effectiveDateStr"/>
</td> </td>
<td><span translate="ExpiredDateTo"></span></td> <td><span translate="ExpiredDateTo"></span></td>
<td> <td>
<!-- 失效时间 --> <!-- 失效时间 -->
<input type="text" class="form_datetime form-control" name="expiredDate" id="{{x.toID}}" ng-model="x.expiredDateStr" /> <input type="text" class="form_datetime form-control" name="expiredDate"
id="{{x.toID}}" ng-model="x.expiredDateStr"/>
</td> </td>
</tr> </tr>
...@@ -312,7 +401,9 @@ ...@@ -312,7 +401,9 @@
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" ng-click="updateRelevantOrg()">{{'Confirm' | translate }}</button> <button type="button" class="btn btn-primary" ng-click="updateRelevantOrg()">{{'Confirm' | translate
}}
</button>
<button type="button" class="btn btn-third" data-dismiss="modal">{{'Cancel' | translate }}</button> <button type="button" class="btn btn-third" data-dismiss="modal">{{'Cancel' | translate }}</button>
</div> </div>
</div> </div>
......
atms-web/src/main/webapp/bundles/basicData.js
View file @ 68f30e0a
...@@ -2703,12 +2703,12 @@ basicDataModule ...@@ -2703,12 +2703,12 @@ basicDataModule
columnDefs: [{ columnDefs: [{
field: 'code', field: 'code',
name: $translate.instant('EnterpriceAccountCode'), name: $translate.instant('EnterpriseAccountCode'),
width: '15%', width: '15%',
cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.code}}">{{row.entity.code}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.code}}">{{row.entity.code}}</span></div>'
}, { }, {
field: 'name', field: 'name',
name: $translate.instant('EnterpriceAccountName'), name: $translate.instant('EnterpriseAccountName'),
width: '31%', width: '31%',
cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>'
}, { }, {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment