Merge branch 'DZBLFAPZEDIT' into test

# Conflicts:
#	vue.config.js

src/components/cdssManage/plan/AddPlan.vue

@@ -609,6 +609,10 @@ export default {
     },
     // 合并默认数据
     mergeDefaultPlans(data) {
+      if (!this.form.planDetailSub) {
+        this.form.planDetailSub = data;
+        return;
+      }
       data.forEach((item) => {
         const oneIndex = this.form.planDetailSub.findIndex(
           (ite) => ite.name === item.name

src/components/cdssManage/tcmdisease/tcmdisease.vue

@@ -32,7 +32,7 @@
       <el-table :data="list" border style="width: 100%">
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="80"></el-table-column>
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
-        <el-table-column :resizable="false" prop="hisName" label="中医疾病名称" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="hisName" label="医院中医疾病名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueCode" label="中医疾病代码" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueName" label="标准中医疾病名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">

src/components/cdssManage/tcmdrome/tcmdrome.vue

@@ -32,7 +32,7 @@
       <el-table :data="list" border style="width: 100%">
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="80"></el-table-column>
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
-        <el-table-column :resizable="false" prop="hisName" label="中医证候名称" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="hisName" label="医院中医证候名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueCode" label="中医证候代码" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueName" label="标准中医证候名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">

vue.config.js

@@ -1,5 +1,9 @@
 const path = require('path');
+<<<<<<< HEAD
 // const proxy_path = 'http://192.168.2.236:80';
+=======
+// const proxy_path = 'http://192.168.2.236:5050';
+>>>>>>> DZBLFAPZEDIT
 const proxy_path = 'http://192.168.2.241:88';
 // const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';