1

src/views/customerManagement/subscribe/subscribeIndex.vue

@@ -37,13 +37,14 @@
                 <el-button
                   size="mini"
                   type="text"
-                  :disabled="scope.row.status === 2"
+                  :disabled="scope.row.status !== 1"
                   @click="handleAdd(scope.row)"
                 >登记
                 </el-button>
                 <el-button
                   size="mini"
                   type="text"
+                  :disabled="scope.row.status === 1 || scope.row.status === 4 || scope.row.status === 5"
                   @click="handleEdit(scope.row)"
                 > 修改
                 </el-button>
@@ -97,7 +98,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: ['DECORATION_SITUATION'],
+            dc_key: ['DECORATION_SITUATION', 'DEPOSIT_STATUS'],
             loading: false,
             AllData: [],
             customerManagementId: '',
@@ -155,7 +156,7 @@ export default {
             })
         },
         getItemJson: function(item) {
-            item.statusStr = item.status === 1 ? '未收取' : '已收取'
+            item.fundCollectionStatusStrstatusStr = this.dc_map.DEPOSIT_STATUS[item.status]
             item.collectionName = item.collectionName == null ? this.username : item.collectionName
             item.collectionTime = item.collectionTime == null ? this.dateStr : item.collectionTime
             return item

src/views/receiveRefundsManagement/maintenanceFundsManagement/index.vue

@@ -27,7 +27,7 @@
       <el-col :span="24" style="margin-top: 20px">
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
-<!--        <el-button type="primary" size="small" style="float: right" @click="downLoad()">&nbsp;专项维修资金凭证</el-button>-->
+        <!--        <el-button type="primary" size="small" style="float: right" @click="downLoad()">&nbsp;专项维修资金凭证</el-button>-->
       </el-col>
     </el-row>
     <el-row class="handle-box">
@@ -58,7 +58,7 @@
           </el-table-column>
           <el-table-column header-align="center" label="操作" width="180">
             <template scope="scope">
-              <el-button size="mini" type="text" @click="handleEdit(scope.row)">收款登记</el-button>
+              <el-button size="mini" type="text" :disabled="scope.row.fundCollectionStatus == '2' || scope.row.fundCollectionStatus == '3'" @click="handleEdit(scope.row)">收款登记</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
             </template>
           </el-table-column>