修改了bug

yz3456

2024-05-27 ce09e7d8c54d1868fe9a589caec577ddb0aeaf52

修改了bug

 ruoyi-ui/src/views/healthy/healthYear.vue

@@ -998,7 +998,7 @@
     // 数据范围选项
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
     

      fileList:[
      ],
      fileListOther:[
@@ -1039,7 +1039,7 @@
  },
  created() {
    this.getList()

    this.$route.meta.title = "现状健康情况";
  },

  methods: {
@@ -2080,7 +2080,7 @@
      };
      console.log(111)
      console.log(this.bloodData)
	  

      if(isObjectEmpty(this.bloodData)){
        this.HealthyBaseList.bloodClass = this.HealthyBaseList.bloodClass;
      }else {
@@ -2274,7 +2274,7 @@
        }
      })
      // 刷新页面
   

    },
    //年度健康报告
    toYearhealthy(){

 ruoyi-ui/src/views/meeting/approve.vue

@@ -122,7 +122,8 @@
      </el-table-column>

      <el-table-column label="状态" prop="statu" sortable align="center">
        <template slot-scope="scope">{{scope.row.statu===1? '同意': '拒绝'}}</template>
        <!-- <template slot-scope="scope">{{scope.row.statu===1? '同意': '拒绝'}}</template> -->
                <template slot-scope="scope">{{scope.row.statu ===3 ? '待审批' : (scope.row.statu===1? '同意': '拒绝')}}</template>
      </el-table-column>

      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">

 ruoyi-ui/src/views/meeting/approveInfo.vue

@@ -237,6 +237,10 @@
            {
              value: 0,
              label: '拒绝',
            },
            {
              value: 3 ,
              label: '待审批',
            }
            ],
      }

 ruoyi-ui/src/views/meeting/index.vue

@@ -222,7 +222,9 @@
      </el-table-column>

      <el-table-column label="状态" prop="statu" sortable align="center">
        <template slot-scope="scope">{{scope.row.statu===1? '同意': '拒绝'}}</template>
        <!-- <template slot-scope="scope">{{scope.row.statu===1? '同意': '拒绝'}}</template> -->
        <template slot-scope="scope">{{scope.row.statu ===3 ? '待审批' : (scope.row.statu===1? '同意': '拒绝')}}</template>
        <!-- scope.row.statu ==='待审批' ? '待审批' : (scope.row.statu===1? '同意': '拒绝') -->
      </el-table-column>

      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
@@ -287,7 +289,7 @@
          <el-input v-model="formDat.applyApart" placeholder="请输入申请家庭或部门" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>
        <el-form-item label="是否拜访水牌" prop="isPlacebrand">
        <el-form-item label="是否摆放水牌" prop="isPlacebrand">
          <el-select v-model="formDat.isPlacebrand" placeholder="请选择" clearable :style="{width: '100%'}">
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
@@ -301,10 +303,11 @@
          <el-input v-model="formDat.connPhone" placeholder="请输入联系电话" clearable :style="{width: '100%'}"></el-input>
        </el-form-item>
        <el-form-item label="状态" prop="statu">
          <el-select v-model="formDat.statu" placeholder="请选择" clearable :style="{width: '100%'}">
          <!-- <el-select v-model="formDat.statu" placeholder="请选择" clearable :style="{width: '100%'}">
            <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
          </el-select> -->
          <el-input placeholder="待审核" :disabled='true'></el-input>
        </el-form-item>

      </el-form>
@@ -415,7 +418,7 @@
        }],
        isPlacebrand: [{
          required: true,
          message: '请选择是否拜访水牌',
          message: '请选择是否摆放水牌',
          trigger: 'blur'
        }],
        connPerson: [{
@@ -428,11 +431,11 @@
          message: '请输入联系电话',
          trigger: 'blur'
        }],
        statu: [{
          required: true,
          message: '请选择状态',
          trigger: 'blur'
        }],
        // statu: [{
        //   // required: true,
        //   message: '请选择状态',
        //   trigger: 'blur'
        // }],

      },
        typeOptions: [
@@ -487,6 +490,28 @@
        this.queryParams.pageNum = 1;
        this.getList();
      },
      reset() {
        if (this.$refs.menu != undefined) {
          this.$refs.menu.setCheckedKeys([]);
        }
        this.menuExpand = false,
          this.menuNodeAll = false,
          this.deptExpand = true,
          this.deptNodeAll = false,
          this.form = {
            roleId: undefined,
            roleName: undefined,
            roleKey: undefined,
            roleSort: 0,
            status: "0",
            menuIds: [],
            deptIds: [],
            menuCheckStrictly: true,
            deptCheckStrictly: true,
            remark: undefined
          };
        this.resetForm("elForm");
      },
      /** 重置按钮操作 */
      resetQuery() {
        this.dateRange = [];
@@ -496,17 +521,20 @@


      newRequest(){
        this.reset();
        this.open = true;
        this.title = "新申请"
      },
      cancel() {
        this.open = false;
        // this.reset();
        this.reset();
      },
submitDataScope: function() {
      this.$refs["elForm"].validate(valid => {
        // alert(valid)
        if (valid) {
          // console.log(this.formDat,'formDat')
          this.formDat.statu = 3
          addMeeting(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;

 ruoyi-ui/src/views/meeting/meetingInfo.vue

@@ -124,7 +124,7 @@
              <el-form-item label="状态" prop="statu" label-width="120px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-select v-model="formData.statu" placeholder="请选择 " clearable :style="{width: '100%'}"
                  :disabled="dsb">
                  :disabled="true">
                  <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label"
                    :value="item.value"></el-option>
                </el-select>
@@ -255,7 +255,7 @@
            trigger: 'blur'
          }],
          statu: [{
            required: true,
            // required: true,
            message: '请选择状态',
            trigger: 'blur'
          }],
@@ -279,6 +279,10 @@
            {
              value: 0,
              label: '拒绝',
            },
            {
              value: 3 ,
              label: '待审批',
            }
            ],
      }