From c36ada6253862acaa44a1dc0eb5b9cbb28e68fd8 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期二, 21 一月 2025 11:08:41 +0800
Subject: [PATCH] 1
---
src/views/system/tijian/index.vue | 48 +++++++++++++++++++++++++++++++++---------------
.gitignore | 2 +-
2 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
index 78a752d..339e2a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
yarn-debug.log*
yarn-error.log*
**/*.log
-
+vue.config.js
tests/**/coverage/
tests/e2e/reports
selenium-debug.log
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 8ae341d..bbea675 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -351,7 +351,7 @@
</el-table-column>
<el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
-
+
<el-table-column prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
@@ -421,16 +421,8 @@
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
- <el-table-column
- prop="proPrice"
- label="鍘熶环"
- width="56px"
- ></el-table-column>
- <el-table-column
- prop="proName"
- label="鏄庣粏椤圭洰"
- width="260px"
- >
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px"></el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
@@ -588,8 +580,9 @@
<el-table-column label="鎶樻墸">
<template slot-scope="scope">
<!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
- <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)" @change="handleManualChange(scope.row)"
- placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1" :step="0.1" :max="10" :min="0">
+ <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)"
+ @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1"
+ :step="0.1" :max="10" :min="0">
</el-input-number>
</template>
</el-table-column>
@@ -2328,12 +2321,37 @@
dwId: this.form.firmId || "",
};
if (this.form.tjType == 1) {
- if (!this.form.firmId) {
+ if (!this.form.firmId && !this.form.firmName) {
this.$message({
type: "warning",
message: "璇峰厛缁存姢鍗曚綅锛�",
});
- } else {
+ } else if (!this.form.firmId && this.form.firmName) {
+ this.taocan = true;
+ this.loading = true;
+ deptTreeSelect(cusSex).then((response) => {
+ this.newpacName = response.rows;
+ try {
+ if (this.tableData1.length >= 1) {
+ this.newpacName.forEach((item3) => {
+ this.tableData1.forEach((item4) => {
+ item4.list.forEach((item6) => {
+ if (item6.pacName === item3.pacName) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(item3, true);
+ });
+ throw Error();
+ }
+ });
+ });
+ });
+ }
+ } catch (error) { }
+ this.loading = false;
+ });
+ }
+
+ else {
this.taocan = true;
this.loading = true;
tuantiSelect(param).then((res) => {
--
Gitblit v1.8.0