完善流程

src/views/dashboard/Analysis.vue

@@ -166,7 +166,9 @@
       </a-col>
     </a-row>
     <a-modal :title="noticeTitle" :visible="visible" @cancel="handleCancel" :footer="null" width="40%">
+      <div class="notice-content">
         <p v-html="noticeContent "></p>
+      </div>
     </a-modal>
   </div>
 </template>
@@ -452,4 +454,10 @@ export default {
     }
   }
 }
+.notice-content{
+  img{
+    width: 100%;
+    height: auto;
+  }
+}
 </style>
\ No newline at end of file

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

@@ -30,28 +30,38 @@
                 <a-input v-model="model.createTime" placeholder="请输入"></a-input>
               </a-form-model-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="complaintImg">
+                <j-image-upload bizPath="scott/pic" accept="image/png, image/jpeg"
+                  v-model="model.complaintImg"></j-image-upload>
+              </a-form-model-item>
+            </a-col>
             <a-col :span="24">
-              <a-form-model-item label="问题描述" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol" prop="problemDesc">
+              <a-form-model-item label="问题描述" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol"
+                prop="problemDesc">
                 <a-textarea v-model="model.problemDesc" placeholder="请输入" style="width:80%" />
               </a-form-model-item>
             </a-col>
           </a-row>
         </a-form-model>
       </j-form-container>
-      <j-form-container v-if="!formDisabled">
-        <a-form-model ref="form" :model="form" :rules="validatorRules" slot="detail">
+      <j-form-container v-if="!formDisabled || model.handleStatus == 'finish'"
+        :disabled="model.handleStatus == 'finish'">
+        <a-form-model ref="form" :model="form" slot="detail">
           <a-row>
             <a-col :span="24">
-              <a-form-model-item label="处理状态" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol" prop="handleStatus">
-                <a-select v-model="form.handleStatus" placeholder="请选择与业主关系" style="width:50%">
-                  <a-select-option value="pending" v-if="model.handleStatus !== 'pending'">处理中</a-select-option>
+              <a-form-model-item label="处理状态" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol"
+                prop="handleStatus">
+                <a-select v-model="form.handleStatus" placeholder="请选择处理状态" style="width:50%">
+                  <a-select-option value="pending">处理中</a-select-option>
                   <a-select-option value="finish">处理完成</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :span="24" v-if="model.handleStatus === 'pending'">
-              <a-form-model-item label="处理结果" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol" prop="handleResult">
-                <a-textarea v-model="model.handleResult" placeholder="请输入" style="width:80%" />
+            <a-col :span="24">
+              <a-form-model-item label="处理结果" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol"
+                prop="handleResult">
+                <a-textarea v-model="form.handleResult" placeholder="请输入" style="width:80%" />
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -67,17 +77,17 @@
 </template>
 
 <script>
-  import { querycommunityComplaintApi, auditCommunityComplaintApi} from '@/api/api'
-  export default {
+import { querycommunityComplaintApi, auditCommunityComplaintApi } from '@/api/api'
+export default {
   name: 'PropertyChargruleForm',
-    inject:['closeCurrent'],
-    data () {
+  inject: ['closeCurrent'],
+  data() {
     return {
       currentStep: 1,
-        model:{},
+      model: {},
       form: {
         handleStatus: 'pending',
-          auditOpinion: ''
+        handleResult: '',
       },
       labelCol: {
         xs: { span: 24 },
@@ -87,50 +97,45 @@
         xs: { span: 24 },
         sm: { span: 20 },
       },
-        validatorRules: {
-          handleStatus: [{ required: true, message: '请选择处理状态', trigger: 'change' }],
-          handleResult: [{ required: true, message: '请输入处理结果', trigger: 'blur' }]
-        },
       confirmLoading: false,
     }
   },
   computed: {
-      formDisabled(){
+    formDisabled() {
       return this.$route.query.type === '1'
     },
   },
-    created () {
+  created() {
     //备份model原始值
     this.getDetail()
   },
   methods: {
     async getDetail() {
       this.confirmLoading = true
-        let {result} = await querycommunityComplaintApi({id: this.$route.query.id})
-        if(result.handleStatus === 'pending') {
-          this.form.handleStatus = 'finish'
+      let { result } = await querycommunityComplaintApi({ id: this.$route.query.id })
+      this.model = { ...result }
+      if (this.model.handleStatus == 'finish') {
+        this.form.handleStatus = this.model.handleStatus
+        this.form.handleResult = this.model.handleResult
       }
-        this.model = {...result}
       this.confirmLoading = false
     },
     onReturn() {
-        this.closeCurrent()
+      this.$store.dispatch('tags/delView', this.$route.path)
+      this.$router.go(-1)
     },
-      onSubmit() {
-        this.$refs.form.validate(async valid => {
-          if (valid) {
+    async onSubmit() {
       let res = await auditCommunityComplaintApi({
-              ...this.model,
         id: this.$route.query.id,
-              handleStatus: this.form.handleStatus
-            })
-            this.$message.success(res.message);
-            this.closeCurrent()
-          }
+        handleStatus: this.form.handleStatus,
+        handleResult: this.form.handleResult,
       })
-      }
-    }
-  }
+      this.$message.success(res.message)
+      this.$store.dispatch('tags/delView', this.$route.path)
+      this.$router.go(-1)
+    },
+  },
+}
 </script>
 
 <style scoped lang="less">

src/views/property/maintenance/maintenance.vue

@@ -11,7 +11,7 @@
           </a-col>
           <a-col :md="6" :sm="8">
             <a-form-model-item label="工单状态">
-              <a-select style="width: 100%" v-model="queryParam.useTo" placeholder="请选择工单状态">
+              <a-select style="width: 100%" v-model="queryParam.repairStatus" placeholder="请选择工单状态">
                 <a-select-option v-for="item in repairStatus" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
               </a-select>
             </a-form-model-item>

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

@@ -4,15 +4,15 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="12">
-            <a-form-model-item label="支付订单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
-              <a-input v-model="model.orderNo" placeholder="请输入支付订单号"></a-input>
+            <a-form-model-item label="支付订单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paymentNum">
+              <a-input v-model="model.paymentNum" placeholder="请输入支付订单号"></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-model-item label="支付金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeMoney">
-              <a-input v-model="model.chargeMoney" placeholder="请输入支付金额"></a-input>
+          <!-- <a-col :span="12">
+            <a-form-model-item label="支付金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalAmount">
+              <a-input v-model="model.totalAmount" placeholder="请输入支付金额"></a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-model-item label="业主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ownerName">
               <a-input v-model="model.ownerName" placeholder="请输入业主"></a-input>
@@ -24,15 +24,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="缴费类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeType">
-              <a-select style="width: 100%" v-model="model.chargeType" placeholder="请选择缴费类型">
-                <a-select-option v-for="item in dictOptions" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
-              </a-select>
+            <a-form-model-item label="缴费类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeItem">
+              <a-input v-model="model.chargeItem" placeholder="请输入房屋编号"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeMoney">
-              <a-input v-model="model.chargeMoney" placeholder="请输入缴费金额"></a-input>
+            <a-form-model-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalAmount">
+              <a-input v-model="model.totalAmount" placeholder="请输入缴费金额"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -41,16 +39,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="缴费时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateTime">
-              <a-input v-model="model.updateTime" placeholder="请输入缴费时间"></a-input>
+            <a-form-model-item label="缴费时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paymentTime">
+              <a-input v-model="model.paymentTime" placeholder="请输入缴费时间"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="收据状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiptStatus">
-              <a-select style="width: 100%" v-model="model.receiptStatus" placeholder="请选择收据状态">
-                <a-select-option value="1">在职</a-select-option>
-                <a-select-option value="0">离职</a-select-option>
-              </a-select>
+              <span :style="{'color': model.receiptStatus === '1' ? 'green' : 'red'}">{{model.receiptStatus === '1' ? '是' : '否'}}</span>
             </a-form-model-item>
           </a-col>
         </a-row>

src/views/property/receipt/receipt.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <a-form-item label="订单编号">
-              <a-input placeholder="请输入订单编号" v-model="queryParam.orderNo"></a-input>
+              <a-input placeholder="请输入订单编号" v-model="queryParam.paymentNum"></a-input>
             </a-form-item>
           </a-col>
           <!-- <a-col :md="6" :sm="8">
@@ -68,13 +68,13 @@
         class="j-table-force-nowrap"
         @change="handleTableChange"
       >
-        <span slot="employeeStatus" slot-scope="text, record">
-          <span :style="{'color': record.employeeStatus === '1' ? 'green' : 'red'}">{{record.employeeStatus === '1' ? '在职' : '离职'}}</span>
+        <span slot="receiptStatus" slot-scope="text, record">
+          <span :style="{'color': record.receiptStatus === '1' ? 'green' : 'red'}">{{record.receiptStatus === '1' ? '是' : '否'}}</span>
         </span>
         <span slot="action" slot-scope="text, record">
           <!-- <a @click="handleEdit(record)">编辑</a> -->
           <a @click="handleDetail(record)">查看</a>
-          <a @click="onIssueReceipt(record)">开收据</a>
+          <a @click="onIssueReceipt(record)" style="margin-left: 10px;">开收据</a>
 
           <!-- <a-divider type="vertical"/>
           <a-dropdown>
@@ -117,14 +117,14 @@
     },
     {
       title: '业主',
-      dataIndex: 'ownerId',
-      key: 'ownerId',
+      dataIndex: 'ownerName',
+      key: 'ownerName',
       align: 'center'
     },
     {
       title: '订单编号',
-      dataIndex: 'orderNo',
-      key: 'orderNo',
+      dataIndex: 'paymentNum',
+      key: 'paymentNum',
       align: 'center',
       // customRender: function(text) {
       //   return filterDictTextByCache('duties', text);
@@ -132,8 +132,8 @@
     },
     {
       title: '缴费类型',
-      dataIndex: 'chargeType',
-      key: 'chargeType',
+      dataIndex: 'chargeItem',
+      key: 'chargeItem',
       // scopedSlots: { customRender: 'employeeStatus' },
       align: 'center'
     },
@@ -145,19 +145,20 @@
     },
     {
       title: '缴费金额',
-      dataIndex: 'chargeMoney',
-      key: 'chargeMoney',
+      dataIndex: 'totalAmount',
+      key: 'totalAmount',
       align: 'center'
     },
     {
       title: '缴费时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
+      dataIndex: 'paymentTime',
+      key: 'paymentTime',
       align: 'center'
     },
     {
       title: '收据状态',
       dataIndex: 'receiptStatus',
+      scopedSlots: { customRender: 'receiptStatus' },
       key: 'receiptStatus',
       align: 'center'
     },