最新

李宇
1 parent af6a273d
Showing 7 changed files with 149 additions and 39 deletions
antis-ncc-admin/.env.development
antis-ncc-admin/src/views/lqKdKdjlb/Form.vue
绿纤uni-app/common/config.js
绿纤uni-app/pages/consume-detail/consume-detail.vue
绿纤uni-app/pages/refund-detail/refund-detail.vue
绿纤uni-app/pagesA/lx-detail/lx-detail.vue
绿纤uni-app/pagesA/lx/lx.vue
@@ -2,8 +2,8 @@
  
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com'
-# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
-VUE_APP_BASE_API = 'http://localhost:2011'
+VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
+# VUE_APP_BASE_API = 'http://localhost:2011'
 # VUE_APP_BASE_API = 'http://localhost:2011'
 VUE_APP_IMG_API = ''
 VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket'
@@ -89,6 +89,35 @@
 						</div>
 					</el-form-item>
 				</el-col>
+				<!-- 储扣明细（只读展示） -->
+				<el-col :span="24">
+					<el-form-item label-width="0">
+						<div class="table-header">
+							<span class="table-title">储扣明细</span>
+						</div>
+						<el-table
+							v-if="dataForm.lqKdDeductList && dataForm.lqKdDeductList.length"
+							:data="dataForm.lqKdDeductList"
+							size="mini"
+							border
+							style="width: 100%;">
+							<el-table-column prop="itemName" label="品项名称" min-width="160" />
+							<el-table-column prop="deductType" label="类型" width="100" />
+							<el-table-column prop="projectNumber" label="数量" width="80" />
+							<el-table-column prop="unitPrice" label="单价" width="120">
+								<template slot-scope="scope">
+									<span>{{ Number(scope.row.unitPrice || 0).toFixed(2) }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column prop="amount" label="金额" width="120">
+								<template slot-scope="scope">
+									<span>{{ Number(scope.row.amount || 0).toFixed(2) }}</span>
+								</template>
+							</el-table-column>
+						</el-table>
+						<div v-else style="color:#909399;font-size:12px;padding:8px 0;">暂无储扣明细</div>
+					</el-form-item>
+				</el-col>
 			</el-form>
 		</el-row>
 		<span slot="footer" class="dialog-footer">
@@ -144,7 +173,7 @@ export default {
 				jksyj: undefined,
 				kjblsyj: undefined,
 				pxxx: undefined,
-				lqKdKdjlbDeductList: [],
+				lqKdDeductList: [],
 			},
 			rules: {
 				kdhy: [
@@ -570,6 +599,7 @@ export default {
 						method: 'get'
 					}).then(res => {
 						this.dataForm = res.data;
+						console.error(this.dataForm.lqKdDeductList)
 						// if (!this.dataForm.scwj) this.dataForm.scwj = [];
 						// if (!this.dataForm.hyqz) this.dataForm.hyqz = [];
  
@@ -667,21 +697,40 @@ export default {
 		calculateQk() {
 			const zdyj = parseFloat(this.dataForm.zdyj) || 0;
 			const sfyj = parseFloat(this.dataForm.sfyj) || 0;
-			this.dataForm.qk = (zdyj - sfyj).toFixed(2);
+			// 计算所有储扣明细的总价（参考 H5 计算逻辑）
+			let totalDeductAmount = 0;
+			if (this.dataForm.lqKdDeductList && this.dataForm.lqKdDeductList.length > 0) {
+				this.dataForm.lqKdDeductList.forEach(deduct => {
+					const amount = parseFloat(deduct.amount) || 0;
+					totalDeductAmount += amount;
+				});
+			}
+			// 欠款 = 整单业绩 - 实付业绩 - 储扣总计
+			this.dataForm.qk = (zdyj - sfyj - totalDeductAmount).toFixed(2);
 		},
-		// 计算实付业绩 - 根据品项总价自动计算
+		// 计算实付业绩 - 根据品项总价和储扣金额自动计算（参考 H5 calculateShifuYej）
 		calculateSfyj() {
-			let totalSfyj = 0;
+			let totalPxPrice = 0;
  
-			// 遍历所有品项，计算总实付业绩
+			// 遍历所有品项，计算总价
 			this.dataForm.lqKdPxmxList.forEach(px => {
 				const actualPrice = parseFloat(px.actualPrice) || 0;
-				totalSfyj += actualPrice;
+				totalPxPrice += actualPrice;
 			});
  
-			// 更新实付业绩
-			this.dataForm.sfyj = totalSfyj.toFixed(2);
-			console.log('计算实付业绩:', totalSfyj);
+			// 计算所有储扣明细的总价
+			let totalDeductAmount = 0;
+			if (this.dataForm.lqKdDeductList && this.dataForm.lqKdDeductList.length > 0) {
+				this.dataForm.lqKdDeductList.forEach(deduct => {
+					const amount = parseFloat(deduct.amount) || 0;
+					totalDeductAmount += amount;
+				});
+			}
+			
+			// 实付业绩 = 品项总价 - 储扣明细总价
+			const sfyj = totalPxPrice - totalDeductAmount;
+			this.dataForm.sfyj = sfyj.toFixed(2);
+			console.log('计算实付业绩: 实付=', this.dataForm.sfyj, '品项总价=', totalPxPrice, '储扣总额=', totalDeductAmount);
  
 			// 重新计算欠款
 			this.calculateQk();
@@ -10,8 +10,8 @@ const ENV_CONFIG = {
 	// 正式环境
 	production: {
 		name: '正式环境',
-		apiBaseUrl: 'http://erp_test.lvqianmeiye.com',
-		// apiBaseUrl: 'https://erp.lvqianmeiye.com',
+		// apiBaseUrl: 'http://erp_test.lvqianmeiye.com',
+		apiBaseUrl: 'https://erp.lvqianmeiye.com',
 		// apiBaseUrl: 'http://lvqian.antissoft.com',
 		description: '生产环境服务器'
 	}
@@ -242,6 +242,7 @@
 	export default {
 		data() {
 			return {
+				isopen:false,
 				newuserInfo: uni.getStorageSync('newuserInfo'),
 				baseUrl: config.getImgBaseUrl(),
 				loading: false,
@@ -258,14 +259,17 @@
 		computed: {
 			// 判断耗卡日期是否在本月
 			isCurrentMonth() {
-				return true
-				if (!this.consumeData || !this.consumeData.hksj) return false
-				
-				const consumeDate = new Date(this.consumeData.hksj)
-				const currentDate = new Date()
-				
-				return consumeDate.getFullYear() === currentDate.getFullYear() &&
-					   consumeDate.getMonth() === currentDate.getMonth()
+				if(this.isopen) {
+					return this.isopen
+				} else{
+					if (!this.consumeData || !this.consumeData.hksj) return false
+					
+					const consumeDate = new Date(this.consumeData.hksj)
+					const currentDate = new Date()
+					
+					return consumeDate.getFullYear() === currentDate.getFullYear() &&
+						   consumeDate.getMonth() === currentDate.getMonth()
+				}
 			}
 		},
  
@@ -277,10 +281,26 @@
 			this.initializePage(options)
 		},
 		onShow() {
+			this.getisopen()
 			this.loadConsumeDetail()
 		},
  
 		methods: {
+			getisopen(){
+				this.isopen = false
+				const menuData = uni.getStorageSync('appMenuData') || []
+				if (Array.isArray(menuData) && menuData.length > 0) {
+					const rootNode = menuData.find(item => item.fullName == 'app耗卡开关按钮')
+					// console.error(rootNode)
+					if (rootNode) {
+						console.error('app耗卡开关按钮')
+						this.isopen = true
+					} else{
+						this.isopen = false
+					}
+				}
+				console.error(this.isopen)
+			},
 			goToAppointment(appointmentId) {
 				uni.navigateTo({
 					url: '/pages/appointment-detail/appointment-detail?id='+appointmentId
@@ -229,6 +229,7 @@
 	export default {
 		data() {
 			return {
+				isopen:false,
 				newuserInfo: uni.getStorageSync('newuserInfo'),
 				baseUrl: config.getImgBaseUrl(),
 				loading: false,
@@ -244,14 +245,17 @@
 		computed: {
 			// 判断退卡日期是否在本月
 			isCurrentMonth() {
-				return true
-				if (!this.refundData || !this.refundData.tksj) return false
-				
-				const refundDate = new Date(this.refundData.tksj)
-				const currentDate = new Date()
-				
-				return refundDate.getFullYear() === currentDate.getFullYear() &&
-					   refundDate.getMonth() === currentDate.getMonth()
+				if(this.isopen) {
+					return this.isopen
+				} else{
+					if (!this.refundData || !this.refundData.tksj) return false
+					
+					const refundDate = new Date(this.refundData.tksj)
+					const currentDate = new Date()
+					
+					return refundDate.getFullYear() === currentDate.getFullYear() &&
+						   refundDate.getMonth() === currentDate.getMonth()
+				}
 			}
 		},
  
@@ -261,8 +265,25 @@
 		onLoad(options) {
 			this.initializePage(options)
 		},
-
+		onShow() {
+			this.getisopen()
+		},
 		methods: {
+			getisopen(){
+				this.isopen = false
+				const menuData = uni.getStorageSync('appMenuData') || []
+				if (Array.isArray(menuData) && menuData.length > 0) {
+					const rootNode = menuData.find(item => item.fullName == 'app退卡开关按钮')
+					// console.error(rootNode)
+					if (rootNode) {
+						console.error('app退卡开关按钮')
+						this.isopen = true
+					} else{
+						this.isopen = false
+					}
+				}
+				console.error(this.isopen)
+			},
 			previewSignature(listfile, index) {
 				let listfilenew = listfile.map(item => this.baseUrl + item.url)
 				uni.previewImage({
@@ -368,6 +368,7 @@
 	export default {
 		data() {
 			return {
+				isopen:false,
 				newuserInfo: uni.getStorageSync('newuserInfo'),
 				baseUrl:config.getImgBaseUrl(),
 				loading: false,
@@ -396,14 +397,17 @@
 			},
 			// 判断开单日期是否在本月
 			isCurrentMonth() {
-				return true
-				if (!this.lxData || !this.lxData.kdrq) return false
-				
-				const orderDate = new Date(this.lxData.kdrq)
-				const currentDate = new Date()
-				
-				return orderDate.getFullYear() === currentDate.getFullYear() &&
-					   orderDate.getMonth() === currentDate.getMonth()
+				if(this.isopen) {
+					return this.isopen
+				} else{
+					if (!this.lxData || !this.lxData.kdrq) return false
+					
+					const orderDate = new Date(this.lxData.kdrq)
+					const currentDate = new Date()
+					
+					return orderDate.getFullYear() === currentDate.getFullYear() &&
+						   orderDate.getMonth() === currentDate.getMonth()
+				}
 			}
 		},
  
@@ -416,9 +420,25 @@
 		},
 		onShow() {
 			this.loadLxDetail()
+			this.getisopen()
 		},
  
 		methods: {
+			getisopen(){
+				this.isopen = false
+				const menuData = uni.getStorageSync('appMenuData') || []
+				if (Array.isArray(menuData) && menuData.length > 0) {
+					const rootNode = menuData.find(item => item.fullName == 'app开单开关按钮')
+					// console.error(rootNode)
+					if (rootNode) {
+						console.error('app开单开关按钮')
+						this.isopen = true
+					} else{
+						this.isopen = false
+					}
+				}
+				console.error(this.isopen)
+			},
 			goToAppointment(appointmentId) {
 				uni.navigateTo({
 					url: '/pages/appointment-detail/appointment-detail?id='+appointmentId
@@ -655,7 +655,7 @@
 					const rootNode = menuData.find(item => item.fullName == 'app时间选择开关按钮')
 					// console.error(rootNode)
 					if (rootNode) {
-						console.error('时间选择开关按钮')
+						console.error('app时间选择开关按钮')
 						this.istime = false
 					}
 				}