BUG

operationSupport/src/views/assetManagement/housingManagement/saveEdits.vue

@@ -370,6 +370,10 @@ export default {
     'ruleForm.communityId' (newValue, oldValue) {
       if (newValue !== oldValue) {
         this.buildingNameList();
+        this.ruleForm.buildingId = '';
+        this.ruleForm.unitName = '';
+        this.ruleForm.floorNumber = '';
+        this.ruleForm.roomNumber = '';
       }
     },
     'ruleForm.buildingId' (newValue, oldValue) {
@@ -378,11 +382,16 @@ export default {
 
         this.unitNameList();
         this.unitChoice(newValue);
+        this.ruleForm.unitName = '';
+        this.ruleForm.floorNumber = '';
+        this.ruleForm.roomNumber = '';
       }
     },
     'ruleForm.unitName' (newValue, oldValue) {
       if (newValue !== oldValue) {
         this.unitChoice(newValue);
+        this.ruleForm.floorNumber = '';
+        this.ruleForm.roomNumber = '';
       }
     },
     unitList (val) {
@@ -444,8 +453,7 @@ export default {
           if (res.data.buildingUnitList.length != 0) {
 
             for (let i = 0; i < res.data.buildingUnitList.length; i++) {
-              debugger
-              if (res.data.buildingUnitList[i].unitName != null) {
+              if (res.data.buildingUnitList[i].unitName != null && res.data.buildingUnitList[i].unitName != '') {
                 this.resunitList.push(res.data.buildingUnitList[i])
               }
             }

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

@@ -301,24 +301,24 @@ export default {
         //   prop: 'assets'
         // },
         {
-          label: '费用名称',
+          label: '费用类型',
           prop: 'chargeName',
           width: '150'
         },
         {
-          label: '账期',
+          label: '计费周期',
           prop: 'payBeginTime',
           slot: 'payBeginTime',
           width: '150'
         },
-        {
-          label: '费用金额(元)',
-          prop: 'amount'
-        },
-        {
-          label: '滞纳金(元)',
-          prop: 'lateFee'
-        },
+        // {
+        //   label: '账单金额(元)',
+        //   prop: 'amount'
+        // },
+        // {
+        //   label: '滞纳金(元)',
+        //   prop: 'lateFee'
+        // },
         {
           label: '账单金额(元)',
           prop: 'amount'
@@ -369,7 +369,7 @@ export default {
           prop: 'lateFee'
         },
         {
-          label: '应收金额(元)',
+          label: '实收金额(元)',
           prop: 'discountAmount'
         },
         {

operationSupport/src/views/payService/systemSetup/stepPage/billingSettings.vue

@@ -117,7 +117,7 @@
               placeholder="请选择"
             >
               <el-option
-                label="物业公司"
+                label="物业"
                 value="1"
               >
               </el-option>
@@ -136,23 +136,13 @@
               v-model="bill[scope.$index].expenseType"
               placeholder="请选择"
             >
-
               <el-option
-                label="物业费"
-                value="1"
+                v-for="(items,indexs) in expenseType"
+                :label="items.name"
+                :value="items.value"
+                :key="indexs"
               >
               </el-option>
-
-              <el-option
-                label="停车月卡"
-                value="2"
-              ></el-option>
-
-              <el-option
-                label="临停车费"
-                value="3"
-              ></el-option>
-
             </el-select>
           </template>
 
@@ -300,6 +290,7 @@ export default {
   },
   data () {
     return {
+      id: '',
       resDate: [
         {
           customer: '',
@@ -317,13 +308,13 @@ export default {
       customer: [
         {
           name: '住户',
-          value: '1'
+          value: '3'
         }, {
           name: '商户',
           value: '2'
         }, {
           name: "房东",
-          value: '3'
+          value: '1'
         }
       ],
       expenseType: [
@@ -339,27 +330,36 @@ export default {
           value: '3'
         },
         {
-          name: '租赁费',
+          name: '车位费',
           value: '4'
         },
+        {
+          name: '卫生费',
+          value: '6'
+        },
+        {
+          name: '其他费用',
+          value: '7'
+        },
       ],
       payee: [
         {
           name: '房东',
-          value: '1'
+          value: '2'
         },
         {
-          name: '物业公司',
-          value: '2'
+          name: '物业',
+          value: '1'
         }
-      ]
+      ],
+      url: '/czc-community/payConfig/add'
     }
   },
   methods: {
     currentOrganId (data) {
 
       this.currentId = data.id || '';
-      // this.getData();
+      this.findByCommunityId();
     },
     add () {
       this.resDate.push({
@@ -369,7 +369,6 @@ export default {
       })
     },
     addBill () {
-
       this.bill.push({
         commission: '',//提成对象
         expenseType: '',//费用类型
@@ -390,7 +389,76 @@ export default {
       }
     },
     submit () {
-      this.$message.success('成功');
+      let resData = [];
+      this.resDate.map((item, index) => {
+        resData.push({
+          configType: 1,
+          userType: Number(item.customer),
+          feeType: Number(item.expenseType),
+          beneficiary: Number(item.payee),
+        })
+      })
+      this.bill.map((item, index) => {
+        resData.push({
+          configType: 2,
+          userType: Number(item.commission),
+          feeType: Number(item.expenseType),
+          commissionMethod: Number(item.commissionPlatform),
+          divideIntoValues: Number(item.platformAmount),
+        })
+      })
+
+      let data = {
+        communityId: this.currentId, payOptionDtoList: resData, merchantNumber: this.wxMerchant, id: this.id
+      }
+      this.$http.post(this.url, data).then(({ status, data, msg }) => {
+        if (status == 0) {
+          this.$message.success(msg);
+        }
+      })
+    },
+    findByCommunityId () {
+      this.$http.get('/czc-community/payConfig/findByCommunityId', { communityId: this.currentId }).then(({ status, data, msg }) => {
+        if (status == 0 && !!data) {
+          this.resDate = [];
+          this.bill = [];
+          this.id = data.id;
+          this.url = '/czc-community/payConfig/update'
+          data.billConfig.map((item, index) => {
+            this.resDate.push({
+              customer: item.userType + '',
+              expenseType: item.feeType + '',
+              payee: item.beneficiary + '',
+              configType: '1'
+            })
+          })
+
+          data.divideSettings.map((item, index) => {
+            this.bill.push({
+              commission: item.userType + '',
+              configType: '2',
+              expenseType: item.feeType + '',
+              commissionPlatform: item.commissionMethod + '',
+              platformAmount: item.divideIntoValues
+
+            })
+          })
+          this.wxMerchant = data.merchantNumber;
+        } else {
+          this.resDate = [{
+            customer: '',
+            expenseType: '',
+            payee: '',
+          }];
+          this.bill = [{
+            commission: '',
+            expenseType: '',
+            commissionPlatform: '',
+            platformAmount: ''
+          }];
+          this.wxMerchant = '';
+        }
+      })
     }
   }
 }

operationSupport/src/views/workOrders/index.vue

@@ -180,6 +180,19 @@ export default {
           label: '报修时间',
           prop: 'createDate'
         },
+        {
+          label: '工单关闭',
+          prop: 'auditStatus',
+          format (val) {
+            if (val == 1) {
+              return '审核中'
+            } else if (val == 2) {
+              return '已审核'
+            } else {
+              return '-'
+            }
+          }
+        },
         {
           label: '操作',
           prop: 'id',
@@ -238,10 +251,11 @@ export default {
         this.$store.dispatch('addPopup', {
           url: '/workOrders/popups/closeTsk.vue',
           width: '500px',
-          height: '100px',
+          height: '280px',
           props: {
             data,
             row,
+            closeAudit: this.$closeAudit,
             callback: resolve
           },
           notip: true,

operationSupport/src/views/workOrders/popups/closeTsk.vue

@@ -1,11 +1,56 @@
 <template>
-  <zz-form
-    :cols="formCols"
-    :data="formData"
-    :rules="formRules"
-    labelWidth="90"
-    ref="form"
-  > </zz-form>
+  <div>
+    <zz-form
+      :cols="formCols"
+      :data="formData"
+      :rules="formRules"
+      labelWidth="90"
+      ref="form"
+      v-if="this.params.row.auditStatus == null ? true :false"
+    > </zz-form>
+    <template>
+      <div v-if="this.params.row.auditStatus != null ? true :false">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="80px"
+        >
+          <el-form-item label="关闭原因">
+            <el-input
+              v-model="form.cause"
+              disabled
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="状态">
+            <el-input
+              v-model="form.auditStatus"
+              disabled
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item
+            label="审核"
+            v-if="this.params.closeAudit"
+          >
+            <!-- this.params.row.auditStatus -->
+            <el-radio-group v-model="form.resource">
+              <el-radio
+                label="1"
+                :disabled="this.params.row.auditStatus == '2' ? true : false"
+              >审核通过</el-radio>
+              <el-radio
+                label="0"
+                :disabled="this.params.row.auditStatus == '2' ? true : false"
+              >审核不通过</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+        </el-form>
+      </div>
+    </template>
+  </div>
+
 </template>
 <script >
 export default {
@@ -27,13 +72,19 @@ export default {
             input: true
           }
         ]
-      ]
+      ],
+      form: {
+        cause: '',
+        auditStatus: '',
+        resource: '1'
+      },
+      dataJurisdiction: '',//是否含有审核权限
     };
   },
 
   methods: {
     submit () {
-      if (this.params.auditStatus == null) {
+      if (this.params.row.auditStatus == null) {
         new Promise((resolve) => {
           this.$refs.form.validate(resolve);
         }).then(() => {
@@ -56,15 +107,43 @@ export default {
             });
         });
       } else {
-        alert('111')
+        if (this.params.row.auditStatus == '1') {
+          this.$http.post('/czc-community/workOrder/audit', { orderId: Number(this.params.row.id), audit: this.form.resource }).then(({ data, status, msg }) => {
+            if (status == 0) {
+              this.$message.success(msg);
+              this.params.callback();
+              this.$emit('close');
+            }
+          })
+        } else {
+          this.$emit('close');
+        }
+
       }
+    },
+    // /czc-community/workOrder/checkAudit
+    checkAudit () {
+      this.$http.postForm('/czc-community/workOrder/checkAudit', { orderId: Number(this.params.row.id) }).then(({ data, status, msg }) => {
+        if (status == 0) {
+          this.dataJurisdiction = data;
+        }
+      })
     }
   },
   created () {
     // this.formData.orderId = JSON.parse(JSON.stringify(this.params.data)).id;
-    debugger
     this.params.row.id;
     this.formData.orderId = this.params.row.id;
+
+    this.form.cause = this.params.row.cause;
+    this.form.auditStatus = this.params.row.auditStatus == '1' ? '审核中' : '已审核';
+    if (this.params.row.auditStatus == 2) {
+      this.form.resource = '0';
+    }
+    if (this.params.row.auditStatus != null) {
+      this.checkAudit();
+    }
+
   }
 };
 </script>