Merge remote-tracking branch 'origin/dev' into dev

src/views/modules/base/smartImport.vue

@@ -79,7 +79,7 @@
             min-width="110"
           >
             <template slot-scope="scope">
-              <div >
+              <div>
                 <el-select
                   class="item_width_sel"
                   v-model="scope.row.itemGroupId"
@@ -88,17 +88,17 @@
                 >
                   <el-option
                     v-for="item in groupList"
-                    @click.native="handleSelGroup(scope.$index, item)"
-                    :key="item.id"
+                    @click.native="handleSelGroup(scope.$index, item,'change')"
+                    :key="item.value"
                     :label="item.label"
-                    :value="item.id"
+                    :value="item.label"
                   >
                   </el-option>
                 </el-select>
 
                 <el-select
                   class="item_width_sel"
-                  v-model="scope.row.locTableHeader"
+                  v-model="scope.row.itemId"
                   size="small"
                   style="margin-left: 10px"
                   placeholder="请选择"
@@ -147,23 +147,23 @@ export default {
       },
       search: "",
       dataList: [
-        {
-          userTableHeader: "所属房屋",
-          field: "所属房屋",
-        },
-        {
-          index: "key2",
-          userTableHeader: "基础信息",
-          field: "基础信息",
-        },
-        {
-          userTableHeader: "房屋信息",
-          field: "房屋信息",
-        },
-        {
-          userTableHeader: "本地户籍",
-          field: "本地户籍",
-        },
+        // {
+        //   userTableHeader: "所属房屋",
+        //   field: "所属房屋",
+        // },
+        // {
+        //   index: "key2",
+        //   userTableHeader: "基础信息",
+        //   field: "基础信息",
+        // },
+        // {
+        //   userTableHeader: "房屋信息",
+        //   field: "房屋信息",
+        // },
+        // {
+        //   userTableHeader: "本地户籍",
+        //   field: "本地户籍",
+        // },
       ],
       dataListLoading: false,
       total: 0,
@@ -201,12 +201,22 @@ export default {
   },
   components: {},
   created() {},
+  watch: {
+    //监听dataList有数据才再让他给高度 解决报找不到dom节点错误
+    "dataList.length": {
+      immediate: true,
+      handler(newVal) {
+        this.$nextTick(() => {
+          if (newVal > 0) {
+            this.sHeight = this.$refs.divEditBtn.offsetHeight + 300;
+          }
+        });
+      },
+    },
+  },
   async mounted() {
-    // await this.loadData();
     await this.loadPersonGroup();
     this.getResident();
-
-    this.sHeight = this.$refs.divEditBtn.offsetHeight + 300;
   },
   methods: {
     diaClose() {
@@ -233,19 +243,21 @@ export default {
     },
 
     //选择人员信息第一列下拉框
-    async handleSelGroup(index, item, isSet) {
+    async handleSelGroup(index, item,change) {
       const url = "/oper/customize/icformitem/getItemListV2";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {
         policyFlag: "1",
         groupId: item.id,
       };
-
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         let oneData = this.dataList[index];
-        oneData.itemList = data;
+       if(change == 'change'){
+        this.dataList[index].itemId = ''
+       }
+       oneData.itemList = data;
         this.$set(this.dataList, index, oneData);
       } else {
         this.$message.error(msg);
@@ -397,25 +409,29 @@ export default {
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       formData.append("flieModel", "flieModel"); //添加文件对象
+      // http://127.0.0.1:4523/mock2/2515967/97869993
       await this.$http
-        .post("http://127.0.0.1:4523/mock2/2515967/97869993", formData)
+        .post("/actual/base/residentBaseInfo/importExcel", formData)
         .then((res) => {
           console.log("res-up", res);
           if (res.data.code == 0 ) {
-            console.log(res.data.data);
-            const data = res.data.data;
+            const { data: rawData } = res.data.data;
+            rawData.forEach((item, index) => {
+              const arr = this.groupList.filter(group => group.label === item.itemGroupId);
+              this.handleSelGroup(index, arr[0]);
+            });
             this.afterSuccess();
-            this.dataList = data
-            console.log(this.dataList);
-            // this.importOption = data.option;
-            this.importCode = res.importCode;
+            this.dataList = rawData
+            this.importCode = res.data.data.importCode;
             this.fileData = file;
-          } else this.$message.error(res.data.msg);
+          } else{
+            this.$message.error(res.rawData.msg);
+          }
         })
         .catch((err) => {
           console.log("失败", err);
           file.onError(); //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
+          this.$message.error('导入失败')
         });
       this.importLoading = false;
       this.importBtnTitle = "导入";
@@ -426,18 +442,12 @@ export default {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       const { importOption, importCode, dataList } = this;
-      dataList.forEach((item) => {
-        if (!item.exist) {
-          importOption.notExist[item.index] = item.field;
-        }
-      });
+      //MOCK http://127.0.0.1:4523/mock2/2515967/97971313
+     let arr = dataList.map(item=>({userTableHeader:item.userTableHeader,itemGroupId:item.itemGroupId,itemId:item.itemId}))
       await this.$http
         .post("/actual/base/residentBaseInfo/import/header", {
-          code: importCode,
-          option: {
-            exist: importOption.exist,
-            notExist: importOption.notExist,
-          },
+          importCode,
+          option:arr,
         })
         .then((res) => {
           console.log("res-up", res);

src/views/modules/shequzhili/xiangmu/cpts/project-info.vue

@@ -99,10 +99,10 @@
                 projectInfo.origin == 'resi_event'
               "
             >
-              <span class="u-info-title-2">项目来源：</span>
+              <!-- <span class="u-info-title-2">项目来源：</span>
               <el-button type="text" @click="handleWatchOrigin"
                 > <i class="el-icon-view"></i> 查看项目来源</el-button
-              >
+              > -->
             </div>
 
             <div