From 0f2eb65ab16ea098e8be09ea5dfcb081e56313ad Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期五, 21 二月 2025 11:08:46 +0800
Subject: [PATCH] 1
---
.env.staging | 8 +
src/views/hosp/order/index.vue | 178 ++++++--------------------------------------
src/views/login.vue | 21 ++++-
3 files changed, 48 insertions(+), 159 deletions(-)
diff --git a/.env.staging b/.env.staging
index 4668c84..2fee84e 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,12 @@
# 椤甸潰鏍囬
VUE_APP_TITLE = 鏅烘収鍋ュ悍浣撴绠＄悊绯荤粺
-
-NODE_ENV = production
-
# 娴嬭瘯鐜閰嶇疆
ENV = 'staging'
+NODE_ENV = production
+
+
+
# 鑻ヤ緷绠＄悊绯荤粺/娴嬭瘯鐜
VUE_APP_BASE_API = '/stage-api'
+VUE_APP_ENV ='staging'
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 2056b76..7c847ec 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -804,13 +804,20 @@
<el-table
:data="DataList3"
border
- style="width: 100%"
+ style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ :span-method="objectspanmethod">
+ <el-table-column
+ prop="propinName"
+ label="妫�鏌ラ」鐩�"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="200px">
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -953,15 +960,7 @@
<div class="tab8">
<el-row :gutter="20" style="width: 100%">
<el-col :span="22">
- <!-- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 椤圭洰鍒楄〃
- </div> -->
+
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterage"
@@ -984,29 +983,6 @@
</el-tree>
</div>
</el-col>
- <!-- <el-col :span="11">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packagedataList"
- node-key="proId"
- :props="defaultpackProps"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </el-col> -->
- <!-- <el-col :span="11"> </el-col> -->
</el-row>
</div>
</el-tab-pane>
@@ -1014,15 +990,6 @@
<div class="tab8">
<el-row type="flex" class="row-bg" justify="space-around">
<el-col :span="22">
- <!-- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 椤圭洰鍒楄〃
- </div> -->
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterText"
@@ -1045,106 +1012,6 @@
</el-tree>
</div>
</el-col>
- <!-- <el-col :span="11">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <div class="outside1">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="TreedataList"
- node-key="proId"
- :props="defaultProps"
- :filter-node-method="filterNode"
- show-checkbox
- @check-change="handleCurrentChecked1"
- :default-checked-keys="checkedListkey"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </div>
- </el-col> -->
- <!-- <el-col :span="11">
- <div class="grid-content bg-purple">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 宸查�夐」鐩垪琛�
- </div>
-
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
- </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>
-
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
- </template>
- </el-table-column>
- </el-table> -->
- <!-- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
- <el-table-column
- prop="proName"
- label="椤圭洰"
- width="180"
- >
- </el-table-column>
- <el-table-column prop="ordPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse> -->
- <!-- </div>
- </el-col> -->
</el-row>
</div>
</el-tab-pane>
@@ -1158,13 +1025,20 @@
<el-table
:data="DataList3"
border
- style="width: 100%"
+ style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ :span-method="objectspanmethod">
+ <el-table-column
+ prop="propinName"
+ label="妫�鏌ラ」鐩�"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="200px">
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -2686,7 +2560,7 @@
renderContent(h, { node, data, store }) {
return (
<span class="custom-tree-node">
- 聽 <span>{node.label}</span>
+ <span>{node.label}</span>
<span>({data.proPrice}鍏�)</span>
</span>
);
diff --git a/src/views/login.vue b/src/views/login.vue
index a87bc0f..3a6ee04 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -174,14 +174,27 @@
this.loginForm.hospId = "pbkwyy";
break;
+ case '8095':
+ this.loginForm.hospId = "jdczgzyy";
+ break;
}
Cookies.set("hospId", this.loginForm.hospId);
- }
+ } else if (env === 'staging') {
+ // 鑾峰彇褰撳墠URL鐨勭鍙ｅ彿
+ const port = window.location.port;
+
+ switch (port) {
+ case '9013':
+ this.loginForm.hospId = "pbkwyy";
+ break;
-
+ case '9014':
+ this.loginForm.hospId = "jdczgzyy";
+ break;
+ }
+ Cookies.set("hospId", this.loginForm.hospId);
+ }
// 瀛樺偍hospId鍒癈ookie
-
-
// 鏇存柊URL鍙傛暟
if (this.loginForm.hospId) {
const query = { ...this.$route.query, hospId: this.loginForm.hospId };
--
Gitblit v1.8.0