ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 联调企标计划立项/变更流程

Browse Source
This commit is contained in:
lideqin
2023-10-16 20:34:08 +08:00
parent 2db880c6b7
commit 48ac6dd11e
18 changed files with 374 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/PersonnelInfo.vue
+1
View File
@@ -82,6 +82,7 @@ export default {
data: {
handler () {
this.stepsData = JSON.parse(JSON.stringify(this.data))
console.log(this.stepsData)
this.currentNodeIndex = this.stepsData.findIndex(tt => tt.nodeName === this.currentNode)
},
deep: true,
src/components/selection/UserSelectByContact.vue
+1 -1
View File
@@ -99,7 +99,7 @@ export default {
position: relative;
display: flex;
align-items: center;
height: 39.98px;
//height: 39.98px;
.user-input {
resize: none;
src/components/selection/UserSelectByContactModal.vue
+12 -7
View File
@@ -43,8 +43,8 @@
</div>
<p class="modal-content-title">{{ $t('userSelect.selectedPersonnel') }}</p>
<div v-if="dataSourceRight && dataSourceRight.length > 0" class="name-content">
<div v-for="(item, index) in dataSourceRight" :key="item.id" class="name-div">
{{ item.realname + '(' + item.username + ')' }}
<div v-for="(item, index) in dataSourceRight" :key="item.contactId" class="name-div">
{{ item.contactId_dictText }}
<a-icon type="close" @click="handleDelete(item, index)" />
</div>
</div>
@@ -192,7 +192,7 @@ export default {
if (selectedRowKeys.length > this.dataSourceRight.length) {
// 说明是增加了数据
for (const rowIndex in selectedRows) {
if (!this.dataSourceRight.find(item => item.id === selectedRows[rowIndex].id)) {
if (!this.dataSourceRight.find(item => item.contactId === selectedRows[rowIndex].contactId)) {
// 右侧不存在，追加到右侧表格
this.dataSourceRight.push(selectedRows[rowIndex])
}
@@ -202,7 +202,7 @@ export default {
if (selectedRowKeys && selectedRowKeys.length > 0) {
// 没有选中数据，说明这一页没有选中数据了
for (let i = 0; i < this.dataSourceRight.length; i++) {
if (!selectedRowKeys.find(item => item === this.dataSourceRight[i].id)) {
if (!selectedRowKeys.find(item => item === this.dataSourceRight[i].contactId)) {
// 表格选中中没有找到这一条数据，说明已经被删了
this.dataSourceRight.splice(i, 1)
i--
@@ -229,7 +229,12 @@ export default {
this.loadingRight = true
getAction(this.url.userListByIds, params).then((res) => {
if (res.success) {
this.dataSourceRight = res.result || []
this.dataSourceRight = res.result.map(item => {
return {
contactId: item.id,
contactId_dictText: item.realname + '(' + item.username + ')'
}
}) || []
} else {
this.$message.warn(res.message)
}
@@ -240,12 +245,12 @@ export default {
// 名字列表的删除
handleDelete (record, index) {
this.dataSourceRight.splice(index, 1)
this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== record.id)
this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== record.contactId)
},
handleOk () {
this.$emit('change', this.selectedRowKeys.join(','))
this.$emit('listChange', this.dataSourceRight)
this.$emit('nameChange', this.dataSourceRight.map(item => item.realname + '(' + item.username + ')').join(','))
this.$emit('nameChange', this.dataSourceRight.map(item => item.contactId_dictText).join(','))
this.close()
},
handleCancel () {
src/components/selection/UserSelectByWorkGroup.vue
+1 -1
View File
@@ -96,7 +96,7 @@ export default {
position: relative;
display: flex;
align-items: center;
height: 39.98px;
//height: 39.98px;
.user-input {
resize: none;
src/components/selection/UserSelectByWorkGroupModal.vue
+19 -19
View File
@@ -30,20 +30,20 @@
<a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.post')" v-model="queryParam.userPostName"></a-input>
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :label="$t('userSelect.workGroup')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select
tree-node-filter-prop="title"
v-model="queryParam.workingGroupId"
:maxTagCount="1"
:show-search="true"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
style="width: 100%"
:tree-data="workingGroupTreeList"
:placeholder="$t('pleaseSelect')"
/>
</a-form-item>
</a-col>
<!--<a-col :span="6">-->
<!-- <a-form-item :label="$t('userSelect.workGroup')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-tree-select-->
<!-- tree-node-filter-prop="title"-->
<!-- v-model="queryParam.workingGroupId"-->
<!-- :maxTagCount="1"-->
<!-- :show-search="true"-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- style="width: 100%"-->
<!-- :tree-data="workingGroupTreeList"-->
<!-- :placeholder="$t('pleaseSelect')"-->
<!-- />-->
<!-- </a-form-item>-->
<!--</a-col>-->
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-button style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
@@ -54,7 +54,7 @@
<div class="modal-content">
<a-table
:columns="columns"
rowKey="userId"
rowKey="id"
bordered
:scroll="{x: '100%'}"
:data-source="dataSource"
@@ -164,7 +164,7 @@ export default {
dataSourceRight: [],
workingGroupTreeList: [], // 内部工作组下拉框数据
url: {
userList: '/sys/lawsWorkingGroupUser/page',
userList: '/act/user/workGroupPage',
userListByIds: '/sys/user/queryByIds'
}
}
@@ -237,7 +237,7 @@ export default {
if (selectedRowKeys.length > this.dataSourceRight.length) {
// 说明是增加了数据
for (const rowIndex in selectedRows) {
if (!this.dataSourceRight.find(item => item.userId === selectedRows[rowIndex].userId)) {
if (!this.dataSourceRight.find(item => item.id === selectedRows[rowIndex].id)) {
// 右侧不存在，追加到右侧表格
this.dataSourceRight.push(selectedRows[rowIndex])
}
@@ -247,7 +247,7 @@ export default {
if (selectedRowKeys && selectedRowKeys.length > 0) {
// 没有选中数据，说明这一页没有选中数据了
for (let i = 0; i < this.dataSourceRight.length; i++) {
if (!selectedRowKeys.find(item => item === this.dataSourceRight[i].userId)) {
if (!selectedRowKeys.find(item => item === this.dataSourceRight[i].id)) {
// 表格选中中没有找到这一条数据，说明已经被删了
this.dataSourceRight.splice(i, 1)
i--
@@ -285,7 +285,7 @@ export default {
// 名字列表的删除
handleDelete (record, index) {
this.dataSourceRight.splice(index, 1)
this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== record.userId)
this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== record.id)
},
handleOk () {
this.$emit('change', this.selectedRowKeys.join(','))
src/components/selection/UserSelection.vue
+1 -1
View File
@@ -97,7 +97,7 @@ export default {
position: relative;
display: flex;
align-items: center;
height: 39.98px;
//height: 39.98px;
.user-input {
resize: none;