增加家庭号

linwenling

2023-04-07 eb3e97b425f14ea55bed57b2485816950d6f0141

增加家庭号

 ruoyi-ui/src/views/bignote/familyInfo.vue

File was deleted

 ruoyi-ui/src/views/bignote/familyeventInfo.vue

@@ -31,9 +31,14 @@
          <el-input v-model="formData.address" placeholder="请输入地点" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
      <el-form-item label="家庭号" prop="familyId">
        <el-input v-model="formData.familyId" placeholder="请输入家庭号" :maxlength="11" show-word-limit :disabled="true"
                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>

  
        <h4 class="form-header">相关图片 </h4>
        <el-upload
@@ -162,11 +167,11 @@
            message: '请输入大事标题',
            trigger: 'blur'
          }],
          // location: [{
          //   required: true,
          //   message: '请输入存储地址',
          //   trigger: 'blur'
          // }],
        familyId: [{
          required: true,
          message: '请输入家庭号',
          trigger: 'blur'
        }],
          people: [{
            required: true,
            message: '请输入人物',
@@ -362,4 +367,3 @@
    position: absolute;
  }
  </style>
  

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

@@ -38,7 +38,7 @@
              v-model="queryParams.address"
              placeholder="请输入地点"
              clearable
              style="width: width: 197px;
          style="width: 197px;
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
@@ -51,7 +51,7 @@
        <el-form-item label="时间">
          <el-date-picker
            v-model="dateRange"
            style="width: width: 197px;
          style=" width: 197px;
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
@@ -131,6 +131,7 @@
       
        <el-table-column label="备注" prop="remark" sortable width="100" />
        <el-table-colum label="电子文件" prop="fujian" sortable width="100"/>
      <el-table-column label="家庭号" prop="familyId" sortable width="100" />
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
            <el-button
@@ -178,6 +179,10 @@
          </el-form-item>
          <el-form-item label="地点" prop="address">
            <el-input v-model="formDat.address" placeholder="请输入地点" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="家庭号" prop="familyId">
          <el-input v-model="formDat.familyId" placeholder="请输入家庭号" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="备注" prop="remark">
@@ -317,6 +322,7 @@
          holder: undefined,
          address: undefined,
          remark: undefined,
        familyId:undefined,
          url: undefined,
        },
        // 菜单列表
@@ -356,11 +362,11 @@
            message: '请输入地点',
            trigger: 'blur'
          }],
          // remark: [{
          //   required: true,
          //   message: '请输入备注',
          //   trigger: 'blur'
          // }],
        familyId: [{
          required: true,
          message: '请输入家庭号',
          trigger: 'blur'
        }],
          createTime: [{
            required: true,
            message: '请选择日期选择',
@@ -384,17 +390,17 @@

      //隔行变色

      methods: {
      tableRowClassName({row, rowIndex}) {
        if (rowIndex === 1)  //=>这里可以改成 rowIndex%2=== 1，后面直接else即可达到隔行变色效果。
        { 
          return 'warning-row';
        } else if (rowIndex === 3) {
          return 'success-row';
        }
        return '';
      }
    },
    //   methods: {
    //   tableRowClassName({row, rowIndex}) {
    //     if (rowIndex === 1)  //=>这里可以改成 rowIndex%2=== 1，后面直接else即可达到隔行变色效果。
    //     {
    //       return 'warning-row';
    //     } else if (rowIndex === 3) {
    //       return 'success-row';
    //     }
    //     return '';
    //   }
    // },

      /** 查询角色列表 */  
      //列表显示家大事记
@@ -477,7 +483,7 @@
      /** 查看详细信息 */
      handleCheck(row){
        const id = row.id;
        this.$router.push("/family1/bignote/familyeventInfo/" + id);
      this.$router.push("/family/zfEvent/bignote/familyeventInfo/" + id);
      },
      /** 修改按钮操作 */
      handleUpdate(row) {
@@ -485,7 +491,7 @@
        let jd = true
  
        this.$router.push({
          path:"/family1/bignote/familyeventInfo/" + id,
        path:"/family/zfEvent/bignote/familyeventInfo/" + id,
          query:{
            detail:jd
          }
@@ -560,4 +566,3 @@
    }
  };
  </script>


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

@@ -20,7 +20,7 @@
            v-model="queryParams.title"
            placeholder="请输入标题"
            clearable
            style="width: 240px"title
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
@@ -114,11 +114,14 @@
      <el-table-column label="持有人" prop="holder" sortable width="100" />
      <el-table-column label="具体位置" prop="address" sortable width="100" />
      <el-table-column label="备注信息" prop="remark" sortable width="100" />
      <el-table-column label="家庭号" prop="familyId" sortable width="100" />
      <el-table-column label="创建时间" align="center" sortable prop="createTime" width="180">

        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>

      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
@@ -176,6 +179,11 @@
          <el-input v-model="formDat.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="家庭号" prop="familyId">
          <el-input v-model="formDat.familyId" placeholder="请输入家庭号" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

        <el-form-item label="备注" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
@@ -312,6 +320,7 @@
        address: undefined,
        remark: undefined,
        url: undefined,

      },
      // 菜单列表
      menuOptions: [],
@@ -326,7 +335,8 @@
        location:undefined,
        holder:undefined,
        address:undefined,
        createTime:undefined
        createTime:undefined,

      },
      // 表单参数
      form: {},
@@ -361,9 +371,9 @@
          message: '请输入具体位置',
          trigger: 'blur'
        }],
        remark: [{
        familyId: [{
          required: true,
          message: '请输入备注',
          message: '请输入familyId',
          trigger: 'blur'
        }],
        createTime: [{
@@ -477,7 +487,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      this.$router.push("/family/note1/propertyInfo/" + id);
      this.$router.push("/family/property/note1/propertyInfo/" + id);
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
@@ -485,7 +495,7 @@
      let jd = true

      this.$router.push({
        path:"/family/note1/propertyInfo/" + id,
        path:"/family/property/note1/propertyInfo/" + id,
        query:{
          detail:jd
        }

 ruoyi-ui/src/views/note/propertyInfo.vue

File was deleted

 ruoyi-ui/src/views/note/propertylnfo.vue

@@ -6,7 +6,7 @@
    </div>

    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
      <el-form-item label="id" prop="id">
      <el-form-item label="序号" prop="id">
        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"
                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item>
@@ -34,6 +34,10 @@
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="家庭号" prop="familyId">
        <el-input v-model="formData.familyId" placeholder="请输入家庭号" :maxlength="11" show-word-limit :disabled="true"
                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item>

      <h4 class="form-header">相关图片 </h4>
      <el-upload