残疾人接口联调,还差导入、导出,地址更换

.env.development

@@ -1,6 +1,6 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://localhost:8080/api
+VUE_APP_API_SERVER =  http://192.168.1.144/api
 # VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api

src/views/modules/base/residentManagement/resiDisability/addForm.vue

@@ -46,7 +46,12 @@
               <span class="info-title-2">证件类型: </span>
               <span>{{ formData.idTypeName || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="证件类型" prop="idType"  v-else>
+            <el-form-item
+              label-width="100px"
+              label="证件类型"
+              prop="idType"
+              v-else
+            >
               <el-select v-model="formData.idType" clearable>
                 <el-option
                   v-for="item in dicts.idCard_type"
@@ -63,7 +68,12 @@
               <span class="info-title-2">证件号: </span>
               <span>{{ formData.idNum || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="证件号" prop="idNum"  v-else>
+            <el-form-item
+              label-width="100px"
+              label="证件号"
+              prop="idNum"
+              v-else
+            >
               <el-input
                 v-model="formData.idNum"
                 placeholder="请输入"
@@ -77,11 +87,17 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">性别: </span>
-              <span>{{  formData.gender?formData.gender=='1'?'男':formData.gender=='2'?'女':'--':'--' }}</span
+              <span>{{
-              >
+                formData.gender
+                  ? formData.gender == "1"
+                    ? "男"
+                    : formData.gender == "2"
+                    ? "女"
+                    : "--"
+                  : "--"
+              }}</span>
             </div>
             <el-form-item label-width="100px" label="性别" v-else>
-                
               <el-select v-model="formData.gender" clearable>
                 <el-option
                   v-for="item in genderList"
@@ -96,8 +112,15 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">本地户籍: </span>
-              <span>{{  formData.localResidenceFlag?formData.localResidenceFlag=='1'?'是':formData.localResidenceFlag=='0'?'否':'--':'--' }}</span
+              <span>{{
-              >
+                formData.localResidenceFlag != null
+                  ? formData.localResidenceFlag === 1
+                    ? "是"
+                    : formData.localResidenceFlag === 0
+                    ? "否"
+                    : "--"
+                  : "--"
+              }}</span>
             </div>
             <el-form-item label-width="100px" label="本地户籍" v-else>
               <el-select v-model="formData.localResidenceFlag" clearable>
@@ -119,7 +142,12 @@
               <span class="info-title-2">户籍地址: </span>
               <span>{{ formData.placeOfDomicile || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
+            <el-form-item
+              label-width="100px"
+              label="户籍地址"
+              class="wd-wr"
+              v-else
+            >
               <el-input
                 v-model="formData.placeOfDomicile"
                 placeholder="请输入"
@@ -135,7 +163,12 @@
               <span class="info-title-2">现居地址: </span>
               <span>{{ formData.currentResidence || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
+            <el-form-item
+              label-width="100px"
+              label="现居地址"
+              class="wd-wr"
+              v-else
+            >
               <el-input
                 v-model="formData.currentResidence"
                 placeholder="请输入"
@@ -199,8 +232,15 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">低保: </span>
-              <span>{{  formData.subsistenceAllowanceFlag?formData.subsistenceAllowanceFlag=='1'?'是':formData.subsistenceAllowanceFlag=='0'?'否':'--':'--' }}</span
+              <span>{{
-              >
+                formData.subsistenceAllowanceFlag != null
+                  ? formData.subsistenceAllowanceFlag == "1"
+                    ? "是"
+                    : formData.subsistenceAllowanceFlag == "0"
+                    ? "否"
+                    : "--"
+                  : "--"
+              }}</span>
             </div>
             <el-form-item label-width="100px" label="低保" v-else>
               <el-select v-model="formData.subsistenceAllowanceFlag" clearable>
@@ -227,6 +267,7 @@
                 v-model="formData.retirementAmount"
                 placeholder="请输入"
                 clearable
+                @blur="checkNumberInput"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -235,11 +276,12 @@
               <span class="info-title-2">月收入: </span>
               <span>{{ formData.monthIncome || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="月收入" v-else>
+            <el-form-item label-width="100px" label="退休金额" v-else>
               <el-input
                 v-model="formData.monthIncome"
                 placeholder="请输入"
                 clearable
+                @blur="monthIncomeNumberInput"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -316,7 +358,7 @@ export default {
   props: {
     formType: {
       type: String,
-        default:'add'
+      default: "add",
     },
     source: {
       //展示来源：manage  管理平台    visiual  可视化平台
@@ -384,46 +426,46 @@ export default {
     async initForm(type, row) {
       this.formType = type;
       this.scopeId = row.categorizedResiId;
-      await this.getDetail();
+      await this.getDetail(row.categorizedResiId);
     },
     async getDetail(categorizedResiId) {
-      const url = `/governance/commonDemand/detail/${categorizedResiId}`;
+      const url = `/actual/base/resiCategorized/disability/detail/${categorizedResiId}`;
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
         console.log(data);
-        //   let obj = {
+        this.formData = { ...data };
-        //     name: "测试",
-        //     mobile: "17555555555",
-        //     idType: "1",
-        //     idNum: "370254111111111111",
-        //     gender: "1",
-        //     localResidenceFlag: 1,
-        //     placeOfDomicile: "青岛市市北区时代国际广场",
-        //     currentResidence: "青岛市李沧区建安小区",
-        //     disabilityCategoryCode: "tingli",
-        //     disabilityLevel: "1",
-        //     disabilityNum: "545461564512167",
-        //     subsistenceAllowanceFlag: 1,
-        //     retirementAmount: 1,
-        //     monthIncome: 200.111,
-        //     contactName: "刘备",
-        //     contactMobile: "15655555454",
-        //     remark: "备注",
-        //   };
-        this.formData = { ...obj };
       } else {
         this.$message.error(msg);
       }
     },
+    checkNumberInput() {
+      if (isNaN(this.formData.retirementAmount)) {
+        this.$message.error("请输入数字");
+        this.formData.retirementAmount = "";
+      } else {
+        this.formData.retirementAmount = parseFloat(
+          this.formData.retirementAmount
+        );
+      }
+    },
+    monthIncomeNumberInput() {
+      if (isNaN(this.formData.monthIncome)) {
+        this.$message.error("请输入数字");
+        this.formData.monthIncome = "";
+      } else {
+        this.formData.monthIncome = parseFloat(this.formData.monthIncome);
+      }
+    },
     async handleComfirm() {
       this.$refs["ref_add_form"].validate(async (valid) => {
         if (!valid) {
           return false;
         }
+        console.log(this.formData);
         const url =
           this.formType === "edit"
-            ? "/governance/commonDemand/update"
+            ? "/actual/base/resiCategorized/disability/update"
-            : "/governance/commonDemand/save";
+            : "/actual/base/resiCategorized/disability/create";
 
         const { data, code, msg } = await requestPost(url, this.formData);
         if (code === 0) {

src/views/modules/base/residentManagement/resiDisability/resiDisability.vue

@@ -310,14 +310,20 @@
             label="性别"
             :show-overflow-tooltip="true"
           >
+            <template slot-scope="scope">
+              <span>{{ scope.row.gender?scope.row.gender == "1" ? "男":scope.row.gender == "2"?"女" :'--':"--"  }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="localResidenceFlagName"
+            prop="localResidenceFlag"
             align="center"
             width="100"
             label="本地户籍"
             :show-overflow-tooltip="true"
           >
+          <template slot-scope="scope">
+              <span>{{binaryText(scope.row.localResidenceFlag)}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="currentResidence"
@@ -358,6 +364,9 @@
             label="低保"
             :show-overflow-tooltip="true"
           >
+          <template slot-scope="scope">
+              <span>{{binaryText(scope.row.subsistenceAllowanceFlag)}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="contactName"
@@ -398,11 +407,8 @@
                 size="small"
                 >查看</el-button
               >
-              <el-button
+              <!--       v-if="scope.row.serviceStatus === 'in_service'" -->
-                v-if="scope.row.serviceStatus === 'in_service'"
+              <el-button @click="handleEdit(scope.row)" type="text" size="small"
-                @click="handleEdit(scope.row)"
-                type="text"
-                size="small"
                 >编辑</el-button
               >
 
@@ -441,7 +447,7 @@
       <add-form
         ref="ref_add_form"
         :formType="formType"
-        @handleOk="handleOk"
+        @handleComfirm="handleComfirm"
         @handleClose="handleClose"
       ></add-form>
     </el-dialog>
@@ -556,6 +562,7 @@ export default {
       return this.$store.state.inIframe ? h : _h;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
+  
   },
   watch: {},
   async created() {
@@ -589,7 +596,11 @@ export default {
         console.log("获取字典失败: ", error);
       }
     },
-
+    binaryText(value){
+       let text = ''
+       text = this.binaryOptionList.filter(item=>item.value == value)[0].label
+       return text || "--"
+    },
     // ------------------------------------事件------------------------------------------
     // 搜索事件
     handleSearch(val) {
@@ -607,8 +618,7 @@ export default {
     //   查看详情触发事件
     async handleDetail(row) {
       this.addDiaTitle = "详情";
-      this.showDetail = true;
+      this.formType = "detail";
-      this.formType = "add";
       this.showAdd = true;
       this.$nextTick(() => {
         this.$refs.ref_add_form.initForm("detail", row);
@@ -621,8 +631,11 @@ export default {
     },
     //   编辑触发事件
     async handleEdit(row) {
+      this.addDiaTitle = "编辑";
+      this.formType = "edit";
+      this.showAdd = true;
       this.$nextTick(() => {
-        this.$refs.ref_add_form.initForm(type, row);
+        this.$refs.ref_add_form.initForm("edit", row);
       });
     },
     //  新增弹出框组件取消事件
@@ -633,7 +646,7 @@ export default {
       this.showEdit = false;
     },
     //  新增弹出框组件确定事件
-    handleOk() {
+    handleComfirm() {
       this.handleClose();
       this.pageNo = 1;
       this.getTableData();
@@ -646,7 +659,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.cancelFuwu([row.id]);
+          this.cancelFuwu([row.categorizedResiId]);
         })
         .catch((err) => {
           if (err == "cancel") {
@@ -659,10 +672,10 @@ export default {
     },
     //   删除处理
     async cancelFuwu(id) {
-      const url = "/governance/icServiceRecordV2/delete";
+      const url = "/actual/base/resiCategorized/disability/deleteBatch";
       const { data, code, msg } = await requestPost(url, id);
       if (code === 0) {
-        this.$message.success("取消成功！");
+        this.$message.success("删除成功！");
         this.getTableData();
       } else {
         this.$message.error("操作失败！");
@@ -671,8 +684,7 @@ export default {
     //   获取列表
     async getTableData() {
       this.tableLoading = true;
-      const url = "/actual/base/resiDisability/page";
+      const url = "/actual/base/resiCategorized/disability/page";
-
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
@@ -799,7 +811,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.cancelFuwu(this.multiSelection.map((e) => e.id));
+          this.cancelFuwu(this.multiSelection.map((e) => e.categorizedResiId));
         })
         .catch((err) => {
           console.error(err);