Browse Source

文件审批权限添加-提交

lxh 10 months ago
parent
commit
60eed90786

+ 2 - 2
src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -442,8 +442,8 @@ async function getList() {
   // fireMonitor[5].level = res.info.sysInfo.fireS.summaryInfo.external.o2val ? res.info.sysInfo.fireS.summaryInfo.external.o2val.maxlevel : '';
   // fireMonitor[5].level = res.info.sysInfo.fireS.summaryInfo.external.o2val ? res.info.sysInfo.fireS.summaryInfo.external.o2val.maxlevel : '';
 
 
   // fireMonitor1[0].value = res.info.sysInfo.fireS.summaryInfo.internal.coval ? res.info.sysInfo.fireS.summaryInfo.internal.coval.value : '';
   // fireMonitor1[0].value = res.info.sysInfo.fireS.summaryInfo.internal.coval ? res.info.sysInfo.fireS.summaryInfo.internal.coval.value : '';
-  // fireMonitor1[0].value = res.info.sysInfo.fireS.summaryInfo.internal.coval ? '50.0' : '';
-  fireMonitor1[0].value = '';
+  fireMonitor1[0].value = res.info.sysInfo.fireS.summaryInfo.internal.coval ? '50.0' : '';
+  // fireMonitor1[0].value = '';
   fireMonitor1[0].level = res.info.sysInfo.fireS.summaryInfo.internal.coval ? res.info.sysInfo.fireS.summaryInfo.internal.coval.maxlevel : '';
   fireMonitor1[0].level = res.info.sysInfo.fireS.summaryInfo.internal.coval ? res.info.sysInfo.fireS.summaryInfo.internal.coval.maxlevel : '';
   fireMonitor1[1].value = res.info.sysInfo.fireS.summaryInfo.internal.chval ? res.info.sysInfo.fireS.summaryInfo.internal.chval.value : '';
   fireMonitor1[1].value = res.info.sysInfo.fireS.summaryInfo.internal.chval ? res.info.sysInfo.fireS.summaryInfo.internal.chval.value : '';
   fireMonitor1[1].level = res.info.sysInfo.fireS.summaryInfo.internal.chval ? res.info.sysInfo.fireS.summaryInfo.internal.chval.maxlevel : '';
   fireMonitor1[1].level = res.info.sysInfo.fireS.summaryInfo.internal.chval ? res.info.sysInfo.fireS.summaryInfo.internal.chval.maxlevel : '';

+ 1 - 1
src/views/vent/performance/approvalPend/index.vue

@@ -114,7 +114,7 @@ async function getHistoricFlowNewList(params) {
     if (res.length != 0) {
     if (res.length != 0) {
         historySpList.length = 0
         historySpList.length = 0
         res.forEach(el => {
         res.forEach(el => {
-            historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime, status: el.status || '待处理' })
+            historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime, status:el.assignees[0].isExecutor ? '已处理' : '待处理' })
         })
         })
     }
     }
 }
 }

+ 18 - 12
src/views/vent/performance/comment/NormalTable.vue

@@ -2,9 +2,9 @@
   <div>
   <div>
     <BasicTable @register="registerTable" :key="resetTable">
     <BasicTable @register="registerTable" :key="resetTable">
       <template #actionSp="{ record }">
       <template #actionSp="{ record }">
-        <a class="table-action-link" @click="handleTo(record)">提交</a>
         <a class="table-action-link" @click="handleSpDetail(record)">审批详情</a>
         <a class="table-action-link" @click="handleSpDetail(record)">审批详情</a>
-        <a class="table-action-link" @click="handleSpRevoke(record)">撤回</a>
+        <a class="table-action-link" @click="handleTo(record)" :disabled="userName==record.createBy">提交</a>
+        <a class="table-action-link" @click="handleSpRevoke(record)" :disabled="userName==record.createBy">撤回</a>
       </template>
       </template>
       <template #actionWj="{ record }">
       <template #actionWj="{ record }">
         <a class="table-action-link" @click="handleEdit(record)">编辑</a>
         <a class="table-action-link" @click="handleEdit(record)">编辑</a>
@@ -13,7 +13,7 @@
           <a class="table-action-link">删除</a>
           <a class="table-action-link">删除</a>
         </a-popconfirm>
         </a-popconfirm>
       </template>
       </template>
-     
+
       <template #bodyCell="{ column, record }">
       <template #bodyCell="{ column, record }">
         <slot name="filterCell" v-bind="{ column, record }"></slot>
         <slot name="filterCell" v-bind="{ column, record }"></slot>
       </template>
       </template>
@@ -46,7 +46,7 @@
 
 
 <script lang="ts" name="system-user" setup>
 <script lang="ts" name="system-user" setup>
 //ts语法
 //ts语法
-import { ref, provide, reactive, toRaw, defineExpose } from 'vue';
+import { ref, provide, reactive, toRaw, defineExpose, unref } from 'vue';
 import { BasicTable, TableAction } from '/@/components/Table';
 import { BasicTable, TableAction } from '/@/components/Table';
 import DeviceModal from './DeviceModal.vue';
 import DeviceModal from './DeviceModal.vue';
 import CADModal from './CADModal.vue';
 import CADModal from './CADModal.vue';
@@ -57,6 +57,7 @@ import { useListPage } from '/@/hooks/system/useListPage';
 import { commit } from '../fileDetail/fileDetail.api'
 import { commit } from '../fileDetail/fileDetail.api'
 import { historicFlowNew, getHighlightImgNew, getTodoTask, getCancelNew } from './comment.api'
 import { historicFlowNew, getHighlightImgNew, getTodoTask, getCancelNew } from './comment.api'
 import { message } from 'ant-design-vue';
 import { message } from 'ant-design-vue';
+import { useUserStore } from '/@/store/modules/user';
 
 
 
 
 const props = defineProps({
 const props = defineProps({
@@ -77,7 +78,7 @@ const props = defineProps({
   //查询参数
   //查询参数
   searchParam: {
   searchParam: {
     type: Object,
     type: Object,
-    default:()=>{
+    default: () => {
       return {}
       return {}
     },
     },
   },
   },
@@ -124,7 +125,7 @@ const props = defineProps({
   },
   },
 });
 });
 
 
-let resetTable=ref(0)
+let resetTable = ref(0)
 let fileType = ref(''); //文件类型
 let fileType = ref(''); //文件类型
 let editID = ref(0); //文件ID
 let editID = ref(0); //文件ID
 const isUpdate = ref(false);
 const isUpdate = ref(false);
@@ -157,6 +158,8 @@ let visibleCx = ref(false)
 let revokeDes = ref('')
 let revokeDes = ref('')
 let cxInfo = reactive({})
 let cxInfo = reactive({})
 
 
+let userStore = useUserStore(); //获取用户信息
+let userName = unref(userStore.getUserInfo).username;
 
 
 // 列表页面公共参数、方法
 // 列表页面公共参数、方法
 const { tableContext, doRequest } = useListPage({
 const { tableContext, doRequest } = useListPage({
@@ -186,14 +189,14 @@ const { tableContext, doRequest } = useListPage({
     // actionColumn: {
     // actionColumn: {
     //   width: 200,
     //   width: 200,
     // },
     // },
-    showActionColumn:false,
+    showActionColumn: false,
     useSearchForm: false, //不使用查询条件
     useSearchForm: false, //不使用查询条件
     // pagination: false, //不使用分页组件
     // pagination: false, //不使用分页组件
     beforeFetch: (params) => {
     beforeFetch: (params) => {
       params.parentId = props.nodeParam.id ? props.nodeParam.id : '';
       params.parentId = props.nodeParam.id ? props.nodeParam.id : '';
       params.selectFlag = props.nodeParam.id ? false : true;
       params.selectFlag = props.nodeParam.id ? false : true;
       params.likeFileName = props.searchParam.fileName ? props.searchParam.fileName : '';
       params.likeFileName = props.searchParam.fileName ? props.searchParam.fileName : '';
-      params.fileSuffix = props.searchParam.fileType ? '.'+ props.searchParam.fileType : '';
+      params.fileSuffix = props.searchParam.fileType ? '.' + props.searchParam.fileType : '';
       params.bpmStatus = props.selfParam.bpmStatus ? props.selfParam.bpmStatus : '';
       params.bpmStatus = props.selfParam.bpmStatus ? props.selfParam.bpmStatus : '';
       params.sysOrgCode = props.selfParam.sysOrgCode ? props.selfParam.sysOrgCode : '';
       params.sysOrgCode = props.selfParam.sysOrgCode ? props.selfParam.sysOrgCode : '';
     },
     },
@@ -218,7 +221,7 @@ async function handleTjOk() {
     if (res == '提交成功') {
     if (res == '提交成功') {
       message.success(res);
       message.success(res);
       visibleTj.value = false
       visibleTj.value = false
-      resetTable.value=new Date().getTime()
+      resetTable.value = new Date().getTime()
     } else {
     } else {
       message.warning(res.message);
       message.warning(res.message);
     }
     }
@@ -244,7 +247,7 @@ async function getHistoricFlowNewList(params) {
   let res = await historicFlowNew({ ...params })
   let res = await historicFlowNew({ ...params })
   if (res.length != 0) {
   if (res.length != 0) {
     res.forEach(el => {
     res.forEach(el => {
-      historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime, status:el.assignees[0].isExecutor ? '已处理' : '待处理' })
+      historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime, status: el.assignees[0].isExecutor ? '已处理' : '待处理' })
     })
     })
 
 
   }
   }
@@ -268,7 +271,7 @@ async function getTodoTaskShow(params) {
 //审批通过/驳回弹窗关闭
 //审批通过/驳回弹窗关闭
 function spClose() {
 function spClose() {
   visibleSp.value = false
   visibleSp.value = false
-  resetTable.value=new Date().getTime()
+  resetTable.value = new Date().getTime()
 }
 }
 //审批-撤回提交
 //审批-撤回提交
 function handleSpRevoke(data) {
 function handleSpRevoke(data) {
@@ -285,7 +288,7 @@ async function handleCxOk() {
   }
   }
   visibleCx.value = false
   visibleCx.value = false
   revokeDes.value = ''
   revokeDes.value = ''
-  resetTable.value=new Date().getTime()
+  resetTable.value = new Date().getTime()
 }
 }
 //审批-撤销-取消
 //审批-撤销-取消
 function handleCxCancel() {
 function handleCxCancel() {
@@ -389,4 +392,7 @@ defineExpose({
   padding-top: 20px !important;
   padding-top: 20px !important;
   box-sizing: border-box;
   box-sizing: border-box;
 }
 }
+a[disabled] {
+  color: #fff;
+}
 </style>
 </style>

+ 1 - 1
src/views/vent/performance/endEd/index.vue

@@ -113,7 +113,7 @@ async function getHistoricFlowNewList(params) {
     if (res.length != 0) {
     if (res.length != 0) {
         historySpList.length = 0
         historySpList.length = 0
         res.forEach(el => {
         res.forEach(el => {
-            historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime, status: el.status || '待处理' })
+            historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime, status:el.assignees[0].isExecutor ? '已处理' : '待处理' })
         })
         })
     }
     }
 }
 }