任务类型

operationSupport/src/router/dynamicMuen.js

@@ -62,24 +62,24 @@ const staticMuen = [
         name: 'editWorkbench'
     },
     // 配置完成需要删除      房东管理
-    {
-        path: '/landlordManagement',
-        component: () => import(/* webpackChunkName: "404" */ '@views/ownerManagement/landlordManagement/index.vue'),
-        meta: { title: 'xxxx' },
-        name: 'landlordManagement'
-    },
-    {
-        path: '/landlordReview',
-        component: () => import(/* webpackChunkName: "404" */ '@views/ownerManagement/landlordReview/index.vue')
-    },
-    {
-        path: '/landlordReview',
-        component: () => import(/* webpackChunkName: "404" */ '@views/payService/landlordBill/index.vue')
-    },
-    {
-        path: '/receivableExamine',
-        component: () => import(/* webpackChunkName: "404" */ '@views/payService/receivableExamine/index.vue')
-    },
+    // {
+    //     path: '/landlordManagement',
+    //     component: () => import(/* webpackChunkName: "404" */ '@views/ownerManagement/landlordManagement/index.vue'),
+    //     meta: { title: 'xxxx' },
+    //     name: 'landlordManagement'
+    // },
+    // {
+    //     path: '/landlordReview',
+    //     component: () => import(/* webpackChunkName: "404" */ '@views/ownerManagement/landlordReview/index.vue')
+    // },
+    // {
+    //     path: '/landlordReview',
+    //     component: () => import(/* webpackChunkName: "404" */ '@views/payService/landlordBill/index.vue')
+    // },
+    // {
+    //     path: '/receivableExamine',
+    //     component: () => import(/* webpackChunkName: "404" */ '@views/payService/receivableExamine/index.vue')
+    // },
     {
         path: '*',
         redirect: '/404'

operationSupport/src/views/flow/index.vue

@@ -303,7 +303,7 @@ export default {
             }
             .search-btn {
                 height: 30px;
-                background: #2787f1;
+                // background: #2787f1;
                 border-radius: 4px;
                 padding: 9px 8px;
                 box-sizing: border-box;

operationSupport/src/views/flow/popups/AddOrEdit.vue

@@ -45,6 +45,10 @@
             label="运维工单"
             :value="3"
           ></el-option>
+          <el-option
+            label="收费管理"
+            :value="4"
+          ></el-option>
         </el-select>
       </template>
       <template slot="taskType">
@@ -184,6 +188,9 @@ export default {
           break;
         case 3:
           this.getTaskType('SC_WORK_ORDER_TYPE');
+          break;
+        case 4:
+          this.getTaskType('CZC_CHARGE_TYPE');
       }
     }
   },

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

@@ -538,14 +538,22 @@ export default {
       });
     },
     // 修改应收金额
-    receivableAmount () {
+    receivableAmount (row) {
+      debugger
       new Promise((resolve) => {
         this.$store.dispatch('addPopup', {
           url: '/payService/landlordBill/stePage/receivable.vue',
           width: '830px',
           height: '500px',
           props: {
-            callback: resolve
+            id: row.id,
+            communityName: row.communityName,
+            assets: row.assets,
+            residentName: row.residentName,
+            paymentDaysDict: row.paymentDaysDict,
+            amount: row.amount,
+            discountAmount: row.discountAmount,
+            callback: resolve,
           },
           showConfirmButton: true,
           showCancelButton: true,

operationSupport/src/views/payService/landlordBill/stePage/Addreceivable.vue

@@ -41,7 +41,7 @@ export default {
   data () {
     return {
       ruleForm: {
-        amountReceived: '200',
+        amountReceived: '',
         applicationAmount: '',
         reason: ''
       },
@@ -56,8 +56,16 @@ export default {
     submit () {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          this.$emit('close');
-          this.params.callback();
+          this.$http.post('/czc-charge/bill/amount/audit/submit', { billId: this.params.id, applicantReason: this.ruleForm.reason, amount: this.ruleForm.amountReceived, applyAmount: Number(this.ruleForm.applicationAmount) }).then(({ status, data, msg }) => {
+            debugger
+            if (status == 0) {
+              this.$emit('close');
+              this.params.callback();
+            }
+          })
+
+
+
         } else {
           return;
         }
@@ -65,6 +73,9 @@ export default {
     }
   },
   created () {
+    debugger
+    this.params;
+    this.ruleForm.amountReceived = this.params.amount;
 
   }
 }

operationSupport/src/views/payService/landlordBill/stePage/receivable.vue

@@ -5,7 +5,11 @@
         :span="12"
         class="el-col-hight"
       >
-        <div class="formContent-item_title">景乐新村南区3栋（张三）</div>
+        <div class="formContent-item_title">
+          <span>{{this.params.communityName}}-</span>
+          <span>{{this.params.assets}}</span>
+          <span>({{this.params.residentName}})</span>
+        </div>
       </el-col>
 
       <el-col
@@ -16,6 +20,7 @@
           <el-button
             type="primary"
             @click="addreceivable"
+            :disabled="typeNum == 1 ? true : false"
           >新增</el-button>
         </div>
       </el-col>
@@ -24,7 +29,7 @@
         class="span_margin"
         style="margin: 10px 0;"
       >
-        <span>{{YearTime}}年{{MonTime}}月物业费账单</span>
+        <span>{{this.params.paymentDaysDict}}物业费账单</span>
       </el-col>
 
       <el-col :span="24">
@@ -45,38 +50,38 @@
             <el-table-column
               label="原应收金额（元）"
               width="120"
-              prop="name"
+              prop="discountAmount"
             >
             </el-table-column>
             <el-table-column
               label="申请应收金额（元）"
               width="130"
-              prop="name"
+              prop="receivableAmount"
             >
             </el-table-column>
             <el-table-column
               label="申请原因"
-              prop="name"
+              prop="applicantReason"
             >
             </el-table-column>
             <el-table-column
               label="申请人"
-              prop="name"
+              prop="applicantName"
             >
             </el-table-column>
             <el-table-column
               label="审核状态"
-              prop="name"
+              prop="status"
             >
             </el-table-column>
             <el-table-column
               label="审核信息"
-              prop="name"
+              prop="remarks"
             >
             </el-table-column>
             <el-table-column
               label="审核人"
-              prop="name"
+              prop="reviewedBy"
             >
             </el-table-column>
           </el-table>
@@ -91,30 +96,34 @@
 
 <script>
 export default {
+  props: ['params'],
   data () {
     return {
       YearTime: '',
       MonTime: '',
+      typeNum: '2',
       tableData: [
-        {
-          name: '1',
-        }, {
-          name: '2'
-        },
-        {
-          name: '3'
-        },
-        ,
-        {
-          name: '3'
-        }
-        ,
-        {
-          name: '4'
-        },
-        {
-          name: '5'
-        },
+        // {
+        //   name: '1',
+        //   amount: '100'
+        // }, {
+        //   name: '2',
+        //   amount: '200'
+        // },
+        // {
+        //   name: '3'
+        // },
+        // ,
+        // {
+        //   name: '3'
+        // }
+        // ,
+        // {
+        //   name: '4'
+        // },
+        // {
+        //   name: '5'
+        // },
         // {
         //   name: '6'
         // }
@@ -131,27 +140,53 @@ export default {
       this.MonTime = time.getMonth() + 1;
     },
     addreceivable () {
-      // alert('11')
       new Promise((resolve) => {
         this.$store.dispatch('addPopup', {
           url: '/payService/landlordBill/stePage/Addreceivable.vue',
           width: '560px',
           height: '310px',
           props: {
+            id: this.params.id,
+            amount: this.params.discountAmount,
             callback: resolve
           },
-          // showConfirmButton: true,
-          // showCancelButton: true,
-          // hideStar: true,
           title: '修改应收金额'
         });
       }).then(() => {
         debugger
       });
+    },
+    audit () {
+      this.$http.get('/czc-charge/bill/amount/audit/list', { billId: this.params.id }).then(({ status, data, msg }) => {
+        debugger
+        if (status == 0) {
+          this.tableData = [];
+          var dataNum = [];
+          for (let i = 0; i < data.length; i++) {
+            this.tableData.push({
+              receivableAmount: data[i].receivableAmount,
+              discountAmount: data[i].discountAmount,
+              applicantReason: data[i].applicantReason,
+              applicantName: data[i].applicantName,
+              remarks: data[i].remarks,
+              reviewedBy: data[i].reviewedBy,
+              status: data[i].status == 1 ? '审核中' : data[i].status == 2 ? '审核通过' : '审核未通过'
+            })
+            dataNum.push(data[i].status);
+          }
+          for (let k = 0; k < dataNum.length; k++) {
+            if (data[k] == 1) {
+              this.typeNum = '1'
+            }
+          }
+        }
+        debugger
+      })
     }
   },
   created () {
     this.timeCode();
+    this.audit();
   }
 }
 

smart/src/views/vehicleAudit/detalis.vue

@@ -146,16 +146,23 @@
           </template>
         </el-col>
         <el-col :span="24">
-          <div class="formContent-item_title">社区名称</div>
+          <div class="formContent-item_title">{{this.address}}</div>
         </el-col>
         <el-col
           :span="24"
           class="span_margin_bottom"
         >
-          <span>物业缴费情况：</span><span>未缴清物业费用，无法办理月卡</span>
+          <span>物业缴费情况：</span><span>{{this.reasonNum == null ? '已缴清物业费，可以办理月卡':this.reasonNum}}</span>
         </el-col>
         <el-col :span="24">
-          <span>审核结果：</span><span style="color:red">不通过</span>
+          <span>审核结果：</span>
+
+          <span v-if="this.auditStatusNum == 0">待审核</span>
+          <span v-else-if="this.auditStatusNum == 1">通过</span>
+          <span
+            style="color:red"
+            v-else-if="this.auditStatusNum == 2"
+          >未通过</span>
         </el-col>
 
       </el-row>
@@ -179,6 +186,7 @@ export default {
         modular: '1'
       },
       modularType: '0',
+      parkcarAuditNum: '',
       businessRecordList: [
         {
           name: '车主信息'
@@ -187,6 +195,9 @@ export default {
           name: '物业缴费情况'
         }
       ],
+      address: '',
+      auditStatusNum: '',
+      reasonNum: '',
       rules: {
         resource: [
           { required: true, message: '请选择审核方式', trigger: 'change' }
@@ -198,6 +209,15 @@ export default {
     }
   },
   methods: {
+    parkcarAudit () {
+      this.$http.get(`/czc-community/parkcarAudit/find/${this.params.id}`).then(({ data, msg, status }) => {
+        debugger
+        this.parkcarAuditNum = '1'
+        this.address = data.address;
+        this.auditStatusNum = data.auditStatus;
+        this.reasonNum = data.reason;
+      })
+    },
     formDataRadio () {
       if (this.ruleForm.resource == 1) {
         this.ruleForm.desc = ''
@@ -206,13 +226,23 @@ export default {
     submit () {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
+          if (this.parkcarAuditNum != '1') {
+            this.$http.post('/czc-community/parkcarAudit/audit',
+              { userType: this.params.userType, userId: this.params.userId, houseId: this.params.houseId, buildId: this.params.buildId, id: this.params.id, auditStatus: this.ruleForm.resource, reason: this.params.reason, }).
+              then(({ data, msg, status }) => {
+                this.ruleForm.modular = '2';
+                this.$message.success('成功');
+                if (this.ruleForm.resource == 1) {
+                  this.parkcarAudit();
+                } else if (this.ruleForm.resource == 2) {
+                  this.$emit('close');
+                }
+              })
+          }
 
-          debugger
-          if (this.modularType == '0') {
-            this.ruleForm.modular = '2';
-          } else {
-            alert('1');
+          if (this.parkcarAuditNum == 1) {
             this.$emit('close');
+            this.params.callback();
           }
         } else {
 
@@ -223,6 +253,7 @@ export default {
   },
   created () {
     debugger
+    this.params;
     // this.ruleForm.modular = this.params.modular;
     this.ruleForm.modular = '1';
   }

smart/src/views/vehicleAudit/index.vue

@@ -28,7 +28,7 @@
       >
         <el-option
           value="0"
-          label="待审核"
+          label="未审核"
         >
         </el-option>
         <el-option
@@ -69,6 +69,114 @@
       @page-change="pageChange"
       @selection-change="selectionChange"
     >
+
+      <template
+        slot="idCardUrl"
+        slot-scope="scope"
+      >
+
+        <div>
+          <div
+            class="imgVdio"
+            v-for="item in scope.row.idCardUrl.split(',')"
+            :key="item"
+          >
+
+            <el-image
+              class="imgs"
+              :src="url + item"
+              :preview-src-list="[item]"
+            ></el-image>
+          </div>
+        </div>
+
+      </template>
+
+      <!-- driveUrl -->
+      <template
+        slot="driveUrl"
+        slot-scope="scope"
+      >
+
+        <div>
+          <div
+            class="imgVdio"
+            v-for="item in scope.row.driveUrl.split(',')"
+            :key="item"
+          >
+            <el-image
+              class="imgs"
+              :src="url + item"
+              :preview-src-list="[item]"
+            ></el-image>
+          </div>
+        </div>
+
+      </template>
+      <!-- travelUrl -->
+      <template
+        slot="travelUrl"
+        slot-scope="scope"
+      >
+
+        <div>
+          <div
+            class="imgVdio"
+            v-for="item in scope.row.travelUrl.split(',')"
+            :key="item"
+          >
+            <el-image
+              class="imgs"
+              :src="url + item"
+              :preview-src-list="[item]"
+            ></el-image>
+          </div>
+        </div>
+
+      </template>
+      <!-- contractUrl -->
+      <template
+        slot="contractUrl"
+        slot-scope="scope"
+      >
+
+        <div>
+          <div
+            class="imgVdio"
+            v-for="item in scope.row.contractUrl.split(',')"
+            :key="item"
+          >
+            <el-image
+              class="imgs"
+              :src="url + item"
+              :preview-src-list="[item]"
+            ></el-image>
+          </div>
+        </div>
+
+      </template>
+      <!-- gridLivingUrl -->
+      <template
+        slot="gridLivingUrl"
+        slot-scope="scope"
+      >
+
+        <div>
+          <div
+            class="imgVdio"
+            v-for="item in scope.row.gridLivingUrl.split(',')"
+            :key="item"
+          >
+            <el-image
+              class="imgs"
+              :src="url + item"
+              :preview-src-list="[item]"
+            ></el-image>
+          </div>
+        </div>
+
+      </template>
+
       <template
         slot-scope="scope"
         slot="opt"
@@ -77,12 +185,17 @@
           class="item"
           effect="light"
           placement="bottom"
-          content="审核"
+          :content="scope.row.auditStatus == 0 ? '审核' : '无法审核'"
         >
           <i
+            v-if="scope.row.orderStatus == 0"
             class="zoniot_font zoniot-icon-shenhe"
             @click="lookDetails(scope.row)"
           ></i>
+          <i
+            v-else
+            class="zoniot_font zoniot-icon-shenhe ashText"
+          ></i>
         </el-tooltip>
       </template>
     </zz-table>
@@ -100,6 +213,7 @@ export default {
     return {
       mixins_post: 'post',
       nameParkingLot: [],
+      url: 'http://114.135.61.186:21020',
       cols: [
         {
           label: '车主名称',
@@ -119,23 +233,28 @@ export default {
         },
         {
           label: '身份证图片',
-          prop: 'idCardUrl'
+          prop: 'idCardUrl',
+          slot: 'idCardUrl'
         },
         {
           label: '驾驶证图片',
-          prop: 'driveUrl'
+          prop: 'driveUrl',
+          slot: 'driveUrl'
         },
         {
           label: '行驶证图片',
-          prop: 'travelUrl'
+          prop: 'travelUrl',
+          slot: 'travelUrl'
         },
         {
           label: '住房合同图片',
-          prop: 'contractUrl'
+          prop: 'contractUrl',
+          slot: 'contractUrl'
         },
         {
           label: "网格居住信息图片",
-          prop: 'gridLivingUrl'
+          prop: 'gridLivingUrl',
+          slot: 'gridLivingUrl'
         },
         {
           label: '审核状态',
@@ -181,7 +300,8 @@ export default {
         this.mixins_search();
       })
     },
-    lookDetails () {
+    lookDetails (row) {
+      debugger
       new Promise((resolve) => {
         this.$store.dispatch('addPopup', {
           url: '/vehicleAudit/detalis.vue',
@@ -190,6 +310,13 @@ export default {
           props: {
             // id: row.parkId,
             // garageName: row.garageName,
+            userType: row.userType,
+            userId: row.userId,
+            houseid: row.houseId,
+            buildingid: row.buildId,
+            id: row.id,
+            auditStatus: row.auditStatus,
+            reason: row.reason,
             callback: resolve,
             modular: this.modular
           },
@@ -199,16 +326,9 @@ export default {
           title: '月卡审核'
         });
       }).then((data) => {
-        debugger
         this.mixins_search();
-        if (data.id == 2) {
-          this.modular = '2';
-          this.lookDetails();
-          this.modular = '1';
-        }
-        // this.lookDetails();
       });
-    }
+    },
   },
   created () {
     this.nameParking();