优化

src/api/api.js

@@ -130,6 +130,8 @@ const getRuleDayDetailApi = (params)=>getAction("/property-central/sharerule/set
 const getshareBenefitApi = (params)=>getAction("/property-central/partners/shareBenefit/queryById",params);
 // 分利对账结算
 const getshareBalanceApi = (params)=>getAction("/property-central/partners/shareBalance/queryById",params);
+// 上传收据
+const editCommunityPaymentApi = (params)=>postAction("/property-community/wechat/communityPayment/edit",params);
 
 //数据字典
 const addDict = (params)=>postAction("/sys/dict/add",params);
@@ -284,7 +286,8 @@ export {
   shopDeleteApi,
   shopDetailApi,
   freezeOrThawApi,
-  shopCommunityApi
+  shopCommunityApi,
+  editCommunityPaymentApi
 }
 
 

src/components/jeecg/JUpload.vue

 <template>
-  <div :id="containerId" style="position: relative">
+  <div :id="containerId" class="j-upload-box" style="position: relative">
 
     <!--  ---------------------------- begin 图片左右换位置 ------------------------------------- -->
     <div class="movety-container" :style="{top:top+'px',left:left+'px',display:moveDisplay}" style="padding:0 8px;position: absolute;z-index: 91;height: 32px;width: 104px;text-align: center;">
@@ -23,15 +23,17 @@
       :returnUrl="returnUrl"
       :listType="complistType"
       @preview="handlePreview"
+      :showUploadList="showUploadList"
       :class="{'uploadty-disabled':disabled}">
-      <template>
+      <template v-if="buttonVisible">
         <div v-if="isImageComp">
           <a-icon type="plus" />
           <div class="ant-upload-text">{{ text }}</div>
         </div>
-        <a-button v-else-if="buttonVisible">
+        <a-button v-if="showBtn">
          <a-icon type="upload" />{{ text }}
         </a-button>
+        <span class="ant-upload-text" v-else>{{ text }}</span>
       </template>
     </a-upload>
     <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
@@ -142,6 +144,14 @@
       beforeUpload: {
         type: Function
       },
+      showUploadList: {
+        type:Boolean,
+        default: true
+      },
+      showBtn: {
+        type:Boolean,
+        default: true
+      }
     },
     watch:{
       value:{
@@ -265,7 +275,6 @@
         return true
       },
       handleChange(info) {
-        console.log("--文件列表改变--")
         if(!info.file.status && this.uploadGoOn === false){
           info.fileList.pop();
         }

src/components/page/GlobalLayout.vue

@@ -597,6 +597,8 @@
 
       img {
         height: 32px;
+        width: auto;
+        position: initial;
       }
 
       h1 {

src/components/tools/Logo.vue

 <template>
   <div class="logo">
     <router-link :to="routerLinkTo">
-      <img :src="getAvatar()" alt="logo">
+      <img style="width:32px" :src="getAvatar()" alt="logo">
       <h1 v-if="showTitle">{{ title }}</h1>
     </router-link>
   </div>
@@ -47,6 +47,7 @@
   .sider {
     box-shadow: none !important;
     .logo {
+      
       height: @height !important;
       line-height: @height !important;
       box-shadow: none !important;

src/views/information/owner/modules/NoticeForm.vue

@@ -64,6 +64,7 @@
                 <a-select-option value="1">身份证</a-select-option>
                 <a-select-option value="2">港澳通行证</a-select-option>
                 <a-select-option value="3">护照</a-select-option>
+                <a-select-option value="4">其他</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>

src/views/information/owner/owner-add.vue

@@ -59,6 +59,7 @@
                   <a-select-option value="1">身份证</a-select-option>
                   <a-select-option value="2">港澳通行证</a-select-option>
                   <a-select-option value="3">护照</a-select-option>
+                  <a-select-option value="4">其他</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>

src/views/information/owner/owner-setting.vue

@@ -40,6 +40,7 @@
                   <a-select-option value="1">身份证</a-select-option>
                   <a-select-option value="2">港澳通行证</a-select-option>
                   <a-select-option value="3">护照</a-select-option>
+                  <a-select-option value="4">其他</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
@@ -283,9 +284,9 @@
         if(this.labelType === '3') {
           let formParamas = {
             accessAddress: result.communityVo.accessAddress,
-            logoUrl: result.committee.logoUrl,
+            logoUrl: result.committee ? result.committee.logoUrl : '',
             labelCode: result.committeeInfo ? result.committeeInfo.labelCode : null,
-            committeeName: result.committee.committeeName,
+            committeeName: result.committee ? result.committee.committeeName : '',
             adminLoginName: result.communityOwner.residentPhone,
             adminPassword: result.communityVo.adminPassword,
             labelImg: result.committeeInfo ? result.committeeInfo.labelImg : null,

src/views/property/complaint/complaint-detail.vue

@@ -152,9 +152,13 @@ export default {
         let res = await auditMoveComplaintApi({
           id: this.$route.query.id
         })
-        this.$message.success(res.message)
+        if(res.success) {
+          this.$message.success(res.message)
+          this.closeCurrent()
+        } else {
+          this.$message.warning(res.message)
+        }
       }
-      this.closeCurrent()
     },
   },
 }

src/views/property/receipt/modules/NoticeForm.vue

@@ -53,11 +53,15 @@
           </a-col>
         </a-row>
 
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="收据" :labelCol="{ xs:{ span: 24 }, sm:{ span: 3 } }" :wrapperCol="wrapperCol" prop="employeeAvatar">
-              <j-image-upload :isMultiple="false" text="点击上传" bizPath="scott/pic" v-model="model.employeeAvatar"></j-image-upload>
+        <a-row v-if="model.receiptUrl">
+          <a-col :span="12" style="position:relative">
+            <a-form-model-item label="收据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiptUrl">
+              <div>
+                <a-icon type="paper-clip" />
+                <span>{{model.receiptUrl.replace('temp/', '')}}</span>
+              </div>
             </a-form-model-item>
+            <span @click="onOpenLink" style="color:#13c2c2;position:absolute;top:0;right:-10px;line-height:40px;z-index:999;pointer-events:auto;cursor:pointer;">查看</span>
           </a-col>
         </a-row>
       </a-form-model>
@@ -70,6 +74,7 @@
   import { httpAction } from '@/api/manage'
   import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
   import { CHARGING_CYCLE } from '@/assets/static.js'
+  import { getFileAccessHttpUrl } from '@/api/manage';
 
   export default {
     name: 'PropertyChargruleForm',
@@ -182,6 +187,10 @@
          
         })
       },
+      onOpenLink() {
+        let url = getFileAccessHttpUrl(this.model.receiptUrl)
+        window.open(url, "_blank");
+      }
     }
   }
 </script>
\ No newline at end of file

src/views/property/receipt/receipt.vue

@@ -75,21 +75,20 @@
           <span>{{record.residentName}}，{{record.residentPhone}}</span>
         </span>
         <span slot="receiptStatus" slot-scope="text, record">
-          <span :style="{'color': record.receiptStatus === '1' ? 'green' : 'red'}">{{record.receiptStatus === '1' ? '是' : '否'}}</span>
+          <span :style="{'color': record.receiptStatus === '1' ? 'green' : 'red'}">{{record.receiptUrl ? '已上传' : '未上传'}}</span>
         </span>
         <span slot="action" slot-scope="text, record">
           <!-- <a @click="handleEdit(record)">编辑</a> -->
           <a @click="handleDetail(record)">查看</a>
-          <template v-if="record.receiptStatus !== '1'">
+          <template v-if="!record.receiptUrl">
             <a-divider type="vertical" />
             <a @click="onIssueReceipt(record)">开收据</a>
-          </template>
-          <template v-if="record.receiptStatus !== '1'">
             <a-divider type="vertical" />
-            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+            <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
               :action="importExcelUrl" @change="handleImportExcel">
               <a-button type="primary" icon="import">上传正式收据</a-button>
-            </a-upload>
+            </a-upload> -->
+            <j-upload v-model="receiptUrl" text="上传正式收据" :showBtn="false" :showUploadList="false" :multiple="false" @change="url=>onUploadFile(url, record)"></j-upload>
           </template>
         </span>
       </a-table>
@@ -106,7 +105,10 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import NoticeModal from './modules/NoticeModal'
   import templateModal from './templateModal'
+  import Vue from 'vue'
+  import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
   import {filterDictTextByCache} from '@/components/dict/JDictSelectUtil'
+import { editCommunityPaymentApi } from '@/api/api'
 
   const columns = [
     {
@@ -179,38 +181,54 @@
         // 表头
         columns: columns,
         url: {
-          list: "/property-community/payment/communityPayment/queryReceiptList",
+          list: "/property-community/payment/communityPayment/queryReceiptList?receiptStatus=1",
           delete: '/property-community/property/communityReceipt/delete',
           deleteBatch: '/property-community/property/communityReceipt/deleteBatch',
-          importExcelUrl: 'property-community/info/communityOwner/importExcel',
+          importExcelUrlTmp: 'property-community/info/communityOwner/importExcel',
         },
 
-        templateColumns: [
-          
-        ],
-        templateDta: [],
-        pagination: {
-          total: 0,
-          current: 1,
-          pageSize: 10,
-          showSizeChanger: true
-        }
+        receiptUrl: ''
       }
     },
     computed: {
       importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrlTmp}`
       },
+      tokenHeader(){
+        let head = {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)}
+        let tenantid = Vue.ls.get(TENANT_ID)
+        if(tenantid){
+          head['tenant-id'] = tenantid
+        }
+        return head;
+      }
     },
     methods: {
       onIssueReceipt(row) {
         this.$refs.templateModal.onLoadTemplate(row)
       },
-      handleOk() {},
-      handleCancel() {},
+      onUploadFile(url, row) {
+        console.log(url, row)
+        editCommunityPaymentApi({
+          id: row.id,
+          receiptUrl: url
+        }).then(res=> {
+          this.loadData();
+        })
+      },
+      handleImportExcel(val) {
+        console.log(val)
+      }
     }
   }
 </script>
-<style scoped>
+<style lang="less" scoped>
   @import '~@assets/less/common.less';
+  /deep/ .j-upload-box {
+    display: inline-flex;
+    .ant-upload-text {
+      color: #13c2c2;
+      cursor: pointer;
+    }
+  }
 </style>
\ No newline at end of file

src/views/property/record/RecordDetails.vue

@@ -21,7 +21,7 @@
             </a-col>
             <a-col :md="6" :sm="8">
               <a-form-model-item label="收费类型">
-                <a-select style="width: 100%" v-model="queryParam.chargeTypeId" placeholder="请选择收费类型">
+                <a-select style="width: 100%" v-model="queryParam.chargeTypeCode" placeholder="请选择收费类型">
                   <a-select-option v-for="item in chargeTypeOptions" :key="item.typeCode" :value="item.typeCode">{{item.typeName}}</a-select-option>
                 </a-select>
               </a-form-model-item>