12.06

lkk

2024-12-06 de1ecd434ef51cf7aa43850d2d648162bfe86289

12.06

 src/views/reservation/reservations/index.vue

@@ -273,17 +273,17 @@
            type="text"
            icon="el-icon-s-order"
            @click="handleUpdate1(scope.row)"
            v-hasPermi="['reservation:reservation:edit']"
            title="预约详细"
          ></el-button>
          <!--  v-hasPermi="['reservation:reservation:edit']" -->
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['reservation:reservation:edit']"
            title="修改"
          ></el-button>
          <!-- v-hasPermi="['reservation:reservation:edit']" -->
          <el-button
            size="mini"
            type="text"

 src/views/sampling/sampling/index.vue

@@ -461,6 +461,8 @@
    // this.getNowTime();
    getTxmmccd().then((res) => {
      this.msg = Number(res.msg);
      console.log(res,444);
      
    });
    this.getdate();
  },

 src/views/system/tijian/TreeTransfer.vue

@@ -87,7 +87,7 @@
  },
  created() {
    this.leftNodeData = this.nodeData
    console.log(this.leftNodeData,111);
    // console.log(this.leftNodeData,111);
    
    this.rightKeys.length > 0 ? this.rerenderData(this.rightKeys) : ''
  },

 src/views/system/tijian/index.vue

@@ -1014,6 +1014,7 @@
                v-for="(item, index) in tableData1"
                :key="'info1-' + index"
              >

                <el-collapse-item :name="index">
                  <template slot="title">
                    <div style="width: 70%">
@@ -1044,7 +1045,7 @@
                    style="width: 100%"
                    height="270"
                  >
                    <el-table-column prop="proName" label="项目" width="180">
                    <el-table-column prop="s" label="项目" width="180">
                    </el-table-column>
                    <el-table-column prop="proType" label="性别" width="180">
                      <template
@@ -1695,6 +1696,9 @@
  },
  mounted() {
    console.log(this.dict.type.dict_user_marry, 555);
    console.log(this.dict.type.dict_user_national, 666);

    
  },

  methods: {
@@ -2203,6 +2207,12 @@
            }
            if (this.form.tjType === null) {
              this.form.tjType = "3";
            }
            if (this.form.cusMarryStatus === "null") {
              this.form.cusMarryStatus = "5";
            }
            if (this.form.cusNational === "null") {
              this.form.cusNational = "1";
            }
            if (this.form.reservationId != null) {
              if (this.form.groupingId) {
@@ -3309,6 +3319,9 @@
              }
              this.list1 = false;
              this.list3 = true;
              this.list2 = false;
              console.log(this.list1)
              console.log(this.list3)
            } else {
              this.list1 = true;
              this.TotalPrice = "0.00";

 src/views/system/tijianall/index.vue

@@ -1743,7 +1743,7 @@
          this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img;
        }
      } else {
        this.$message.warning("未查到用户信息");
        this.$message.warning("请放置身份证后再点击读取");
      }
      /* else if (resultObj.resultFlag == "-1") {
          if (resultObj.errorMsg == "端口打开失败") {