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

src/components/selection/UserSelectByWorkGroupModal.vue

@@ -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(','))