Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

shj

2022-04-13 e388dcb1c0a9efa3f1522c5adb48b26e86295fd1

 src/views/hiddenDangerRectification/index.vue

@@ -145,7 +145,7 @@
    </el-radio-group>
      </el-col> -->
      <el-col  :span="24" style="text-align:right;">
        <el-button class="btns" type="primary" size="small" @click="applicationExtension()">申请延期</el-button>
        <el-button class="btns" type="primary" size="small" @click="dialogVisible=true">申请延期</el-button>
      </el-col>
    </el-row>
    <el-table :data="tableData" style="width: 100%">
@@ -215,6 +215,59 @@
        </template>
      </el-table-column>
    </el-table>
      <!--申请延期弹窗-->
      <el-dialog
          title="提示"
          :visible.sync="dialogVisible"
          :close-on-click-modal="false"
          width="30%"
          :before-close="handleClose">
          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
              <el-row>
                  <el-col :span="16" :offset="3">
                      <el-form-item label="申请限改时间" prop="name">
                          <el-date-picker
                              v-model="value1"
                              type="date"
                              :disabled="true"
                              placeholder="选择日期"
                              style="width: 100%">
                          </el-date-picker>
                      </el-form-item>
                  </el-col>
              </el-row>
              <el-row>
                  <el-col :span="16" :offset="3">
                      <el-form-item label="附件上传" prop="desc">
                          <el-upload
                              class="upload-demo"
                              ref="upload"
                              action="https://jsonplaceholder.typicode.com/posts/"
                              :on-preview="handlePreview"
                              :on-remove="handleRemove"
                              :file-list="fileList"
                              :before-upload="beforeUpload"
                              :auto-upload="true">
                              <el-button slot="trigger" size="small" type="primary" class="btns">选择文件</el-button>
                              <div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div>
                          </el-upload>
                      </el-form-item>
                  </el-col>
              </el-row>
              <el-row>
                  <el-col :span="16" :offset="3">
                      <el-form-item label="备注" prop="desc">
                          <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
                      </el-form-item>
                  </el-col>
              </el-row>
              <div style="text-align: center">
                  <el-button class="btns" size="small" type="primary" @click="dialogVisible = false">保存</el-button>
                  <el-button size="small" @click="dialogVisible = false">关闭</el-button>
              </div>
          </el-form>
      </el-dialog>
      <!--申请延期弹窗-->
    <div style="text-align: right">
      <el-pagination
        v-show="recordTotal > 0"
@@ -269,6 +322,21 @@
            name: '王小虎',
            address: '上海市普陀区金沙江路 1516 弄'
          }],
        dialogVisible: false,
        ruleForm: {
            name: '',
            region: '',
            date1: '',
            date2: '',
            delivery: false,
            type: [],
            resource: '',
            value1: '',
            desc: ''
        },
        rules: {},
        fileList: [],

      pageSize: 10,
      recordTotal: 0,
      currentPage: 1,
@@ -282,10 +350,33 @@
          })
      },

      applicationExtension(){
          this.$router.push({
              path:"/applicationForExtension"
          })
      // applicationExtension(){
      //     this.$router.push({
      //         path:"/applicationForExtension"
      //     })
      // },
      handleClose(done) {
          this.$confirm('确认关闭？')
              .then(_ => {
                  done();
              })
              .catch(_ => {});
      },
      handleRemove(file, fileList) {
          console.log(file, fileList);
      },
      handlePreview(file) {
          console.log(file);
      },
      beforeUpload(file) {
          var FileExt = file.name.replace(/.+\./, "");
          if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
              this.$message({
                  type: 'warning',
                  message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
              });
              return false;
          }
      },
  }
};
@@ -306,4 +397,16 @@
  background-color: #034ea2;
  border: 1px solid #034ea2;
}
/deep/ .el-dialog .el-textarea__inner{
    height: 80px;
    max-height: 80px;
    overflow-y: auto
}
/deep/.el-dialog .button .el-form-item__content{
    margin-left: 0;
}
    .textarea{
        max-height: 70px;
        overflow-y: auto;
    }
</style>