Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

sgzb-ui/src/views/claimAndRefund/receive/agreement.vue

@@ -576,6 +576,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.agreementId)
+      console.log(this.ids)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
@@ -662,13 +663,17 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      if (this.ids.length) {
         this.download(
           'material/agreementInfo/export',
           {
-          ...this.queryParams,
+            dataCondition: this.ids,
           },
           `协议_${new Date().getTime()}.xlsx`
         )
+      } else {
+        this.$modal.msgWarning('请选择要导出的数据')
+      }
     },
   },
 }

sgzb-ui/vue.config.js

@@ -44,8 +44,8 @@ module.exports = {
 
         // target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.81:8080`, //韩
-        target: `http://10.40.92.74:8080`,//旭/
-        // target: `http://10.40.92.153:8080`, //帅
+        // target: `http://10.40.92.74:8080`,//旭/
+        target: `http://10.40.92.153:8080`, //帅
         // target: `http://10.40.92.14:8080`, //福
 
         //******** 注意事项  ********* */