发送服务计划

src/api/modules/systemService/service.js

@@ -77,7 +77,7 @@ export default {
     },
     async sendServicePlan(form) {
         return HcApi({
-            url: '/api/ /blade-manager/serviceplan/sendServicePlan',
+            url: '/api/blade-manager/serviceplan/sendServicePlan',
             method: 'get',
             params: form,
         })

src/views/systemService/fromDrawer.vue

@@ -34,6 +34,7 @@
                 </HcTooltip>
                 <HcTooltip keys="system-service-plan-send-btn">
                     <el-button
+                        v-if="status === 1 || status === 3"
                         class="node-card-plan-btn ml-6"
                         hc-btn
                         keys="system-service-plan-send-btn"
@@ -53,7 +54,7 @@
                         keys="system-service-plan-back-btn"
                         :loading="sendPlanLoad"
                         type="warning"
-                        @click="sendPlanClick(2)"
+                        @click="sendPlanClick(3)"
                     >
                         <HcIcon name="arrow-go-back" />
                         计划回退
@@ -67,7 +68,7 @@
                         hc-btn
                         keys="system-service-plan-comfirm-btn"
                         type="success"
-                        @click="sendPlanClick(3)"
+                        @click="sendPlanClick(4)"
                     >
                         <HcIcon name="check" />
                         确认计划
@@ -233,7 +234,7 @@ const fixedUserFinish = async (data) => {
      userIds.value = arrToKey(res, 'userId', ',')
 
     console.log(userIds, 'userIds')
-    sendPlanClick(1)
+    sendPlanClick(2)
 
     
 }
@@ -253,6 +254,7 @@ const sendPlanClick = async (type)=>{
         if (!error && code === 200) {
         
             window?.$message?.success(msg)
+            getDetailData()
            
         } else {
             sendPlanLoad.value = false
@@ -322,8 +324,10 @@ const getDetailData = async ()=>{
     }, false)
     if (!error && code === 200) {
        const res = getObjVal(data)
-       const { status } = res
-        status.value = status
+       
+        status.value = res.status
+        console.log( status.value, ' status.value')
+        
     } else {
      
         status.value = ''

src/views/systemService/plan.vue

@@ -16,12 +16,12 @@
             </div>
             <div class="ml-3 w-32">
                 <el-select v-model="searchForm.createUser" clearable block placeholder="编写人" @change="getTableData">
-                    <el-option v-for="item in preparedList" :key="item.id" :label="item.name" :value="item.id" />
+                    <el-option v-for="item in preparedList" :key="item.userId" :label="item.userName" :value="item.userId" />
                 </el-select>
             </div>
             <div class="ml-3 w-32">
                 <el-select v-model="searchForm.sendUser" placeholder="发送人" clearable multiple block @change="getTableData">
-                    <el-option v-for="item in postList" :key="item.batch" :label="item.name" :value="item.id" />
+                    <el-option v-for="item in postList" :key="item.userId" :label="item.userName" :value="item.userId" />
                 </el-select>
             </div>
         </template>
@@ -52,7 +52,7 @@
             </template>
             <template #action="{ row }">
                 <el-link v-if="row.status !== 4" type="primary" @click="editRow(row)">编辑</el-link>
-                <el-link type="success">查看</el-link>
+                <el-link v-if="row.status !== 1 " type="success" @click="viewPlan(row)">查看</el-link>
                 <el-link v-if="row.status === 1 " v-del-com:[handleDelete]="row" type="warning">删除</el-link>
             </template>
         </hc-table>
@@ -70,6 +70,7 @@ import fromDrawer from './fromDrawer.vue'
 import dataApi from '~api/systemService/service'
 import { useAppStore } from '~src/store'
 import { arrToId, getArrValue } from 'js-fast-way'
+import { toPdfPage } from '~uti/btn-auth'
 
 onMounted(()=>{
         getTableData()
@@ -115,9 +116,9 @@ const tableColumn = [
     { key: 'fileInType', name: '填写类型' },
     { key: 'planTime', name: '计划时间' },
     { key: 'statusValue', name: '状态' },
-    { key: 'createUser', name: '编写人' },
+    { key: 'writeUserName', name: '编写人' },
     { key: 'createTime', name: '创建时间' },
-    { key: 'sendUser', name: '发送人员' },
+    { key: 'sendUserName', name: '发送人员' },
     { key: 'action', name: '操作', width:150 },
 ]
 const tableData = ref([
@@ -162,8 +163,8 @@ const getPreparedList = async (id) => {
     })
     //判断状态
     if (!error && code === 200) {
-        preparedList.value = getArrValue(data['records'])
-        postList.value = getArrValue(data['records'])
+        preparedList.value = getArrValue(data['writeUser'])
+        postList.value = getArrValue(data['sendUser'])
 
     } else {
         preparedList.value = []
@@ -179,7 +180,8 @@ const createMonthPlan = (type)=>{
 }
 const closeDrawer = ()=>{
     isShowForm.value = false
-    // getTableData()
+        getTableData()
+        getPreparedList()
 }
 const dataId = ref(null)
 const editRow = (row)=>{
@@ -187,6 +189,16 @@ const editRow = (row)=>{
     typeVal.value = row.fileInType
     dataId.value = row.id
 }
+const viewPlan = (row)=>{
+     const { pdfUrl } = row
+           if (pdfUrl) {
+        toPdfPage(pdfUrl)
+
+       } else {
+        window?.$message?.error('暂无预览文件')
+       
+       }
+}
 const handleDelete = async ({ item }, resolve) => {
     await delData(item.id)
     resolve()