From 55f244bc13574390e9ac2822a4f1e959662a62b1 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期六, 04 一月 2025 19:00:24 +0800
Subject: [PATCH] 1

---
 src/views/system/tijian/index.vue         |   13 ++++++++++++-
 src/views/reservation/resercopy/index.vue |    7 +++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index f36df99..8d478e9 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -130,6 +130,13 @@
           width="200"
         >
         </el-table-column>
+        <el-table-column
+          label="鍗曚綅閮ㄩ棬"
+          align="center"
+          prop="department"
+          width="200"
+        >
+        </el-table-column>
         <!-- <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" /> -->
         <el-table-column label="濮撳悕" align="center" prop="name" width="75" />
         <el-table-column label="鎬у埆" align="center" prop="sex" width="75">
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index ec6cc61..bf3c9af 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1702,6 +1702,13 @@
             }
             if (this.form.reservationId != null) {
               if (this.form.groupingId) {
+                this.form.firmName = this.form.compName
+                this.form.tjType = "1"
+                this.CompanyList.forEach((item) => {
+                  if (item.cnName == this.form.firmName) {
+                    this.form.firmId = item.drugManufacturerId;
+                  }
+                });
                 _this.tcShow = true;
 
                 getTransitionList1(this.form.cusIdcard).then((res) => {
@@ -2789,7 +2796,7 @@
           }
         });
       }
-       else {
+      else {
         getaddtTransition(data).then((response) => {
           if (response.code == 200) {
             let cusId = this.form.cusIdcard;
@@ -3152,6 +3159,8 @@
                 userId,
                 tjType,
                 tjCategory: this.tjCategory,
+                firmId: this.form.firmId,
+                firmName: this.form.firmName
               };
 
               this.listgetOrder(data);
@@ -3163,6 +3172,8 @@
                 userId,
                 tjType,
                 tjCategory: this.tjCategory,
+                firmId: this.form.firmId,
+                firmName: this.form.firmName
               };
               this.listgetOrder(data);
             } else {

--
Gitblit v1.8.0