ZaiZai 1 tahun lalu
induk
melakukan
ff3215ebd0

+ 2 - 1
src/config/index.json

@@ -1,9 +1,10 @@
 {
     "version": "20230607160059",
     "target1": "http://127.0.0.1:8090",
-    "target": "http://192.168.0.125:8090",
+    "target2": "http://192.168.0.125:8090",
     "target3": "http://39.108.216.210:8090",
     "target4": "http://192.168.0.109:8090",
+    "target": "http://192.168.0.102:8090",
     "smsPhone": "",
     "vite": {
         "port": 5180,

+ 18 - 2
src/views/debit-pay/admin/components/middlepay/task-modal.vue

@@ -58,6 +58,8 @@
 
 <script setup>
 import { ref, watch } from 'vue'
+import { getArrValue, getObjValue } from 'js-fast-way'
+import mainApi from '~api/tasks/hc-data'
 
 const props = defineProps({
     data: {
@@ -78,7 +80,7 @@ const isShow = defineModel('modelValue', {
 //监听
 const dataInfo = ref(props.data)
 watch(() => props.data, (data) => {
-    dataInfo.value = data
+    dataInfo.value = getObjValue(data)
 }, { immediate: true, deep:true })
 
 //监听
@@ -90,7 +92,21 @@ const rowInfo = ref({})
 const flowList = ref([])
 const flowListTask = ref([])
 const getDataApi = async () => {
-
+    const { taskId } = getObjValue(dataInfo.value)
+    const { data } = await mainApi.getDetail(taskId)
+    const tasks = getArrValue(data.taskProcessInfo)
+    console.log(tasks)
+    flowList.value = tasks
+    /*const list = [...arr]
+    let firstarr = list.slice(0, 1)
+    let taskList = list.slice(1, list.length)
+    taskList.forEach((ele)=>{
+        ele.name = ele.taskBranchName
+        ele.status = ele.taskBranchStatus
+        ele.type = ele.taskBranchType
+        ele.isTask = true
+    })
+    flowListTask.value = arrUnion(firstarr, taskList)*/
 }
 
 //查看详情

+ 2 - 1
src/views/debit-pay/admin/middlepay.vue

@@ -39,7 +39,8 @@
                         {{ getTablePeriod(row) }}
                     </template>
                     <template #approveStatusName="{ row }">
-                        <el-link type="primary" @click="rowTableClick(row)">{{ row.approveStatusName }}</el-link>
+                        <el-link v-if="row.approveStatusName !== '未上报'" type="primary" @click="rowTableClick(row)">{{ row.approveStatusName }}</el-link>
+                        <span v-else>{{ row.approveStatusName }}</span>
                     </template>
                     <template #action="{ row }">
                         <el-link type="primary" @click="rowViewClick(row)">预览</el-link>