su

su1124

2024-03-08 b989da3c3a99fef9068c20ac55467d7ce25523af

 src/views/sampling/sampling/index.vue

@@ -32,8 +32,9 @@
        <el-date-picker
          v-model="createTimeList"
          @change="dateChangebirthday1"
          style="width: 240px"
          value-format="yyyy-MM-dd"
          :default-time="['00:00:00', '23:00:00']"
          format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
@@ -90,12 +91,11 @@
    </el-radio-group>
      </el-col >
            <el-col :span="12" v-if="tableList.length > 1 && tjStatus==0">
                <el-button type="primary" plain 
                    v-hasPermi="['hosp:detail:add']">合并样本</el-button>
        <el-button type="primary" plain v-hasPermi="['hosp:detail:add']"
          >合并样本</el-button
        >
            </el-col>

        </el-row>
   

    <div style="width: 100%; margin-left: 10px; display: flex">
      <div style="width: 40%; margin-right: 20px">
@@ -156,7 +156,6 @@
        </el-table>
      </div>
      <div style="width: 50%">
       
        <el-table
          v-loading="loading"
          :data="tableList"
@@ -175,7 +174,12 @@
                    <span>{{ parseTime(scope.row.tjTime, '{y}-{m}-{d}') }}</span>
                </template>
            </el-table-column> -->
          <el-table-column label="标本类型" align="center" prop="specimenType" width="120">
          <el-table-column
            label="标本类型"
            align="center"
            prop="specimenType"
            width="120"
          >
            <template slot-scope="scope">
              <dict-tag
                :options="dict.type.sys_dict_specimen"
@@ -184,15 +188,31 @@
            </template>
          </el-table-column>
          <el-table-column label="项目名称" align="center" prop="proName" />
          <el-table-column label="性别" align="center" prop="proSex" width="90" />
          <el-table-column label="空腹" align="center" prop="proCheckMethod" width="90" />
          <el-table-column
            label="性别"
            align="center"
            prop="proSex"
            width="90"
          />
          <el-table-column
            label="空腹"
            align="center"
            prop="proCheckMethod"
            width="90"
          />
          <el-table-column
            label="采样编号"
            align="center"
            prop="samplingNumber"
            :show-overflow-tooltip="true" width="120"
            :show-overflow-tooltip="true"
            width="120"
          />
          <el-table-column label="采样状态" align="center" prop="isSignFor" width="90">
          <el-table-column
            label="采样状态"
            align="center"
            prop="isSignFor"
            width="90"
          >
            <template slot-scope="scope">
              <dict-tag
                :options="dict.type.sampling_type"
@@ -265,6 +285,8 @@
  updateSampling,
  confirmSampling,
} from "@/api/sampling/sampling";
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";

export default {
  dicts: [
@@ -357,8 +379,9 @@
    };
  },
  created() {
    this.getNowTime();
    // this.getNowTime();
    this.getList();
    this.getdate();
  },
  mounted() {
    this.$nextTick(() => {
@@ -366,6 +389,15 @@
    });
  },
  methods: {
    getdate() {
      getNewDateList().then((res) => {
        this.createTimeList = [
          moment(res.data).format("YYYY-MM-DD 00:00:00"),
          moment(res.data).format("YYYY-MM-DD 23:59:00"),
        ];
        console.log(this.createTimeList, 111);
      });
    },
    handleSizeChange(val) {
      this.size = val;
      this.page = 1;
@@ -531,7 +563,6 @@
      this.loading = true;
      this.queryParams.isSignFor = value;
      getList(this.queryParams).then((response) => {

        if (response.data) {
          if (response.data.list == null) {
            this.samplingList = [];