From e19defd15577e70c8e55593d7fe44bab1cbe1a66 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期二, 11 六月 2024 11:00:27 +0800
Subject: [PATCH] qxtj

---
 src/components/Pricedictionary/index.vue |  116 ++++
 src/components/dictionary/index.vue      |  108 ++++
 src/views/doctor/checkAll/index.vue      |   77 ++
 src/components/Prescription/index.vue    |  562 ++++++++++++++++++++++
 src/views/doctor/geriatric/index.vue     |  572 ++++++++++++++++++++++
 src/views/system/package/index.vue       |   32 
 6 files changed, 1,432 insertions(+), 35 deletions(-)

diff --git a/src/components/Prescription/index.vue b/src/components/Prescription/index.vue
new file mode 100644
index 0000000..3efa3b7
--- /dev/null
+++ b/src/components/Prescription/index.vue
@@ -0,0 +1,562 @@
+<template>
+  <div>
+    <el-drawer :title="title" :visible.sync="open" size="80%" append-to-body>
+      <div style="font-size: 14px">
+        <table
+          style="
+            width: 96%;
+            margin: 0px 10px;
+            border: 1px solid #dfe6ec;
+            border-collapse: collapse;
+          "
+          cellspacing="4"
+        >
+          <caption style="background-color: #f8f8f9; font-size: 18px">
+            {{
+              fList.cusName
+            }}鐨勪綋妫�璧勬枡
+          </caption>
+          <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
+            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              濮撳悕锛�
+            </td>
+            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              {{ fList.cusName }}
+            </td>
+            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              骞撮緞锛�
+            </td>
+            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              {{ fList.age }}宀�
+            </td>
+          </tr>
+          <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
+            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              浣撴鍗曞彿锛�
+            </td>
+            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              {{ fList.tjNumber }}
+            </td>
+            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              浣撴鏃堕棿锛�
+            </td>
+            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+              {{ fList.tjTime }}
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div style="padding: 10px 10px;width: 96%;">
+        <el-row :gutter="5">
+          <el-col :span="4" v-show="activities.length >=1">
+            <el-timeline style="padding: 0px 10px">
+              <el-timeline-item
+                v-for="(activity, index) in activities"
+                :key="index"
+              >
+                <el-card>
+                  <h4>{{ activity.timestamp }}</h4>
+                  <p @click="lookmingxi(activity)">{{ activity.content }}</p>
+                </el-card>
+              </el-timeline-item>
+            </el-timeline>
+          </el-col>
+          <el-col :span="20">
+            <el-tabs type="border-card">
+              <el-tab-pane label="瑗胯嵂澶勬柟">
+                <el-row :gutter="10" class="mb8" style="margin-left: 5px">
+                  <el-col :span="1.5" >
+                    <div style="display: flex">
+                      <div>鍙栬嵂鑽埧:</div>
+                      <div style="border-bottom: 1px solid black">
+                        闂ㄨ瘖瑗胯嵂鎴�
+                      </div>
+                    </div>
+                  </el-col>
+                  <el-col :span="1.5" style="margin-left: 10px">
+                    <el-button type="primary" @click="handledrug" size="mini"
+                    :disabled="time">鏂板鑽搧</el-button
+                    >
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="deledrug"
+                    :disabled="time" >鍒犻櫎鑽搧</el-button
+                    >
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="Resetdrug"
+                      >閲嶇疆</el-button
+                    >
+                  </el-col>
+                </el-row>
+                <el-table
+                  :data="dataList"
+                  ref="elTable"
+                  v-loading="loading"
+                  @selection-change="handledrugChange"
+                  border
+                  height="320px"
+                >
+                  <el-table-column type="selection" width="40" align="center" />
+                  <el-table-column
+                    label="搴忓彿"
+                    width="60"
+                    prop="id"
+                    align="center"
+                  />
+                  <el-table-column
+                    label="鑽搧鍚嶇О"
+                    align="center"
+                    prop="pacName"
+                  >
+                    <template #default="scope">
+                      <el-input
+                        v-if="scope.row.isEdit"
+                        v-model="scope.row.pacName"
+                        placeholder="璇疯緭鍏�"
+                        @focus="changeblur"
+                      ></el-input>
+                      <div v-else class="txt">{{ scope.row.pacName }}</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="瑙勬牸"
+                    align="center"
+                    prop="pacName"
+                    width="100px"
+                  />
+                  <el-table-column
+                    label="鍓傞噺"
+                    align="center"
+                    prop="detail"
+                    width="100px"
+                  />
+                  <el-table-column
+                    label="鍗曚綅"
+                    align="center"
+                    prop="pacRemark"
+                  />
+                  <el-table-column label="缁欒嵂鏂瑰紡" align="center" prop="price">
+                    <template #default="scope">
+                      <el-input
+                        v-if="scope.row.isEdit"
+                        v-model="scope.row.price"
+                        placeholder="璇疯緭鍏�"
+                        @focus="changefocus"
+                      ></el-input>
+                      <div v-else class="txt">{{ scope.row.price }}</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="缁欒嵂棰戠巼"
+                    align="center"
+                    prop="pacRemark"
+                  >
+                    <template #default="scope">
+                      <el-input
+                        v-if="scope.row.isEdit"
+                        v-model="scope.row.pacRemark"
+                        placeholder="璇疯緭鍏�"
+                        @focus="changefocus"
+                      ></el-input>
+                      <div v-else class="txt">{{ scope.row.pacRemark }}</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="澶╂暟"
+                    align="center"
+                    prop="pacRemark"
+                  />
+                  <el-table-column
+                    label="鏁伴噺"
+                    align="center"
+                    prop="pacRemark"
+                  />
+                  <el-table-column
+                    label="搴撳瓨"
+                    align="center"
+                    prop="pacRemark"
+                  />
+                  <el-table-column
+                    label="鍗曚綅"
+                    align="center"
+                    prop="pacRemark"
+                  />
+                  <el-table-column
+                    label="鍗曚环"
+                    align="center"
+                    prop="pacRemark"
+                  />
+                  <!-- <el-table-column label="鐨瘯" align="center" prop="pacRemark" />
+
+              <el-table-column
+                label="鐨瘯缁撴灉"
+                align="center"
+                prop="pacRemark"
+              />
+
+              <el-table-column label="鑷" align="center" prop="pacRemark" /> -->
+                </el-table>
+                <el-form
+                  style="margin-top: 10px"
+                  :model="queryParams"
+                  size="small"
+                  :inline="true"
+                  label-width="68px"
+                >
+                  <el-form-item label="閲戦" prop="question">
+                    <el-input
+                      v-model="queryParams.question"
+                      placeholder="璇疯緭鍏ラ噾棰�"
+                      clearable
+                    />
+                  </el-form-item>
+                  <el-form-item label="鑽搧绉嶇被" prop="Typesofdrugs">
+                    <el-input
+                      v-model="queryParams.Typesofdrugs"
+                      placeholder="璇疯緭鍏ヨ嵂鍝佺绫�"
+                      clearable
+                    />
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      size="mini"
+                      @click="handlecomplete"
+                      >鏂板澶勬柟</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+              </el-tab-pane>
+              <el-tab-pane label="涓崏鑽�">
+                <el-row :gutter="10" class="mb8" style="margin-left: 5px">
+                  <el-col :span="1.5">
+                    <div style="display: flex">
+                      <div>鍙栬嵂鑽埧:</div>
+                      <div style="border-bottom: 1px solid black">
+                        闂ㄨ瘖涓嵂鎴�
+                      </div>
+                    </div>
+                  </el-col>
+                  <el-col :span="1.5" style="margin-left: 10px">
+                    <el-button type="primary" @click="handlemeddrug" size="mini"
+                      :disabled="time">鏂板鑽搧</el-button
+                    >
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="delemeddrug"
+                    :disabled="time" >鍒犻櫎鑽搧</el-button
+                    >
+                  </el-col>
+                  <el-col :span="1.5">
+                    <el-button type="primary" size="mini" @click="Resetdrug"
+                      >閲嶇疆</el-button
+                    >
+                  </el-col>
+                </el-row>
+                <el-table
+                  :data="list"
+                  ref="elTable"
+                  v-loading="loading"
+                  @selection-change="handleSelectionChange"
+                  border
+                  height="320px"
+                >
+                  <el-table-column type="selection" width="40" align="center" />
+                  <el-table-column
+                    label="搴忓彿"
+                    width="60"
+                    prop="id"
+                    align="center"
+                  />
+                  <el-table-column
+                    label="鑽搧鍚嶇О"
+                    align="center"
+                    prop="pacName"
+                  >
+                    <template #default="scope">
+                      <el-input
+                        v-if="scope.row.isEdit"
+                        v-model="scope.row.pacName"
+                        placeholder="璇疯緭鍏�"
+                        @focus="changeblur"
+                      ></el-input>
+                      <div v-else class="txt">{{ scope.row.pacName }}</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鍓傞噺"
+                    align="center"
+                    prop="pacName"
+                    width="100px"
+                  />
+                  <el-table-column
+                    label="鍗曚綅"
+                    align="center"
+                    prop="detail"
+                    width="100px"
+                  />
+                  <el-table-column
+                    label="鍗曚环"
+                    align="center"
+                    prop="pacRemark"
+                  />
+                  <el-table-column label="搴撳瓨" align="center" prop="price" />
+                </el-table>
+                <el-form
+                  style="margin-top: 10px"
+                  :model="form"
+                  size="small"
+                  :inline="true"
+                  label-width="68px"
+                >
+                  <el-form-item label="閲戦" prop="question">
+                    <el-input
+                      v-model="form.question"
+                      placeholder="璇疯緭鍏ラ噾棰�"
+                      clearable
+                    />
+                  </el-form-item>
+                  <el-form-item label="鑽搧绉嶇被" prop="Typesofdrugs">
+                    <el-input
+                      v-model="form.Typesofdrugs"
+                      placeholder="璇疯緭鍏ヨ嵂鍝佺绫�"
+                      clearable
+                    />
+                  </el-form-item>
+                  <el-form-item label="鍓傛暟" prop="question">
+                    <el-input
+                      v-model="form.question"
+                      placeholder="璇疯緭鍏ュ墏鏁�"
+                      clearable
+                    />
+                  </el-form-item>
+                  <el-form-item label="鐓庤嵂鏂瑰紡" prop="question">
+                    <el-input
+                      v-model="form.question"
+                      placeholder="璇疯緭鍏ョ厧鑽柟寮�"
+                      clearable
+                    />
+                  </el-form-item>
+                  <el-form-item label="浠g厧鍓傛暟" prop="question">
+                    <el-input
+                      v-model="form.question"
+                      placeholder="璇疯緭鍏ヤ唬鐓庡墏鏁�"
+                      clearable
+                    />
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      size="mini"
+                      @click="handlecomplete1"
+                      >鏂板澶勬柟</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+              </el-tab-pane>
+            </el-tabs>
+          </el-col>
+        </el-row>
+      </div>
+       
+
+      <Pricedictionary ref="dict" />
+      <Dictionary ref="ar" />
+      <!-- <span slot="footer" class="dialog-footer">
+        <el-button @click="open = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="handleOk">纭� 瀹�</el-button>
+      </span> -->
+    </el-drawer>
+  </div>
+</template>
+  
+<script>
+import Pricedictionary from "../Pricedictionary";
+import Dictionary from "../dictionary";
+import {
+  Packagestlist,
+  newGetTjPat,
+  getTjYxjcList,
+} from "@/api/system/package";
+import { getConfigKey } from "@/api/system/config";
+export default {
+  name: "Prescription",
+  components: {
+    Pricedictionary,
+    Dictionary,
+  },
+  props: {
+    preObj: {
+      type: Object,
+    },
+  },
+  data() {
+    return {
+      open: false,
+      openone: 0,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      time:true,
+      dataList: [],
+      selectionList: [],
+      // 閬僵灞�
+      loading: false,
+      form: {
+        Typesofdrugs: 0,
+      },
+      reverse: false,
+      activities: [
+        {
+          content: "娲诲姩鎸夋湡寮�濮�",
+          timestamp: "2018-04-15",
+        },
+        {
+          content: "閫氳繃瀹℃牳",
+          timestamp: "2018-04-13",
+        },
+        {
+          content: "鍒涘缓鎴愬姛",
+          timestamp: "2018-04-11",
+        },
+      ],
+      queryParams: {
+        pacCode: "",
+        pacName: "",
+        pacRemark: "",
+        Typesofdrugs: 0,
+      },
+      list: [],
+      medList: [],
+      fList: {},
+    };
+  },
+  watch: {
+    preObj(val, newVla) {
+      this.fList = val;
+    },
+  },
+  mounted() {},
+
+  created() {},
+  methods: {
+    handledrug() {
+      if (!this.dataList) {
+        this.dataList = [];
+        this.dataList.push({
+          id: parseInt(length + 1),
+          pacName: "",
+          pacRemark: "",
+          detail: "",
+          price: "",
+          isEdit: true,
+          Selection,
+        });
+      } else {
+        this.dataList.push({
+          id: parseInt(this.dataList.length + 1),
+          pacName: "",
+          pacRemark: "",
+          detail: "",
+          price: "",
+          isEdit: true,
+          Selection,
+        });
+      }
+      this.queryParams.Typesofdrugs = this.dataList.length;
+    },
+    handledrugChange(selection) {
+      this.selectionList = selection;
+    },
+    deledrug() {
+      if (this.selectionList.length == 0) {
+        this.$modal.msgSuccess("璇烽�夋嫨闇�瑕佸垹闄ょ殑鏁版嵁");
+      } else {
+        this.selectionList.forEach((item) => {
+          this.dataList.forEach((item1, index) => {
+            if (item == item1) {
+              this.dataList.splice(index, 1);
+            }
+          });
+        });
+      }
+      this.queryParams.Typesofdrugs = this.dataList.length;
+    },
+    handlemeddrug() {
+      if (!this.list) {
+        this.list = [];
+        this.list.push({
+          id: parseInt(this.list.length + 1),
+          pacName: "",
+          pacRemark: "",
+          detail: "",
+          price: "",
+          isEdit: true,
+          Selection,
+        });
+      } else {
+        this.list.push({
+          id: parseInt(this.list.length + 1),
+          pacName: "",
+          pacRemark: "",
+          detail: "",
+          price: "",
+          isEdit: true,
+          Selection,
+        });
+      }
+      this.form.Typesofdrugs = this.list.length;
+    },
+    delemeddrug() {
+      console.log(this.medList);
+      if (this.medList.length == 0) {
+        this.$modal.msgSuccess("璇烽�夋嫨闇�瑕佸垹闄ょ殑鏁版嵁");
+      } else {
+        this.medList.forEach((item) => {
+          this.list.forEach((item1, index) => {
+            if (item == item1) {
+              this.list.splice(index, 1);
+            }
+          });
+        });
+      }
+      this.form.Typesofdrugs = this.list.length;
+    },
+    lookmingxi(val) {
+      console.log(val, 11111);
+    },
+    getList() {},
+    handleQuery() {},
+    handleSelectionChange(selection) {
+      this.medList = selection;
+      //   if (selection.length > 1) {
+      //     this.$refs.elTable.clearSelection(); // 娓呯┖鎵�鏈夐�夋嫨
+      //     this.$refs.elTable.toggleRowSelection(selection.pop()); // 璁剧疆閫夋嫨椤�
+      //   }
+    },
+    changeblur() {
+      this.$refs.dict.open = true;
+    },
+    Resetdrug(){
+      this.medList=[],
+      this.dataList=[]
+      this.time = false
+    },
+    changefocus() {
+      this.$refs.ar.open = true;
+    },
+    handleOk() {
+      this.open = false;
+    },
+    handlecomplete() {
+      this.open = false;
+    },
+    handlecomplete1() {
+      this.open = false;
+    },
+  },
+};
+</script>
+  
+<style scoped></style>
+  
\ No newline at end of file
diff --git a/src/components/Pricedictionary/index.vue b/src/components/Pricedictionary/index.vue
new file mode 100644
index 0000000..bdd3659
--- /dev/null
+++ b/src/components/Pricedictionary/index.vue
@@ -0,0 +1,116 @@
+<template>
+    <div>
+        <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+                <el-form-item label="鎷奸煶鐮�" prop="pacCode">
+                    <el-input v-model="queryParams.pacCode" placeholder="璇疯緭鍏ユ嫾闊崇爜" clearable
+                        @keyup.enter.native="handleQuery" style="width: 120px;" />
+                </el-form-item>
+                <el-form-item label="鍚嶇О" prop="pacName">
+                    <el-input v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ悕绉�" clearable
+                        @keyup.enter.native="handleQuery" style="width: 130px;" />
+                </el-form-item>
+              
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+                </el-form-item>
+            </el-form>
+            <el-table :data="dataList" ref="elTable" v-loading="loading" @selection-change="handleSelectionChange" border
+                height="320px">
+                <el-table-column type="selection" width="40" align="center" />
+                <el-table-column label="鎷奸煶鐮�" align="center" prop="detail" width="100px" />
+                <el-table-column label="鍚嶇О" align="center" prop="pacName" width="100px" />
+                <el-table-column label="瑙勬牸" align="center" prop="pacRemark" />
+                <el-table-column label="浠锋牸" align="center" prop="price" />
+                <el-table-column label="搴撳瓨" align="center" prop="pacRemark" />
+                <el-table-column label="鍖讳繚绫诲埆" align="center" prop="pacRemark" />
+                <el-table-column label="鍐滃悎绫诲埆" align="center" prop="pacRemark" />
+                <el-table-column label="绀句繚绫诲埆" align="center" prop="pacRemark" />
+            </el-table>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="open = false">鍙� 娑�</el-button>
+                <el-button type="primary" @click="handleOk">纭� 瀹�</el-button>
+            </span>
+        </el-dialog>
+
+    </div>
+</template>
+  
+<script>
+import {
+  getTjHyBgList,
+} from "@/api/hosp/project";
+export default {
+    name: 'Pricedictionary',
+    props: {
+        // row: {
+        //     type: Object,
+        // }
+
+    },
+    data() {
+        return {
+            open: false,
+            openone:false,
+            // 寮瑰嚭灞傛爣棰�
+            title: "",
+            dataList: [],
+            // 閬僵灞�
+            loading: false,
+            form: {
+                desc: ""
+            },
+            queryParams: {
+                pacCode: "",
+                pacName: "",
+                pacRemark: "",
+            },
+            list: [],
+            fList: {}
+        };
+    },
+    watch: {
+        // 'row'(val, newVla) {
+        //     console.log(val,newVla)
+        //     this.fList = val
+        //     console.log(this.fList);
+
+        // }
+
+    },
+    mounted() {
+    },
+
+    created() {
+    },
+    methods: {
+        getAllList(){
+           
+        },
+        getList() {
+           
+        },
+        handleQuery() {
+           
+        },
+        handleSelectionChange(selection) {
+            if (selection.length > 1) {
+                this.$refs.elTable.clearSelection(); // 娓呯┖鎵�鏈夐�夋嫨
+                this.$refs.elTable.toggleRowSelection(selection.pop()); // 璁剧疆閫夋嫨椤�
+            }
+            this.list = selection;
+            console.log(this.list)
+
+        },
+        handleOk() {
+            this.open = false
+            if (this.list.length == 1) {
+                this.$emit('add',this.list);
+            }
+        }
+    }
+}
+</script>
+  
+<style scoped></style>
+  
\ No newline at end of file
diff --git a/src/components/dictionary/index.vue b/src/components/dictionary/index.vue
new file mode 100644
index 0000000..e19b480
--- /dev/null
+++ b/src/components/dictionary/index.vue
@@ -0,0 +1,108 @@
+<template>
+    <div>
+        <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+                <el-form-item label="鍚嶇О" prop="pacName">
+                    <el-input v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ悕绉�" clearable
+                        @keyup.enter.native="handleQuery" style="width: 130px;" />
+                </el-form-item>
+              
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+                </el-form-item>
+            </el-form>
+            <el-table :data="dataList" ref="elTable" v-loading="loading" @selection-change="handleSelectionChange" border
+                height="320px">
+                <el-table-column type="selection" width="40" align="center" />
+                <el-table-column label="搴忓彿" align="center" prop="pacRemark" />
+                <el-table-column label="缂栫爜" align="center" prop="pacRemark" />
+                <el-table-column label="鍚嶇О" align="center" prop="pacName" width="100px" />
+                <el-table-column label="鎷奸煶鐮�" align="center" prop="price" />
+            </el-table>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="open = false">鍙� 娑�</el-button>
+                <el-button type="primary" @click="handleOk">纭� 瀹�</el-button>
+            </span>
+        </el-dialog>
+
+    </div>
+</template>
+  
+<script>
+import {
+  getTjHyBgList,
+} from "@/api/hosp/project";
+export default {
+    name: 'Pricedictionary',
+    props: {
+        // row: {
+        //     type: Object,
+        // }
+
+    },
+    data() {
+        return {
+            open: false,
+            openone:false,
+            // 寮瑰嚭灞傛爣棰�
+            title: "",
+            dataList: [],
+            // 閬僵灞�
+            loading: false,
+            form: {
+                desc: ""
+            },
+            queryParams: {
+                pacCode: "",
+                pacName: "",
+                pacRemark: "",
+            },
+            list: [],
+            fList: {}
+        };
+    },
+    watch: {
+        // 'row'(val, newVla) {
+        //     console.log(val,newVla)
+        //     this.fList = val
+        //     console.log(this.fList);
+
+        // }
+
+    },
+    mounted() {
+    },
+
+    created() {
+    },
+    methods: {
+        getAllList(){
+           
+        },
+        getList() {
+           
+        },
+        handleQuery() {
+           
+        },
+        handleSelectionChange(selection) {
+            if (selection.length > 1) {
+                this.$refs.elTable.clearSelection(); // 娓呯┖鎵�鏈夐�夋嫨
+                this.$refs.elTable.toggleRowSelection(selection.pop()); // 璁剧疆閫夋嫨椤�
+            }
+            this.list = selection;
+            console.log(this.list)
+
+        },
+        handleOk() {
+            this.open = false
+            if (this.list.length == 1) {
+                this.$emit('add',this.list);
+            }
+        }
+    }
+}
+</script>
+  
+<style scoped></style>
+  
\ No newline at end of file
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 6f0c246..8de4fc4 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -67,8 +67,12 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item> 
-        <el-button type="primary" size="mini" @click="submitForm" style="margin-right:15px;"
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="submitForm"
+          style="margin-right: 15px"
           >鎼滅储</el-button
         >
         <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -182,17 +186,25 @@
           <template slot-scope="scope">
             <el-button
               fixed="right"
+              title="澶勬柟"
+              type="text"
+              size="mini"
+              @click.stop="rowClick(scope.row)"
+              icon="el-icon-edit-outline"
+            ></el-button>
+            <el-button
+              fixed="right"
               title="璇︽儏"
               type="text"
               size="mini"
-              @click="handleClick(scope.row)"
+              @click.stop="handleClick(scope.row)"
               icon="el-icon-document-copy"
             ></el-button>
             <!-- <el-button type="text" size="mini" @click="generate(scope.row)" v-if="scope.row.tjStatus=='1'">鐢熸垚</el-button> -->
             <el-button
               type="text"
               size="mini"
-              @click="viewReport(scope.row)"
+              @click.stop="viewReport(scope.row)"
               v-if="scope.row.tjStatus == '1'"
               title="棰勮"
               icon="el-icon-view"
@@ -202,7 +214,7 @@
               size="mini"
               v-if="scope.row.tjStatus == '1'"
               title="鎾ら攢"
-              @click="getRevoke(scope.row)"
+              @click.stop="getRevoke(scope.row)"
               icon="el-icon-refresh-left"
             ></el-button>
           </template>
@@ -575,13 +587,22 @@
                 </el-input>
               </el-form-item>
             </el-form>
-            <div slot="footer" class="dialog-footers" v-if="tjproject == '0'">
+            <div slot="footer" class="dialog-footers" >
               <el-button
                 type="primary"
-                @click="determine"
-                :disabled="isdisabled"
-                >鎻愪氦骞剁敓鎴愭姤鍛�</el-button
+                size="mini"
+                @click.stop="rowClick"
+                icon="el-icon-edit-outline"
+                >寮�澶勬柟</el-button
               >
+              <div v-if="tjproject == '0'" style="padding-left:10px ;">
+                <el-button
+                  type="primary"
+                  @click="determine"
+                  :disabled="isdisabled"
+                  >鎻愪氦骞剁敓鎴愭姤鍛�</el-button
+                >
+              </div>
             </div>
           </div>
         </el-col>
@@ -1047,6 +1068,7 @@
       </span>
     </el-dialog>
     <Packages ref="bbb" :baogao="baogao" />
+    <Prescription ref="Pre" :preObj="preObj" />
     <proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" />
     <createproposal ref="createproposal" :creatobj="creatobj" />
 
@@ -1064,6 +1086,7 @@
 <script>
 import jianqianwenzhen from "@/components/jianqianwenzhen";
 import Packages from "@/components/Packages";
+import Prescription from "@/components/Prescription";
 import proposal from "@/components/proposal";
 import createproposal from "@/components/createproposal";
 import {
@@ -1098,6 +1121,7 @@
     Packages,
     proposal,
     createproposal,
+    Prescription,
   },
   dicts: [
     "dict_tjtype",
@@ -1113,6 +1137,7 @@
   name: "checkAll",
   data() {
     return {
+      preObj: {},
       baogao: [],
       flags: false,
       jianqianwenzhendata: [],
@@ -1123,7 +1148,7 @@
       hosproy: true,
       remarks: "",
       remark: "",
-      creatobj:{},
+      creatobj: {},
       propdialog: false,
       proIds: "",
       cusobj: {},
@@ -1469,6 +1494,16 @@
       });
     },
 
+    rowClick(row) {
+      if(row.tjNumber){
+        this.preObj = row;
+      }else{
+        this.preObj = this.tableAll;
+      }
+      this.$refs.Pre.open = true;
+      this.$refs.Pre.title = "澶勬柟";
+    },
+
     // 鍗曢�夋寜閽�
     radioChange(value) {
       this.loading = true;
@@ -1490,10 +1525,10 @@
       // this.$refs.proposal.getList();
     },
     eventchange(data) {
-      this.dataText = data
-      console.log(this.textarea1 )
-      if(this.textarea1 == null ){
-        this.textarea1 = ""
+      this.dataText = data;
+      console.log(this.textarea1);
+      if (this.textarea1 == null) {
+        this.textarea1 = "";
       }
       data.forEach((item) => {
         this.textarea1 += item.advice;
@@ -1501,14 +1536,14 @@
     },
     proposalChange() {
       if (this.textarea1) {
-        this.creatobj = {proParentList:this.textarea1, isZj: 0}
+        this.creatobj = { proParentList: this.textarea1, isZj: 0 };
         this.$refs.createproposal.open = true;
         this.$refs.createproposal.title = "甯哥敤寤鸿缁存姢";
-      }else{
+      } else {
         this.$message({
-              type: "warning ",
-              message: "璇峰厛濉啓鎬绘寤鸿",
-            });
+          type: "warning ",
+          message: "璇峰厛濉啓鎬绘寤鸿",
+        });
       }
     },
     radiotjprojectChange() {
@@ -1641,6 +1676,7 @@
 
     // 鐐瑰嚮璇︽儏
     handleClick(row) {
+      this.$refs.Pre.open = false;
       this.tableAll = row;
       this.tjproject = "0";
       // if (this.tableAll.cusSex === 0) {
@@ -1946,7 +1982,8 @@
 
 .dialog-footers {
   /* margin-top: 5px; */
-  margin-left: calc(100% - 15%);
+  display: flex;
+  margin-left: calc(100% - 25%);
 }
 
 textarea {
diff --git a/src/views/doctor/geriatric/index.vue b/src/views/doctor/geriatric/index.vue
new file mode 100644
index 0000000..3ea4831
--- /dev/null
+++ b/src/views/doctor/geriatric/index.vue
@@ -0,0 +1,572 @@
+<template>
+  <div>
+    <el-form
+      :model="queryParams"
+      ref="tableList"
+      :inline="true"
+      label-width="76px"
+      style="margin-top: 10px"
+    >
+      <el-form-item label="濮撳悕" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          style="width: 116px"
+          placeholder="璇疯緭鍏ュ鍚�"
+          clearable
+          @keyup.enter.native="submitForm"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="浣撴鍙�" prop="tjNumber">
+        <el-input
+          ref="inputName"
+          v-model="queryParams.tjNumber"
+          style="width: 240px"
+          placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+          clearable
+          @blur="hb"
+          @keyup.enter.native="submitForm"
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          size="mini"
+          type="primary"
+          @click="submitForm"
+          style="margin-right: 15px"
+          >鎼滅储</el-button
+        >
+        <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
+      </el-form-item>
+    </el-form>
+    <div style="display: flex">
+      <el-radio-group
+        v-model="tjStatus"
+        @input="radioChange"
+        style="margin-left: 30px"
+      >
+        <el-radio-button label="0">鏈</el-radio-button>
+        <el-radio-button label="1">宸叉</el-radio-button>
+      </el-radio-group>
+    </div>
+
+    <template>
+      <el-table
+        :data="tableList"
+        v-loading="loading"
+        ref="table"
+        height="536px"
+        style="margin: 20px; width: 98%"
+        border
+        :cell-class-name="myclass"
+      >
+        <!-- <template slot="empty">鏁版嵁姝e湪鍔犺浇涓�</template> -->
+        <el-table-column
+          label="浣撴鍙�"
+          align="center"
+          prop="tjNumber"
+          width="160px"
+        />
+        <el-table-column
+          label="濮撳悕"
+          align="center"
+          prop="cusName"
+          width="90px"
+        />
+        <el-table-column label="鎬у埆" align="center" prop="cusSex" width="60px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.cusSex == '0'">鐢�</span>
+            <span v-if="scope.row.cusSex == '1'">濂�</span>
+            <span v-if="scope.row.cusSex == '2'">鏈煡</span>
+            <span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鍑虹敓鏃ユ湡"
+          align="center"
+          prop="cusBrithday"
+          width="100px"
+        />
+        <el-table-column
+          label="鐢佃瘽"
+          align="center"
+          prop="cusPhone"
+          width="100px"
+        />
+        <el-table-column
+          label="浣撴绫诲瀷"
+          align="center"
+          prop="tjType"
+          width="80px"
+        />
+        <el-table-column
+          label="鐧昏鏃堕棿"
+          align="center"
+          prop="tjTime"
+          width="160px"
+        >
+        </el-table-column>
+        <el-table-column
+          label="浣撴鏃堕棿"
+          align="center"
+          prop="tjTime"
+          width="100px"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.tjTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鏈椤�"
+          prop="notCheckeds"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column label="鎿嶄綔" align="center" width="130px">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              icon="el-icon-first-aid-kit"
+              size="mini"
+              @click="Changeapplyfor(scope.row)"
+              title="浼氳瘖鐢宠"
+              v-if="tjStatus == '1'"
+            ></el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-share"
+              size="mini"
+              @click="handleClick(scope.row)"
+              title="璇︽儏"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="pag">
+        <div class="pag1">
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.page"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
+      </div>
+    </template>
+
+    <!-- 鐐瑰嚮鍙宠竟寮瑰嚭灞� -->
+    <el-drawer
+      :visible.sync="drawer"
+      :with-header="false"
+      size="70%"
+      :before-close="handleClose"
+    >
+      <el-card class="box-card" style="margin: 15px 15px"   v-for="(item, index) in illnes"
+          :key="index">
+        <div slot="header" class="clearfix">
+          <span>{{item.title}}</span>
+        </div>
+        <el-card
+          class="box-card"
+          style="margin: 15px 15px"
+          v-for="(item1, index) in item.illness"
+          :key="index"
+        >
+          <div style="padding: 10px 0">{{ item1.title }}</div>
+          <el-checkbox-group
+            v-model="checkedCities"
+            @change="handleCheckedCitiesChange"
+          >
+            <el-checkbox
+              v-for="city in item1.cities"
+              :label="city"
+              :key="city"
+              >{{ city }}</el-checkbox
+            >
+          </el-checkbox-group>
+        </el-card>
+      </el-card>
+    </el-drawer>
+  </div>
+</template>
+
+
+<script>
+import { getInfo } from "@/api/login";
+import { getProList } from "@/api/doctor/check";
+import { listHzlog } from "@/api/hosp/hzlog";
+import { listUser } from "@/api/system/user";
+import { getChildList } from "@/api/system/dept";
+export default {
+  dicts: ["sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"],
+  name: "check",
+  data() {
+    return {
+      // 閬僵灞�
+      loading: false,
+      open: false,
+      title: "",
+      hzlogList: [],
+      id: [],
+      // 鎬绘潯鏁�
+      total: 0,
+      // 缁戝畾鍗曢�夋寜閽�
+      tjStatus: "0",
+      // 鎶藉眽鎵撳紑鏂瑰紡
+      drawer: false,
+      tableList: [],
+      deptList: [],
+      tableAll: {},
+      row: {},
+      info: {},
+      allList: [],
+      autorule: [],
+      vals: {},
+      illnes: [
+        {
+          title: "鍏崼浣撴",
+          illness: [
+            {
+              title: "鐥囩姸",
+              cities: [
+                "澶寸柤",
+                "澶存檿",
+                "渚跨",
+                "鑰抽福",
+                "蹇冩偢",
+                "鑳搁椃",
+                "鍛煎惛鍥伴毦",
+                "鍏宠妭鑲跨棝",
+                "鍚笉娓呮垨鏃犳硶鍚竻",
+                "鎱㈡�у挸鍡�",
+              ],
+            },
+            {
+              title: "鐤剧梾鍙�",
+              cities: [
+                "楂樿鍘�",
+                "绯栧翱鐥�",
+                "鑴戝嚭琛�",
+                "鐧藉唴闅�",
+                "鎭跺績鑲跨槫",
+                "鎱㈡�ф敮姘旂鐐�",
+                "鑰佸勾鎬ч鍏宠妭鐥�",
+                "蹇冭倢姊楁",
+                "蹇冪粸鐥�",
+                "鎱㈡�ч樆濉炴�ц偤姘旇偪",
+              ],
+            },
+            {
+              title: "鐢熸椿鏂瑰紡",
+              cities: [
+                "澶寸柤",
+                "澶存檿",
+                "渚跨",
+                "鑰抽福",
+                "蹇冩偢",
+                "鑳搁椃",
+                "鍛煎惛鍥伴毦",
+                "鍏宠妭鑲跨棝",
+                "鍚笉娓呮垨鏃犳硶鍚竻",
+                "鎱㈡�у挸鍡�",
+              ],
+            },
+          ],
+        },
+        {
+          title:"浣撴牸妫�鏌�"
+        },
+        {
+          title:"杈呭姪妫�鏌�"
+        },
+        {
+          title:"鍋ュ悍鎸囧"
+        },
+      ],
+
+      checkedCities: ["澶寸柤", "澶存檿"],
+      form: {
+        createTime: new Date(),
+      },
+      // 鍖荤敓
+      doctorName: "",
+      // 鐖堕」
+      proName: "",
+      // 鐖堕」Id
+      proId: "",
+      company: "",
+      tjStandardGtValue: "",
+      // 鐢ㄦ埛琛ㄦ牸鏁版嵁
+      userList: null,
+      // 鐖堕」鐩垪琛�
+      Parent: [],
+      hzReplyLogsList: [],
+      hasdeptList: [],
+      radio: "",
+      nums: "",
+      proParentList: [],
+      tjNumber: "",
+      // 鍏ㄩ儴灏忕粨
+      DeptadviceAll: [],
+      project: {},
+      // 灏忕粨
+      summaryList: [],
+      summaryAll: [],
+      tjOrderDetailList: [],
+      tjOrderDetail: [],
+      deptId: "",
+      userId: "",
+      nickName: "",
+      doctorNames: "",
+      date: new Date(new Date().getTime() + 8 * 3600 * 1000)
+        .toJSON()
+        .substr(0, 19)
+        .replace("T", " "),
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        page: 1,
+        pageSize: 10,
+        tjNumber: "",
+        type: "",
+        name: null,
+      },
+      queryParam: {
+        page: 1,
+        pageSize: 1000,
+      },
+      rules: {
+        hzType: [
+          { required: true, message: "浼氳瘖绉戝涓哄繀濉」", trigger: "change" },
+        ],
+      },
+    };
+  },
+
+  created() {
+    this.getList();
+    this.getListUser();
+  },
+
+  mounted() {
+    let _this = this;
+    this.timer = setInterval(() => {
+      _this.date = new Date(new Date().getTime() + 8 * 3600 * 1000)
+        .toJSON()
+        .substr(0, 19)
+        .replace("T", " ");
+    }, 1000);
+
+    this.$nextTick(() => {
+      this.$refs.inputName.focus();
+    });
+  },
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+  },
+
+  methods: {
+    /** 鏌ヨ鐢ㄦ埛鍒楄〃 */
+    getListUser() {
+      listUser().then((response) => {
+        this.userList = response.rows;
+        this.userList.forEach((element) => {
+          const userName = this.$store.state.user.name;
+          if (userName == element.userName) {
+            this.doctorName = element.nickName;
+          }
+        });
+      });
+      getInfo().then((response) => {
+        this.info = response.user;
+        this.deptId = response.user.deptId;
+        this.userId = response.user.userId;
+        this.nickName = response.user.nickName;
+      });
+    },
+
+    // 鎼滅储
+    submitForm() {
+      this.queryParams.page = 1;
+      this.loading = true;
+      this.queryParams.type = this.tjStatus;
+      getProList(this.queryParams).then((response) => {
+        if (response.code == 200) {
+          this.loading = false;
+          if (response.data) {
+            if (response.data.date) {
+              this.tableList = response.data.date;
+              this.queryParams.tjNumber = "";
+            } else {
+              this.tableList = response.data.customers;
+              this.queryParams.tjNumber = "";
+            }
+            this.total = response.data.total;
+          } else {
+            this.tableList = [];
+          }
+        }
+      });
+    },
+
+    handleClose() {
+      this.$tab.refreshPage();
+    },
+
+    myclass(row, column, rowIndex, columnIndex) {
+      if (row.row.isPositive == 1) {
+        return "setclass";
+      }
+    },
+
+    getList() {
+      this.loading = true;
+      this.queryParams.type = this.tjStatus;
+      getProList(this.queryParams).then((response) => {
+        if (response.code == 200) {
+          this.loading = false;
+          if (response.data) {
+            if (response.data.date) {
+              this.tableList = response.data.date;
+            } else {
+              this.tableList = response.data.customers;
+            }
+            this.total = response.data.total;
+          } else {
+            this.tableList = [];
+          }
+        }
+      });
+    },
+
+    // 鍗曢�夋寜閽�
+    radioChange(val) {
+      this.queryParams.type = val;
+      this.loading = true;
+      getProList(this.queryParams).then((response) => {
+        if (response.code == 200) {
+          this.loading = false;
+          if (response.data) {
+            this.tableList = response.data.date;
+            this.total = response.data.total;
+          } else {
+            this.tableList = [];
+          }
+        }
+      });
+    },
+    hb() {
+      if (this.queryParams.tjNumber != "") {
+        this.submitForm();
+      }
+    },
+
+    // 閲嶇疆
+    resetQuery() {
+      this.resetForm("tableList");
+      this.submitForm();
+      this.$nextTick(() => {
+        this.$refs.inputName.focus();
+      });
+    },
+
+    Changeapplyfor(row) {
+      this.open = true;
+      this.form = row;
+      this.form.hzDoctorId = this.info.userId;
+      getChildList().then((res) => {
+        this.deptList = res.data;
+      });
+      this.Hzlog(this.form.tjNumber);
+    },
+
+    Hzlog(val) {
+      let data = {
+        tjNumber: val,
+      };
+      listHzlog(data).then((response) => {
+        this.hzlogList = response.rows;
+        this.hzlogList.forEach((item) => {
+          item.hzDeptName = "";
+          if (item.hzType == "0") {
+            item.hzDeptName = "鍏ㄩ櫌浼氳瘖";
+          } else {
+            item.hzDeptIdList.forEach((item1) => {
+              this.deptList.forEach((item2) => {
+                if (item1 == item2.deptId) {
+                  item.hzDeptName += item2.deptName + ",";
+                }
+              });
+            });
+          }
+        });
+      });
+    },
+
+    // 鐐瑰嚮璇︽儏
+    handleClick(row) {
+      this.drawer = true;
+    },
+    handleCheckedCitiesChange() {
+    },
+  },
+};
+</script>
+<style>
+.el-table .cell {
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  text-overflow: ellipsis;
+  white-space: normal;
+  word-break: break-all;
+  line-height: 23px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+.setclass {
+  background-color: #f86b35;
+  color: black;
+}
+
+.blue-button {
+  width: 10px;
+  background-color: #e2e3e4;
+}
+
+.el-button--medium {
+  padding: 4px 14px;
+  font-size: 14px;
+}
+
+.dialog-footers {
+  margin-top: 10px;
+  margin-left: calc(100% - 10%);
+}
+
+.main {
+  height: 700px;
+  overflow: hidden;
+}
+
+.pag {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
+
+.pag1 {
+  width: 30%;
+}
+
+.el-message {
+  top: 40px !important;
+  border: 1px solid #c1c1c1;
+  background-color: #c1c1c1;
+}
+
+.el-message * {
+  color: var(--white) !important;
+}
+</style>
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 5644531..2dd443d 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -640,7 +640,6 @@
   components: { Packages },
   data() {
     let checkPhoneNum = (rule, value, callback) => {
-      console.log(value);
       let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
       if (value == "" && value == undefined && !value) {
         return callback("");
@@ -696,6 +695,7 @@
       newproName: [],
       // 鎵�鏈変綋妫�椤圭洰路
       allList: [],
+      treeList: [],
       // 鎵�鏈夊椁愭暟鎹�
       // allpackage:[],
       // 寮瑰嚭灞傛爣棰�
@@ -794,7 +794,6 @@
       });
     },
     sel(val) {
-      console.log(val);
       let id = val;
       this.keys = "";
       id.forEach((item) => {
@@ -808,9 +807,7 @@
         this.categoryList = response.rows;
       });
     },
-    shangpin(vals) {
-      console.log(vals);
-    },
+    shangpin(vals) {},
     // 鍙栨秷鎸夐挳
     cancel() {
       this.open = false;
@@ -928,7 +925,7 @@
       // });
       getPacInFo(this.forms.pacId).then((response) => {
         this.form = response.data;
-        this.form.keywords=this.form.keywords.slice(0, -1);
+        this.form.keywords = this.form.keywords.slice(0, -1);
         this.form.keywords = this.form.keywords.split(",");
         this.DataList = [];
         this.checkedkey = [];
@@ -942,7 +939,7 @@
       this.open = true;
       getPacInFo(row.pacId).then((response) => {
         this.form = response.data;
-        this.form.keywords=this.form.keywords.slice(0, -1);
+        this.form.keywords = this.form.keywords.slice(0, -1);
         this.form.keywords = this.form.keywords.split(",");
         this.DataList = [];
         this.checkedkey = [];
@@ -1031,7 +1028,6 @@
     },
     //  // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      // console.log(row, column, rowIndex, columnIndex);
       let fields = ["propinName"];
       let cellValue = row[column.property];
       if (cellValue && fields.includes(column.property)) {
@@ -1100,7 +1096,6 @@
       });
     },
     handleCurrentChecked(data, checked, checkedNodes) {
-      console.log(data, checked);
       this.dataObj = data;
       this.checkedObj = checked;
       if (checked == true) {
@@ -1136,7 +1131,6 @@
             item.disabled = true;
           });
           this.checkedListkey = [];
-          console.log(this.TreedataList.length);
           this.DataList.forEach((item, index) => {
             if (item.proParentId == this.dataObj.proId) {
               this.DataList.splice(index, this.TreedataList.length);
@@ -1207,7 +1201,16 @@
       if (this.form.pacName) {
         this.form.tjProjectList = [];
         if (this.DataList.length != 0) {
-          this.DataList.forEach((item) => {
+          this.treeList = JSON.parse(JSON.stringify(this.DataList));
+          for (var i = 0; i < this.treeList.length; i++) {
+            for (var j = i + 1; j < this.treeList.length; j++) {
+              if (this.treeList[i].proParentId == this.treeList[j].proParentId) {
+                this.treeList.splice(j, 1);
+                j--;
+              }
+            }
+          }
+           this.treeList.forEach((item) => {
             this.form.tjProjectList.push({
               // id: 0,
               proName: item.propinName,
@@ -1226,12 +1229,12 @@
               // } else {
               //   this.form.pacStatus = 1;
               // }
-              if(this.keys){
+              if (this.keys) {
                 this.form.keywords = this.keys;
-              }else{
+              } else {
                 this.form.keywords = this.form.keywords.toString();
               }
-            
+
               updatePackage(this.form).then((response) => {
                 this.$modal.msgSuccess("淇敼鎴愬姛");
                 this.open = false;
@@ -1244,7 +1247,6 @@
               // } else {
               //   this.form.pacStatus = 1;
               // }
-              // console.log(this.form.tjProjectList);
               // return;
               addPackage(this.form).then((response) => {
                 this.$modal.msgSuccess("鏂板鎴愬姛");

--
Gitblit v1.8.0