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

packages/party/AppPartyPayment/AppPartyPayment.vue

@@ -3,7 +3,7 @@
     <template slot="title">
       <ai-title title="党费缴纳" isShowBottomBorder :instance="instance"></ai-title>
     </template>
-    <template slot="content">
+    <template #content>
       <div class="statistics-top">
         <div class="statistics-top__item">
           <span>本月已缴纳党费金额</span>
@@ -23,15 +23,14 @@
         </div>
       </div>
       <div class="content">
-        <ai-search-bar class="search-bar">
+        <ai-search-bar>
           <template #left>
-            <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">新增</el-button>
             <ai-party :instance="instance" v-model="search.partyOrgId" :topOrgId="topOrgId" :name.sync="search.partyOrgName"
                     style="display:inline-block" @origin="handlePartyOrgSelect" customClicker
                     url="/app/partyOrganization/queryAllChildren">
               <el-input size="small" v-model="search.partyOrgName" readonly placeholder="选择党组织"></el-input>
             </ai-party>
-            <el-date-picker v-model="search.ymd" type="month" placeholder="选择月" size="small" value-format="yyyy-MM" @change="getListInit"></el-date-picker>
+            <el-date-picker v-model="search.ymd" type="month" placeholder="选择日期" size="small" value-format="yyyy-MM" @change="getListInit"></el-date-picker>
             <ai-select
               v-model="search.status"
               @change="getListInit()"
@@ -39,7 +38,16 @@
               :selectList="dict.getDict('zhishengPartyFeeRecordStatus')">
             </ai-select>
           </template>
-          <template slot="right">
+          <template #right>
+            <el-input size="small" v-model="search.name" placeholder="姓名/身份证"
+              suffix-icon="iconfont iconSearch" v-throttle="() => {getListInit()}" clearable @clear="search.name = '', getListInit()"/>
+          </template>
+        </ai-search-bar>
+        <ai-search-bar>
+          <template #left>
+            <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">新增</el-button>
+          </template>
+          <template #right>
             <ai-import :instance="instance" :dict="dict" type="appconvenientaddressbook" name="党费缴纳"
               @success="getListInit()" importUrl="/app/appdfjnzhisheng/import" url="/app/appdfjnzhisheng/downloadTemplate">
               <el-button icon="iconfont iconImport">导入</el-button>
@@ -48,8 +56,6 @@
               :disabled="tableData.length == 0">
               <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
             </ai-download>
-            <el-input size="small" v-model="search.name" placeholder="姓名/身份证"
-              suffix-icon="iconfont iconSearch" v-throttle="() => {getListInit()}" clearable @clear="search.name = '', getListInit()"/>
           </template>
         </ai-search-bar>
         <ai-table
@@ -91,7 +97,7 @@
           <el-form-item label="缴纳月份" prop="ymd">
             <el-date-picker v-model="form.ymd" type="month" placeholder="选择年月" size="small" value-format="yyyy-MM"></el-date-picker>
           </el-form-item>
-          <el-form-item label="金额" prop="amount">
+          <el-form-item label="金额(元)" prop="amount">
             <el-input-number :precision="2" size="small" type="input" v-model="form.amount" clearable placeholder="2位小数"></el-input-number>
           </el-form-item>
         </el-form>
@@ -101,6 +107,7 @@
 </template>
 
 <script>
+  import {mapState} from 'vuex'
   export default {
     name: 'AppPartyPayment',
     label: '党费缴纳',
@@ -110,8 +117,6 @@
     },
     data () {
       return {
-        today: '',
-        date: '',
         search: {
           current: 1,
           size: 10,
@@ -165,11 +170,12 @@
           ymd: [{ required: true, message: '请选择缴纳月份', trigger: 'change'}],
           amount: [{ required: true, message: '请输入金额', trigger: 'blur'}],
         }
-      }
+      },
+      ...mapState(['user']),
     },
 
     created () {
-      // this.topOrgId = this.user.info.organizationId;
+      this.topOrgId = this.user.info.organizationId
       this.dict.load('zhishengPartyFeeRecordStatus').then(() => {
         this.getList()
       })
@@ -216,6 +222,7 @@
             this.instance.post(`/app/appdfjnzhisheng/addOrUpdate`, {...this.form}).then((res) => {
               if (res.code == 0) {
                 this.$message.success(this.dialogTitle == '编辑党费信息' ? "编辑成功" : "新增成功");
+                this.$refs.form.resetFields()
                 this.dialog = false
                 this.getListInit()
                 this.getTotal()
@@ -244,6 +251,9 @@
           }
         }).then(res => {
           if (res.code == 0) {
+            res.data.records.map((item) => {
+              item.ymd = item.ymd.substring(0, 7)
+            })
             this.tableData = res.data.records
             this.total = res.data.total
           }

project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue

@@ -308,7 +308,7 @@
           this.map = new AMap.Map('map', {
             resizeEnable: true,
             zooms: [6, 20],
-            center: this.form.lng ? [this.form.lng, this.form.lat] : [this.lng, this.lat],
+            center: this.form.lng ? [this.form.lng, this.form.lat] : undefined,
             zoom: 11,
           })
           this.placeSearch = new AMap.PlaceSearch({ map: this.map })