合同tji

operationSupport/src/views/newWorkBench/components/contractAward.vue

@@ -8,8 +8,8 @@
                     <el-date-picker
                         value-format="yyyy"
                         v-model="date"
-                        type="month"
-                        placeholder="选择月"
+                        type="year"
+                        placeholder="选择年"
                         class="saveColumn-select"
                         @change="changeTime"
                         :clearable="false"
@@ -28,58 +28,26 @@
 import { discountedWave } from './indexOptionChart';
 import permissionComponent from './permissionComponent';
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-let dataDay = [
-    '01-01',
-    '01-02',
-    '01-03',
-    '01-04',
-    '01-05',
-    '01-06',
-    '01-07',
-    '01-08',
-    '01-09',
-    '01-10',
-    '01-11',
-    '01-12',
-    '01-13',
-    '01-14',
-    '01-15',
-    '01-16',
-    '01-17',
-    '01-18',
-    '01-19',
-    '01-20',
-    '01-21',
-    '01-22',
-    '01-23',
-    '01-24',
-    '01-25',
-    '01-26',
-    '01-27',
-    '01-28',
-    '01-29',
-    '01-30',
-    '01-31'
-];
+let dataDay = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];
 export default {
     props: ['dataObj'],
     mixins: [permissionComponent],
     data() {
         return {
             defaultModel: {
-                permissUrl: 'propertyManagement/index',
-                titleName: '投诉建议'
+                permissUrl: '21',
+                titleName: '商业管理'
             },
             mixins_query: {
                 communityId: '',
                 date: ''
             },
             date: '',
-            clientOptions: discountedWave('(次)', dataDay, dataArr)
+            clientOptions: discountedWave('(个)', dataDay, dataArr)
         };
     },
     created() {
-        this.mixins_query.date = this.$moment().format('YYYY');
+        this.mixins_query.date = this.$moment().format('YYYY') +'-01-01';
         this.date = this.$moment().format('YYYY');
         this.getData();
     },
@@ -95,13 +63,13 @@ export default {
                             dateTime.push(item.date);
                             valueArr.push(item.data);
                         });
-                        this.clientOptions = discountedWave('(次)', dateTime, valueArr);
+                        this.clientOptions = discountedWave('(个)', dateTime, valueArr);
                     }
                 })
                 .catch((err) => {});
         },
         changeTime(v) {
-            this.mixins_query.date = v;
+            this.mixins_query.date = v +'-01-01';
             this.getData();
         }
     }

operationSupport/src/views/payService/leaseBill/index.vue

@@ -14,6 +14,13 @@
                     v-trim
                     v-model.trim="mixins_query.name"
                 ></el-input>
+                <el-select v-model="mixins_query.payType" v-if="chargeStatus == 2" class="width120" placeholder="缴费方式" clearable>
+                    <el-option label="微信" :value="1"></el-option>
+                    <el-option label="支付宝" :value="2"></el-option>
+                    <el-option label="现金" :value="3"></el-option>
+                    <el-option label="其他" :value="5"></el-option>
+                    <el-option label="刷卡" :value="6"></el-option>
+                </el-select>
                 <el-date-picker
                     v-model="times"
                     value-format="yyyy-MM-DD"
@@ -136,8 +143,7 @@ export default {
 
                 {
                     label: '费用名称',
-                    prop: 'chargeName',
-                    width: '200'
+                    prop: 'chargeName'
                 },
                 {
                     label: '计费周期',
@@ -145,15 +151,6 @@ export default {
                     slot: 'payBeginTime',
                     width: '150'
                 },
-                {
-                    label: '费用金额(元)',
-                    prop: 'amount'
-                },
-                {
-                    label: '滞纳金(元)',
-                    prop: 'lateFee'
-                },
-
                 {
                     label: '应收金额(元)',
                     prop: 'receivableAmount'
@@ -170,6 +167,11 @@ export default {
                     label: '缴费状态',
                     prop: 'chargeStatusDict'
                 },
+                {
+                    label: '缴费时间',
+                    prop: 'chargeDate',
+                    width: '150'
+                },
                 {
                     label: '操作',
                     prop: 'id',
@@ -302,42 +304,68 @@ export default {
         },
         selectable(row, index) {
             return true;
+        },
+        Object_Set(thisObj, val, editThisObj) {
+            if (thisObj instanceof Array && val instanceof Array) {
+                if (!!editThisObj) {
+                    thisObj.map((item, index) => {
+                        this[editThisObj][item] = val[index];
+                    });
+                } else {
+                    thisObj.map((item, index) => {
+                        this['mixins_query'][item] = val[index];
+                    });
+                }
+            } else {
+                if (!!editThisObj) {
+                    this[editThisObj][thisObj] = val;
+                } else {
+                    this['mixins_query'][thisObj] = val;
+                }
+            }
         }
     },
     watch: {
         currentId(newValue, oldValue) {
-            this.mixins_query.communityId = '';
-            this.mixins_query.buildingId = '';
-            this.mixins_query.unitName = '';
-            this.mixins_query.houseId = '';
+            this.Object_Set(['communityId', 'buildingId', 'unitName', 'houseId'], ['', '', '', '']);
             if (newValue.type) {
-                let newValueIds = newValue.id.split('-');
                 this.chiData.type = newValue.type;
                 if (newValue.type === 'community') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.chiData.value = newValue.communityId;
-                    this.chiData.address = newValue.communityName;
+                    this.Object_Set(['communityId'], [newValue.communityId]);
+                    this.Object_Set(['value', 'address'], [newValue.communityId, newValue.communityName], 'chiData');
                 } else if (newValue.type === 'building') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.chiData.value = newValue.buildingId;
-                    this.chiData.address = newValue.communityName + ' ' + newValue.buildingName;
+                    this.Object_Set(['communityId', 'buildingId'], [newValue.communityId, newValue.buildingId]);
+                    this.Object_Set(
+                        ['value', 'address'],
+                        [newValue.buildingId, newValue.communityName + ' ' + newValue.buildingName],
+                        'chiData'
+                    );
                 } else if (newValue.type === 'unit') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.mixins_query.unitName = newValue.unitId;
-
-                    this.chiData.value = newValue.buildingId + ':' + newValue.unitId;
-                    this.chiData.address = newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName;
+                    this.Object_Set(
+                        ['communityId', 'buildingId', 'unitName'],
+                        [newValue.communityId, newValue.buildingId, newValue.unitId]
+                    );
+                    this.Object_Set(
+                        ['value', 'address'],
+                        [
+                            newValue.buildingId + ':' + newValue.unitId,
+                            newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName
+                        ],
+                        'chiData'
+                    );
                 } else if (newValue.type === 'room') {
-                    this.mixins_query.communityId = newValue.communityId;
-                    this.mixins_query.buildingId = newValue.buildingId;
-                    this.mixins_query.unitName = newValue.unitId;
-                    this.mixins_query.houseId = newValue.houseId;
-
-                    this.chiData.value = newValue.houseId;
-                    this.chiData.address =
-                        newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName + ' ' + newValue.houseName;
+                    this.Object_Set(
+                        ['communityId', 'buildingId', 'unitName', 'houseId'],
+                        [newValue.communityId, newValue.buildingId, newValue.unitId, newValue.houseId]
+                    );
+                    this.Object_Set(
+                        ['value', 'address'],
+                        [
+                            newValue.houseId,
+                            newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName + ' ' + newValue.houseName
+                        ],
+                        'chiData'
+                    );
                 }
             }
             this.mixins_search();
@@ -347,7 +375,8 @@ export default {
         this.mixins_dataUrl = '/sc-charge/charge/bill/page'; // 分页查询接口
         this.mixins_query = {
             chargeStatus: this.chargeStatus,
-            chargeType: '8'
+            chargeType: '8',
+             payType: ''
         };
     }
 };
@@ -358,5 +387,8 @@ export default {
     .zz-tab-button {
         margin-right: 20px;
     }
+    .width120 {
+        width: rem(120);
+    }
 }
 </style>

operationSupport/src/views/payService/propertyFee/stepPage/details.vue

@@ -91,6 +91,10 @@ export default {
                     label: '业主手机号:',
                     prop: 'phone'
                 },
+                {
+                    label: '支付方式:',
+                    prop: 'payTypeDict'
+                },
                 {
                     label: '收款人:',
                     prop: 'payee'
@@ -106,6 +110,10 @@ export default {
                 {
                     label: '实收金额(元):',
                     prop: 'receivedAmount'
+                },
+                {
+                    label: '备注:',
+                    prop: 'remark'
                 }
             ],
             thisItem: {}