Merge branch 'fix_foton_20231213' into 'master'

Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!145

src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue

@@ -2,134 +2,143 @@
 <template>
   <div class="already-process v-class">
     <div class="search-area">
-      <el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form">
+      <el-form ref="processSearch" :inline="true" :model="searchForm" class="label-input-form">
         <div class="search-area-item">
           <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-input
-                    v-model.trim="searchForm.prcName"
-                    placeholder="按流程名称查找"
-                    :maxlength="100"
-                    clearable
-            ></el-input>
+              v-model.trim="searchForm.prcName"
+              placeholder="按流程名称查找"
+              :maxlength="100"
+              clearable
+            />
           </el-form-item>
           <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-input
-                    v-model.trim="searchForm.prcNum"
-                    placeholder="按流程编号查找"
-                    :maxlength="100"
-                    clearable
-            ></el-input>
+              v-model.trim="searchForm.prcNum"
+              placeholder="按流程编号查找"
+              :maxlength="100"
+              clearable
+            />
           </el-form-item>
           <el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-select
-                    v-model="searchForm.prcType"
-                    placeholder="按流程类型查找"
-                    filterable
-                    clearable
+              v-model="searchForm.prcType"
+              placeholder="按流程类型查找"
+              filterable
+              clearable
             >
               <el-option
-                      v-for="item in processTypeList"
-                      :value="item.value"
-                      :key="item.value"
-                      :label="item.label"
-              ></el-option>
+                v-for="item in processTypeList"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              />
             </el-select>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                    type="primary"
-                    class="common-button-primary"
-                    size="mini"
-                    v-btn-permission="'2c8041eb6226368ee6e6b975b4aa88f1'"
-                    @click="selectProcessBtn">查询</el-button>
+              v-btn-permission="'2c8041eb6226368ee6e6b975b4aa88f1'"
+              type="primary"
+              class="common-button-primary"
+              size="mini"
+              @click="selectProcessBtn"
+            >
+              查询
+            </el-button>
             <el-button
-                    class="common-button-default"
-                    size="mini"
-                    v-btn-permission="'4c674bc8b1a21ca17592f1b034444c57'"
-                    @click="resetSelect">清空</el-button>
+              v-btn-permission="'4c674bc8b1a21ca17592f1b034444c57'"
+              class="common-button-default"
+              size="mini"
+              @click="resetSelect"
+            >
+              清空
+            </el-button>
           </el-form-item>
         </div>
-        <div class="search-area-item">
-        </div>
+        <div class="search-area-item" />
       </el-form>
     </div>
     <div class="content">
       <div class="table-wrap">
         <el-table
-                height="100%"
-                ref="selection"
-                :data="processList"
-                tooltip-effect="dark"
-                style="width: 100%; flex: auto;"
-                border
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                @selection-change="handleSelectionChange">
+          ref="selection"
+          height="100%"
+          :data="processList"
+          tooltip-effect="dark"
+          style="width: 100%; flex: auto;"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                               fontWeight: 'bold', height: '48px'}"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-          </el-table-column>
+            type="selection"
+            width="55"
+            align="center"
+          />
           <el-table-column
-              type="index"
-              fixed="left"
-              width="55"
-              label="序号"
-              align="center">
+            type="index"
+            fixed="left"
+            width="55"
+            label="序号"
+            align="center"
+          >
             <template slot-scope="{scope, column, $index}">
               {{ ($index + 1) + (pageNo - 1) * pageSize }}
             </template>
           </el-table-column>
           <el-table-column
-                  prop="prcNum"
-                  label="流程编号"
-                  align="center"
-                  width="150"
-          >
-          </el-table-column>
+            prop="prcNum"
+            label="流程编号"
+            align="center"
+            width="150"
+          />
           <el-table-column
-                  prop="prcType"
-                  label="流程类型"
-                  align="center"
-                  width="180"
+            prop="prcType"
+            label="流程类型"
+            align="center"
+            width="180"
           >
             <template slot-scope="scope">
               <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="prcName"
-                  label="流程名称"
-                  show-overflow-tooltip
-                  align="center"
-                  min-width="250"
+            prop="prcName"
+            label="流程名称"
+            show-overflow-tooltip
+            align="center"
+            min-width="250"
           >
             <template slot-scope="scope">
               <span>{{ getPrcNameFilter(scope.row) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="creatUserName"
-                  label="发起人"
-                  align="center"
-                  width="90"
+            prop="creatUserName"
+            label="发起人"
+            align="center"
+            width="180"
           >
+            <template slot-scope="scope">
+              <span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
+            </template>
           </el-table-column>
           <el-table-column
-                  prop="creatTime"
-                  label="创建日期"
-                  align="center"
-                  width="150"
+            prop="creatTime"
+            label="创建日期"
+            align="center"
+            width="150"
           >
             <template slot-scope="scope">
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="overTime"
-                  label="完成日期"
-                  align="center"
-                  width="150"
+            prop="overTime"
+            label="完成日期"
+            align="center"
+            width="150"
           >
             <template slot-scope="scope">
               <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -137,11 +146,11 @@
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">
             <template slot-scope="scope">
-              <div @click.stop style="display: inline-block">
+              <div style="display: inline-block" @click.stop>
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'">查看</el-dropdown-item>
+                    <el-dropdown-item v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'" :command="[scope.row, '查看']">查看</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -151,22 +160,23 @@
       </div>
       <!--分页-->
       <pagination
-              class="tabpagination"
-              :page="pageNo"
-              :total="total"
-              @pageChange="pageChange"
-              @pageSizeChange="pageSizeChange"></pagination>
+        class="tabpagination"
+        :page="pageNo"
+        :total="total"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"
+      />
       <loading :loading="loading">数据获取中</loading>
     </div>
   </div>
 </template>
 
 <script>
-  import {mapMutations, mapActions} from 'vuex'
-  import ProcessMixin from '../../../components/ProcessMixin'
+import { mapMutations, mapActions } from 'vuex'
+import ProcessMixin from '../../../components/ProcessMixin'
 export default {
   name: 'AlreadyProcess',
-  mixins: [ProcessMixin],
+  mixins: [ ProcessMixin ],
   data () {
     return {
       searchForm: {
@@ -174,11 +184,11 @@ export default {
         prcNum: '',
         prcType: ''
       },
-      pageSize:this.$store.getters.userInfo.configContent,
+      pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
       pageNo: 1,
       loading: false,
-      processList: [],// 列表数据
+      processList: [], // 列表数据
       processListSelect: [], // 列表选中数据
     }
   },
@@ -190,7 +200,7 @@ export default {
           break
       }
     },
-    resetSelect () { //清空
+    resetSelect () { // 清空
       this.searchForm.prcName = ''
       this.searchForm.prcNum = ''
       this.searchForm.prcType = ''
@@ -225,22 +235,21 @@ export default {
       this.queryProcess()
     },
     pageSizeChange (pageSize) { // 数量改变
-      this.pageSize=pageSize
+      this.pageSize = pageSize
       this.queryProcess()
     },
     dealWith (row) { // 查看
-      let routeUrl =this.$router.resolve({
+      const routeUrl = this.$router.resolve({
         name: 'ProcessDetail',
         query: {
           prcNum: row.prcNum,
           tabsName: 'AlreadyProcess'
         }
       })
-      window.open(routeUrl.href, "_blank");
-
+      window.open(routeUrl.href, '_blank');
     },
-    ...mapMutations(['setProcess', 'setHandleInfo']),
-    ...mapActions(['setMenu'])
+    ...mapMutations([ 'setProcess', 'setHandleInfo' ]),
+    ...mapActions([ 'setMenu' ])
   },
   mounted () {
     this.queryProcess()

src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue

@@ -2,134 +2,143 @@
 <template>
   <div class="already-send v-class">
     <div class="search-area">
-      <el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form">
+      <el-form ref="processSearch" :inline="true" :model="searchForm" class="label-input-form">
         <div class="search-area-item">
           <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-input
-                    v-model.trim="searchForm.prcName"
-                    placeholder="按流程名称查找"
-                    :maxlength="100"
-                    clearable
-            ></el-input>
+              v-model.trim="searchForm.prcName"
+              placeholder="按流程名称查找"
+              :maxlength="100"
+              clearable
+            />
           </el-form-item>
           <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-input
-                    v-model.trim="searchForm.prcNum"
-                    placeholder="按流程编号查找"
-                    :maxlength="100"
-                    clearable
-            ></el-input>
+              v-model.trim="searchForm.prcNum"
+              placeholder="按流程编号查找"
+              :maxlength="100"
+              clearable
+            />
           </el-form-item>
           <el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-select
-                    v-model="searchForm.prcType"
-                    placeholder="按流程类型查找"
-                    filterable
-                    clearable
+              v-model="searchForm.prcType"
+              placeholder="按流程类型查找"
+              filterable
+              clearable
             >
               <el-option
-                      v-for="item in processTypeList"
-                      :value="item.value"
-                      :key="item.value"
-                      :label="item.label"
-              ></el-option>
+                v-for="item in processTypeList"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              />
             </el-select>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                    type="primary"
-                    class="common-button-primary"
-                    size="mini"
-                    v-btn-permission="'253fb387b97868c10434cc8fa3d87294'"
-                    @click="selectProcessBtn">查询</el-button>
+              v-btn-permission="'253fb387b97868c10434cc8fa3d87294'"
+              type="primary"
+              class="common-button-primary"
+              size="mini"
+              @click="selectProcessBtn"
+            >
+              查询
+            </el-button>
             <el-button
-                    class="common-button-default"
-                    size="mini"
-                    v-btn-permission="'dc9c8efc60be6ba8b78b68bf949e2f6b'"
-                    @click="resetSelect">清空</el-button>
+              v-btn-permission="'dc9c8efc60be6ba8b78b68bf949e2f6b'"
+              class="common-button-default"
+              size="mini"
+              @click="resetSelect"
+            >
+              清空
+            </el-button>
           </el-form-item>
         </div>
-        <div class="search-area-item">
-        </div>
+        <div class="search-area-item" />
       </el-form>
     </div>
     <div class="content">
       <div class="table-wrap">
         <el-table
-                height="100%"
-                ref="selection"
-                :data="processList"
-                tooltip-effect="dark"
-                style="width: 100%; flex: auto;"
-                border
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                @selection-change="handleSelectionChange">
+          ref="selection"
+          height="100%"
+          :data="processList"
+          tooltip-effect="dark"
+          style="width: 100%; flex: auto;"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                               fontWeight: 'bold', height: '48px'}"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-          </el-table-column>
+            type="selection"
+            width="55"
+            align="center"
+          />
           <el-table-column
-              type="index"
-              fixed="left"
-              width="55"
-              label="序号"
-              align="center">
+            type="index"
+            fixed="left"
+            width="55"
+            label="序号"
+            align="center"
+          >
             <template slot-scope="{scope, column, $index}">
               {{ ($index + 1) + (pageNo - 1) * pageSize }}
             </template>
           </el-table-column>
           <el-table-column
-                  prop="prcNum"
-                  label="流程编号"
-                  align="center"
-                  width="150"
-          >
-          </el-table-column>
+            prop="prcNum"
+            label="流程编号"
+            align="center"
+            width="150"
+          />
           <el-table-column
-                  prop="prcType"
-                  label="流程类型"
-                  align="center"
-                  width="180"
+            prop="prcType"
+            label="流程类型"
+            align="center"
+            width="180"
           >
             <template slot-scope="scope">
-                <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
+              <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="prcName"
-                  label="流程名称"
-                  show-overflow-tooltip
-                  align="center"
-                  min-width="250"
+            prop="prcName"
+            label="流程名称"
+            show-overflow-tooltip
+            align="center"
+            min-width="250"
           >
             <template slot-scope="scope">
               <span>{{ getPrcNameFilter(scope.row) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="creatUserName"
-                  label="发起人"
-                  align="center"
-                  width="90"
+            prop="creatUserName"
+            label="发起人"
+            align="center"
+            width="180"
           >
+            <template slot-scope="scope">
+              <span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
+            </template>
           </el-table-column>
           <el-table-column
-                  prop="creatTime"
-                  label="创建日期"
-                  align="center"
-                  width="150"
+            prop="creatTime"
+            label="创建日期"
+            align="center"
+            width="150"
           >
             <template slot-scope="scope">
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="overTime"
-                  label="完成日期"
-                  align="center"
-                  width="150"
+            prop="overTime"
+            label="完成日期"
+            align="center"
+            width="150"
           >
             <template slot-scope="scope">
               <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -137,11 +146,11 @@
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">
             <template slot-scope="scope">
-              <div @click.stop style="display: inline-block">
+              <div style="display: inline-block" @click.stop>
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
+                    <el-dropdown-item v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'" :command="[scope.row, '查看']">查看</el-dropdown-item>
                     <el-dropdown-item :command="[scope.row, '强制撤回']">撤回</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -152,22 +161,23 @@
       </div>
       <!--分页-->
       <pagination
-              class="tabpagination"
-              :page="pageNo"
-              :total="total"
-              @pageChange="pageChange"
-              @pageSizeChange="pageSizeChange"></pagination>
+        class="tabpagination"
+        :page="pageNo"
+        :total="total"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"
+      />
       <loading :loading="loading">数据获取中</loading>
     </div>
   </div>
 </template>
 
 <script>
-  import {mapMutations, mapActions} from 'vuex'
-  import ProcessMixin from '../../../components/ProcessMixin'
+import { mapMutations, mapActions } from 'vuex'
+import ProcessMixin from '../../../components/ProcessMixin'
 export default {
   name: 'AlreadySend',
-  mixins: [ProcessMixin],
+  mixins: [ ProcessMixin ],
   data () {
     return {
       searchForm: {
@@ -176,10 +186,10 @@ export default {
         prcType: ''
       },
       total: 0,
-      pageSize:this.$store.getters.userInfo.configContent,
+      pageSize: this.$store.getters.userInfo.configContent,
       pageNo: 1,
       loading: false,
-      processList: [],// 列表数据
+      processList: [], // 列表数据
       processListSelect: [], // 列表选中数据
     }
   },
@@ -218,7 +228,7 @@ export default {
         this.$message.warning('当前流程数据已完成，请选择未完成的流程数据')
       }
     },
-    resetSelect () { //清空
+    resetSelect () { // 清空
       this.searchForm.prcName = ''
       this.searchForm.prcNum = ''
       this.searchForm.prcType = ''
@@ -226,22 +236,22 @@ export default {
     },
     queryProcess () { // 查询待办流程
       this.$http.postData('lawss/activiti/IssuedProcess',
-          {
-            current: this.pageNo,
-            size: this.$store.getters.userInfo.configContent,
-            userId: this.$store.getters.userInfo.userId,
-            prcName: this.searchForm.prcName,
-            prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
-            prcNum: this.searchForm.prcNum
-          },
-          {
-            loading: 'loading',
-            _this: this
-          }, res => {
-            this.processList = res.list
-            this.total = res.count
-          }, e => {
-          })
+        {
+          current: this.pageNo,
+          size: this.$store.getters.userInfo.configContent,
+          userId: this.$store.getters.userInfo.userId,
+          prcName: this.searchForm.prcName,
+          prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '',
+          prcNum: this.searchForm.prcNum
+        },
+        {
+          loading: 'loading',
+          _this: this
+        }, res => {
+          this.processList = res.list
+          this.total = res.count
+        }, e => {
+        })
     },
     selectProcessBtn () { // 搜索按钮
       this.pageNo = 1
@@ -255,22 +265,21 @@ export default {
       this.queryProcess()
     },
     pageSizeChange (pageSize) { // 数量改变
-      this.pageSize=pageSize
+      this.pageSize = pageSize
       this.queryProcess()
     },
     dealWith (row) { // 查看
-      let routeUrl =this.$router.resolve({
+      const routeUrl = this.$router.resolve({
         name: 'ProcessDetail',
         query: {
           prcNum: row.prcNum,
           tabsName: 'AlreadySend'
         }
       })
-      window.open(routeUrl.href, "_blank");
-
+      window.open(routeUrl.href, '_blank');
     },
-    ...mapMutations(['setProcess', 'setHandleInfo']),
-    ...mapActions(['setMenu'])
+    ...mapMutations([ 'setProcess', 'setHandleInfo' ]),
+    ...mapActions([ 'setMenu' ])
   },
   mounted () {
     this.queryProcess()

src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue

@@ -2,134 +2,143 @@
 <template>
   <div class="monitor-process v-class">
     <div class="search-area">
-      <el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form">
+      <el-form ref="processSearch" :inline="true" :model="searchForm" class="label-input-form">
         <div class="search-area-item">
           <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-input
-                    v-model.trim="searchForm.prcName"
-                    placeholder="按流程名称查找"
-                    :maxlength="100"
-                    clearable
-            ></el-input>
+              v-model.trim="searchForm.prcName"
+              placeholder="按流程名称查找"
+              :maxlength="100"
+              clearable
+            />
           </el-form-item>
           <el-form-item label="流程编号" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-input
-                    v-model.trim="searchForm.prcNum"
-                    placeholder="按流程编号查找"
-                    :maxlength="100"
-                    clearable
-            ></el-input>
+              v-model.trim="searchForm.prcNum"
+              placeholder="按流程编号查找"
+              :maxlength="100"
+              clearable
+            />
           </el-form-item>
           <el-form-item label="流程类型" class="search-item" @keyup.enter.native="selectProcessBtn">
             <el-select
-                    v-model="searchForm.prcType"
-                    placeholder="按流程类型查找"
-                    filterable
-                    clearable
+              v-model="searchForm.prcType"
+              placeholder="按流程类型查找"
+              filterable
+              clearable
             >
               <el-option
-                      v-for="item in processTypeList"
-                      :value="item.value"
-                      :key="item.value"
-                      :label="item.label"
-              ></el-option>
+                v-for="item in processTypeList"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              />
             </el-select>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                    type="primary"
-                    class="common-button-primary"
-                    size="mini"
-                    v-btn-permission="'68d17445a13ff3f635c39291070985c3'"
-                    @click="selectProcessBtn">查询</el-button>
+              v-btn-permission="'68d17445a13ff3f635c39291070985c3'"
+              type="primary"
+              class="common-button-primary"
+              size="mini"
+              @click="selectProcessBtn"
+            >
+              查询
+            </el-button>
             <el-button
-                    class="common-button-default"
-                    size="mini"
-                    v-btn-permission="'2321e6eaaf6d89eb7c36a12aa5624396'"
-                    @click="resetSelect">清空</el-button>
+              v-btn-permission="'2321e6eaaf6d89eb7c36a12aa5624396'"
+              class="common-button-default"
+              size="mini"
+              @click="resetSelect"
+            >
+              清空
+            </el-button>
           </el-form-item>
         </div>
-        <div class="search-area-item">
-        </div>
+        <div class="search-area-item" />
       </el-form>
     </div>
     <div class="content">
       <div class="table-wrap">
         <el-table
-                height="100%"
-                ref="selection"
-                :data="processList"
-                tooltip-effect="dark"
-                style="width: 100%; flex: auto;"
-                border
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                @selection-change="handleSelectionChange">
+          ref="selection"
+          height="100%"
+          :data="processList"
+          tooltip-effect="dark"
+          style="width: 100%; flex: auto;"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                               fontWeight: 'bold', height: '48px'}"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-          </el-table-column>
+            type="selection"
+            width="55"
+            align="center"
+          />
           <el-table-column
-              type="index"
-              fixed="left"
-              width="55"
-              label="序号"
-              align="center">
+            type="index"
+            fixed="left"
+            width="55"
+            label="序号"
+            align="center"
+          >
             <template slot-scope="{scope, column, $index}">
               {{ ($index + 1) + (pageNo - 1) * pageSize }}
             </template>
           </el-table-column>
           <el-table-column
-                  prop="prcNum"
-                  label="流程编号"
-                  align="center"
-                  width="150"
-          >
-          </el-table-column>
+            prop="prcNum"
+            label="流程编号"
+            align="center"
+            width="150"
+          />
           <el-table-column
-                  prop="prcType"
-                  label="流程类型"
-                  align="center"
-                  width="180"
+            prop="prcType"
+            label="流程类型"
+            align="center"
+            width="180"
           >
             <template slot-scope="scope">
               <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="prcName"
-                  label="流程名称"
-                  show-overflow-tooltip
-                  align="center"
-                  min-width="250"
+            prop="prcName"
+            label="流程名称"
+            show-overflow-tooltip
+            align="center"
+            min-width="250"
           >
             <template slot-scope="scope">
               <span>{{ getPrcNameFilter(scope.row) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="creatUserName"
-                  label="发起人"
-                  align="center"
-                  width="90"
+            prop="creatUserName"
+            label="发起人"
+            align="center"
+            width="180"
           >
+            <template slot-scope="scope">
+              <span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
+            </template>
           </el-table-column>
           <el-table-column
-                  prop="creatTime"
-                  label="创建日期"
-                  align="center"
-                  width="150"
+            prop="creatTime"
+            label="创建日期"
+            align="center"
+            width="150"
           >
             <template slot-scope="scope">
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="overTime"
-                  label="完成日期"
-                  align="center"
-                  width="150"
+            prop="overTime"
+            label="完成日期"
+            align="center"
+            width="150"
           >
             <template slot-scope="scope">
               <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -137,7 +146,7 @@
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">
             <template slot-scope="scope">
-              <div @click.stop style="display: inline-block">
+              <div style="display: inline-block" @click.stop>
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
@@ -151,22 +160,23 @@
       </div>
       <!--分页-->
       <pagination
-              class="tabpagination"
-              :page="pageNo"
-              :total="total"
-              @pageChange="pageChange"
-              @pageSizeChange="pageSizeChange"></pagination>
+        class="tabpagination"
+        :page="pageNo"
+        :total="total"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"
+      />
       <loading :loading="loading">数据获取中</loading>
     </div>
   </div>
 </template>
 
 <script>
-  import {mapMutations, mapActions} from 'vuex'
-  import ProcessMixin from '../../../components/ProcessMixin'
+import { mapMutations, mapActions } from 'vuex'
+import ProcessMixin from '../../../components/ProcessMixin'
 export default {
   name: 'MonitorProcess',
-  mixins: [ProcessMixin],
+  mixins: [ ProcessMixin ],
   data () {
     return {
       searchForm: {
@@ -175,10 +185,10 @@ export default {
         prcType: ''
       },
       total: 0,
-      pageSize:this.$store.getters.userInfo.configContent,
+      pageSize: this.$store.getters.userInfo.configContent,
       pageNo: 1,
       loading: false,
-      processList: [],// 列表数据
+      processList: [], // 列表数据
       processListSelect: [], // 列表选中数据
     }
   },
@@ -190,7 +200,7 @@ export default {
           break
       }
     },
-    resetSelect () { //清空
+    resetSelect () { // 清空
       this.searchForm.prcName = ''
       this.searchForm.prcNum = ''
       this.searchForm.prcType = ''
@@ -198,23 +208,23 @@ export default {
     },
     queryProcess () { // 查询待办流程
       this.$http.postData('lawss/activiti/allProcess',
-          {
-            current: this.pageNo,
-            size: this.$store.getters.userInfo.configContent,
-            userId: this.$store.getters.userInfo.userId,
-            prcName: this.searchForm.prcName,
-            prcType: this.searchForm.prcType || '',
-            prcNum: this.searchForm.prcNum
-          },
-          {
-            loading: 'loading',
-            _this: this
-          }, res => {
-            this.processList = res.list || []
-            console.log(this.processList)
-            this.total = res.count
-          }, e => {
-          })
+        {
+          current: this.pageNo,
+          size: this.$store.getters.userInfo.configContent,
+          userId: this.$store.getters.userInfo.userId,
+          prcName: this.searchForm.prcName,
+          prcType: this.searchForm.prcType || '',
+          prcNum: this.searchForm.prcNum
+        },
+        {
+          loading: 'loading',
+          _this: this
+        }, res => {
+          this.processList = res.list || []
+          console.log(this.processList)
+          this.total = res.count
+        }, e => {
+        })
     },
     selectProcessBtn () { // 搜索按钮
       this.pageNo = 1
@@ -232,7 +242,7 @@ export default {
       this.queryProcess()
     },
     dealWith (row) { // 查看
-      let routeUrl =this.$router.resolve({
+      const routeUrl = this.$router.resolve({
         name: 'ProcessDetail',
         query: {
           bpnId: row.id,
@@ -240,11 +250,10 @@ export default {
           tabsName: 'MonitorProcess'
         }
       })
-      window.open(routeUrl.href, "_blank");
-
+      window.open(routeUrl.href, '_blank');
     },
-    ...mapMutations(['setProcess', 'setHandleInfo']),
-    ...mapActions(['setMenu'])
+    ...mapMutations([ 'setProcess', 'setHandleInfo' ]),
+    ...mapActions([ 'setMenu' ])
   },
   mounted () {
     this.queryProcess()

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -123,8 +123,12 @@
             prop="creatUserName"
             label="发起人"
             align="center"
-            width="90"
-          />
+            width="180"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="creatTime"
             label="创建日期"

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -123,7 +123,11 @@
             prop="creatUserName"
             label="发起人"
             align="center"
-          />
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row.creatUserName }}({{ scope.row.creatUser || '-' }})</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="creatTime"
             label="创建日期"

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -4390,6 +4390,10 @@ export default {
       this.drawerTitle = title
       this.modalShowRoleFlag1 = true
     },
+    unique (newArr) {
+      const res = new Map();
+      return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+    },
     checkedRole2 (data) {
       let idList = ''
       let nameList = ''
@@ -4411,7 +4415,11 @@ export default {
         this.sarBussionessSearch['QCRBUSS'] = nameList
       }
       if (this.drawerTitle === '选择起草人') {
+        const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+        const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
         this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
+        this.$set(this.sarBussionessStandEO, 'QCDWId', institutionIdList)
+        this.$set(this.sarBussionessStandEO, 'QCDW', institutionNameList)
         if (this.sarBussionessStandEO.QCRBUSS) {
           this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
         }