fix

virgo.wzfrontend/console/src/components/work/bill/common/invoiceForm.vue

@@ -65,6 +65,7 @@
 			}
 		},
 		created() {
+			this.form['organizationId'] = this.$store.getters.organization.id;
 			this.form[this.type + 'Id'] = this.itemId;
 			if (this.type === 'payment') {
 				this.form['cargoName'] = '房租';

virgo.wzfrontend/console/src/components/work/bill/contract/detail.vue

@@ -81,12 +81,10 @@
 				</div>
 			</div>
 		</div>
-		<div class="hui-drawer-submit" v-if="detail.status !== 2 && detail.id">
-			<el-button size="medium" type="primary" @click="paymentOperation('record')" v-if="!detail.status">
-				账单付款
-			</el-button>
-			<el-button size="medium" type="primary" @click="paymentOperation('invoice')" v-if="detail.status === 1">
-				账单发票
+		<div class="hui-drawer-submit" v-if="operationBtn.length > 0">
+			<el-button size="medium" type="primary" v-for="(item,index) in operationBtn"
+				@click="paymentOperation(item.type)" :key="item.id">
+				{{item.name}}
 			</el-button>
 		</div>
 		<el-dialog title="新增" :visible.sync="visible" width="900px" :append-to-body="true">
@@ -106,7 +104,7 @@
 	import invoiceForm from '@/components/work/bill/common/invoiceForm';
 	import upload from '@/components/common/upload'
 	export default {
-		props: ['detailId'],
+		props: ['detailId', 'showType'],
 		data() {
 			return {
 				detail: {
@@ -118,7 +116,8 @@
 					paymentInvoiceList: []
 				},
 				visible: false,
-				type: ''
+				type: '',
+				operationBtn: []
 			}
 		},
 		created() {
@@ -126,9 +125,24 @@
 		},
 		methods: {
 			init() {
+				this.operationBtn = [];
 				getPaymentDetailById(this.detailId).then(res => {
 					if (res.state) {
-						this.detail = res.data
+						this.detail = res.data;
+						if (!this.detail.status && this.showType === 2) {
+							this.operationBtn.push({
+								id: 1,
+								name: '账单付款',
+								type: 'record'
+							})
+						}
+						if (this.detail.status === 1 && this.showType === 1) {
+							this.operationBtn.push({
+								id: 2,
+								name: '账单发票',
+								type: 'invoice'
+							})
+						}
 					}
 				})
 			},

virgo.wzfrontend/console/src/components/work/order/detail.vue

@@ -142,7 +142,7 @@
 						name: '处理工单'
 					})
 				}
-				if (this.detail.userId === user.userId) { //跟进人
+				if (this.detail.followUpPerson === user.userId) { //跟进人
 					if (this.detail.status === 1) button.push({
 						type: 3,
 						name: '开始工单'

virgo.wzfrontend/console/src/views/system/log.vue

@@ -141,12 +141,23 @@
 					</div>
 				</div>
 			</el-timeline-item>
-			<el-timeline-item timestamp="2024-07-01" placement="top">
+			<el-timeline-item timestamp="2024-07-02" placement="top">
 				<div class="log-box">
 					<div class="log-item">1、新增运维管理-模型设备，展示BIM模型。</div>
 					<div class="log-item">2、实现部分小程序页面(<span class="download-item" @click="download(13809)">点击下载</span>)。
 					</div>
 				</div>
+			</el-timeline-item>
+			<el-timeline-item timestamp="2024-07-03" placement="top">
+				<div class="log-box">
+					<div class="log-item">
+						1、完成用户手册的全部功能的编写(<span class="download-item" @click="download(13816)">点击下载用户手册</span>)。
+					</div>
+					<div class="log-item">2、修复一些自测时的BUG
+						<div class="log-item">1、修复工单过程操作显示的BUG。</div>
+						<div class="log-item">2、修复账单操作显示的BUG。</div>
+					</div>
+				</div>
 			</el-timeline-item>
 		</el-timeline>
 	</div>

virgo.wzfrontend/console/src/views/work/bill/contract/client.vue

@@ -66,7 +66,7 @@
 			</div>
 		</div>
 		<el-drawer title="账单详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId" @reload="init"></detail>
+			<detail v-if="drawer" :detailId="detailId" @reload="init" :showType="2"></detail>
 		</el-drawer>
 	</div>
 </template>

virgo.wzfrontend/console/src/views/work/bill/contract/organization.vue

@@ -66,7 +66,7 @@
 			</div>
 		</div>
 		<el-drawer title="账单详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId" @reload="init"></detail>
+			<detail v-if="drawer" :detailId="detailId" @reload="init" :showType="2"></detail>
 		</el-drawer>
 	</div>
 </template>

virgo.wzfrontend/console/src/views/work/bill/contract/payment.vue

@@ -66,7 +66,7 @@
 			</div>
 		</div>
 		<el-drawer title="账单详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId" @reload="init"></detail>
+			<detail v-if="drawer" :detailId="detailId" @reload="init" :showType="1"></detail>
 		</el-drawer>
 	</div>
 </template>

virgo.wzfrontend/console/src/views/work/contract/list.vue

@@ -133,7 +133,7 @@
 				this.init();
 			},
 			insert() {
-				this.detailId = {};
+				this.detail = {};
 				this.type = 'edit';
 			},
 			currentChange(currPage) {