Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

qx

5 天以前 6eb098b9ea2673240e802e4aa460ddc67ec7d869

 src/views/doctor/check/index.vue

@@ -682,7 +682,7 @@
        </el-tab-pane>
      </el-tabs>
      <span slot="footer" class="dialog-footer">
        <el-button @click="taocan = false">取 消</el-button>
        <el-button @click="quzxiao">取 消</el-button>
        <el-button type="primary" @click="queding">确 定</el-button>
      </span>
    </el-dialog>
@@ -742,7 +742,7 @@
      activeNames: "first",
      taocan: false,
      minedis: false,
      lastClickedTab:null,
      lastClickedTab: null,
      creatobj: {},
      dataText: [],
      propform: {},
@@ -1330,19 +1330,51 @@

    bzxz() {
      this.taocan = true;
      let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
      getAdviceByTjNumAndPro(data).then((res) => {
        if (res.data) {
          this.deptAdviceList3 = res.data;
          this.deptAdviceList1 = [
            ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
          ];
          this.deptAdviceList3.forEach((items) => {
            this.idss.push(items.id);
            this.remakes += items.advice + ",";
          });
        }
      });
      var deptAdviceList1 = []
      // let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
      // getAdviceByTjNumAndPro(data).then((res) => {
        // if (res.data) {
        //   this.deptAdviceList3 = res.data;
          if (this.proParentList.xiaoJieIds.length != 0) {
            if (this.vaids.length != 0) {
              const result = this.vaids.reduce((acc, item) => {
                const matches = this.deptAdviceList.filter(items => {
                  return item == items.id;  // 或 === 根据需求
                });
                return acc.concat(matches);
              }, []);
              deptAdviceList1 = result;

              return this.deptAdviceList1 = [
                ...new Set(deptAdviceList1),
              ];
            } else {
              this.proParentList.xiaoJieIds.forEach(item => {
                this.deptAdviceList.forEach((items) => {
                  if (item == items.id) {
                    deptAdviceList1.push(items)
                  }
                });
              })
              return this.deptAdviceList1 = [
                ...new Set(deptAdviceList1),
              ];
            }


          } else if (this.proParentList.xiaoJieIds == null) {
            this.deptAdviceList1 = []
          }

          // this.deptAdviceList1 = [
          //   ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
          // ];
          // this.deptAdviceList3.forEach((items) => {
          //   this.idss.push(items.id);
          //   this.remakes += items.advice + ",";
          // });
      //   }
      // });
    },

    result() {
@@ -1380,26 +1412,45 @@

    handleDelete(row) {
      this.deptAdviceList1.forEach((item, index) => {
        if (item.id == row.id) this.deptAdviceList1.splice(index, 1);
        if (item.id == row.id) {
          this.deptAdviceList1.splice(index, 1);
          this.$refs.multipleTable.toggleRowSelection(item, false);
        }

      });
    },

    handleSelectionChanges(selection) {
      this.deptAdviceList2 = this.deptAdviceList1;
      if (this.deptAdviceList1.length != 0) {
        this.deptAdviceList2 = this.deptAdviceList1;
      }
      if (selection.length > 1) {
        const del_row = selection.shift();
        this.$refs.multipleTable.toggleRowSelection(del_row, false);
      }
      selection.forEach((item) => this.deptAdviceList2.push(item));
      this.deptAdviceList1 = [
        ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
      ];
    },
      // this.deptAdviceList1 = [
      //   ...new Set(this.deptAdviceList2),
      // ];
      this.deptAdviceList1 = [...new Set(
        this.deptAdviceList2.map(item => JSON.stringify(item))
      )].map(str => JSON.parse(str));
      // if( this.deptAdviceList1.length == 0){
      //   this.deptAdviceList1 = selection
      // }else{
      //   selection.forEach((item) => this.deptAdviceList1.push(item));
      // }

    },
    quzxiao() {
      this.taocan = false;
      this.deptAdviceList1 = []
    },
    queding() {
      if (this.proParentList.xiaoJie.length != 0) {
        this.remakes = "";
        this.titles = "";
        this.vaids = []
        this.deptAdviceList1.forEach((item1) => {
          if (this.proParentList.remark != null) {
            this.titles += item1.title + ",";
@@ -1853,6 +1904,7 @@
      this.loading = true;
      this.drawer = true;
      this.isLoading = true;
      this.titles = ""
      this.Parent = []
      this.tableAll = []
      this.proParentList = {}
@@ -1962,11 +2014,11 @@
            //判断新数组是否有这个元素值，没有的话，就把arr[i]给push到新数组newArr中
            if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
              this.radio = this.lastClickedTab.name
              this.$modal.msgError("请填写资料");
              this.$modal.msgError("请检查项目是否填写完成");
              this.minedis = true
              return
            } else if (this.proParentList.sons[i].proResult.includes(" ")) {
              this.$modal.msgError("请查看是否有空格");
              this.$modal.msgError("请检查填写项目中是否有空格");
              this.radio = this.lastClickedTab.name
              this.minedis = true
              return
@@ -1994,7 +2046,7 @@
              proId: this.proId,
              remark: this.proParentList.remark,
              proName: this.proName,
              summaryList: this.value,
              summaryList: this.vaids,
              doctorName: this.doctorName,
              tjOrderDetailList: this.tjOrderDetail,
            }];
@@ -2045,14 +2097,14 @@
        //   rulesList: item.rulesList,
        // });
      });
        for (var i = 0; i < this.proParentList.sons.length; i++) {
      for (var i = 0; i < this.proParentList.sons.length; i++) {
        //判断新数组是否有这个元素值，没有的话，就把arr[i]给push到新数组newArr中
        if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
          this.$modal.msgError("请填写资料");
          this.$modal.msgError("请检查项目是否填写完成");
          this.minedis = true
          return
        } else if (this.proParentList.sons[i].proResult.includes(" ")) {
          this.$modal.msgError("请查看是否有空格");
          this.$modal.msgError("请检查填写项目中是否有空格");
          this.minedis = true
          return
        } else {
@@ -2079,7 +2131,7 @@
            proId: this.proId,
            remark: this.proParentList.remark,
            proName: this.proName,
            summaryList: this.vaids1,
            summaryList: this.vaids,
            doctorName: this.doctorName,
            tjOrderDetailList: this.tjOrderDetail,
          },