From e29d11bbd648e5077352347f8b444829664e2338 Mon Sep 17 00:00:00 2001
From: liyu1201 <1492230202@qq.com>
Date: Tue, 13 Jan 2026 17:58:27 +0800
Subject: [PATCH] 最新

---
 antis-ncc-admin/.env.development                                     |   4 ++--
 antis-ncc-admin/src/views/LqLaundryFlow/cancel-dialog.vue            |  90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 antis-ncc-admin/src/views/LqLaundryFlow/index.vue                    |  86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 antis-ncc-admin/src/views/lqKdKdjlb/hedge-dialog.vue                 | 624 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 antis-ncc-admin/src/views/lqKdKdjlb/index.vue                        |  15 ++++++++++++---
 antis-ncc-admin/src/views/lqKhxx/index.vue                           |   2 +-
 antis-ncc-admin/src/views/statisticsList/form2.vue                   |   4 ++--
 antis-ncc-admin/src/views/wageManagement/assistants.vue              |   8 ++------
 antis-ncc-admin/src/views/wageManagement/business-unit-managers.vue  |   8 ++------
 antis-ncc-admin/src/views/wageManagement/cienceTeacher.vue           |   8 ++------
 antis-ncc-admin/src/views/wageManagement/director.vue                |   8 ++------
 antis-ncc-admin/src/views/wageManagement/healthCoach.vue             |   8 ++------
 antis-ncc-admin/src/views/wageManagement/major-project-directors.vue |   8 ++------
 antis-ncc-admin/src/views/wageManagement/major-project-teachers.vue  |   8 ++------
 antis-ncc-admin/src/views/wageManagement/shop.vue                    |   8 ++------
 antis-ncc-admin/src/views/wageManagement/tech-general-managers.vue   |   8 ++------
 16 files changed, 828 insertions(+), 69 deletions(-)
 create mode 100644 antis-ncc-admin/src/views/LqLaundryFlow/cancel-dialog.vue
 create mode 100644 antis-ncc-admin/src/views/lqKdKdjlb/hedge-dialog.vue

diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development
index 6462393..198955a 100644
--- a/antis-ncc-admin/.env.development
+++ b/antis-ncc-admin/.env.development
@@ -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'
diff --git a/antis-ncc-admin/src/views/LqLaundryFlow/cancel-dialog.vue b/antis-ncc-admin/src/views/LqLaundryFlow/cancel-dialog.vue
new file mode 100644
index 0000000..4e898c2
--- /dev/null
+++ b/antis-ncc-admin/src/views/LqLaundryFlow/cancel-dialog.vue
@@ -0,0 +1,90 @@
+<template>
+	<el-dialog title="作废记录" :visible.sync="visible" width="500px" :close-on-click-modal="false">
+		<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+			<el-form-item label="作废原因" prop="remark">
+				<el-input v-model="form.remark" type="textarea" :rows="4" placeholder="请输入作废原因" maxlength="500" show-word-limit />
+			</el-form-item>
+		</el-form>
+		<div slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="danger" @click="submit" :loading="loading">确定作废</el-button>
+		</div>
+	</el-dialog>
+</template>
+
+<script>
+import request from '@/utils/request'
+
+export default {
+	name: 'CancelDialog',
+	data() {
+		return {
+			visible: false,
+			loading: false,
+			form: {
+				id: '',
+				remark: ''
+			},
+			rules: {
+				remark: [{ required: true, message: '请输入作废原因', trigger: 'blur' }]
+			}
+		}
+	},
+	methods: {
+		// 初始化
+		init(row) {
+			this.visible = true
+			this.form = {
+				id: row.id,
+				remark: ''
+			}
+			this.$nextTick(() => {
+				if (this.$refs.form) {
+					this.$refs.form.clearValidate()
+				}
+			})
+		},
+		// 提交
+		submit() {
+			this.$refs.form.validate(valid => {
+				if (!valid) return
+
+				this.loading = true
+				request({
+					url: '/api/Extend/LqLaundryFlow/Cancel',
+					method: 'POST',
+					data: {
+						id: this.form.id,
+						remark: this.form.remark
+					}
+				}).then(res => {
+					this.loading = false
+					if (res.code == 200) {
+						this.$message.success(res.msg || '作废成功')
+						this.visible = false
+						this.$emit('refresh')
+					} else {
+						this.$message.error(res.msg || '作废失败')
+					}
+				}).catch(() => {
+					this.loading = false
+				})
+			})
+		}
+	},
+	watch: {
+		visible(val) {
+			if (!val) {
+				this.$refs.form && this.$refs.form.resetFields()
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+	text-align: right;
+}
+</style>
+
diff --git a/antis-ncc-admin/src/views/LqLaundryFlow/index.vue b/antis-ncc-admin/src/views/LqLaundryFlow/index.vue
index 24e15ee..befeeb8 100644
--- a/antis-ncc-admin/src/views/LqLaundryFlow/index.vue
+++ b/antis-ncc-admin/src/views/LqLaundryFlow/index.vue
@@ -32,7 +32,7 @@
 					<el-col :span="6">
 						<el-form-item label="清洗商">
 							<el-select v-model="query.laundrySupplierId" placeholder="请选择清洗商" clearable filterable>
-								<el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName" :value="item.id" />
+								<el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName+'('+item.productType+')'" :value="item.id" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -69,6 +69,10 @@
 						<el-button type="primary" icon="el-icon-plus" @click="addSend()">创建送出记录</el-button>
 						<el-button type="success" icon="el-icon-refresh" @click="addReturn()">创建送回记录</el-button>
 						<el-button type="warning" icon="el-icon-warning" @click="viewDifference()">查看差异记录</el-button>
+						<span class="total-price-sum">
+							<i class="el-icon-money"></i>
+							总费用合计：<strong>{{ totalPriceSum }}</strong>
+						</span>
 					</div>
 					<div class="NCC-common-head-right">
 						<el-tooltip effect="dark" content="刷新" placement="top">
@@ -96,7 +100,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="门店名称" align="center">
+					<el-table-column label="门店名称" align="center" width="180">
 						<template slot-scope="scope">
 							<div class="store-info">
 								<i class="el-icon-office-building store-icon"></i>
@@ -104,7 +108,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="产品类型" align="center">
+					<el-table-column label="产品类型" align="center" width="100">
 						<template slot-scope="scope">
 							<div class="product-type-info">
 								<i class="el-icon-goods product-type-icon"></i>
@@ -138,10 +142,11 @@
 					</el-table-column>
 					<el-table-column label="总费用" align="center" width="120">
 						<template slot-scope="scope">
-							<div class="total-price-info">
+							<div class="total-price-info" v-if="scope.row.flowType === 0">
 								<i class="el-icon-money total-price-icon"></i>
 								<span>{{ scope.row.totalPrice || 0 }}</span>
 							</div>
+							<span v-else>无</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="备注" align="center" min-width="150">
@@ -188,7 +193,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作" width="150" align="left" fixed="right">
+					<el-table-column label="操作" width="200" align="left" fixed="right">
 						<template slot-scope="scope">
 							<div class="action-buttons">
 								<el-button type="text" icon="el-icon-view" @click="viewDetail(scope.row)" class="view-btn">
@@ -197,6 +202,9 @@
 								<el-button type="text" icon="el-icon-edit" @click="editRecord(scope.row)" class="edit-btn">
 									编辑
 								</el-button>
+								<el-button type="text" icon="el-icon-close" @click="cancelRecord(scope.row)" class="cancel-btn">
+									作废
+								</el-button>
 							</div>
 						</template>
 					</el-table-column>
@@ -215,6 +223,8 @@
 		<DifferenceDialog v-if="differenceDialogVisible" ref="DifferenceDialog" />
 		<!-- 编辑弹窗 -->
 		<EditDialog v-if="editDialogVisible" ref="EditDialog" @refresh="refresh" />
+		<!-- 作废弹窗 -->
+		<CancelDialog v-if="cancelDialogVisible" ref="CancelDialog" @refresh="refresh" />
 	</div>
 </template>
 
@@ -226,9 +236,10 @@ import ReturnDialog from './return-dialog.vue'
 import DetailDialog from './detail-dialog.vue'
 import DifferenceDialog from './difference-dialog.vue'
 import EditDialog from './edit-dialog.vue'
+import CancelDialog from './cancel-dialog.vue'
 
 export default {
-	components: { SendDialog, ReturnDialog, DetailDialog, DifferenceDialog, EditDialog },
+	components: { SendDialog, ReturnDialog, DetailDialog, DifferenceDialog, EditDialog, CancelDialog },
 	data() {
 		return {
 			list: [],
@@ -252,7 +263,20 @@ export default {
 			returnDialogVisible: false,
 			detailDialogVisible: false,
 			differenceDialogVisible: false,
-			editDialogVisible: false
+			editDialogVisible: false,
+			cancelDialogVisible: false
+		}
+	},
+	computed: {
+		// 计算总费用合计（只计算送出类型的记录）
+		totalPriceSum() {
+			return this.list
+				.filter(item => item.flowType === 0) // 只计算送出类型
+				.reduce((sum, item) => {
+					const price = parseFloat(item.totalPrice) || 0
+					return sum + price
+				}, 0)
+				.toFixed(2)
 		}
 	},
 	created() {
@@ -370,11 +394,19 @@ export default {
 				this.$refs.EditDialog.init(row)
 			})
 		},
+		// 作废记录
+		cancelRecord(row) {
+			this.cancelDialogVisible = true
+			this.$nextTick(() => {
+				this.$refs.CancelDialog.init(row)
+			})
+		},
 		// 刷新
 		refresh() {
 			this.sendDialogVisible = false
 			this.returnDialogVisible = false
 			this.editDialogVisible = false
+			this.cancelDialogVisible = false
 			this.initData()
 		},
 		// 格式化日期时间
@@ -469,6 +501,30 @@ export default {
 	font-size: 16px;
 }
 
+// 总费用合计样式
+.total-price-sum {
+	margin-left: 20px;
+	padding: 8px 16px;
+	background-color: #f0f9ff;
+	border: 1px solid #409EFF;
+	border-radius: 4px;
+	color: #409EFF;
+	font-size: 14px;
+	display: inline-flex;
+	align-items: center;
+	gap: 6px;
+
+	i {
+		font-size: 16px;
+	}
+
+	strong {
+		color: #F56C6C;
+		font-size: 16px;
+		font-weight: 600;
+	}
+}
+
 // 操作按钮样式
 .action-buttons {
 	display: flex;
@@ -484,6 +540,22 @@ export default {
 	}
 }
 
+.edit-btn {
+	color: #409EFF;
+
+	&:hover {
+		color: #66b1ff;
+	}
+}
+
+.cancel-btn {
+	color: #F56C6C;
+
+	&:hover {
+		color: #f78989;
+	}
+}
+
 // 表格行悬停效果
 ::v-deep .el-table__row:hover {
 	background-color: #f5f7fa;
diff --git a/antis-ncc-admin/src/views/lqKdKdjlb/hedge-dialog.vue b/antis-ncc-admin/src/views/lqKdKdjlb/hedge-dialog.vue
new file mode 100644
index 0000000..b6a4fe8
--- /dev/null
+++ b/antis-ncc-admin/src/views/lqKdKdjlb/hedge-dialog.vue
@@ -0,0 +1,624 @@
+<template>
+  <el-dialog
+    title="对冲开单"
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    class="NCC-dialog NCC-dialog_center"
+    lock-scroll
+    width="1400px"
+    @close="handleClose"
+  >
+    <div v-loading="loading">
+      <el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right">
+        <!-- 基本信息 -->
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="单据门店">
+              <el-input v-model="dataForm.djmdName" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开单会员">
+              <el-input v-model="dataForm.kdhyc" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开单日期">
+              <el-date-picker
+                v-model="dataForm.kdrq"
+                type="date"
+                format="yyyy-MM-dd"
+                value-format="timestamp"
+                placeholder="请选择开单日期"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 费用信息 -->
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="整单业绩">
+              <el-input v-model="dataForm.zdyj" disabled>
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="实付业绩">
+              <el-input v-model="dataForm.sfyj" disabled>
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 品项明细 -->
+        <el-form-item label="品项明细">
+          <el-table :data="dataForm.lqKdPxmxList" border size="small" style="width: 100%">
+            <el-table-column prop="pxmc" label="品项名称" align="left">
+              <template slot-scope="scope">
+                <span>{{ scope.row.pxmc || '无' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="pxjg" label="单价"  align="right">
+              <template slot-scope="scope">
+                <el-input-number
+                  v-model="scope.row.pxjg"
+                  :precision="2"
+                  :step="0.01"
+                  :min="-999999"
+                  :max="999999"
+                  size="small"
+                  style="width: 100%"
+                  @change="calculatePxTotal(scope.$index)"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="projectNumber" label="次数"  align="right">
+              <template slot-scope="scope">
+                <el-input-number
+                  v-model="scope.row.projectNumber"
+                  :precision="2"
+                  :step="0.01"
+                  :min="-999999"
+                  :max="999999"
+                  size="small"
+                  style="width: 100%"
+                  @change="calculatePxTotal(scope.$index)"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="totalPrice" label="总价"  align="right">
+              <template slot-scope="scope">
+                <span>{{ formatMoney(scope.row.totalPrice) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="sourceType" label="来源类型"  align="center">
+              <template slot-scope="scope">
+                <el-tag size="small">{{ scope.row.sourceType || '无' }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100" align="center" fixed="right">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  icon="el-icon-delete"
+                  @click="deletePxRow(scope.$index)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+
+        <!-- 健康师和科技部老师业绩 -->
+        <el-form-item
+          v-for="(px, pxIndex) in dataForm.lqKdPxmxList"
+          :key="pxIndex"
+          :label="`品项${pxIndex + 1} - ${px.pxmc || '无'}`"
+        >
+          <el-card shadow="never" style="margin-bottom: 20px">
+            <!-- 健康师业绩 -->
+            <div style="margin-bottom: 20px">
+              <div style="margin-bottom: 10px; font-weight: 600; color: #409EFF">
+                <i class="el-icon-user"></i> 健康师业绩
+              </div>
+              <el-table
+                :data="px.lqKdJksyjList"
+                border
+                size="mini"
+                style="width: 100%"
+                v-if="px.lqKdJksyjList && px.lqKdJksyjList.length > 0"
+              >
+                <el-table-column prop="jksxm" label="健康师"  align="left">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.jksxm || '无' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="jksyj" label="业绩" align="right">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      v-model="scope.row.jksyj"
+                      :precision="2"
+                      :step="0.01"
+                      :min="-999999"
+                      :max="999999"
+                      size="mini"
+                      style="width: 100%"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="100" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="mini"
+                      icon="el-icon-delete"
+                      @click="deleteJks(pxIndex, scope.$index)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div v-else style="padding: 10px; color: #909399; text-align: center">
+                暂无健康师
+              </div>
+            </div>
+
+            <!-- 科技部老师业绩 -->
+            <div v-if="px.lqKdKjbsyjList && px.lqKdKjbsyjList.length > 0">
+              <div style="margin-bottom: 10px; font-weight: 600; color: #67C23A">
+                <i class="el-icon-user-solid"></i> 科技部老师业绩
+              </div>
+              <el-table
+                :data="px.lqKdKjbsyjList"
+                border
+                size="mini"
+                style="width: 100%"
+              >
+                <el-table-column prop="kjblsxm" label="科技部老师"  align="left">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.kjblsxm || '无' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="kjblsyj" label="业绩"  align="right">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      v-model="scope.row.kjblsyj"
+                      :precision="2"
+                      :step="0.01"
+                      :min="-999999"
+                      :max="999999"
+                      size="mini"
+                      style="width: 100%"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="100" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="mini"
+                      icon="el-icon-delete"
+                      @click="deleteKjb(pxIndex, scope.$index)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" :loading="submitLoading" @click="submitHedge">提交对冲</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import request from '@/utils/request'
+import { previewDataInterface } from '@/api/systemData/dataInterface'
+
+export default {
+  name: 'HedgeDialog',
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      submitLoading: false,
+      billingId: null,
+      dataForm: {
+        id: '',
+        djmd: '',
+        djmdName: '',
+        kdhy: '',
+        kdhyc: '',
+        kdhysjh: '',
+        kdrq: '',
+        gjlx: '',
+        jsj: '',
+        hgjg: '',
+        fkyy: '',
+        zdyj: '',
+        sfyj: '',
+        jj: '',
+        bz: '',
+        activityId: '',
+        appointmentId: '',
+        lqKdPxmxList: []
+      },
+      djmdOptions: []
+    }
+  },
+  created() {
+    this.loadOptions()
+  },
+  methods: {
+    // 初始化弹窗
+    init(billingId) {
+      this.billingId = billingId
+      this.visible = true
+      this.$nextTick(() => {
+        if (this.billingId) {
+          this.getBillingDetail(this.billingId)
+        } else {
+          // 新建对冲时，开单日期默认取当前时间（时间戳，配合 value-format="timestamp"）
+          this.dataForm.kdrq = new Date().getTime()
+        }
+      })
+    },
+    // 获取开单详情
+    async getBillingDetail(id) {
+      this.loading = true
+      try {
+        const res = await request({
+          url: `/api/Extend/LqKdKdjlb/${id}`,
+          method: 'GET'
+        })
+        if (res.code === 200) {
+          // 深拷贝数据，避免修改原数据
+          const billingData = JSON.parse(JSON.stringify(res.data))
+          
+          // 处理品项明细数据
+          if (billingData.lqKdPxmxList && billingData.lqKdPxmxList.length > 0) {
+            billingData.lqKdPxmxList = billingData.lqKdPxmxList.map(px => {
+              // 保存原始项目次数
+              const originalProjectNumber = parseFloat(px.projectNumber) || 0
+              
+              // 确保所有数值字段都存在，并保留所有原始字段
+              const pxItem = {
+                ...px,
+                pxjg: parseFloat(px.pxjg) || 0,
+                projectNumber: originalProjectNumber,
+                originalProjectNumber: originalProjectNumber, // 保存原始次数
+                totalPrice: (parseFloat(px.pxjg) || 0) * originalProjectNumber,
+                // 保留品项的关键字段
+                BillingItemId: px.BillingItemId || px.billingItemId || px.px,
+                memberId: px.memberId || billingData.kdhy,
+                sourceType: px.sourceType || '购买',
+                // 处理健康师业绩
+                lqKdJksyjList: (px.lqKdJksyjList || []).map(jks => {
+                  const originalJksyj = parseFloat(jks.jksyj) || 0
+                  
+                  return {
+                    ...jks,
+                    jksyj: originalJksyj,
+                    originalJksyj: originalJksyj // 保存原始业绩
+                  }
+                }),
+                // 处理科技部老师业绩
+                lqKdKjbsyjList: (px.lqKdKjbsyjList || []).map(kjb => {
+                  const originalKjblsyj = parseFloat(kjb.kjblsyj) || 0
+                  
+                  return {
+                    ...kjb,
+                    kjblsyj: originalKjblsyj,
+                    originalKjblsyj: originalKjblsyj // 保存原始业绩
+                  }
+                })
+              }
+              return pxItem
+            })
+          }
+
+          // 处理开单日期
+          billingData.kdrq = new Date().getTime()
+          
+          // 获取门店名称
+          const djmdName = this.getStoreName(billingData.djmd)
+          
+          this.dataForm = {
+            id: '',
+            djmd: billingData.djmd || '',
+            djmdName: djmdName || '',
+            kdhy: billingData.kdhy || '',
+            kdhyc: billingData.kdhyc || '',
+            kdhysjh: billingData.kdhysjh || '',
+            kdrq: billingData.kdrq,
+            gjlx: billingData.gjlx || '',
+            jsj: billingData.jsj || '',
+            hgjg: billingData.hgjg || '',
+            fkyy: billingData.fkyy || '',
+            zdyj: '0.00',
+            sfyj: '0.00',
+            jj: billingData.jj || '',
+            bz: billingData.bz || '',
+            activityId: billingData.activityId || '',
+            appointmentId: billingData.appointmentId || '',
+            lqKdPxmxList: billingData.lqKdPxmxList || []
+          }
+
+          // 计算总金额
+          this.calculateTotalAmounts()
+        } else {
+          this.$message.error(res.msg || '获取开单详情失败')
+        }
+      } catch (error) {
+        console.error('获取开单详情失败:', error)
+        this.$message.error('获取开单详情失败')
+      } finally {
+        this.loading = false
+      }
+    },
+    // 加载选项数据
+    loadOptions() {
+      previewDataInterface('730960205902251269').then(res => {
+        this.djmdOptions = res.data || []
+      })
+    },
+    // 获取门店名称
+    getStoreName(storeId) {
+      const store = this.djmdOptions.find(item => item.id === storeId)
+      return store ? store.fullName : ''
+    },
+    // 计算品项总价
+    calculatePxTotal(pxIndex) {
+      const px = this.dataForm.lqKdPxmxList[pxIndex]
+      if (px) {
+        const newProjectNumber = parseFloat(px.projectNumber) || 0
+        const originalProjectNumber = parseFloat(px.originalProjectNumber) || 1 // 避免除0
+        
+        // 计算比例
+        const ratio = originalProjectNumber !== 0 ? newProjectNumber / originalProjectNumber : 0
+        
+        px.totalPrice = (parseFloat(px.pxjg) || 0) * newProjectNumber
+        
+        // 按比例重新计算健康师的业绩
+        if (px.lqKdJksyjList && px.lqKdJksyjList.length > 0) {
+          px.lqKdJksyjList.forEach(jks => {
+            // 按比例计算
+            if (jks.originalJksyj !== undefined) {
+              jks.jksyj = parseFloat((jks.originalJksyj * ratio).toFixed(2))
+            }
+          })
+        }
+        
+        // 按比例重新计算科技部老师的业绩
+        if (px.lqKdKjbsyjList && px.lqKdKjbsyjList.length > 0) {
+          px.lqKdKjbsyjList.forEach(kjb => {
+            // 按比例计算
+            if (kjb.originalKjblsyj !== undefined) {
+              kjb.kjblsyj = parseFloat((kjb.originalKjblsyj * ratio).toFixed(2))
+            }
+          })
+        }
+        
+        this.calculateTotalAmounts()
+      }
+    },
+    // 计算总金额
+    calculateTotalAmounts() {
+      let totalZdyj = 0
+      let totalSfyj = 0
+
+      this.dataForm.lqKdPxmxList.forEach(px => {
+        if (px.pxjg && px.projectNumber) {
+          totalZdyj += parseFloat(px.pxjg) * parseFloat(px.projectNumber)
+        }
+        
+        // 计算实付业绩：健康师业绩 + 科技部老师业绩
+        if (px.lqKdJksyjList && px.lqKdJksyjList.length > 0) {
+          px.lqKdJksyjList.forEach(jks => {
+            totalSfyj += parseFloat(jks.jksyj) || 0
+          })
+        }
+        if (px.lqKdKjbsyjList && px.lqKdKjbsyjList.length > 0) {
+          px.lqKdKjbsyjList.forEach(kjb => {
+            totalSfyj += parseFloat(kjb.kjblsyj) || 0
+          })
+        }
+      })
+
+      this.dataForm.zdyj = totalZdyj.toFixed(2)
+      this.dataForm.sfyj = totalSfyj.toFixed(2)
+    },
+    // 删除品项
+    deletePxRow(pxIndex) {
+      if (this.dataForm.lqKdPxmxList.length <= 1) {
+        this.$message.warning('至少需要保留一个品项')
+        return
+      }
+      this.$confirm('确定要删除该品项吗？', '提示', {
+        type: 'warning'
+      })
+        .then(() => {
+          this.dataForm.lqKdPxmxList.splice(pxIndex, 1)
+          this.calculateTotalAmounts()
+        })
+        .catch(() => {})
+    },
+    // 删除健康师
+    deleteJks(pxIndex, jksIndex) {
+      const px = this.dataForm.lqKdPxmxList[pxIndex]
+      if (px && px.lqKdJksyjList) {
+        px.lqKdJksyjList.splice(jksIndex, 1)
+        this.calculateTotalAmounts()
+      }
+    },
+    // 删除科技部老师
+    deleteKjb(pxIndex, kjbIndex) {
+      const px = this.dataForm.lqKdPxmxList[pxIndex]
+      if (px && px.lqKdKjbsyjList) {
+        px.lqKdKjbsyjList.splice(kjbIndex, 1)
+        this.calculateTotalAmounts()
+      }
+    },
+    // 格式化金额
+    formatMoney(amount) {
+      if (!amount && amount !== 0) return '0.00'
+      return Number(amount).toFixed(2)
+    },
+    // 提交对冲
+    async submitHedge() {
+      // 验证表单
+      if (!this.dataForm.lqKdPxmxList || this.dataForm.lqKdPxmxList.length === 0) {
+        this.$message.warning('至少需要保留一个品项')
+        return
+      }
+
+      if (!this.dataForm.kdrq) {
+        this.$message.warning('请选择开单日期')
+        return
+      }
+
+      // 过滤掉空的品项
+      const filteredPxList = this.dataForm.lqKdPxmxList
+        .filter(px => px.px && px.pxmc)
+        .map(px => ({
+          billingItemId: px.BillingItemId || px.billingItemId || px.px,
+          px: px.px,
+          memberId: px.memberId || this.dataForm.kdhy,
+          pxmc: px.pxmc,
+          pxjg: parseFloat(px.pxjg) || 0,
+          projectNumber: parseFloat(px.projectNumber) || 0,
+          sourceType: px.sourceType || '购买',
+          totalPrice: (parseFloat(px.pxjg) || 0) * (parseFloat(px.projectNumber) || 0),
+          actualPrice: (parseFloat(px.pxjg) || 0) * (parseFloat(px.projectNumber) || 0),
+          lqKdJksyjList: (px.lqKdJksyjList || []).map(jks => ({
+            jks: jks.jks,
+            jksxm: jks.jksxm,
+            jkszh: jks.jkszh || jks.jks,
+            jksyj: parseFloat(jks.jksyj) || 0,
+            jsjId: jks.jsjId || '',
+            kdpxid: px.BillingItemId || px.billingItemId || px.px
+          })),
+          lqKdKjbsyjList: (px.lqKdKjbsyjList || []).map(kjb => ({
+            kjbls: kjb.kjbls,
+            kjblsxm: kjb.kjblsxm,
+            kjblszh: kjb.kjblszh || kjb.kjbls,
+            kjblsyj: parseFloat(kjb.kjblsyj) || 0,
+            kdpxid: px.BillingItemId || px.billingItemId || px.px
+          }))
+        }))
+
+      // 处理开单日期
+      let kdrqValue = new Date().toISOString()
+      if (this.dataForm.kdrq) {
+        const date = new Date(this.dataForm.kdrq)
+        kdrqValue = date.toISOString()
+      }
+
+      const formData = {
+        activityId: this.dataForm.activityId || '',
+        djmd: this.dataForm.djmd,
+        jsj: this.dataForm.jsj,
+        kdrq: kdrqValue,
+        gjlx: this.dataForm.gjlx,
+        kdhysjh: this.dataForm.kdhysjh,
+        kdhyc: this.dataForm.kdhyc,
+        kdhy: this.dataForm.kdhy,
+        zdyj: this.dataForm.zdyj,
+        sfyj: this.dataForm.sfyj,
+        qk: 0, // 对冲开单欠款为0
+        fkfs: '对冲', // 付款方式为对冲
+        hgjg: this.dataForm.hgjg || '',
+        fkyy: this.dataForm.fkyy || '',
+        sfskdd: '否', // 对冲开单不是首开订单
+        jj: this.dataForm.jj || '',
+        bz: this.dataForm.bz || '',
+        lqKdPxmxList: filteredPxList,
+        scwj: [], // 对冲开单不需要收据文件
+        f_FileUrl: '[]', // 对冲开单不需要方案其他文件
+        lqKdKdjlbDeductList: [], // 对冲开单不需要储扣明细
+        hyqz: [] // 对冲开单不需要会员签字
+      }
+      
+      // 如果有预约ID，则添加
+      if (this.dataForm.appointmentId) {
+        formData.appointmentId = this.dataForm.appointmentId
+      }
+
+      console.log('对冲数据:', formData)
+
+      this.submitLoading = true
+      try {
+        const result = await request({
+          url: '/api/Extend/LqKdKdjlb',
+          method: 'POST',
+          data: formData
+        })
+
+        if (result.code === 200) {
+          this.$message.success('对冲成功！')
+          this.handleClose()
+          this.$emit('refresh')
+        } else {
+          this.$message.error(result.msg || '对冲失败，请重试')
+        }
+      } catch (error) {
+        console.error('对冲失败:', error)
+        this.$message.error('网络错误，请稍后重试')
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    // 关闭弹窗
+    handleClose() {
+      this.visible = false
+      this.dataForm = {
+        id: '',
+        djmd: '',
+        djmdName: '',
+        kdhy: '',
+        kdhyc: '',
+        kdhysjh: '',
+        kdrq: '',
+        gjlx: '',
+        jsj: '',
+        hgjg: '',
+        fkyy: '',
+        zdyj: '',
+        sfyj: '',
+        jj: '',
+        bz: '',
+        activityId: '',
+        appointmentId: '',
+        lqKdPxmxList: []
+      }
+      this.billingId = null
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+  text-align: right;
+  padding: 20px 0;
+}
+
+.dialog-footer .el-button {
+  margin-left: 10px;
+}
+</style>
+
diff --git a/antis-ncc-admin/src/views/lqKdKdjlb/index.vue b/antis-ncc-admin/src/views/lqKdKdjlb/index.vue
index 19e387a..2cb5531 100644
--- a/antis-ncc-admin/src/views/lqKdKdjlb/index.vue
+++ b/antis-ncc-admin/src/views/lqKdKdjlb/index.vue
@@ -506,7 +506,7 @@
           </el-table-column>
 
           <!-- 操作 -->
-          <el-table-column label="操作" width="180" align="left" fixed="right">
+          <el-table-column label="操作" width="240" align="left" fixed="right">
             <template slot-scope="scope">
               <div class="action-buttons">
                 <el-button 
@@ -530,6 +530,7 @@
 								>
 									删除
 								</el-button>
+                <!-- <el-button v-if="scope.row.sfyj >= 0" type="text" @click="handleHedge(scope.row.id)">对冲</el-button> -->
               </div>
             </template>
           </el-table-column>
@@ -542,6 +543,7 @@
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
     <LqKdKdjlbDetail ref="detailDialog" />
     <MemberCreateDialog :visible.sync="memberCreateVisible" @success="handleMemberCreateSuccess" />
+    <HedgeDialog ref="hedgeDialog" @refresh="refresh" />
   </div>
 </template>
 <script>
@@ -551,10 +553,11 @@ import NCCForm from './Form'
 import ExportBox from './ExportBox'
 import LqKdKdjlbDetail from './detail'
 import MemberCreateDialog from './MemberCreateDialog'
+import HedgeDialog from './hedge-dialog'
 import { previewDataInterface } from '@/api/systemData/dataInterface'
 import { number } from 'echarts/lib/export'
 export default {
-  components: { NCCForm, ExportBox, MemberCreateDialog, LqKdKdjlbDetail },
+  components: { NCCForm, ExportBox, MemberCreateDialog, LqKdKdjlbDetail, HedgeDialog },
   data() {
     return {
       kdhyLoading: false,
@@ -885,7 +888,9 @@ export default {
     },
     refresh(isrRefresh) {
       this.formVisible = false
-      if (isrRefresh) this.initData()
+      if (isrRefresh) {
+        this.initData()
+      }
     },
     reset() {
       for (let key in this.query) {
@@ -934,6 +939,10 @@ export default {
     handleDjmdChange() {
       this.query.jksId = undefined; // 清空健康师选择
       this.getjksOptions();
+    },
+    // 处理对冲
+    handleHedge(billingId) {
+      this.$refs.hedgeDialog.init(billingId)
     }
   }
 }
diff --git a/antis-ncc-admin/src/views/lqKhxx/index.vue b/antis-ncc-admin/src/views/lqKhxx/index.vue
index 63e82a4..8b78ffc 100644
--- a/antis-ncc-admin/src/views/lqKhxx/index.vue
+++ b/antis-ncc-admin/src/views/lqKhxx/index.vue
@@ -3,7 +3,7 @@
 		<div class="NCC-common-layout-center">
 			<!-- 现代化筛选卡片 -->
 			<el-card class="search-card" :class="{ 'search-card-animated': searchCardMounted }" shadow="never">
-				<el-form @submit.native.prevent label-width="80px" size="small">
+				<el-form @submit.native.prevent  size="small">
 					<!-- 第一行：基础筛选 -->
 					<el-row :gutter="16" class="search-row search-row-1">
 						<el-col :span="5">
diff --git a/antis-ncc-admin/src/views/statisticsList/form2.vue b/antis-ncc-admin/src/views/statisticsList/form2.vue
index 658b869..ededac1 100644
--- a/antis-ncc-admin/src/views/statisticsList/form2.vue
+++ b/antis-ncc-admin/src/views/statisticsList/form2.vue
@@ -119,7 +119,7 @@
               {{ scope.row.createUserName || '无' }}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="操作" width="120" fixed="right">
+          <el-table-column label="操作" width="120" fixed="right">
             <template slot-scope="scope">
               <el-button
                 type="danger"
@@ -131,7 +131,7 @@
                 清空欠款
               </el-button>
             </template>
-          </el-table-column> -->
+          </el-table-column>
         </NCC-table>
 
         <!-- 分页组件 -->
diff --git a/antis-ncc-admin/src/views/wageManagement/assistants.vue b/antis-ncc-admin/src/views/wageManagement/assistants.vue
index 508077f..306bcd1 100644
--- a/antis-ncc-admin/src/views/wageManagement/assistants.vue
+++ b/antis-ncc-admin/src/views/wageManagement/assistants.vue
@@ -872,15 +872,11 @@ export default {
         const response = await importAssistantSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
diff --git a/antis-ncc-admin/src/views/wageManagement/business-unit-managers.vue b/antis-ncc-admin/src/views/wageManagement/business-unit-managers.vue
index b3e70ac..6f80408 100644
--- a/antis-ncc-admin/src/views/wageManagement/business-unit-managers.vue
+++ b/antis-ncc-admin/src/views/wageManagement/business-unit-managers.vue
@@ -780,15 +780,11 @@ export default {
         const response = await importBusinessUnitManagerSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
diff --git a/antis-ncc-admin/src/views/wageManagement/cienceTeacher.vue b/antis-ncc-admin/src/views/wageManagement/cienceTeacher.vue
index afd4574..9747b97 100644
--- a/antis-ncc-admin/src/views/wageManagement/cienceTeacher.vue
+++ b/antis-ncc-admin/src/views/wageManagement/cienceTeacher.vue
@@ -991,15 +991,11 @@ export default {
         const response = await importTechTeacherSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
diff --git a/antis-ncc-admin/src/views/wageManagement/director.vue b/antis-ncc-admin/src/views/wageManagement/director.vue
index 947cca6..e60d508 100644
--- a/antis-ncc-admin/src/views/wageManagement/director.vue
+++ b/antis-ncc-admin/src/views/wageManagement/director.vue
@@ -837,15 +837,11 @@ export default {
         const response = await importDirectorSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
diff --git a/antis-ncc-admin/src/views/wageManagement/healthCoach.vue b/antis-ncc-admin/src/views/wageManagement/healthCoach.vue
index 832d286..f6b2da7 100644
--- a/antis-ncc-admin/src/views/wageManagement/healthCoach.vue
+++ b/antis-ncc-admin/src/views/wageManagement/healthCoach.vue
@@ -1186,15 +1186,11 @@ export default {
         const response = await importHealthCoachSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
diff --git a/antis-ncc-admin/src/views/wageManagement/major-project-directors.vue b/antis-ncc-admin/src/views/wageManagement/major-project-directors.vue
index 56f6048..ca23e72 100644
--- a/antis-ncc-admin/src/views/wageManagement/major-project-directors.vue
+++ b/antis-ncc-admin/src/views/wageManagement/major-project-directors.vue
@@ -771,15 +771,11 @@ export default {
         const response = await importMajorProjectDirectorSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
diff --git a/antis-ncc-admin/src/views/wageManagement/major-project-teachers.vue b/antis-ncc-admin/src/views/wageManagement/major-project-teachers.vue
index e58a53d..3daf87e 100644
--- a/antis-ncc-admin/src/views/wageManagement/major-project-teachers.vue
+++ b/antis-ncc-admin/src/views/wageManagement/major-project-teachers.vue
@@ -814,15 +814,11 @@ export default {
         const response = await importMajorProjectTeacherSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
diff --git a/antis-ncc-admin/src/views/wageManagement/shop.vue b/antis-ncc-admin/src/views/wageManagement/shop.vue
index e1f235c..0578a39 100644
--- a/antis-ncc-admin/src/views/wageManagement/shop.vue
+++ b/antis-ncc-admin/src/views/wageManagement/shop.vue
@@ -1016,15 +1016,11 @@ export default {
         const response = await importStoreManagerSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
diff --git a/antis-ncc-admin/src/views/wageManagement/tech-general-managers.vue b/antis-ncc-admin/src/views/wageManagement/tech-general-managers.vue
index 5ba29c2..409b62a 100644
--- a/antis-ncc-admin/src/views/wageManagement/tech-general-managers.vue
+++ b/antis-ncc-admin/src/views/wageManagement/tech-general-managers.vue
@@ -800,15 +800,11 @@ export default {
         const response = await importTechGeneralManagerSalaryFromExcel(this.importFile)
         if (response.code === 200) {
           const result = response.data || response
-          let message = '导入成功'
-          if (result.successCount !== undefined) {
-            message = `导入成功：新增${result.insertCount || 0}条，更新${result.updateCount || 0}条，跳过${result.skippedCount || 0}条`
-          }
-          this.$message.success(message)
+          this.$message.success( result.message || '导入成功')
           this.handleImportDialogClose()
           this.getList()
         } else {
-          this.$message.error(response.msg || '导入失败')
+          this.$message.error(response.message || '导入失败')
         }
       } catch (error) {
         console.error('导入失败:', error)
--
libgit2 0.21.4