From e894589294d3b09b8ef18cf30f47f4fa309718c2 Mon Sep 17 00:00:00 2001
From: 郭娟 <2715201989@qq.com>
Date: Thu, 27 Jun 2024 09:36:01 +0800
Subject: [PATCH] fix:提交财务审批中往年应收和本年新增参数

---
 components/popUpComponent/popUpComponent.vue | 44 ++++++++++++++++++++++++++++++++++++++++++--
 pages/charge/visitsAndFees/createaVisit.vue  | 16 +++++++++++++---
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/components/popUpComponent/popUpComponent.vue b/components/popUpComponent/popUpComponent.vue
index 970ff6d..ab050a5 100644
--- a/components/popUpComponent/popUpComponent.vue
+++ b/components/popUpComponent/popUpComponent.vue
@@ -5,6 +5,23 @@
         <view class="padding-top text-lg text-center">
           {{title}}
         </view>
+        <view class="padding" style="padding-bottom: 0px!important;" v-if="title=='同意'&& publishStatus=='PENDING_LEVEL_2_AUDIT'">
+          <u-radio-group
+            v-model="invoiceYearType"
+            placement="row"
+            @change="groupChange"
+          >
+            <u-radio
+              :customStyle="{marginRight: '8px'}"
+              v-for="(item, index) in radiolist1"
+              :key="index"
+              :label="item.name"
+              :name="item.name"
+              @change="radioChange"
+            >
+            </u-radio>
+          </u-radio-group>
+        </view>
         <view class="padding">
           <u-textarea v-model="textarea" placeholder="请简单描述原因"></u-textarea>
         </view>
@@ -45,16 +62,32 @@
       modificationStatus: {
         type: String,
         default: ""
-      }
+      },
     },
     data() {
       return {
+        radiolist1:[
+          {
+            name:'往年应收'
+          },
+          {
+            name:'本年新增'
+          }
+        ],
+        invoiceYearType:'往年应收',
         textarea: "",
         show: false,
       };
     },
     methods: {
+      groupChange(value){
+        console.log('打印value',value)
+      },
+      radioChange(value){
+        console.log('打印value',value)
+      },
       open() {
+        this.invoiceYearType = '往年应收';
         this.show = true;
       },
       close() {
@@ -81,9 +114,16 @@
         }
 
         if (this.publishStatus === 'PENDING_LEVEL_2_AUDIT') {
+          if(this.title == '同意'){
+            data= {
+              ...data,
+              invoiceYearType:this.invoiceYearType
+            }
+            console.log('打印data',data)
+          }
           const result = await submitAuditTwo(data);
           if (result.code === 200) {
-            uni.$u.toast(`${this.title}成功`)
+            uni.$u.toast(`${this.title}成功`);
             setTimeout(()=>{
               that.$emit('getList');
             },300)
diff --git a/pages/charge/visitsAndFees/createaVisit.vue b/pages/charge/visitsAndFees/createaVisit.vue
index ebce3fd..3f792ae 100644
--- a/pages/charge/visitsAndFees/createaVisit.vue
+++ b/pages/charge/visitsAndFees/createaVisit.vue
@@ -757,7 +757,7 @@
     },
     onLoad(data) {
       this.init();
-      console.log(data);
+      console.log('data===?',data);
       if (data.objData) {
         let obj = JSON.parse(data.objData);
         this.model = {
@@ -837,8 +837,18 @@
         console.log(this.$store);
         // 默认选是
         this.model.isCharged = '是';
-        this.model.isVisited = '是';
-        this.model.hasDm = '是';
+        this.model.isVisited = '否';
+        this.model.hasDm = '否';
+        if (this.model.hasDm === '否') {
+          this.decisionMakersData.slice(1).map(item => {
+            item.show = false;
+          })
+        }
+        if (this.model.isVisited === '否') {
+          this.visitData.slice(1).map(item => {
+            item.show = false;
+          })
+        }
         this.model.entryTime = this.$u.timeFormat(this.dataTimeValue, 'yyyy-mm-dd');
         // 获取缓存用的工作类型
         this.model.jobNature = uni.getStorageSync('jobNature');
--
libgit2 0.21.2