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

src/views/components/resiChangeTransfer.vue

@@ -505,7 +505,7 @@ export default {
     },
 
     async saveForm () {
-      const url = '/pli/power/changeRelocation/saveOutOfInfo'
+      const url = '/epmetuser/changeRelocation/saveOutOfInfo'
       let noData = new Date()
       noData = util.dateFormatter(noData, 'time')
       this.dataForm.transferTime = noData
@@ -513,31 +513,29 @@ export default {
       const { data, code, msg } = await requestPost(url, this.dataForm)
 
       if (code === 0) {
-        // this.$message.success('调动成功')
+        this.$message.success('调动成功')
-        // 调用之前接口
+        this.handleCancle()
-        this.saveFormOld()
-        // this.handleCancle()
       } else {
         this.$message.error(msg)
       }
     },
-      async saveFormOld () {
+      // async saveForm () {
-          const url = '/epmetuser/icusertransferrecord/add'
+      //     const url = '/epmetuser/icusertransferrecord/add'
-          let noData = new Date()
+      //     let noData = new Date()
-          noData = util.dateFormatter(noData, 'time')
+      //     noData = util.dateFormatter(noData, 'time')
-          this.dataForm.transferTime = noData
+      //     this.dataForm.transferTime = noData
-
+      //
-          console.log('-----------3--------------')
+      //     console.log('-----------3--------------')
-          console.log(this.dataForm)
+      //     console.log(this.dataForm)
-          const { data, code, msg } = await requestPost(url, this.dataForm)
+      //     const { data, code, msg } = await requestPost(url, this.dataForm)
-
+      //
-          if (code === 0) {
+      //     if (code === 0) {
-              this.$message.success('调动成功')
+      //         this.$message.success('调动成功')
-              this.handleCancle()
+      //         this.handleCancle()
-          } else {
+      //     } else {
-              this.$message.error(msg)
+      //         this.$message.error(msg)
-          }
+      //     }
-      },
+      // },
 
     handleCancle () {
       this.resetData()

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

@@ -129,11 +129,11 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/pli/power/rentDeath/page',
+        getDataListURL: '/epmetuser/rentDeath/page',
         getDataListIsPage: true,
-        deleteURL: '/pli/power/rentDeath',
+        deleteURL: '/epmetuser/rentDeath',
         deleteIsBatch: true,
-        exportURL: '/pli/power/rentDeath/export'
+        exportURL: '/epmetuser/rentDeath/export'
       },
         timeRange: '',
       dataForm: {

src/views/modules/plugins/change/changerelocation-add-or-update.vue

@@ -234,7 +234,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/pli/power/changeRelocation/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/epmetuser/changeRelocation/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -250,7 +250,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/changeRelocation/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/changeRelocation/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }

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

@@ -202,11 +202,11 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/pli/power/changeRelocation/page',
+        getDataListURL: '/epmetuser/changeRelocation/page',
         getDataListIsPage: true,
-        deleteURL: '/pli/power/changeRelocation',
+        deleteURL: '/epmetuser/changeRelocation',
         deleteIsBatch: true,
-        exportURL: '/pli/power/changeRelocation/export'
+        exportURL: '/epmetuser/changeRelocation/export'
       },
         timeRange: '',
         optionsV: [],

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

@@ -130,9 +130,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/pli/power/changeWelfare/page',
+        getDataListURL: '/epmetuser/changeWelfare/page',
         getDataListIsPage: true,
-        deleteURL: '/pli/power/changeWelfare',
+        deleteURL: '/epmetuser/changeWelfare',
         deleteIsBatch: true
       },
       dataForm: {
@@ -206,7 +206,7 @@ export default {
                 id: this.rowData.id,
                 removeReason: this.removeReason
             }
-            this.$http.post('/pli/power/changeWelfare/removeWelfare', params).then(({ data: res }) => {
+            this.$http.post('/epmetuser/changeWelfare/removeWelfare', params).then(({ data: res }) => {
                 if (res.code !== 0) {
                     return this.$message.error(res.msg)
                 }

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

@@ -432,7 +432,7 @@ export default {
       }
         console.log('----------8----------')
       console.log(params)
-      this.$http.post('/pli/power/rentDeath/save', params).then(({ data: res }) => {
+      this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }

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

@@ -429,7 +429,7 @@ export default {
         joinReason: this.blacklistReason,
         welfareFlag: this.welfareFlag
       }
-      this.$http.post('/pli/power/rentDeath/save', params).then(({ data: res }) => {
+      this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }

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

@@ -426,7 +426,7 @@ export default {
         userId: this.rowData.icResiUserId,
         joinReason: this.blacklistReason
       }
-      this.$http.post('/pli/power/changeWelfare/save', params).then(({ data: res }) => {
+      this.$http.post('/epmetuser/changeWelfare/save', params).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }