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

qx

昨天 d0ba1fd79cf71e389a95123358ce951b34811454

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

 src/api/doctor/checkAll.js

@@ -186,3 +186,13 @@
  })
}

// 撤销按钮
export function chexiao(tjNUm,proId) {
  return request({
    url: '/hosp/order/chushenyemianchexiaojiekou',
    method: 'get',
    params: { tjNUm: tjNUm, proId: proId }
  })
}



 src/components/proposal/index.vue

@@ -81,6 +81,12 @@
      >
        <el-table-column type="selection" width="40" align="center" />
        <el-table-column label="编码" width="70" align="center" prop="id" />
        <el-table-column
          label="用户名"
          width="70"
          align="center"
          prop="userName"
        />
        <el-table-column label="标题" width="120" align="center" prop="title" />
        <el-table-column label="建议内容" align="left" prop="advice" />
        <!-- <el-table-column
@@ -127,6 +133,7 @@
  name: "Packagese",
  props: {
    cusobj: Object,
    mrjy: String,
  },
  data() {
    return {
@@ -168,12 +175,26 @@
      this.fList = val;
      this.queryParams.sex = val.sex;
      this.queryParams.isZj = val.isZj;
      this.tjproposal = "0";
      // this.tjproposal = "0";
      this.getList();
    },
    mrjy(val) {
      /* if (val === "Y") {
        this.tjproposal = "1"; // 默认选中“常用建议”
        this.radiotjproposalChange("1"); // 手动触发相关逻辑
      } */
     const mode = val === "Y" ? "1" : "0";
     this.setTjProposal(mode);
    },
  },

  methods: {
    setTjProposal(mode) {
      if (this.tjproposal !== mode) {
        this.tjproposal = mode;
        this.radiotjproposalChange(mode); // 执行切换逻辑
      }
    },
    getAllList() {
      this.loading = true;
      this.openone = true;

 src/views/doctor/checkAll/index.vue

@@ -575,16 +575,17 @@
                    <el-table-column align="center" prop="proName" label="项目" width="260"></el-table-column>
                    <el-table-column label="状态" align="center" prop="type" :show-overflow-tooltip="true" width="120">
                      <template slot-scope="scope">
                        <span v-if="scope.row.type == '0'">未审核</span>
                        <span v-if="scope.row.type == '1'">已审核</span>
                        <span v-if="scope.row.type == '0'">未检</span>
                        <span v-if="scope.row.type == '1'">已检</span>
                        <span v-if="scope.row.type == '2'">弃检</span>
                        <span v-if="scope.row.type == '3'">延期</span>
                      </template>
                    </el-table-column>
                    <el-table-column label="检查时间" align="center" prop="bcupdateTime" width="160" />
                    <el-table-column label="操作" align="center" width="130px">
                    <el-table-column label="检查时间" align="center" prop="bcupdateTime" :formatter="formatDate" width="160" />
                    <el-table-column label="操作" align="center" width="80px">
                      <template slot-scope="scope">
                        <el-button type="primary" size="mini" @click="huifu" v-if="scope.row.type == '2'">恢复</el-button>
                        <el-button type="primary" size="mini" @click="huifu(scope.row)" v-if="scope.row.type == '2'">恢复</el-button>
                        <el-button type="primary" size="mini" @click="chexiao(scope.row)" v-if="scope.row.type == '1'">撤销</el-button>
                      </template>
                    </el-table-column>
                  </el-table>
@@ -962,13 +963,14 @@
    </el-dialog>
    <Packages ref="bbb" :baogao="baogao" />
    <Prescription ref="Pre" :preObj="preObj" />
    <proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" />
    <proposal ref="proposal" :cusobj="cusobj" :mrjy="mrjy" @event1="eventchange($event)" />
    <createproposal ref="createproposal" :creatobj="creatobj" />
    <el-dialog title="常用建议维护" :visible.sync="propdialog" width="500px" append-to-body></el-dialog>
  </div>
</template>
<script>
import _ from "lodash";
import { getConfigKey } from "@/api/system/config";
import jianqianwenzhen from "@/components/jianqianwenzhen";
import Packages from "@/components/Packages";
import Prescription from "@/components/Prescription";
@@ -992,6 +994,7 @@
  UpdFcPro,
  huiFuyichangxiangmu,
  hfbt,
  chexiao
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
@@ -1189,6 +1192,7 @@
      yichangList: [],
      fcList: [],
      statusList: [],
      mrjy:"",
      queryParam: {
        pageNum: 1,
        pageSize: 10,
@@ -1348,6 +1352,12 @@
        this.cancelAdviceDialog();
        done();
      }
    },

    formatDate(row) {
      if (!row.qdcreateTime) return "";
      const date = moment(row.qdcreateTime, "YYYY-MM-DD");
      return date.isValid() ? date.format("YYYY-MM-DD") : "无效日期";
    },

    handleAdviceBlur(row, index) {
@@ -1625,6 +1635,7 @@
          this.loading = false;
        });
    },


    guanbi() {
      this.drawer = false;
@@ -1987,9 +1998,19 @@

    propoChange() {
      this.cusobj = { sex: this.tableAll.cusSex, isZj: 0 };
      this.$refs.proposal.open = true;
      getConfigKey("mrzscyjy").then((res) => {
        this.mrjy = res.msg; // 会触发 watch → 设置 tjproposal = "1"
        console.log(res,4444);
        
        // 等数据状态准备好后再打开弹窗
      this.$refs.proposal.title = "建议方案";
        this.$refs.proposal.open = true;
     });

    },

   


    eventchange(data) {
      this.dataText = data;
@@ -2121,6 +2142,17 @@
      const proId = row.proId;
      huifu(tjNUm, proId).then((res) => {
        if (res.code == 200) {
           this.$message.success("恢复成功");
          this.xiangmuqingkuang();
        }
      });
    },
    chexiao(row) {
      const tjNUm = this.tjNumber;
      const proId = row.proId;
      chexiao(tjNUm, proId).then((res) => {
        if (res.code == 200) {
          this.$message.success("撤销成功");
          this.xiangmuqingkuang();
        }
      });

 src/views/system/keyword/index.vue

@@ -90,7 +90,13 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="序号" align="center" prop="id" width="80" />
      <el-table-column
        label="序号"
        align="center"
        type="index"
        :index="indexMethod"
        width="80"
      />
      <el-table-column label="关键字" align="center" prop="gjz" />
      <el-table-column
        label="操作"
@@ -198,6 +204,11 @@
        this.loading = false;
      });
    },

    indexMethod(index) {
      return index + 1; // 从100开始编号
    },

    // 取消按钮
    cancel() {
      this.open = false;