WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_2nd_20230213' 到 'master'

Browse Source 
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!291
This commit is contained in:
高嵩
2023-02-14 14:10:26 +08:00
parent 95bd1395f9 3504521f66
commit d2c1d32bfd
6 changed files with 2750 additions and 2701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+16 -16
View File
@@ -264,7 +264,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
//编号，标题，操作 //编号，标题，操作
boolean hasBH = false; boolean hasBH = false;
boolean hasBT = false; boolean hasBT = false;
boolean hasCZ = false; // boolean hasCZ = false;
for (HeadCustomVO hcVO : headCustomVOOneList) { for (HeadCustomVO hcVO : headCustomVOOneList) {
if ("编号".equals(hcVO.getTitle()) || "Number".equals(hcVO.getTitle())) { if ("编号".equals(hcVO.getTitle()) || "Number".equals(hcVO.getTitle())) {
hasBH = true; hasBH = true;
@@ -273,7 +273,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
hasBT = true; hasBT = true;
} }
if ("操作".equals(hcVO.getTitle())) { if ("操作".equals(hcVO.getTitle())) {
hasCZ = true; headCustomVOOneList.remove(hcVO);
} }
} }
if (!hasBH) { if (!hasBH) {
@@ -299,17 +299,17 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
res.add(bt); res.add(bt);
} }
res.addAll(headCustomVOOneList); res.addAll(headCustomVOOneList);
if (!hasCZ) { // if (!hasCZ) {
HeadCustomVO cz = new HeadCustomVO(); // HeadCustomVO cz = new HeadCustomVO();
cz.setDataIndex("operation"); // cz.setDataIndex("operation");
if (CutEnum.CN.getValue().equals(cut)) { // if (CutEnum.CN.getValue().equals(cut)) {
cz.setTitle("操作"); // cz.setTitle("操作");
} else { // } else {
cz.setTitle("Operation"); // cz.setTitle("Operation");
} // }
cz.setFixed("right"); // cz.setFixed("right");
res.add(cz); // res.add(cz);
} // }
return res; return res;
} }
@@ -329,9 +329,9 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
if ("标题".equals(headCustomEO.getHeadFieldCn())) { if ("标题".equals(headCustomEO.getHeadFieldCn())) {
headCustomVO.setFixed("left"); headCustomVO.setFixed("left");
} }
if ("操作".equals(headCustomEO.getHeadFieldCn())) { // if ("操作".equals(headCustomEO.getHeadFieldCn())) {
headCustomVO.setFixed("right"); // headCustomVO.setFixed("right");
} // }
} }
return headCustomVO; return headCustomVO;
} }
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -1376,7 +1376,7 @@ module.exports = {
Updateparametercolumn:'Update The Parameter Column', Updateparametercolumn:'Update The Parameter Column',
columnfirst:'Reference the parameter column first', columnfirst:'Reference the parameter column first',
columnforced:'Confirm a forced retraction?', columnforced:'Confirm a forced retraction?',
customize:'Customize the header', customize:'List setting',
customColumn:'Custom column', customColumn:'Custom column',
} }
jero-web/src/common/lang/zh-cn.js
+1 -1
View File
@@ -1477,6 +1477,6 @@ module.exports = {
brand:'品牌', brand:'品牌',
allsubitemsitem:'该项目下拥有子项目，是否全部删除', allsubitemsitem:'该项目下拥有子项目，是否全部删除',
contactTheFounder:'联系作者', contactTheFounder:'联系作者',
customize:'自定义表头', customize:'列表设置',
customColumn:'自定义列', customColumn:'自定义列',
} }
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+3 -3
View File
@@ -1996,9 +1996,9 @@ popconfirmmize {
//font-weight: bold; //font-weight: bold;
//background: #f3f6f6; //background: #f3f6f6;
//} //}
.ant-table-row-cell-ellipsis{ //.ant-table-row-cell-ellipsis{
padding: 0!important; // padding: 0!important;
} //}
.second{ .second{
padding: 0!important; padding: 0!important;
} }
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+134 -81
View File
@@ -98,11 +98,11 @@
<div class="table-operator" <div class="table-operator"
style="overflow:hidden;margin-bottom: 20px"> style="overflow:hidden;margin-bottom: 20px">
<div style="float: right;margin-top: 1px; margin-left: 20px"> <div style="float: right;margin-top: 1px; margin-left: 20px">
<a-popconfirm :visible="customizevisible" overlayClassName='popconfirmmize' placement="bottomRight" > <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize" placement="bottomRight">
<template slot="title" id="popconfirmmize"> <template slot="title" id="popconfirmmize">
<div style="height:320px;overflow:scroll;overflow-x: auto;"> <div style="height:320px;overflow:scroll;overflow-x: auto;">
<a-checkbox <a-checkbox
style='margin-bottom: 22px;' style="margin-bottom: 22px;"
v-if="customizeList && customizeList.length" v-if="customizeList && customizeList.length"
v-model="checkAll" v-model="checkAll"
:indeterminate="indeterminate" :indeterminate="indeterminate"
@@ -110,16 +110,18 @@
>{{ $t('selectAll') }} >{{ $t('selectAll') }}
</a-checkbox> </a-checkbox>
<a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text"> <a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text">
<a-checkbox class="customize-text-title" :disabled='item.disabled' v-for="(item, key) in customizeList" :key="key" :value="item.field">{{ item.name }} <a-checkbox class="customize-text-title" :disabled="item.disabled" v-for="(item, key) in customizeList"
:key="key" :value="item.field">{{ item.name }}
</a-checkbox> </a-checkbox>
</a-checkbox-group> </a-checkbox-group>
<div class="drawer-bootom-button"> <div class="drawer-bootom-button">
<a-button @click="cancel" style="margin-right: 16px">{{ $t('cancel') }}</a-button> <a-button @click="cancel" style="margin-right: 16px">{{ $t('cancel') }}</a-button>
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button> <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{ $t('determine') }}
</a-button>
</div> </div>
</div> </div>
</template> </template>
<div class="operator-text" style="position: relative" @click='getcustomize'> <div class="operator-text" style="position: relative" @click="getcustomize">
<a-icon type="setting" /> <a-icon type="setting" />
{{ $t('customize') }} {{ $t('customize') }}
</div> </div>
@@ -136,7 +138,7 @@
</div> </div>
</div> </div>
<div style="float: right;margin-top: 1px;;margin-right: 20px" v-if="isDisplay"> <div style="float: right;margin-top: 1px;;margin-right: 20px" v-if="isDisplay">
<a-popconfirm overlayClassName='popconfirm' placement="bottomRight"> <a-popconfirm overlayClassName="popconfirm" placement="bottomRight">
<template slot="title" id="popconfirm"> <template slot="title" id="popconfirm">
<div style="height:320px;overflow:scroll;overflow-x: auto;"> <div style="height:320px;overflow:scroll;overflow-x: auto;">
<div class="operator-text-title"> <div class="operator-text-title">
@@ -907,7 +909,7 @@
field: 'serialNumber', field: 'serialNumber',
key: 1, key: 1,
moduleFlag: '法规清单', moduleFlag: '法规清单',
status:1, status: 1
}, },
{ {
sort: '2', sort: '2',
@@ -918,7 +920,7 @@
field: 'title', field: 'title',
key: 2, key: 2,
moduleFlag: '法规清单', moduleFlag: '法规清单',
status:2, status: 2
}, },
{ {
sort: '', sort: '',
@@ -927,7 +929,7 @@
headFieldEn: 'Sub-title', headFieldEn: 'Sub-title',
field: 'subtitle', field: 'subtitle',
key: 3, key: 3,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -936,7 +938,7 @@
headFieldEn: 'List Confirmation Status', headFieldEn: 'List Confirmation Status',
field: 'inventoryAffirmStatusName', field: 'inventoryAffirmStatusName',
key: 4, key: 4,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -945,7 +947,7 @@
headFieldEn: 'Task Confirmation Status', headFieldEn: 'Task Confirmation Status',
field: 'taskAffirmStatusName', field: 'taskAffirmStatusName',
key: 5, key: 5,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -954,7 +956,7 @@
headFieldEn: 'Area', headFieldEn: 'Area',
field: 'region_dictText', field: 'region_dictText',
key: 6, key: 6,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -963,7 +965,7 @@
headFieldEn: 'Compare EU/CN', headFieldEn: 'Compare EU/CN',
field: 'correspondingStandard', field: 'correspondingStandard',
key: 7, key: 7,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -972,7 +974,7 @@
headFieldEn: 'Usage', headFieldEn: 'Usage',
field: 'implementType_dictText', field: 'implementType_dictText',
key: 8, key: 8,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -981,7 +983,7 @@
headFieldEn: 'New Type Execution Date', headFieldEn: 'New Type Execution Date',
field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
key: 9, key: 9,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -990,7 +992,7 @@
headFieldEn: 'New Vehicle Execution Date', headFieldEn: 'New Vehicle Execution Date',
field: 'implementTime', field: 'implementTime',
key: 10, key: 10,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -999,7 +1001,7 @@
headFieldEn: 'Certification Type', headFieldEn: 'Certification Type',
field: 'attestationType_dictText', field: 'attestationType_dictText',
key: 11, key: 11,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1008,7 +1010,7 @@
headFieldEn: 'Certification Level', headFieldEn: 'Certification Level',
field: 'attestationRank_dictText', field: 'attestationRank_dictText',
key: 12, key: 12,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1017,7 +1019,7 @@
headFieldEn: 'Applicable Supplement', headFieldEn: 'Applicable Supplement',
field: 'applicableSupplement', field: 'applicableSupplement',
key: 13, key: 13,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1026,7 +1028,7 @@
headFieldEn: 'WVTA ID', headFieldEn: 'WVTA ID',
field: 'wvtaId', field: 'wvtaId',
key: 14, key: 14,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1035,7 +1037,7 @@
headFieldEn: 'Responsible Field', headFieldEn: 'Responsible Field',
field: 'dutyTerritory_dictText', field: 'dutyTerritory_dictText',
key: 15, key: 15,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1044,7 +1046,7 @@
headFieldEn: 'Regulation Engineer', headFieldEn: 'Regulation Engineer',
field: 'regulationOwnerName', field: 'regulationOwnerName',
key: 16, key: 16,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1053,7 +1055,7 @@
headFieldEn: 'Homo Engineer', headFieldEn: 'Homo Engineer',
field: 'homologationEngineerName', field: 'homologationEngineerName',
key: 17, key: 17,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1062,7 +1064,7 @@
headFieldEn: 'Eng. Interface', headFieldEn: 'Eng. Interface',
field: 'engineeringInterfacePersonName', field: 'engineeringInterfacePersonName',
key: 18, key: 18,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1071,7 +1073,7 @@
headFieldEn: 'Comments', headFieldEn: 'Comments',
field: 'remark', field: 'remark',
key: 19, key: 19,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1081,7 +1083,7 @@
field: 'designDeliverableTemplateName', field: 'designDeliverableTemplateName',
affirmFlag: '1', affirmFlag: '1',
key: 20, key: 20,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1091,7 +1093,7 @@
field: 'designInitiatorName', field: 'designInitiatorName',
affirmFlag: '1', affirmFlag: '1',
key: 21, key: 21,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1101,7 +1103,7 @@
field: 'designDutyName', field: 'designDutyName',
affirmFlag: '1', affirmFlag: '1',
key: 22, key: 22,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1111,7 +1113,7 @@
field: 'designDueDate', field: 'designDueDate',
affirmFlag: '1', affirmFlag: '1',
key: 23, key: 23,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1121,7 +1123,7 @@
field: 'designRemark', field: 'designRemark',
affirmFlag: '1', affirmFlag: '1',
key: 24, key: 24,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1131,7 +1133,7 @@
field: 'prehomoDeliverableTemplateName', field: 'prehomoDeliverableTemplateName',
affirmFlag: '2', affirmFlag: '2',
key: 25, key: 25,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1141,7 +1143,7 @@
field: 'prehomoInitiatorName', field: 'prehomoInitiatorName',
affirmFlag: '2', affirmFlag: '2',
key: 26, key: 26,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1151,7 +1153,7 @@
field: 'prehomoDutyName', field: 'prehomoDutyName',
affirmFlag: '2', affirmFlag: '2',
key: 27, key: 27,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1161,7 +1163,7 @@
field: 'prehomoDueDate', field: 'prehomoDueDate',
affirmFlag: '2', affirmFlag: '2',
key: 28, key: 28,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1171,7 +1173,7 @@
field: 'prehomoRemark', field: 'prehomoRemark',
affirmFlag: '2', affirmFlag: '2',
key: 29, key: 29,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1181,7 +1183,7 @@
field: 'verifyDeliverableTemplateName', field: 'verifyDeliverableTemplateName',
affirmFlag: '3', affirmFlag: '3',
key: 30, key: 30,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1191,7 +1193,7 @@
field: 'verifyInitiatorName', field: 'verifyInitiatorName',
affirmFlag: '3', affirmFlag: '3',
key: 31, key: 31,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1201,7 +1203,7 @@
field: 'verifyDutyName', field: 'verifyDutyName',
affirmFlag: '3', affirmFlag: '3',
key: 32, key: 32,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1211,7 +1213,7 @@
field: 'verifyDueDate', field: 'verifyDueDate',
affirmFlag: '3', affirmFlag: '3',
key: 33, key: 33,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1221,7 +1223,7 @@
field: 'verifyRemark', field: 'verifyRemark',
affirmFlag: '3', affirmFlag: '3',
key: 34, key: 34,
moduleFlag:'法规清单', moduleFlag: '法规清单'
}, },
{ {
sort: '', sort: '',
@@ -1232,8 +1234,8 @@
key: 35, key: 35,
field: 'operation', field: 'operation',
moduleFlag: '法规清单', moduleFlag: '法规清单',
status:2, status: 2
}, }
], ],
url: { url: {
addModelList: '/project/projectLawsInventoryEO/queryPageDummy', addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
@@ -1399,7 +1401,7 @@
rowKeysSuccessList: [], rowKeysSuccessList: [],
selectedRowKeysList: [], selectedRowKeysList: [],
rowKeysWarningList: [], rowKeysWarningList: [],
rolecode:false, rolecode: false
} }
}, },
@@ -1442,9 +1444,10 @@
}, },
columns() { columns() {
let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
console.log(this.isRoleSwitching)
if (!this.isRoleSwitching) { if (!this.isRoleSwitching) {
for (var i = 0; i < columnResult.length; i++) { for (var i = 0; i < columnResult.length; i++) {
if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 240) { if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 200) {
columnResult.splice(i, 1) columnResult.splice(i, 1)
i-- i--
} }
@@ -1457,6 +1460,7 @@
} }
} }
} }
return columnResult return columnResult
} }
}, },
@@ -1472,7 +1476,7 @@
} else { } else {
roleCodeIndex = 4 roleCodeIndex = 4
} }
console.log(this.formInlineRoleSwitching.roleSwitchingCode); console.log(this.formInlineRoleSwitching.roleSwitchingCode)
if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || if (this.formInlineRoleSwitching.roleSwitchingCode == '11' ||
this.formInlineRoleSwitching.roleSwitchingCode == '12' || this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
this.formInlineRoleSwitching.roleSwitchingCode == '13') { this.formInlineRoleSwitching.roleSwitchingCode == '13') {
@@ -1940,7 +1944,6 @@
moduleFlag: '法规清单' moduleFlag: '法规清单'
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
console.log(res.result)
if (res.result.length != 0) { if (res.result.length != 0) {
this.columnsAll = res.result this.columnsAll = res.result
} else { } else {
@@ -1963,8 +1966,7 @@
item.scopedSlots = { item.scopedSlots = {
customRender: 'titleName' customRender: 'titleName'
} }
} } else if (item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' ||
else if(item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' ||
item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人') { item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人') {
item.sorter = true item.sorter = true
} }
@@ -1978,6 +1980,22 @@
}) })
} }
}) })
if (res.result.length != 0) {
this.columnsAll.push({
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 140,
scopedSlots: { customRender: 'operationOne' }
})
}
this.columnsAll.forEach((item) => { this.columnsAll.forEach((item) => {
if (item.children) { if (item.children) {
item.children.forEach((val) => { item.children.forEach((val) => {
@@ -1987,7 +2005,6 @@
this.checkedList.push(item.dataIndex) this.checkedList.push(item.dataIndex)
} }
}) })
console.log(this.checkedList)
this.loading = false this.loading = false
this.JLoading = false this.JLoading = false
} else { } else {
@@ -2062,7 +2079,7 @@
}) })
}, },
onCheckAllChange(e) { onCheckAllChange(e) {
this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : []; this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : []
this.selectedValue = this.checkedList this.selectedValue = this.checkedList
this.indeterminate = false this.indeterminate = false
}, },
@@ -2130,56 +2147,67 @@
if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) { if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) {
if (dataSource[i].designDeliverableType) { if (dataSource[i].designDeliverableType) {
if (!dataSource[i].designInitiatorId) { if (!dataSource[i].designInitiatorId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
if (!dataSource[i].designDutyId) { if (!dataSource[i].designDutyId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
if (!dataSource[i].designDueDate) { if (!dataSource[i].designDueDate) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
} }
if (dataSource[i].prehomoDeliverableType) { if (dataSource[i].prehomoDeliverableType) {
if (!dataSource[i].prehomoInitiatorId) { if (!dataSource[i].prehomoInitiatorId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
if (!dataSource[i].prehomoDutyId) { if (!dataSource[i].prehomoDutyId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
if (!dataSource[i].prehomoDueDate) { if (!dataSource[i].prehomoDueDate) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('cutoffTime') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
} }
if (dataSource[i].verifyDeliverableType) { if (dataSource[i].verifyDeliverableType) {
if (!dataSource[i].verifyInitiatorId) { if (!dataSource[i].verifyInitiatorId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
if (!dataSource[i].verifyDutyId) { if (!dataSource[i].verifyDutyId) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
if (!dataSource[i].verifyDueDate) { if (!dataSource[i].verifyDueDate) {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty')} < /div>)
continue continue
} }
} }
this.detailedSuccessList.push(dataSource[i]) this.detailedSuccessList.push(dataSource[i])
} else { } else {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')} < /div>)
// this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification'))
// isTrue = false // isTrue = false
// return // return
} }
} else { } else {
this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>) this.detailedWarningList.push(
< div> {dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>)
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected'))
// isTrue = false // isTrue = false
// return // return
@@ -2227,7 +2255,8 @@
if (dataList[i].verifyDueDate && dataList[i].verifyDutyId if (dataList[i].verifyDueDate && dataList[i].verifyDutyId
&& dataList[i].verifyInitiatorId) { && dataList[i].verifyInitiatorId) {
} else { } else {
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConformityVerification') } < /div>) this.TaskWarningList.push(
< div> {dataList[i].serialNumber + this.$t('pleaseConformityVerification')} < /div>)
continue continue
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification'))
@@ -2239,7 +2268,8 @@
if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId
&& dataList[i].prehomoInitiatorId) { && dataList[i].prehomoInitiatorId) {
} else { } else {
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>) this.TaskWarningList.push(
< div> {dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo')} < /div>)
continue continue
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo'))
@@ -2251,7 +2281,8 @@
if (dataList[i].designDueDate && dataList[i].designDutyId if (dataList[i].designDueDate && dataList[i].designDutyId
&& dataList[i].designInitiatorId) { && dataList[i].designInitiatorId) {
} else { } else {
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } < /div>) this.TaskWarningList.push(
< div> {dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation')} < /div>)
continue continue
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation'))
@@ -2266,7 +2297,8 @@
// return // return
} }
} else { } else {
this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } < /div>) this.TaskWarningList.push(
< div> {dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected')} < /div>)
// isTrue = false // isTrue = false
// this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected')) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected'))
// return // return
@@ -2476,16 +2508,20 @@
(dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].designInitiatorId == this.userInfo().id)) { && dataSource[i].designInitiatorId == this.userInfo().id)) {
if (!dataSource[i].designDutyId && !dataSource[i].designDueDate) { if (!dataSource[i].designDutyId && !dataSource[i].designDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank')} < /div>)
continue continue
} else if (!dataSource[i].designDutyId) { } else if (!dataSource[i].designDutyId) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty')} < /div>)
continue continue
} else if (!dataSource[i].designDueDate) { } else if (!dataSource[i].designDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty')} < /div>)
continue continue
} else if (!dataSource[i].designDeliverableType) { } else if (!dataSource[i].designDeliverableType) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty')} < /div>)
continue continue
} }
} }
@@ -2494,16 +2530,20 @@
(dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].prehomoInitiatorId == this.userInfo().id)) { && dataSource[i].prehomoInitiatorId == this.userInfo().id)) {
if (!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate) { if (!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank')} < /div>)
continue continue
} else if (!dataSource[i].prehomoDutyId) { } else if (!dataSource[i].prehomoDutyId) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty')} < /div>)
continue continue
} else if (!dataSource[i].prehomoDueDate) { } else if (!dataSource[i].prehomoDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty')} < /div>)
continue continue
} else if (!dataSource[i].prehomoDeliverableType) { } else if (!dataSource[i].prehomoDeliverableType) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty')} < /div>)
continue continue
} }
} }
@@ -2512,16 +2552,20 @@
(dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].verifyInitiatorId == this.userInfo().id)) { && dataSource[i].verifyInitiatorId == this.userInfo().id)) {
if (!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate) { if (!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank')} < /div>)
continue continue
} else if (!dataSource[i].verifyDutyId) { } else if (!dataSource[i].verifyDutyId) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty')} < /div>)
continue continue
} else if (!dataSource[i].verifyDueDate) { } else if (!dataSource[i].verifyDueDate) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty')} < /div>)
continue continue
} else if (!dataSource[i].verifyDeliverableType) { } else if (!dataSource[i].verifyDeliverableType) {
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) this.rowKeysWarningList.push(
< div> {dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty')} < /div>)
continue continue
} }
} }
@@ -2957,12 +3001,14 @@
color: #040B29; color: #040B29;
margin-bottom: 22px; margin-bottom: 22px;
} }
.customize-text { .customize-text {
height: 1533px; height: 1533px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
} }
.customize-text-title { .customize-text-title {
margin-left: 0; margin-left: 0;
font-size: 14px; font-size: 14px;
@@ -2970,6 +3016,7 @@
color: #040B29; color: #040B29;
margin-bottom: 22px; margin-bottom: 22px;
} }
.drawer-bootom-button { .drawer-bootom-button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@@ -2982,6 +3029,7 @@
background: #fff; background: #fff;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
.itemModelComment { .itemModelComment {
width: calc(100% - 64px); width: calc(100% - 64px);
display: inline-block; display: inline-block;
@@ -3066,7 +3114,7 @@
//} //}
::v-deep .ant-table-body-inner { ::v-deep .ant-table-body-inner {
padding-bottom: 16px; padding-bottom: 10px;
} }
::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar { ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
@@ -3108,6 +3156,7 @@
.popconfirm .anticon-exclamation-circle { .popconfirm .anticon-exclamation-circle {
display: none !important; display: none !important;
} }
popconfirmmize { popconfirmmize {
z-index: 999; z-index: 999;
} }
@@ -3119,9 +3168,11 @@
.popconfirmmize .anticon-exclamation-circle { .popconfirmmize .anticon-exclamation-circle {
display: none !important; display: none !important;
} }
.popconfirmmize .ant-popover-message { .popconfirmmize .ant-popover-message {
padding: 4px 0 36px !important; padding: 4px 0 36px !important;
} }
//.popconfirm .ant-popover-inner-content{ //.popconfirm .ant-popover-inner-content{
// padding: 0px 16px; // padding: 0px 16px;
//} //}
@@ -3145,9 +3196,9 @@
//font-weight: bold; //font-weight: bold;
//background: #f3f6f6; //background: #f3f6f6;
//} //}
.ant-table-row-cell-ellipsis{ //.ant-table-row-cell-ellipsis{
padding: 0!important; // padding: 0!important;
} //}
.second{ .second{
padding: 0!important; padding: 0!important;
} }
@@ -3169,6 +3220,7 @@
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.resize-table-th .table-draggable-handle { .resize-table-th .table-draggable-handle {
height: 100% !important; height: 100% !important;
bottom: 0; bottom: 0;
@@ -3177,5 +3229,6 @@
cursor: col-resize; cursor: col-resize;
touch-action: none; touch-action: none;
} }
/* 插件 end */ /* 插件 end */
</style> </style>
jero-web/src/views/system/modules/UserModal.vue
+4 -8
View File
@@ -483,17 +483,11 @@
handleSubmitOk() { handleSubmitOk() {
this.confirmLoading = true this.confirmLoading = true
let selectedRole = JSON.parse(JSON.stringify(this.selectedRole)) let selectedRole = JSON.parse(JSON.stringify(this.selectedRole))
if(this.dutyTerritories){
let dutyTerritorie = JSON.parse(JSON.stringify(this.dutyTerritories))
}
if(this.brands){
let brand = JSON.parse(JSON.stringify(this.brands))
}
let param = { let param = {
ids: this.userId, ids: this.userId,
selectedroles: selectedRole.join(','), selectedroles: selectedRole.join(','),
dutyTerritories: this.dutyTerritories ? dutyTerritorie.join(',') : '', dutyTerritories: this.dutyTerritories ? this.dutyTerritories.join(',') : '',
brands: this.brands ? brand.join(',') : '' brands: this.brands ? this.brands.join(',') : ''
} }
postAction('/sys/user/setRole', param).then((res) => { postAction('/sys/user/setRole', param).then((res) => {
if (res.success) { if (res.success) {
@@ -643,6 +637,8 @@
this.userDepartModel = { userId: '', departIdList: [] } this.userDepartModel = { userId: '', departIdList: [] }
this.checkedDepartNames = [] this.checkedDepartNames = []
this.checkedDepartNameString = '' this.checkedDepartNameString = ''
this.dutyTerritories = []
this.brands = []
this.checkedDepartKeys = [] this.checkedDepartKeys = []
this.selectedDepartKeys = [] this.selectedDepartKeys = []
this.resultDepartOptions = [] this.resultDepartOptions = []