From f6742a38cd36f07efc574dc665476b897fe17c31 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 20 Mar 2024 11:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=94=9F=E6=88=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                 |  4 ++--
 src/views/basic/destiny/skProject.vue           |  1 +
 .../thirdSys/invOrder/thrInvOrderGenerate.vue   | 17 ++++++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.env.production b/.env.production
index b4b4d009..a5d9b315 100644
--- a/.env.production
+++ b/.env.production
@@ -65,12 +65,12 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 
 # 南靖
-# VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.73.128:9150/UDI_WMS_MC/'
 # 测试NIGINX
 # VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
 
-# VUE_APP_BASE_API = 'http://192.168.0.45:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/basic/destiny/skProject.vue b/src/views/basic/destiny/skProject.vue
index 8278ebfa..41dd72ab 100644
--- a/src/views/basic/destiny/skProject.vue
+++ b/src/views/basic/destiny/skProject.vue
@@ -32,6 +32,7 @@
         <el-table-column label="项目编码" prop="code" width="140"></el-table-column>
         <el-table-column label="项目名称" prop="name" width="160"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
+        <el-table-column label="价格" prop="price" width="160"></el-table-column>
         <el-table-column label="备注" prop="remark" width="180"></el-table-column>
         <!--        <el-table-column label="创建人" prop="createByName" width="140"></el-table-column>-->
         <el-table-column label="更新时间" prop="createTime" width="160"></el-table-column>
diff --git a/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue b/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
index 72039763..6833aa4a 100644
--- a/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
+++ b/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
@@ -58,7 +58,7 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row type="flex">
+    <el-row type="flex" v-if="curAction.corpType != 1">
       <el-col :span="11">
         <el-form-item
           prop="fromCorp"
@@ -89,6 +89,21 @@
       </el-col>
     </el-row>
 
+
+    <el-row type="flex" v-if="curAction.corpType == 1">
+      <el-col :span="11">
+        <el-form-item
+          prop="fromCorp"
+          label="患者信息:"
+        >
+          <el-input style="width: 90%" size="small" placeholder=""
+                    disabled
+                    v-model.trim="generateOrderDate.fromCorp"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
     <div style="text-align: center; margin-bottom: 10px;">
       <el-button type="primary" @click="generateOrder">提交</el-button>
       <el-button type="primary" @click="closeAddDialog">取消</el-button>