解决了245、246、247bug

yz3456

2024-04-10 3a3913a98d2b2394990ec62387834360adeb8b58

解决了245、246、247bug

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

@@ -26,7 +26,7 @@
              </el-row>
              <el-row :span="16">
                <el-form-item label="出生日期" prop="birthday" label-width="75px">
                

                  <el-date-picker v-model="marryList.birthday"
                                  type="date"
                                  placeholder="请选择日期"
@@ -607,6 +607,8 @@
      // open:true,
      // 是否显示弹出层（数据权限）
      bear:undefined,
      handsj:undefined,
      onebear:undefined,
      mrs:undefined,
      smrs:undefined,
      openDataScope: false,
@@ -780,7 +782,7 @@
            this.oldSpouseList = this.marryList.oldSpouseList;
            console.log(111)
            console.log("信息")
            console.log(this.marryList.marryStatus);
            console.log(this.marryList);
            //alert(this.marryList.bearStatus)
            if(this.marryList.marryStatus===3){
              this.showOldSpouse = true;
@@ -959,9 +961,7 @@
        this.marryList.marryStatus = parseInt(this.mrs)
      if(this.smrs!=undefined)
        this.marryList.spouseMarryStatus = parseInt(this.smrs)
      // console.log(this.bear)
      // alert(this.bear)
      // if( parseInt(this.bear))

      if(this.bear!=undefined)
        this.marryList.bearStatus = parseInt(this.bear)


 ruoyi-ui/src/views/pet/noteInfo.vue

@@ -342,13 +342,13 @@
          }
    },
    submitForm() {
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formData.url = ul+","+uls
      // let ul = this.fileList.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // let uls = this.fileListOther.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // this.formData.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {


 ruoyi-ui/src/views/pet/petInfo.vue

@@ -96,7 +96,7 @@
                    <el-input v-model="petList.sex === 1 ? '雄性':'雌性'" :disabled="true"></el-input>
                  </template>
                  <template v-else>
                    <el-select v-model="petList.sex" placeholder="请选择保洁/收纳" clearable :style="{width: '100%'}">
                    <el-select v-model="petList.sex" placeholder="请选择性别" clearable :style="{width: '100%'}">
                      <el-option label="雌性" value="0"></el-option>
                      <el-option label="雄性" value="1"></el-option>
                    </el-select>
@@ -581,6 +581,10 @@
      this.loading = true;
      getPetList(id).then((response) => {
        this.petList = response.data;
        if(this.petList.sex==1)
            this.petList.sex = '雄性'
        else
            this.petList.sex = '雌性'
        console.log(this.petList)
     //   alert(this.petList.headPicture)
        this.loading = false;