Commit e894589294d3b09b8ef18cf30f47f4fa309718c2
1 parent
f9e2f0ae
Exists in
charge
fix:提交财务审批中往年应收和本年新增参数
Showing
2 changed files
with
55 additions
and
5 deletions
Show diff stats
components/popUpComponent/popUpComponent.vue
| @@ -5,6 +5,23 @@ | @@ -5,6 +5,23 @@ | ||
| 5 | <view class="padding-top text-lg text-center"> | 5 | <view class="padding-top text-lg text-center"> |
| 6 | {{title}} | 6 | {{title}} |
| 7 | </view> | 7 | </view> |
| 8 | + <view class="padding" style="padding-bottom: 0px!important;" v-if="title=='同意'&& publishStatus=='PENDING_LEVEL_2_AUDIT'"> | ||
| 9 | + <u-radio-group | ||
| 10 | + v-model="invoiceYearType" | ||
| 11 | + placement="row" | ||
| 12 | + @change="groupChange" | ||
| 13 | + > | ||
| 14 | + <u-radio | ||
| 15 | + :customStyle="{marginRight: '8px'}" | ||
| 16 | + v-for="(item, index) in radiolist1" | ||
| 17 | + :key="index" | ||
| 18 | + :label="item.name" | ||
| 19 | + :name="item.name" | ||
| 20 | + @change="radioChange" | ||
| 21 | + > | ||
| 22 | + </u-radio> | ||
| 23 | + </u-radio-group> | ||
| 24 | + </view> | ||
| 8 | <view class="padding"> | 25 | <view class="padding"> |
| 9 | <u-textarea v-model="textarea" placeholder="请简单描述原因"></u-textarea> | 26 | <u-textarea v-model="textarea" placeholder="请简单描述原因"></u-textarea> |
| 10 | </view> | 27 | </view> |
| @@ -45,16 +62,32 @@ | @@ -45,16 +62,32 @@ | ||
| 45 | modificationStatus: { | 62 | modificationStatus: { |
| 46 | type: String, | 63 | type: String, |
| 47 | default: "" | 64 | default: "" |
| 48 | - } | 65 | + }, |
| 49 | }, | 66 | }, |
| 50 | data() { | 67 | data() { |
| 51 | return { | 68 | return { |
| 69 | + radiolist1:[ | ||
| 70 | + { | ||
| 71 | + name:'往年应收' | ||
| 72 | + }, | ||
| 73 | + { | ||
| 74 | + name:'本年新增' | ||
| 75 | + } | ||
| 76 | + ], | ||
| 77 | + invoiceYearType:'往年应收', | ||
| 52 | textarea: "", | 78 | textarea: "", |
| 53 | show: false, | 79 | show: false, |
| 54 | }; | 80 | }; |
| 55 | }, | 81 | }, |
| 56 | methods: { | 82 | methods: { |
| 83 | + groupChange(value){ | ||
| 84 | + console.log('打印value',value) | ||
| 85 | + }, | ||
| 86 | + radioChange(value){ | ||
| 87 | + console.log('打印value',value) | ||
| 88 | + }, | ||
| 57 | open() { | 89 | open() { |
| 90 | + this.invoiceYearType = '往年应收'; | ||
| 58 | this.show = true; | 91 | this.show = true; |
| 59 | }, | 92 | }, |
| 60 | close() { | 93 | close() { |
| @@ -81,9 +114,16 @@ | @@ -81,9 +114,16 @@ | ||
| 81 | } | 114 | } |
| 82 | 115 | ||
| 83 | if (this.publishStatus === 'PENDING_LEVEL_2_AUDIT') { | 116 | if (this.publishStatus === 'PENDING_LEVEL_2_AUDIT') { |
| 117 | + if(this.title == '同意'){ | ||
| 118 | + data= { | ||
| 119 | + ...data, | ||
| 120 | + invoiceYearType:this.invoiceYearType | ||
| 121 | + } | ||
| 122 | + console.log('打印data',data) | ||
| 123 | + } | ||
| 84 | const result = await submitAuditTwo(data); | 124 | const result = await submitAuditTwo(data); |
| 85 | if (result.code === 200) { | 125 | if (result.code === 200) { |
| 86 | - uni.$u.toast(`${this.title}成功`) | 126 | + uni.$u.toast(`${this.title}成功`); |
| 87 | setTimeout(()=>{ | 127 | setTimeout(()=>{ |
| 88 | that.$emit('getList'); | 128 | that.$emit('getList'); |
| 89 | },300) | 129 | },300) |
pages/charge/visitsAndFees/createaVisit.vue
| @@ -757,7 +757,7 @@ | @@ -757,7 +757,7 @@ | ||
| 757 | }, | 757 | }, |
| 758 | onLoad(data) { | 758 | onLoad(data) { |
| 759 | this.init(); | 759 | this.init(); |
| 760 | - console.log(data); | 760 | + console.log('data===?',data); |
| 761 | if (data.objData) { | 761 | if (data.objData) { |
| 762 | let obj = JSON.parse(data.objData); | 762 | let obj = JSON.parse(data.objData); |
| 763 | this.model = { | 763 | this.model = { |
| @@ -837,8 +837,18 @@ | @@ -837,8 +837,18 @@ | ||
| 837 | console.log(this.$store); | 837 | console.log(this.$store); |
| 838 | // 默认选是 | 838 | // 默认选是 |
| 839 | this.model.isCharged = '是'; | 839 | this.model.isCharged = '是'; |
| 840 | - this.model.isVisited = '是'; | ||
| 841 | - this.model.hasDm = '是'; | 840 | + this.model.isVisited = '否'; |
| 841 | + this.model.hasDm = '否'; | ||
| 842 | + if (this.model.hasDm === '否') { | ||
| 843 | + this.decisionMakersData.slice(1).map(item => { | ||
| 844 | + item.show = false; | ||
| 845 | + }) | ||
| 846 | + } | ||
| 847 | + if (this.model.isVisited === '否') { | ||
| 848 | + this.visitData.slice(1).map(item => { | ||
| 849 | + item.show = false; | ||
| 850 | + }) | ||
| 851 | + } | ||
| 842 | this.model.entryTime = this.$u.timeFormat(this.dataTimeValue, 'yyyy-mm-dd'); | 852 | this.model.entryTime = this.$u.timeFormat(this.dataTimeValue, 'yyyy-mm-dd'); |
| 843 | // 获取缓存用的工作类型 | 853 | // 获取缓存用的工作类型 |
| 844 | this.model.jobNature = uni.getStorageSync('jobNature'); | 854 | this.model.jobNature = uni.getStorageSync('jobNature'); |