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

qx

3 天以前 ad54cf427ee94e01e8c72a01f738615eb2b6569d

 src/views/doctor/checkAll/index.vue

@@ -809,9 +809,10 @@
                      border
                      style="width: 100%"
                      :header-cell-style="{ background: '#67C23A' }"
                      :expand-row-keys="expends"
                     
                      :row-key="getRowKeys"
                    >
                    <!--  :expand-row-keys="expends" -->
                      <el-table-column type="expand">
                        <template slot-scope="props">
                          <div style="padding: 10px">
@@ -911,6 +912,23 @@
                        label="单位"
                        width="78"
                      ></el-table-column>
                      <el-table-column
                        label="操作"
                        align="center"
                        class-name="small-padding fixed-width"
                        width="60"
                        fixed="right"
                      >
                        <template slot-scope="props">
                          <el-button
                            size="mini"
                            type="text"
                            icon="el-icon-delete"
                            @click="shanchu(props.row)"
                          >
                          </el-button>
                        </template>
                      </el-table-column>
                    </el-table>
                  </template>
                  <template v-if="item.jyjc == '1'">
@@ -921,9 +939,9 @@
                      border
                      style="width: 100%"
                      :header-cell-style="{ background: '#67C23A' }"
                      :expand-row-keys="expends"
                      :row-key="getRowKeys"
                    >
                    <!--   :expand-row-keys="expends" -->
                      <el-table-column type="expand">
                        <template slot-scope="props">
                          <div style="padding: 10px">
@@ -1014,6 +1032,23 @@
                        label="检测结果"
                        width="403"
                      ></el-table-column>
                      <el-table-column
                        label="操作"
                        align="center"
                        class-name="small-padding fixed-width"
                        width="60"
                        fixed="right"
                      >
                        <template slot-scope="props">
                          <el-button
                            size="mini"
                            type="text"
                            icon="el-icon-delete"
                            @click="shanchu(props.row)"
                          >
                          </el-button>
                        </template>
                      </el-table-column>
                    </el-table>
                  </template>
                </div>
@@ -2590,21 +2625,22 @@
    yichanghuifu() {
      this.loading = true;
      let tjNum = this.tjNumber;
      huiFuyichangxiangmu(tjNum).then((res) => {
        this.status1 = 4;
        this.ychfList = res.data;
        if(this.ychfList.length == 0){
          this.message.success("暂无异常恢复项目")
        }
      })
      .catch((error)=>{
        console.error("获取项目失败：",error);
        
        this.$message.error("获取项目失败")
      })
      .finally(()=>{
        this.loading = false;
      })
      huiFuyichangxiangmu(tjNum)
        .then((res) => {
          this.status1 = 4;
          this.ychfList = res.data;
          if (this.ychfList.length == 0) {
            this.message.success("暂无异常恢复项目");
          }
        })
        .catch((error) => {
          console.error("获取项目失败：", error);

          this.$message.error("获取项目失败");
        })
        .finally(() => {
          this.loading = false;
        });
    },
    hfyc(id) {
      this.$confirm("确认要恢复该项吗？", "提示", {