Parcourir la source

性能验证补6717

zhonghuizhen il y a 5 mois
Parent
commit
e25bd7e7d5
1 fichiers modifiés avec 25 ajouts et 5 suppressions
  1. 25 5
      src/views/business/performNew/recordVerify.vue

+ 25 - 5
src/views/business/performNew/recordVerify.vue

@@ -85,7 +85,7 @@
             icon="ibps-icon-edit"
             icon="ibps-icon-edit"
             @click="handleEdit(scope.row, 'edit')"
             @click="handleEdit(scope.row, 'edit')"
           >
           >
-            {{ scope.row.shiFouGuoShen === '已编制' ? '审核' : '审批' }}
+            {{ scope.row.NAME_ === '审核' ? '审核' : '审批' }}
           </el-button>
           </el-button>
       </template>
       </template>
 
 
@@ -168,6 +168,7 @@ export default {
       height: document.clientHeight,
       height: document.clientHeight,
       listData: [],
       listData: [],
       pagination: {},
       pagination: {},
+      liuchengData: [],
       sorts: {
       sorts: {
         create_time_: "asc"
         create_time_: "asc"
       },
       },
@@ -191,6 +192,7 @@ export default {
         // 表格字段配置
         // 表格字段配置
         columns: [
         columns: [
           { prop: 'id', label: '主键', width: 0 ,hidden: true},
           { prop: 'id', label: '主键', width: 0 ,hidden: true},
+          { prop: 'NAME_', label: '当前节点', width: 90 },
           { prop: 'xingNengZhiBia', label: '性能指标', tags: [], width: 120 },
           { prop: 'xingNengZhiBia', label: '性能指标', tags: [], width: 120 },
           {
           {
             prop: 'fangAnLeiXing',
             prop: 'fangAnLeiXing',
@@ -247,6 +249,21 @@ export default {
       const searchparam = await this.getSearchFormData()
       const searchparam = await this.getSearchFormData()
       queryExperimental(searchparam)
       queryExperimental(searchparam)
         .then((res) => {
         .then((res) => {
+          //赋值数据当前流程节点
+          const liuchengMap = new Map();
+          this.liuchengData.forEach(item => {
+              liuchengMap.set(item.BIZ_KEY_, item.NAME_);
+          });
+
+          // 如果需要原地修改res.data
+          res.data.dataResult.forEach(item => {
+              if (liuchengMap.has(item.id)) {
+                  item.NAME_ = liuchengMap.get(item.id);
+              } else {
+                  item.NAME_ = null;  
+              }
+          });
+          console.log('列表数据',res.data)
           ActionUtils.handleListData(this, res.data)
           ActionUtils.handleListData(this, res.data)
           this.loading = false
           this.loading = false
         })
         })
@@ -273,17 +290,20 @@ export default {
         if (isSystemAdmin) {
         if (isSystemAdmin) {
           return this.buildDefaultSearchParams(searchParam)
           return this.buildDefaultSearchParams(searchParam)
         }
         }
-
+        console.log('当前用户', user.id)
         try {
         try {
           // 使用 await 等待异步结果
           // 使用 await 等待异步结果
           const res = await this.$common.request('query', {
           const res = await this.$common.request('query', {
             key: 'xnyzhqdb',
             key: 'xnyzhqdb',
             params: [user.id]
             params: [user.id]
           })
           })
-          
+          this.liuchengData = res.variables.data
           const bizKeys = res.variables.data.map(item => item.BIZ_KEY_).join(',')
           const bizKeys = res.variables.data.map(item => item.BIZ_KEY_).join(',')
-          searchParam['Q^id_^SIN'] = bizKeys
-          
+          if(bizKeys){
+              searchParam['Q^id_^SIN'] = bizKeys
+          }else{
+              searchParam['Q^id_^SIN'] = '-1'
+          }
           return ActionUtils.formatParams(
           return ActionUtils.formatParams(
             searchParam,
             searchParam,
             this.pagination,
             this.pagination,