ZaiZai 1 gadu atpakaļ
vecāks
revīzija
28f049adb0

+ 8 - 0
src/api/modules/tasks/hc-data.js

@@ -25,4 +25,12 @@ export default {
             data: form,
         }, false)
     },
+    //获取任务详情
+    async getDetail(id) {
+        return HcApi({
+            url: '/api/blade-meter/task/detail',
+            method: 'get',
+            params: { id },
+        }, false)
+    },
 }

+ 38 - 25
src/views/tasks/components/hc-data/task-review.vue

@@ -5,8 +5,8 @@
                 <div :id="titleId" :class="titleClass">任务审核 【已开启电签】</div>
             </div>
         </template>
-        <div class="relative h-full">
-            <div class="hc-task-name relative">【{{ taskInfo.taskName }}】2019-10-17 中间计量申请 【第1期】 审批信息</div>
+        <div v-loading="isLoading" class="relative h-full">
+            <div class="hc-task-name relative">{{ rowInfo.taskName }} 审批信息</div>
             <div class="hc-task-body relative flex">
                 <div class="hc-task-time">
                     <hc-body class="hc-task-body-card" padding="10px" scrollbar>
@@ -28,7 +28,7 @@
                     <hc-body class="hc-task-body-card" padding="10px">
                         <hc-table
                             ref="tableRef" :column="tableColumn" :datas="tableData"
-                            :loading="tableLoading" :is-stripe="false" is-new :index-style="{ width: 60 }" is-current-row
+                            :is-stripe="false" is-new :index-style="{ width: 60 }" is-current-row
                             @row-click="tableRowClick"
                         >
                             <template #action="{ row }">
@@ -49,7 +49,7 @@
                 </div>
                 <div :id="`hc_task_form_${uuid}`" class="hc-task-form">
                     <hc-body class="hc-task-body-card" padding="10px" scrollbar>
-                        <HcTaskForm v-model="tableInfo" :is-edit="tabsKey === 1" :type="rowInfo.type" />
+                        <HcTaskForm v-model="tableInfo" :is-edit="tabsKey === 1" :type="rowInfo.meterType" />
                     </hc-body>
                 </div>
             </div>
@@ -67,9 +67,11 @@
 
 <script setup>
 import { nextTick, ref, watch } from 'vue'
+import { useAppStore } from '~src/store'
 import { getRandom } from 'js-fast-way'
 import HcTaskForm from './task-form.vue'
 import HcTaskNotes from './task-notes.vue'
+import mainApi from '~api/tasks/hc-data'
 
 const props = defineProps({
     tabs: {
@@ -81,9 +83,14 @@ const props = defineProps({
         default: () => ({}),
     },
 })
-
 //事件
 const emit = defineEmits(['finish', 'close'])
+
+//项目合同段信息
+const useAppState = useAppStore()
+const projectId = ref(useAppState.getProjectId || '')
+const contractId = ref(useAppState.getContractId || '')
+
 const uuid = getRandom(4)
 
 //双向绑定
@@ -96,7 +103,6 @@ const isShow = defineModel('modelValue', {
 const tableRef = ref(null)
 const tabsKey = ref(props.tabs)
 const rowInfo = ref(props.row)
-const taskInfo = ref({})
 
 watch(() => [
     props.tabs,
@@ -130,11 +136,9 @@ const setSplitRef = () => {
 }
 
 //设置任务信息
-const setTaskInfo = async () => {
+const setTaskInfo = () => {
     //meterType:1中间,2材料,3开工,4变更令
-    const { taskName, meterType } = rowInfo.value
-    taskInfo.value.taskName = taskName
-    taskInfo.value.type = meterType
+    const { meterType } = rowInfo.value
     if (meterType === 1) {
         tableColumn.value = middlepayTableColumn.value
     } else if (meterType === 2) {
@@ -146,7 +150,17 @@ const setTaskInfo = async () => {
     } else {
         tableColumn.value = []
     }
-    getTableData().then()
+    getTableDetail()
+}
+
+//获取数据详情
+const isLoading = ref(false)
+const getTableDetail = async () => {
+    isLoading.value = true
+    rejectionLoading.value = true
+    confirmLoading.value = true
+    const { data } = await mainApi.getDetail(rowInfo.value.id)
+    console.log(data)
 }
 
 //流程信息
@@ -158,35 +172,35 @@ const flowList = ref([
 //中间计量单的表格数据
 const middlepayTableColumn = ref([
     { key: 'action', name: '批注', width: 45, align: 'center' },
-    { key: 'key1', name: '计量单编号' },
-    { key: 'key2', name: '计量金额', width: 100 },
-    { key: 'key3', name: '工程划分' },
+    { key: 'meterNumber', name: '计量单编号' },
+    { key: 'meterMoney', name: '计量金额', width: 100 },
+    { key: 'engineerDivide', name: '工程划分' },
     { key: 'state', name: '审批状态', fixed: 'right', width: 70, align: 'center' },
 ])
 //开工预付款计量单的表格数据
 const startWorkTableColumn = ref([
     { key: 'action', name: '批注', width: 45, align: 'center' },
-    { key: 'key1', name: '计量期', minWidth: 100, align: 'center' },
-    { key: 'key2', name: '业务日期', width: 160, align: 'center' },
-    { key: 'key3', name: '计量金额', width: 100, align: 'center' },
+    { key: 'periodName', name: '计量期', minWidth: 100, align: 'center' },
+    { key: 'businessDate', name: '业务日期', width: 160, align: 'center' },
+    { key: 'meterMoney', name: '计量金额', width: 100, align: 'center' },
     { key: 'state', name: '审批状态', fixed: 'right', width: 70, align: 'center' },
 ])
 //变更令的表格数据
 const alterTableColumn = ref([
     { key: 'action', name: '批注', width: 45, align: 'center' },
-    { key: 'key1', name: '变更编号', minWidth: 120, align: 'center' },
-    { key: 'key2', name: '变更名称', minWidth: 120, align: 'center' },
-    { key: 'key3', name: '变更金额', width: 100, align: 'center' },
-    { key: 'key4', name: '变更批复日期', width: 160, align: 'center' },
+    { key: 'changeNumber', name: '变更编号', minWidth: 120, align: 'center' },
+    { key: 'changeName', name: '变更名称', minWidth: 120, align: 'center' },
+    { key: 'changeMoney', name: '变更金额', width: 100, align: 'center' },
+    { key: 'changeApprovalDate', name: '变更批复日期', width: 160, align: 'center' },
     { key: 'state', name: '审批状态', fixed: 'right', width: 70, align: 'center' },
 ])
 //材料计量单的表格数据
 const materialTableColumn = ref([
     { key: 'action', name: '批注', width: 45, align: 'center' },
     { key: 'key1', name: '计量期', minWidth: 100, align: 'center' },
-    { key: 'key2', name: '合同材料', minWidth: 120, align: 'center' },
-    { key: 'key3', name: '材料到场编号', width: 120, align: 'center' },
-    { key: 'key4', name: '计量金额', width: 100, align: 'center' },
+    { key: 'contractMaterialName', name: '合同材料', minWidth: 120, align: 'center' },
+    { key: 'materialArriveNumber', name: '材料到场编号', width: 120, align: 'center' },
+    { key: 'meterMoney', name: '计量金额', width: 100, align: 'center' },
     { key: 'state', name: '审批状态', fixed: 'right', width: 70, align: 'center' },
 ])
 
@@ -249,7 +263,6 @@ const rejectionClick = () => {
 //取消审批
 const cancelClick = () => {
     isShow.value = false
-    taskInfo.value = {}
     rowInfo.value = {}
     tabsKey.value = ''
     tableLoading.value = false