From 26f7101ada1cfe8b52dd03c132a0fe8f4fcaf129 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期三, 27 十二月 2023 15:37:46 +0800
Subject: [PATCH] su

---
 src/views/hosp/history/index.vue         |  484 -------------------------
 src/views/system/dept/index.vue          |   30 
 src/components/jianqianwenzhen/index.vue |  623 ++++++++++++++++++++++++++++++++
 3 files changed, 646 insertions(+), 491 deletions(-)

diff --git a/src/components/jianqianwenzhen/index.vue b/src/components/jianqianwenzhen/index.vue
new file mode 100644
index 0000000..92ff394
--- /dev/null
+++ b/src/components/jianqianwenzhen/index.vue
@@ -0,0 +1,623 @@
+<template>
+  <div>
+    <span class="txt">闂瘖淇℃伅</span>
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="100px"
+      :inline="true"
+      size="mini"
+    >
+      <el-collapse class="coll" v-model="activeName" accordion>
+        <el-collapse-item
+          class="coll"
+          title="鍩烘湰淇℃伅"
+          name="1"
+          style="width: 900px; font-weight: 600"
+        >
+          <div style="width: 900px">
+            <el-form-item label="濮撳悕" prop="cusName">
+              <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" />
+            </el-form-item>
+            <el-form-item label="鑱屼笟" prop="work">
+              <el-select
+                filterable
+                v-model="form.work"
+                placeholder="璇烽�夋嫨鑱屼笟"
+                clearable
+                style="width: 150px"
+              >
+                <el-option
+                  v-for="dict in dict.type.tj_work"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="宸ヤ綔鐘舵��" prop="workStatus">
+              <el-select
+                filterable
+                v-model="form.workStatus"
+                placeholder="璇烽�夋嫨宸ヤ綔鐘舵��"
+                clearable
+                style="width: 150px"
+              >
+                <el-option
+                  v-for="dict in dict.type.tj_work_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison">
+              <el-input
+                type="textarea"
+                rows="4"
+                v-model="form.contactPoison"
+                placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�"
+                style="width: 700px"
+              />
+            </el-form-item>
+            <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
+              <el-input
+                type="textarea"
+                rows="4"
+                v-model="form.medicalHistory"
+                placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
+                style="width: 700px"
+              />
+            </el-form-item>
+          </div>
+        </el-collapse-item>
+        <el-collapse-item title="鏈堢粡鍙�" name="2" v-show="sex">
+          <div style="width: 900px">
+            <el-form-item label="鍒濇疆(宀�)" prop="chuchao">
+              <el-input v-model="form.chuchao" style="width: 70px" />
+            </el-form-item>
+            <el-form-item label="缁忔湡" prop="jingqi">
+              <el-input v-model="form.jingqi" style="width: 70px" />澶�
+            </el-form-item>
+            <el-form-item label="鍛ㄦ湡" prop="zhouqi">
+              <el-input v-model="form.zhouqi" style="width: 70px" />澶�
+            </el-form-item>
+            <el-form-item label="鏈鏈堢粡" prop="mociage">
+              <el-input v-model="form.mociage" style="width: 100px" />
+            </el-form-item>
+          </div>
+        </el-collapse-item>
+        <el-collapse-item title="鐢熻偛鍙�" name="3" v-show="sex">
+          <div style="width: 900px">
+            <el-form-item label="鐜版湁瀛愬コ(浜�)" prop="zinv">
+              <el-input v-model="form.zinv" style="width: 70px" />
+            </el-form-item>
+            <el-form-item label="娴佷骇(娆�)" prop="liuchan">
+              <el-input v-model="form.liuchan" style="width: 70px" />
+            </el-form-item>
+            <el-form-item label="鏃╀骇(娆�)" prop="zaochan">
+              <el-input v-model="form.zaochan" style="width: 70px" />
+            </el-form-item>
+            <el-form-item label="姝讳骇(娆�)" prop="sichan">
+              <el-input v-model="form.sichan" style="width: 70px" />
+            </el-form-item>
+            <el-form-item label="寮傚父鑳�(娆�)" prop="yichangtai">
+              <el-input v-model="form.yichangtai" style="width: 70px" />
+            </el-form-item>
+          </div>
+        </el-collapse-item>
+        <el-collapse-item title="鐑熼厭鍙�" name="4">
+          <div style="width: 900px">
+            <el-form-item label="鏄惁鍚哥儫" prop="xiyan">
+              <!-- <el-input v-model="form.xiyanpinlv" placeholder="璇疯緭鍏ュ惛鐑熼鐜�" /> -->
+              <el-select
+                filterable
+                v-model="form.xiyan"
+                placeholder="璇烽�夋嫨鏄惁鍚哥儫"
+                clearable
+                style="width: 150px"
+              >
+                <el-option
+                  v-for="dict in dict.type.tj_smoking_pinlv"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鍚哥儫棰戠巼" prop="xiyanpinlv">
+              <el-input v-model="form.xiyanpinlv" style="width: 70px" />鏀�/澶�
+            </el-form-item>
+            <el-form-item label="鍚哥儫鏃堕棿" prop="xiyanyear">
+              <el-input
+                v-model="form.xiyanyear"
+                style="width: 70px"
+              />骞� </el-form-item
+            ><br />
+            <el-form-item label="鏄惁楗厭" prop="yinjiu">
+              <!-- <el-input v-model="form.yinjiupinlv" placeholder="璇疯緭鍏ラギ閰掗鐜�" /> -->
+              <el-select
+                filterable
+                v-model="form.yinjiu"
+                placeholder="璇烽�夋嫨鏄惁楗厭"
+                clearable
+                style="width: 150px"
+              >
+                <el-option
+                  v-for="dict in dict.type.tj_smoking_pinlv"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="楗厭棰戠巼" prop="yinjiupinlv">
+              <el-input v-model="form.yinjiupinlv" style="width: 70px" />ml/澶�
+            </el-form-item>
+            <el-form-item label="楗厭鏃堕棿" prop="yinjiuyear">
+              <el-input v-model="form.yinjiuyear" style="width: 70px" />骞�
+            </el-form-item>
+            <el-form-item label="鍏朵粬" prop="qita">
+              <el-input
+                v-model="form.qita"
+                placeholder="璇疯緭鍏ュ叾浠�"
+                type="textarea"
+                style="width: 600px"
+                rows="2"
+              />
+            </el-form-item>
+          </div>
+        </el-collapse-item>
+        <el-collapse-item title="鏃㈠線鐥呭彶" name="5">
+          <div style="width: 900px">
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="addmembers()"
+                  >娣诲姞
+                </el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  size="mini"
+                  @click="delemembers()"
+                  >鍒犻櫎
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-table
+              border
+              :data="form.tjAskHistorysList"
+              ref="tjAskHistorys"
+              style="width: 98%"
+              @selection-change="handlebingChange"
+            >
+              <el-table-column type="selection" width="40" align="center" />
+              <!-- <el-table-column
+            label="搴忓彿"
+            align="center"
+            prop="index"
+            width="50"
+          /> -->
+              <el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
+                <template slot-scope="scope">
+                  <!-- <el-input
+                    size="mini"
+                    v-model="scope.row.diseaseName"
+                    placeholder="璇疯緭鍏ョ柧鐥呭悕绉�"
+                  /> -->
+                  <el-select
+                    v-model="scope.row.diseaseName"
+                    placeholder="璇烽�夋嫨鐤剧梾鍚嶇О"
+                    filterable
+                  >
+                    <el-option
+                      v-for="dict in icdList"
+                      :key="dict.icdname"
+                      :label="dict.icdname"
+                      :value="dict.id"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
+                <template slot-scope="scope">
+                  <!-- <el-input
+                v-model="scope.row.diseaseData"
+                placeholder="璇疯緭鍏ヨ瘖鏂棩鏈�"
+              /> -->
+                  <el-date-picker
+                    size="mini"
+                    v-model="scope.row.diseaseData"
+                    align="right"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                    :picker-options="pickerOptions"
+                    style="width: 130px"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column label="璇婃柇鍗曚綅" prop="diseaseCompany">
+                <template slot-scope="scope">
+                  <el-input
+                    size="mini"
+                    v-model="scope.row.diseaseCompany"
+                    placeholder="璇疯緭鍏ヨ瘖鏂崟浣�"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="鏄惁鐥婃剤" prop="isOk">
+                <template slot-scope="scope">
+                  <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
+                  <el-select
+                    filterable
+                    size="mini"
+                    v-model="scope.row.isOk"
+                    placeholder="璇烽�夋嫨鏄惁鐥婃剤"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.sys_yes_no"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="澶囨敞" prop="remark">
+                <template slot-scope="scope">
+                  <el-input
+                    size="mini"
+                    v-model="scope.row.remark"
+                    placeholder="璇疯緭鍏ュ娉�"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-collapse-item>
+
+        <el-collapse-item title="鑱屼笟鍙�" name="7">
+          <div style="width: 900px">
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="addmemberss()"
+                  >娣诲姞
+                </el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  size="mini"
+                  @click="delememberss()"
+                  >鍒犻櫎
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-table
+              border
+              :data="form.workLogs"
+              style="width: 98%"
+              @selection-change="handlezhiyeChange"
+            >
+              <el-table-column type="selection" width="40" align="center" />
+              <!-- <el-table-column
+            label="搴忓彿"
+            align="center"
+            prop="index"
+            width="50"
+          /> -->
+              <el-table-column label="寮�濮嬫椂闂�" prop="beginTime">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    size="mini"
+                    v-model="scope.row.beginTime"
+                    align="right"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                    :picker-options="pickerOptions"
+                    style="width: 130px"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column label="缁撴潫鏃堕棿" prop="endTime">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    size="mini"
+                    v-model="scope.row.endTime"
+                    align="right"
+                    type="date"
+                    placeholder="閫夋嫨鏃ユ湡"
+                    :picker-options="pickerOptions"
+                    style="width: 130px"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column label="宸ヤ綔鍗曚綅" prop="workCompany">
+                <template slot-scope="scope">
+                  <el-input
+                    size="mini"
+                    v-model="scope.row.workCompany"
+                    placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="閮ㄩ棬" prop="workDept">
+                <template slot-scope="scope">
+                  <el-input
+                    size="mini"
+                    v-model="scope.row.workDept"
+                    placeholder="璇疯緭鍏ラ儴闂�"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="宸ョ" prop="workType">
+                <template slot-scope="scope">
+                  <el-input
+                    size="mini"
+                    v-model="scope.row.workType"
+                    placeholder="璇疯緭鍏ュ伐绉�"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
+                <template slot-scope="scope">
+                  <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
+                  <el-select
+                    filterable
+                    size="mini"
+                    v-model="scope.row.harmTypeLogs"
+                    multiple
+                    placeholder="璇烽�夋嫨鏈夊鍥犵礌"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in harmTypeList"
+                      :key="dict.aid"
+                      :label="dict.harmType"
+                      :value="dict.aid"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="闃叉姢鎺柦" prop="fangHu">
+                <template slot-scope="scope">
+                  <el-input
+                    size="mini"
+                    v-model="scope.row.fangHu"
+                    placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button
+        type="primary"
+        @click="submitForm"
+        style="margin-top: 10px"
+        :disabled="isdisabled"
+        >鎻愪氦</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { listIcd } from "@/api/system/icd";
+import { updateHistory } from "@/api/hosp/history";
+export default {
+  dicts: ["tj_smoking_pinlv", "sys_yes_no", "tj_work_status", "tj_work"],
+  name: "jianqianwenzhen",
+  props: {
+    jianqianwenzhendata: {
+      type: Array, //鏁扮粍绫诲瀷
+      default: () => [],
+    },
+  },
+  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("");
+      } else if (value != undefined && value != "") {
+        return callback();
+      } else if (!patter.test(value)) {
+        return callback("");
+      }
+    };
+    return {
+      dataList: [],
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+        shortcuts: [
+          {
+            text: "浠婂ぉ",
+            onClick(picker) {
+              picker.$emit("pick", new Date());
+            },
+          },
+          {
+            text: "鏄ㄥぉ",
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24);
+              picker.$emit("pick", date);
+            },
+          },
+          {
+            text: "涓�鍛ㄥ墠",
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", date);
+            },
+          },
+        ],
+      },
+      sex: true,
+      activeName: "1",
+      // 閬僵灞�
+      isdisabled: false,
+      // 闈炲涓鐢�
+      multiple: true,
+      // ${subTable.functionName}琛ㄦ牸鏁版嵁
+      tjAskHistorysList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      harmTypeList: [],
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      chageall: [],
+      bingshiall: [],
+      // 鐤剧梾瀛楀吀琛ㄦ牸鏁版嵁
+      icdList: [],
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        deleted: [
+          {
+            required: true,
+            validator: checkPhoneNum,
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    jianqianwenzhendata(val, newVla) {
+      if (val) {
+        this.loading = false;
+        this.form = val;
+        if (this.form.xiyan == null) {
+          this.form.xiyan = "1";
+        }
+        if (this.form.xiyanpinlv == null) {
+          this.form.xiyanpinlv = "0";
+        }
+        if (this.form.xiyanyear == null) {
+          this.form.xiyanyear = "0";
+        }
+        if (this.form.yinjiu == null) {
+          this.form.yinjiu = "1";
+        }
+        if (this.form.yinjiupinlv == null) {
+          this.form.yinjiupinlv = "0";
+        }
+        if (this.form.yinjiuyear == null) {
+          this.form.yinjiuyear = "0";
+        }
+        this.form.tjAskHistorysList = val.tjAskHistorysList;
+      }
+
+      // if (this.fList) {
+      //     this.getList()
+      // }
+    },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 鏌ヨ鐤剧梾瀛楀吀鍒楄〃 */
+    getList() {
+      this.loading = true;
+      listIcd(this.queryParams).then((response) => {
+        this.icdList = response.rows;
+        console.log(this.icdList);
+        response.rows.forEach((item, index) => {
+          item.newID =
+            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+            index +
+            1;
+        });
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鏂板琛�
+    addmembers() {
+      if (this.form.cusName) {
+        if (!this.form.tjAskHistorysList) {
+          this.form.tjAskHistorysList = [];
+          this.form.tjAskHistorysList.push({
+            id: parseInt(length),
+            diseaseName: "",
+            diseaseData: "",
+            diseaseCompany: "",
+            isOk: "",
+            remark: "",
+            Selection,
+          });
+        } else {
+          this.form.tjAskHistorysList.push({
+            id: parseInt(length),
+            diseaseName: "",
+            diseaseData: "",
+            diseaseCompany: "",
+            isOk: "",
+            remark: "",
+            Selection,
+          });
+        }
+      } else {
+        Message.warning("璇峰厛濉啓瀹㈡埛鍚�");
+      }
+      this.$forceUpdate();
+    },
+    handlebingChange(selection) {
+      this.bingshiall = [];
+      this.bingshiall = selection;
+    },
+    handlezhiyeChange(selection) {
+      this.chageall = [];
+      this.chageall = selection;
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.form.tjNum = this.jianqianwenzhendata.tjNum;
+      updateHistory(this.form).then((response) => {
+        this.$modal.msgSuccess("淇敼鎴愬姛");
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.txt {
+  font-size: 16px;
+  font-weight: 800;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 20px;
+}
+.coll {
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/hosp/history/index.vue b/src/views/hosp/history/index.vue
index 06b4e6f..76b5b90 100644
--- a/src/views/hosp/history/index.vue
+++ b/src/views/hosp/history/index.vue
@@ -138,421 +138,10 @@
         </div>
       </div>
       <div class="hist3">
-        <span class="txt">闂瘖淇℃伅</span>
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="100px"
-          :inline="true"
-          size="mini"
-        >
-          <el-collapse class="coll" v-model="activeName" accordion>
-            <el-collapse-item
-              class="coll"
-              title="鍩烘湰淇℃伅"
-              name="1"
-              style="width: 900px; font-weight: 600"
-            >
-              <div style="width: 900px">
-                <el-form-item label="濮撳悕" prop="cusName">
-                  <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" />
-                </el-form-item>
-                <el-form-item label="鑱屼笟" prop="work">
-                  <el-select
-                    filterable
-                    v-model="form.work"
-                    placeholder="璇烽�夋嫨鑱屼笟"
-                    clearable
-                    style="width: 150px"
-                  >
-                    <el-option
-                      v-for="dict in dict.type.tj_work"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="宸ヤ綔鐘舵��" prop="workStatus">
-                  <el-select
-                    filterable
-                    v-model="form.workStatus"
-                    placeholder="璇烽�夋嫨宸ヤ綔鐘舵��"
-                    clearable
-                    style="width: 150px"
-                  >
-                    <el-option
-                      v-for="dict in dict.type.tj_work_status"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison">
-                  <el-input
-                    type="textarea"
-                    rows="4"
-                    v-model="form.contactPoison"
-                    placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�"
-                    style="width: 700px"
-                  />
-                </el-form-item>
-                <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
-                  <el-input
-                    type="textarea"
-                    rows="4"
-                    v-model="form.medicalHistory"
-                    placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
-                    style="width: 700px"
-                  />
-                </el-form-item>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鏈堢粡鍙�" name="2" v-show="sex">
-              <div style="width: 900px">
-                <el-form-item label="鍒濇疆(宀�)" prop="chuchao">
-                  <el-input v-model="form.chuchao" style="width: 70px" />
-                </el-form-item>
-                <el-form-item label="缁忔湡" prop="jingqi">
-                  <el-input v-model="form.jingqi" style="width: 70px" />澶�
-                </el-form-item>
-                <el-form-item label="鍛ㄦ湡" prop="zhouqi">
-                  <el-input v-model="form.zhouqi" style="width: 70px" />澶�
-                </el-form-item>
-                <el-form-item label="鏈鏈堢粡" prop="mociage">
-                  <el-input v-model="form.mociage" style="width: 100px" />
-                </el-form-item>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鐢熻偛鍙�" name="3" v-show="sex">
-              <div style="width: 900px">
-                <el-form-item label="鐜版湁瀛愬コ(浜�)" prop="zinv">
-                  <el-input v-model="form.zinv" style="width: 70px" />
-                </el-form-item>
-                <el-form-item label="娴佷骇(娆�)" prop="liuchan">
-                  <el-input v-model="form.liuchan" style="width: 70px" />
-                </el-form-item>
-                <el-form-item label="鏃╀骇(娆�)" prop="zaochan">
-                  <el-input v-model="form.zaochan" style="width: 70px" />
-                </el-form-item>
-                <el-form-item label="姝讳骇(娆�)" prop="sichan">
-                  <el-input v-model="form.sichan" style="width: 70px" />
-                </el-form-item>
-                <el-form-item label="寮傚父鑳�(娆�)" prop="yichangtai">
-                  <el-input v-model="form.yichangtai" style="width: 70px" />
-                </el-form-item>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鐑熼厭鍙�" name="4">
-              <div style="width: 900px">
-                <el-form-item label="鏄惁鍚哥儫" prop="xiyan">
-                  <!-- <el-input v-model="form.xiyanpinlv" placeholder="璇疯緭鍏ュ惛鐑熼鐜�" /> -->
-                  <el-select
-                    filterable
-                    v-model="form.xiyan"
-                    placeholder="璇烽�夋嫨鏄惁鍚哥儫"
-                    clearable
-                    style="width: 150px"
-                  >
-                    <el-option
-                      v-for="dict in dict.type.tj_smoking_pinlv"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="鍚哥儫棰戠巼" prop="xiyanpinlv">
-                  <el-input
-                    v-model="form.xiyanpinlv"
-                    style="width: 70px"
-                  />鏀�/澶�
-                </el-form-item>
-                <el-form-item label="鍚哥儫鏃堕棿" prop="xiyanyear">
-                  <el-input
-                    v-model="form.xiyanyear"
-                    style="width: 70px"
-                  />骞� </el-form-item
-                ><br />
-                <el-form-item label="鏄惁楗厭" prop="yinjiu">
-                  <!-- <el-input v-model="form.yinjiupinlv" placeholder="璇疯緭鍏ラギ閰掗鐜�" /> -->
-                  <el-select
-                    filterable
-                    v-model="form.yinjiu"
-                    placeholder="璇烽�夋嫨鏄惁楗厭"
-                    clearable
-                    style="width: 150px"
-                  >
-                    <el-option
-                      v-for="dict in dict.type.tj_smoking_pinlv"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="楗厭棰戠巼" prop="yinjiupinlv">
-                  <el-input
-                    v-model="form.yinjiupinlv"
-                    style="width: 70px"
-                  />ml/澶�
-                </el-form-item>
-                <el-form-item label="楗厭鏃堕棿" prop="yinjiuyear">
-                  <el-input v-model="form.yinjiuyear" style="width: 70px" />骞�
-                </el-form-item>
-                <el-form-item label="鍏朵粬" prop="qita">
-                  <el-input
-                    v-model="form.qita"
-                    placeholder="璇疯緭鍏ュ叾浠�"
-                    type="textarea"
-                    style="width: 600px"
-                    rows="2"
-                  />
-                </el-form-item>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鎬ユ參鎬ц亴涓氱梾鍙蹭俊鎭�" name="5">
-              <div style="width: 900px">
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button
-                      type="primary"
-                      icon="el-icon-plus"
-                      size="mini"
-                      @click="addmembers()"
-                      >娣诲姞
-                    </el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button
-                      type="danger"
-                      icon="el-icon-delete"
-                      size="mini"
-                      @click="delemembers()"
-                      >鍒犻櫎
-                    </el-button>
-                  </el-col>
-                </el-row>
-                <el-table
-                  border
-                  :data="form.tjAskHistorysList"
-                  ref="tjAskHistorys"
-                  style="width: 98%"
-                  @selection-change="handlebingChange"
-                >
-                  <el-table-column type="selection" width="40" align="center" />
-                  <!-- <el-table-column
-            label="搴忓彿"
-            align="center"
-            prop="index"
-            width="50"
-          /> -->
-                  <el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
-                    <template slot-scope="scope">
-                      <el-input
-                        size="mini"
-                        v-model="scope.row.diseaseName"
-                        placeholder="璇疯緭鍏ョ柧鐥呭悕绉�"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
-                    <template slot-scope="scope">
-                      <!-- <el-input
-                v-model="scope.row.diseaseData"
-                placeholder="璇疯緭鍏ヨ瘖鏂棩鏈�"
-              /> -->
-                      <el-date-picker
-                        size="mini"
-                        v-model="scope.row.diseaseData"
-                        align="right"
-                        type="date"
-                        placeholder="閫夋嫨鏃ユ湡"
-                        :picker-options="pickerOptions"
-                        style="width: 130px"
-                        value-format="yyyy-MM-dd"
-                      >
-                      </el-date-picker>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="璇婃柇鍗曚綅" prop="diseaseCompany">
-                    <template slot-scope="scope">
-                      <el-input
-                        size="mini"
-                        v-model="scope.row.diseaseCompany"
-                        placeholder="璇疯緭鍏ヨ瘖鏂崟浣�"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="鏄惁鐥婃剤" prop="isOk">
-                    <template slot-scope="scope">
-                      <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
-                      <el-select
-                        filterable
-                        size="mini"
-                        v-model="scope.row.isOk"
-                        placeholder="璇烽�夋嫨鏄惁鐥婃剤"
-                        clearable
-                      >
-                        <el-option
-                          v-for="dict in dict.type.sys_yes_no"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        />
-                      </el-select>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="澶囨敞" prop="remark">
-                    <template slot-scope="scope">
-                      <el-input
-                        size="mini"
-                        v-model="scope.row.remark"
-                        placeholder="璇疯緭鍏ュ娉�"
-                      />
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </el-collapse-item>
-
-            <el-collapse-item title="鑱屼笟鍙�" name="7">
-              <div style="width: 900px">
-                <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                    <el-button
-                      type="primary"
-                      icon="el-icon-plus"
-                      size="mini"
-                      @click="addmemberss()"
-                      >娣诲姞
-                    </el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                    <el-button
-                      type="danger"
-                      icon="el-icon-delete"
-                      size="mini"
-                      @click="delememberss()"
-                      >鍒犻櫎
-                    </el-button>
-                  </el-col>
-                </el-row>
-                <el-table
-                  border
-                  :data="form.workLogs"
-                  style="width: 98%"
-                  @selection-change="handlezhiyeChange"
-                >
-                  <el-table-column type="selection" width="40" align="center" />
-                  <!-- <el-table-column
-            label="搴忓彿"
-            align="center"
-            prop="index"
-            width="50"
-          /> -->
-                  <el-table-column label="寮�濮嬫椂闂�" prop="beginTime">
-                    <template slot-scope="scope">
-                      <el-date-picker
-                        size="mini"
-                        v-model="scope.row.beginTime"
-                        align="right"
-                        type="date"
-                        placeholder="閫夋嫨鏃ユ湡"
-                        :picker-options="pickerOptions"
-                        style="width: 130px"
-                        value-format="yyyy-MM-dd"
-                      >
-                      </el-date-picker>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="缁撴潫鏃堕棿" prop="endTime">
-                    <template slot-scope="scope">
-                      <el-date-picker
-                        size="mini"
-                        v-model="scope.row.endTime"
-                        align="right"
-                        type="date"
-                        placeholder="閫夋嫨鏃ユ湡"
-                        :picker-options="pickerOptions"
-                        style="width: 130px"
-                        value-format="yyyy-MM-dd"
-                      >
-                      </el-date-picker>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="宸ヤ綔鍗曚綅" prop="workCompany">
-                    <template slot-scope="scope">
-                      <el-input
-                        size="mini"
-                        v-model="scope.row.workCompany"
-                        placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="閮ㄩ棬" prop="workDept">
-                    <template slot-scope="scope">
-                      <el-input
-                        size="mini"
-                        v-model="scope.row.workDept"
-                        placeholder="璇疯緭鍏ラ儴闂�"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="宸ョ" prop="workType">
-                    <template slot-scope="scope">
-                      <el-input
-                        size="mini"
-                        v-model="scope.row.workType"
-                        placeholder="璇疯緭鍏ュ伐绉�"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
-                    <template slot-scope="scope">
-                      <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
-                      <el-select
-                        filterable
-                        size="mini"
-                        v-model="scope.row.harmTypeLogs"
-                        multiple
-                        placeholder="璇烽�夋嫨鏈夊鍥犵礌"
-                        clearable
-                      >
-                        <el-option
-                          v-for="dict in harmTypeList"
-                          :key="dict.aid"
-                          :label="dict.harmType"
-                          :value="dict.aid"
-                        />
-                      </el-select>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="闃叉姢鎺柦" prop="fangHu">
-                    <template slot-scope="scope">
-                      <el-input
-                        size="mini"
-                        v-model="scope.row.fangHu"
-                        placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�"
-                      />
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </el-collapse-item>
-          </el-collapse>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button
-            type="primary"
-            @click="submitForm"
-            style="margin-top: 10px"
-            :disabled="isdisabled"
-            >鎻愪氦</el-button
-          >
-        </div>
+        <jianqianwenzhen
+          :jianqianwenzhendata="jianqianwenzhendata"
+          :dataList="dataList"
+        ></jianqianwenzhen>
       </div>
     </div>
 
@@ -568,12 +157,14 @@
 </template>
 
 <script>
+import jianqianwenzhen from "@/components/jianqianwenzhen";
 import { updateHistory, getInfoById } from "@/api/hosp/history";
 import { Message } from "element-ui";
 import { getOrderList } from "@/api/hosp/order";
 import { listHarmType } from "@/api/hosp/harmType";
 export default {
   name: "History",
+  components: { jianqianwenzhen },
   dicts: [
     "tj_smoking_pinlv",
     "sys_yes_no",
@@ -595,6 +186,7 @@
       }
     };
     return {
+      jianqianwenzhendata: [],
       selectList: [],
       dataList: [],
       pickerOptions: {
@@ -812,7 +404,7 @@
       });
       let tjNumber = selection.map((item) => item.tjNumber);
       getInfoById(tjNumber).then((response) => {
-        this.form = response.data;
+        this.jianqianwenzhendata = response.data;
         if (this.form.xiyan == null) {
           this.form.xiyan = "1";
         }
@@ -841,41 +433,6 @@
           return "warning-row";
         }
       }
-    },
-    // 鏂板琛�
-    addmembers() {
-      if (this.form.cusName) {
-        if (!this.form.tjAskHistorysList) {
-          this.form.tjAskHistorysList = [];
-          this.form.tjAskHistorysList.push({
-            id: parseInt(length),
-            diseaseName: "",
-            diseaseData: "",
-            diseaseCompany: "",
-            isOk: "",
-            remark: "",
-            Selection,
-          });
-        } else {
-          this.form.tjAskHistorysList.push({
-            id: parseInt(length),
-            diseaseName: "",
-            diseaseData: "",
-            diseaseCompany: "",
-            isOk: "",
-            remark: "",
-            Selection,
-          });
-        }
-      } else {
-        Message.warning("璇峰厛濉啓瀹㈡埛鍚�");
-      }
-      this.$forceUpdate();
-    },
-
-    handlebingChange(selection) {
-      this.bingshiall = [];
-      this.bingshiall = selection;
     },
 
     delemembers() {
@@ -927,11 +484,6 @@
       this.$forceUpdate();
     },
 
-    handlezhiyeChange(selection) {
-      this.chageall = [];
-      this.chageall = selection;
-    },
-
     delememberss() {
       let that = this;
       if (that.form.workLogs.length == that.chageall.length) {
@@ -945,13 +497,6 @@
           });
         });
       }
-    },
-    /** 鎻愪氦鎸夐挳 */
-    submitForm() {
-      this.form.tjNum = this.dataList[0].tjNumber;
-      updateHistory(this.form).then((response) => {
-        this.$modal.msgSuccess("淇敼鎴愬姛");
-      });
     },
   },
 };
@@ -978,22 +523,9 @@
   margin-top: 60px;
 }
 
-.coll {
-  width: 100%;
-}
-
 ::v-deep .el-collapse-item__header {
   font-weight: 800;
   font-size: 16px;
-}
-
-.txt {
-  font-size: 16px;
-  font-weight: 800;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 20px;
 }
 
 .el-table .warning-row {
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 196b9ff..4d70fb2 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -252,10 +252,10 @@
             placeholder="璇疯緭鍏ョ瀹ょ紪鐮�"
           />
         </el-form-item>
-        <el-form-item label="鏄剧ず椤哄簭" prop="orderNum">
+        <el-form-item label="鏄剧ず椤哄簭" prop="orderNum" style="margin-top:20px">
           <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ樉绀洪『搴�" />
         </el-form-item>
-        <el-form-item label="鎵�灞炲尰闄�" prop="hospId">
+        <el-form-item label="鎵�灞炲尰闄�" prop="hospId" style="margin-top:20px">
           <el-select
             v-model="form.hospId"
             placeholder="璇烽�夋嫨鎵�灞炲尰闄�"
@@ -271,13 +271,13 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="璐熻矗浜�" prop="leader">
+        <el-form-item label="璐熻矗浜�" prop="leader" style="margin-top:20px">
           <el-input v-model="form.leader" placeholder="璇疯緭鍏ヨ礋璐d汉" />
         </el-form-item>
-        <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+        <el-form-item label="鑱旂郴鐢佃瘽" prop="phone" style="margin-top:20px">
           <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
         </el-form-item>
-        <el-form-item label="閭" prop="email">
+        <el-form-item label="閭" prop="email" style="margin-top:20px">
           <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
         </el-form-item>
         <!-- <el-form-item label="绉戝鑻辨枃鍚嶇О" prop="departmentEnName">
@@ -336,7 +336,7 @@
           <el-date-picker clearable v-model="form.buildDate" type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨寤虹珛鏃ユ湡" style="width: 200px">
           </el-date-picker>
         </el-form-item> -->
-        <el-form-item label="鏍囧噯绉戝" prop="standardDeptCode">
+        <el-form-item label="鏍囧噯绉戝" prop="standardDeptCode" style="margin-top:20px">
           <el-input
             v-model="form.standardDeptCode"
             placeholder="璇疯緭鍏ユ爣鍑嗙瀹�"
@@ -467,19 +467,19 @@
       // 琛ㄥ崟鏍¢獙
       rules: {
         parentId: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
+          { required: true, message: "涓婄骇绉戝涓嶈兘涓虹┖", validator: checkPhoneNum, trigger: "blur" },
         ],
         deptName: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
+          { required: true, message: "绉戝鍚嶇О涓嶈兘涓虹┖", validator: checkPhoneNum, trigger: "blur" },
         ],
         orderNum: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
+          { required: true, message: "鏄剧ず椤哄簭涓嶈兘涓虹┖", validator: checkPhoneNum, trigger: "blur" },
         ],
         departmentCode: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
+          { required: true, message: "绉戝缂栫爜涓嶈兘涓虹┖", validator: checkPhoneNum, trigger: "blur" },
         ],
         hospId: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
+          { required: true, message: "鎵�灞炲尰闄笉鑳戒负绌�", validator: checkPhoneNum, trigger: "blur" },
         ],
         // email: [
         //   {
@@ -688,15 +688,15 @@
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.deptId != undefined) {
-            if(this.form.hospId && this.form.hospCode){
+            // if(this.form.hospId && this.form.hospCode){
               updateDept(this.form).then((response) => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               this.open = false;
               this.getList();
             });
-            }else{
-              this.$modal.msgError("璇峰~鍐欏甫鏄熷彿");
-            }
+            // }else{
+            //   this.$modal.msgError("璇峰~鍐欏甫鏄熷彿");
+            // }
            
           } else {
             this.hospList.forEach((element) => {

--
Gitblit v1.8.0