Pārlūkot izejas kodu

审批管理更改

duy 2 gadi atpakaļ
vecāks
revīzija
258791719c

+ 7 - 5
src/views/home/task/components/cost-budget.vue

@@ -86,11 +86,7 @@ import costApi from '~api/project/cost.js';
 
 onActivated(() => {
 
-    getdepartmentListData()
-    getCostTypeDict()
-    getProcessList(otherInfo.value.projectId)
-    getPostDict()
-    getBudgetTypeList()
+  
 })
 //参数
 const props = defineProps({
@@ -105,6 +101,12 @@ watch(() => [
     props.otherInfo,
 ], ([otherInfo]) => {
     console.log(otherInfo, 'otherInfo');
+    getdepartmentListData()
+    getCostTypeDict()
+    getProcessList(otherInfo.projectId)
+    getPostDict()
+    getBudgetTypeList()
+
     constructUnitData.value=otherInfo?.constructUnit||[]
     bulidUnitData.value=otherInfo?.buildUnit||[]
     supervisorUnitData.value=otherInfo?.supervisorUnit||[]

+ 5 - 4
src/views/home/task/components/invoice-request.vue

@@ -83,10 +83,7 @@ import {useAppStore} from "~src/store";
 import mainApi from "~api/expense/invoice";
 const useAppState = useAppStore();
 onActivated(()=>{
-    getUserDict()
-    getInvoiceContentList()
-    getInvoiceType()
-    getProjectData()
+
  })
 //参数
 const props = defineProps({
@@ -102,6 +99,10 @@ watch(() => [
   props.otherInfo,
 ], ([otherInfo]) => {
   console.log(otherInfo, 'otherInfo');
+    getUserDict()
+    getInvoiceContentList()
+    getInvoiceType()
+    getProjectData()
 
 })
 //获取所有员工

+ 4 - 10
src/views/home/task/components/pay-request.vue

@@ -27,14 +27,7 @@
                                 </el-select>
                             </el-form-item>
                         </div>
-                        <div class="hc-form-item" >
-                            <el-form-item label="关联项目:" prop="projectId"  v-if="otherInfo.isProjectBonus !== 1">
-                                <el-select block v-model="otherInfo.projectId">
-                                    <el-option v-for="items in projectData" :label="items.projectName" :value="items.projectId"/>
-                                </el-select>
-                            </el-form-item>
-                         
-                        </div>
+                   
                         <el-form-item label="回款时间:" prop="collectionDate"  v-if="otherInfo.isProjectBonus === 1">
                             <el-input v-model="otherInfo.collectionDate" disabled/>
                         </el-form-item>
@@ -81,8 +74,7 @@
  import {useAppStore} from "~src/store";
 const useAppState = useAppStore();
  onActivated(()=>{
-  getProjectData()
-  getUserDict()
+
  })
  //参数
  const props = defineProps({
@@ -96,6 +88,8 @@ const useAppState = useAppStore();
   props.otherInfo,
  ], ([otherInfo]) => {
     console.log(otherInfo,'otherInfo');
+    getProjectData()
+    getUserDict()
  
  })
  //获取项目数据

+ 1 - 1
src/views/home/task/components/trip-info.vue

@@ -110,7 +110,7 @@ const fellowTravelerUserIds=ref([])
 watch(() => [
   props.otherInfo,
 ], ([otherInfo]) => {
-  fellowTravelerUserIds.value=otherInfo.fellowTravelerUserIds.split('')
+  fellowTravelerUserIds.value=otherInfo.fellowTravelerUserIds.split(',')
   getProjectData()
   getTrafficType()
   getUserDict()

+ 5 - 3
src/views/home/task/task-details.vue

@@ -41,7 +41,7 @@
             </el-form>
         </HcCardItem>
 
-        <HcCardItem title="数据详情" class="mt-4"  v-if="dataType !== '任务审批'||dataType !== '开票审批'||dataType !== '外包支付'||dataType !== '财务审核'">
+        <HcCardItem title="数据详情" class="mt-4"  v-if="dataType!=='任务审批'">
              <!-- 报销 -->
             <div class="hc-info-list" v-if="dataType=='报销审批'">
                 <HcListItem title="报销金额:" :content="otherInfo?.frMoney"/>
@@ -50,15 +50,17 @@
                 <HcListItem title="费用说明:" :content="otherInfo?.frDesc"/>
                 <HcListItem title="电子发票:" >
                     <HcImg ui="img" :index="0"
+                    v-if="otherInfo?.frElectronicInvoiceUrl"
                            :src="otherInfo?.frElectronicInvoiceUrl"
-                           :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
+                           :srcs="[otherInfo?.frElectronicInvoiceUrl]"
                     />
           
                 </HcListItem>
                 <HcListItem title="附件文件:" >
                     <HcImg ui="img" :index="0"
+                    v-if="otherInfo?.frElectronicInvoiceUrl"
                             :src="otherInfo?.frAttachmentUrl"
-                           :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
+                           :srcs="[otherInfo?.frAttachmentUrl]"
                     />
         
                 </HcListItem>