Merge branch 'feature/rentalRevision' into dev

src/views/modules/plugins/change/changewelfare.vue

@@ -56,9 +56,37 @@
 <!--        <div class="resi-row-btn">-->
 <!--          <el-button type="warning" size="small" class="diy-button&#45;&#45;add" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
 <!--        </div>-->
+          <div class="exportBtn">
         <div class="resi-row-btn">
           <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
+            <el-button style="margin-left: 10px"
+                       class="diy-button--export"
+                       size="small"
+                       @click="handleExportModule()">下载模板</el-button>
+            <el-upload :headers="$getElUploadHeaders()"
+                       style=""
+                       ref="upload"
+                       :multiple="false"
+                       :show-file-list="false"
+                       :before-upload="
+            (file) => {
+              beforeUpload(file);
+            }
+          "
+                       action=""
+                       accept=".xls,.xlsx"
+                       :http-request="
+            () => {
+              uploadFile();
+            }
+          ">
+                <el-button style="margin-left: 10px"
+                           size="small"
+                           class="diy-button--delete">导入</el-button>
+            </el-upload>
         </div>
+
+          </div>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号"
@@ -180,6 +208,108 @@ export default {
         }
     },
     methods: {
+        handleExportModule () {
+            let title = "福利人员模板";
+            let url = "/epmetuser/changeWelfare/exporttemplate";
+
+            let params = {};
+
+            app.ajax.exportFilePost(
+                url,
+                params,
+                (data, rspMsg) => {
+                    this.download(data, title + ".xls");
+                },
+                (rspMsg, data) => {
+                    this.$message.error(rspMsg);
+                }
+            );
+        },
+        // 下载文件
+        download (data, fileName) {
+            if (!data) {
+                return;
+            }
+
+            var csvData = new Blob([data]);
+
+            if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                window.navigator.msSaveOrOpenBlob(csvData, fileName);
+            }
+            // for Non-IE (chrome, firefox etc.)
+            else {
+                var a = document.createElement("a");
+                document.body.appendChild(a);
+                a.style = "display: none";
+                var url = window.URL.createObjectURL(csvData);
+                a.href = url;
+                a.download = fileName;
+                a.click();
+                a.remove();
+                window.URL.revokeObjectURL(url);
+            }
+        },
+        // 上传文件之前的钩子
+        beforeUpload (file) {
+            this.files = file;
+
+            const isText = file.type === "application/vnd.ms-excel";
+            const isTextComputer =
+                file.type ===
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+
+            if (!isText && !isTextComputer) {
+                this.$message.error("请选择正确格式的文件");
+                this.files = null;
+                this.fileName = "";
+                return false;
+            } else {
+                this.fileName = file.name;
+                return true;
+            }
+        },
+        async uploadFile () {
+            if (this.fileName == "") {
+                this.$message.warning("请选择要上传的文件！");
+                return false;
+            }
+
+            this.$message({
+                showClose: true,
+                message: "导入中，请到系统管理-导入记录中查看进度",
+                duration: 0,
+            });
+
+            //清空上传列表
+            this.$refs["upload"].clearFiles();
+            let url = "";
+
+            let fileFormData = new FormData();
+            fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+            url = "/epmetuser/changeWelfare/pointImport";
+
+            window.app.ajax.post2(
+                url,
+                fileFormData,
+                (data, rspMsg) => {
+                    if (data.code === 0 && data.msg == "success") {
+                        // this.$message.success('导入成功')
+                    } else {
+                        // this.$message({
+                        //   showClose: true,
+                        //   message: rspMsg,
+                        //   duration: 0,
+                        //   type: "error"
+                        // })
+                        // this.$message.error(rspMsg)
+                    }
+                    this.loadTable();
+                },
+                (rspMsg, data) => { },
+                { headers: { "Content-Type": "multipart/form-data" } }
+            );
+        },
       exportHandle () {
         const url = this.mixinViewModuleOptions.exportURL
         this.$http({
@@ -275,6 +405,11 @@ export default {
 <style lang="scss" scoped>
   @import "@/assets/scss/buttonstyle.scss";
 
+  .exportBtn {
+      display: flex;
+      align-items: center;
+  }
+
   .resi-container .resi-card-table {
     ::v-deep .el-table th {
       color: #fff;

src/views/modules/plugins/change/resiwelfare.vue

@@ -400,7 +400,7 @@ export default {
   },
   methods: {
     searchFilter (columnName) {
-      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD' ]
+      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD', 'IS_BDHJ' ]
       return filterName.some(item => {
         return item == columnName
       })

src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue

@@ -95,7 +95,7 @@
             </el-form-item>
             <br/>
             <el-form-item label="房主姓名" prop="ownerName">
-                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;" disabled></el-input>
+                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;"></el-input>
             </el-form-item>
 
         <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同信息</div>
@@ -417,7 +417,7 @@ export default {
             { dictValue: '媳婿', dictName: '媳婿' },
             { dictValue: '孙子女', dictName: '孙子女' },
             { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
-            { dictValue: '中介', dictName: '中介' }
+            { dictValue: '其他', dictName: '其他' }
         ],
         checkVisible: false,
         disabledBtn: false,

src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue

@@ -136,8 +136,10 @@
     <template slot="footer">
         <div class="resi-btns">
         <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-        <el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
+        <!--<el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>-->
-        <el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>
+        <!--<el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>-->
+            <el-button type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
+            <el-button type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>
         </div>
     </template>
       <el-dialog :visible.sync="dialogVisible" :modal="false">
@@ -204,7 +206,7 @@ export default {
             { dictValue: '媳婿', dictName: '媳婿' },
             { dictValue: '孙子女', dictName: '孙子女' },
             { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
-            { dictValue: '中介', dictName: '中介' }
+            { dictValue: '其他', dictName: '其他' }
         ],
         checkReason: '',
         checkVisible: false,

src/views/modules/plugins/rent/rentcontractreview.vue

@@ -195,10 +195,13 @@
         <el-table-column prop="isBlack" label="是否黑名单人员" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>-->
-             <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>-->
-            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
-            <el-button v-else type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>
+            <!--<el-button v-else type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>-->
+            <el-button type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>