7.28

src/api/index.js

 const api = {
-    Login: '/sys/login',
+    Login: '/sys/partnerLogin',
     Logout: '/sys/logout',
     ForgePassword: '/auth/forge-password',
     Register: '/auth/register',

src/api/login.js

@@ -14,7 +14,7 @@ import { axios } from '@/utils/request'
  */
 export function login(parameter) {
   return axios({
-    url: '/sys/login',
+    url: '/sys/partnerLogin',
     method: 'post',
     data: parameter
   })

src/views/benefiting/ReconciliationList.vue

@@ -54,33 +54,32 @@
       <a-form>
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="对账总金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
+            <a-form-model-item label="对账总金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name1"
               style="width: 100%;">
-              <a-input v-model="model.propertyName" placeholder="对账总金额"></a-input>
+              <a-input v-model="model.name1" placeholder="对账总金额"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="对账日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
+            <a-form-model-item label="对账日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name2"
               style="width: 100%;">
-              <a-input v-model="model.propertyName" placeholder="对账日期"></a-input>
+              <a-input v-model="model.name2" placeholder="对账日期"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="对账明细" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
-              style="width: 100%;">
+            <a-form-model-item label="对账明细" :labelCol="labelCol" :wrapperCol="wrapperCol" style="width: 100%;">
               <a @click="checkDetails()">查看明细</a>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
-              style="width: 100%;">
-              <a-textarea v-model="model.propertyName" :auto-size="{ minRows: 4, maxRows: 6 }" />
+            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" style="width: 100%;">
+              <a-textarea v-model="model.name3" :auto-size="{ minRows: 4, maxRows: 6 }" />
             </a-form-model-item>
           </a-col>
         </a-row>
       </a-form>
     </a-modal>
-    <a-modal centered title="对账明细" :visible="visibleReconciliationDetail" :confirm-loading="confirmLoading" :footer="null" width="60%" @cancel="handleCancelDetail">
+    <a-modal centered title="对账明细" :visible="visibleReconciliationDetail" :confirm-loading="confirmLoading"
+      :footer="null" width="60%" @cancel="handleCancelDetail">
       <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns1"
         :dataSource="selectedList" :pagination="false" :loading="loading" class="j-table-force-nowrap">
       </a-table>
@@ -228,11 +227,11 @@ const columns1 = [
     // customRender: function (text) {
     //   return filterDictTextByCache('companyAuditStatus', text)
     // },
-  }
+  },
 ]
 
 export default {
-  components: { },
+  components: {},
   name: 'ReconciliationList',
   mixins: [JeecgListMixin],
   data() {
@@ -307,11 +306,13 @@ export default {
       confirmLoading: false,
       selectedList: [],
       selectedRowKeys: [],
-      visibleReconciliationDetail:false
+      visibleReconciliationDetail: false,
     }
   },
   created() {
     //this.getChargeList()
+    let data = new Date().toLocaleString();
+    console.log(data)
   },
   methods: {
     // async getChargeList() {
@@ -329,11 +330,18 @@ export default {
     },
     //申请对账
     toReconciliation(type, record) {
-      this.selectedList = [];
+      this.selectedList = []
+      this.model.name1 = 0;
       if (type == 1) {
         if (this.selectionRows.length > 0) {
           this.visibleReconciliation = true
           this.selectedList = this.selectionRows
+          let list = this.selectedList
+          let sum = 0
+          for (var i = 0; i < list.length; i++) {
+            sum += list[i].propertyName
+          }
+          this.model.name1 = sum
           console.log(this.selectedList)
           console.log(333)
         } else {
@@ -341,12 +349,12 @@ export default {
         }
       } else if (type == 2) {
         this.visibleReconciliation = true
-        this.selectedList.push(record);
-        this.selectedRowKeys = [];
+        this.selectedList.push(record)
+        this.selectedRowKeys = []
+        this.model.name1 = record.propertyName;
       }
     },
     handleOk(e) {
-      this.ModalText = 'The modal will be closed after two seconds'
       this.confirmLoading = true
       setTimeout(() => {
         this.visibleReconciliation = false
@@ -366,12 +374,12 @@ export default {
       this.selectedRowKeys = selectedRowKeys
       this.selectionRows = selectedRows
     },
-    checkDetails(){
+    checkDetails() {
       this.visibleReconciliationDetail = true
     },
-    handleCancelDetail(){
+    handleCancelDetail() {
       this.visibleReconciliationDetail = false
-    }
+    },
   },
 }
 </script>

src/views/benefiting/SettlementDetails.vue

@@ -3,7 +3,7 @@
     <div class="title-top">
       <h3>{{title}}</h3>
       <div class="button">
-        <a-button @click="onCancel">返回</a-button>
+        <a-button @click="toReturn">返回</a-button>
         <a-button type="danger" @click="onExamine(2)" v-if="pageType == '2'">审核驳回</a-button>
         <a-button type="primary" @click="onExamine(1)" v-if="pageType == '2'">审核通过</a-button>
         <a-button type="primary" @click="onExamine(3)" v-if="pageType == '3'">确认</a-button>
@@ -133,7 +133,7 @@ const columns = [
 ]
 export default {
   name: 'SettlementDetails',
-  inject: ['closeCurrent'],
+  inject: [],
   mixins: [JeecgListMixin],
   data() {
     return {
@@ -235,7 +235,7 @@ export default {
         )
       }
     },
-    onCancel() {
+    toReturn() {
       this.$router.go(-1)
     },
     contactPhoneChange(e) {
@@ -249,7 +249,6 @@ export default {
       this.visible = true
     },
     onExamine(type) {
-      this.closeCurrent()
       // const that = this
       // if (type == 1) {
       //   return auditPropertyApi({
@@ -258,7 +257,7 @@ export default {
       //   }).then((res) => {
       //     that.$message.success('审核通过成功')
       //     that.$emit('ok')
-      //     this.closeCurrent()
+      //     this.toReturn()
       //   })
       // } else if (type == 2) {
       //   return auditPropertyApi({
@@ -266,7 +265,7 @@ export default {
       //     auditStatus: 'refuse',
       //   }).then((res) => {
       //     that.$message.success('审核驳回成功')
-      //     this.closeCurrent()
+      //     this.toReturn()
       //   })
       // }
     },
@@ -381,7 +380,7 @@ export default {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$emit('ok')
-                this.closeCurrent()
+                this.toReturn()
               } else {
                 that.$message.warning(res.message)
               }
@@ -392,9 +391,6 @@ export default {
         }
       })
     },
-    loadData() {
-      console.log('不请求')
-    },
   },
   mounted() {
     //备份model原始值

src/views/benefiting/SettlementList.vue

@@ -305,7 +305,6 @@ export default {
       this.visibleReconciliation = true
     },
     handleOk(e) {
-      this.ModalText = 'The modal will be closed after two seconds'
       this.confirmLoading = true
       setTimeout(() => {
         this.visibleReconciliation = false
@@ -313,12 +312,8 @@ export default {
       }, 2000)
     },
     handleCancel(e) {
-      console.log('Clicked cancel button')
       this.visibleReconciliation = false
     },
-    loadData() {
-      console.log('不请求')
-    },
   },
 }
 </script>

src/views/shops/ShopsDetails.vue

@@ -2,7 +2,7 @@
   <a-spin :spinning="confirmLoading">
     <div class="title-top">
       <h3>{{title}}</h3>
-      <div class="button"><a-button @click="onCancel">返回</a-button>
+      <div class="button"><a-button @click="toReturn">返回</a-button>
         <a-button type="primary" @click="submitForm" v-if="pageType == 'edit' || pageType == 'add' ">保存</a-button>
         <a-button type="danger" @click="onExamine(2)" v-if="pageType == 'audit'">审核驳回</a-button>
         <a-button type="primary" @click="onExamine(1)" v-if="pageType == 'audit'">审核通过</a-button>
@@ -168,7 +168,7 @@ import SelectShopsModal from './modules/SelectShopsModal'
 
 export default {
   name: 'ShopsDetails',
-  inject: ['closeCurrent'],
+  inject: [],
   components: {
     SelectCommunityModal,
     SelectShopsModal,
@@ -323,7 +323,7 @@ export default {
         )
       }
     },
-    onCancel() {
+    toReturn() {
       this.$router.go(-1)
     },
     //选择小区
@@ -375,7 +375,7 @@ export default {
       //   }).then((res) => {
       //     that.$message.success('审核通过成功')
       //     that.$emit('ok')
-      //     this.closeCurrent()
+      //     this.toReturn()
       //   })
       // } else if (type == 2) {
       //   return auditPropertyApi({
@@ -383,7 +383,7 @@ export default {
       //     auditStatus: 'refuse',
       //   }).then((res) => {
       //     that.$message.success('审核驳回成功')
-      //     this.closeCurrent()
+      //     this.toReturn()
       //   })
       // }
     },
@@ -498,7 +498,7 @@ export default {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$emit('ok')
-                this.closeCurrent()
+                this.toReturn()
               } else {
                 that.$message.warning(res.message)
               }
@@ -510,10 +510,6 @@ export default {
       })
     },
   },
-  beforeDestroy() {
-    clearTimeout(timer)
-    this.mapRef.removeEventListener('click', (e) => this.getAddress(e))
-  },
 }
 </script>
 <style lang="less" scoped>
@@ -539,4 +535,7 @@ export default {
 .area-select {
   width: 100% !important;
 }
+.anchorBL{
+  visibility: hidden;
+}
 </style>
\ No newline at end of file

src/views/shops/ShopsList.vue

@@ -138,7 +138,6 @@ export default {
   components: {},
   data() {
     return {
-      // 表头
       columns: columns,
       loading: false,
       pagination: {
@@ -149,8 +148,6 @@ export default {
       },
       url: {
         list: '/property-central/property/propertySettled/list',
-        delete: '/property-central/property/propertySettled/delete',
-        deleteBatch: '/property-central/property/propertySettled/deleteBatch',
       },
     }
   },