[update] 查询组件、未收金额回显问题

src/views/contractManagement/revenueContract/RevenueContractList.vue

@@ -23,20 +23,30 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-range-picker
+                <j-date
-                    format="YYYY-MM-DD HH:mm:00"
+                  placeholder="请选择开始日期"
-                    :show-time="{ format: 'HH:mm' }"
+                  date-format="YYYY-MM-DD"
-                    :trigger-change="true"
+                  class="query-group-cust"
-                    v-model="queryParam.createTime"
+                  v-model="queryParam.startTime"
-                    style="width: 100%"/>
+                  :disabled-date="disabledStartDate">
+                </j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date
+                  placeholder="请选择结束日期"
+                  date-format="YYYY-MM-DD"
+                  class="query-group-cust"
+                  v-model="queryParam.endTime"
+                  :disabled-date="disabledEndDate">
+                </j-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="合同状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag v-model="queryParam.status" placeholder="请选择合同状态" dictCode="revenue_contract_status"/>
+                <j-dict-select-tag v-model="queryParam.status" placeholder="请选择合同状态"
+                                   dictCode="revenue_contract_status"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="7" :lg="8" :md="9" :sm="24">
+            <a-col :xl="7" :lg="7" :md="9" :sm="24">
               <a-form-item label="来款状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-checkbox-group v-model="queryParam.chargeUse" :options="incomePaymentsStatus"/>
               </a-form-item>
@@ -63,23 +73,25 @@
       <!--    table表格区域-->
       <div>
         <a-table
-            ref="table"
+          ref="table"
-            size="middle"
+          size="middle"
-            bordered
+          bordered
-            rowKey="id"
+          rowKey="id"
-            :columns="columns"
+          :columns="columns"
-            :scroll="{x: 1500}"
+          :scroll="{x: 1500}"
-            :dataSource="dataSource"
+          :dataSource="dataSource"
-            :pagination="ipagination"
+          :pagination="ipagination"
-            :loading="loading"
+          :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            :rowClassName="aduitClass"
+          :rowClassName="aduitClass"
-            @change="handleTableChange"
+          @change="handleTableChange"
-            class="j-table-force-nowrap">
+          class="j-table-force-nowrap">
 
           <!--        项目名称 待审核状态为红色-->
           <template slot="projectName" slot-scope="text, record">
-            <div @click="toRevenueContractDetail(record.id, record.contractNum)" v-if="record.status === 2 || record.status === 4">{{ text }}</div>
+            <div @click="toRevenueContractDetail(record.id, record.contractNum)"
+                 v-if="record.status === 2 || record.status === 4">{{ text }}
+            </div>
             <div class="primary-color" @click="toRevenueContractDetail(record.id)" v-else>{{ text }}</div>
           </template>
 
@@ -89,9 +101,11 @@
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
             <a @click="handleAudit(record.id)" v-if="record.status === 2 || record.status === 4">审核</a>
-            <a @click="handleEdit(record.id, record.contractNum)" v-if="record.status === 1 || record.status === 2 || record.status === 4">编辑</a>
+            <a @click="handleEdit(record.id, record.contractNum)"
+               v-if="record.status === 1 || record.status === 2 || record.status === 4">编辑</a>
             <a @click="handleArchive(record.id)" v-if="record.status === 3">存档</a>
-            <a @click="handleDelete(record.id)" v-if="record.status === 1 || record.status === 2 || record.status === 4">删除</a>
+            <a @click="handleDelete(record.id)"
+               v-if="record.status === 1 || record.status === 2 || record.status === 4">删除</a>
             <a :disabled="true" v-if="record.status === 5">已存档</a>
           </span>
         </a-table>
@@ -106,11 +120,13 @@ import IconImg from '@assets/imgs/icon/icon_revenue_contract.png'
 import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
 import { JeroListMixin } from '../../../mixins/JeroListMixin'
 import RevenueContractAduitModule from './modules/RevenueContractAduitModule'
+import JDate from '../../../components/tools/JDate'
+import { RangeDateMixin } from '../../../mixins/RangeDateMixin'
 
 export default {
   name: 'RevenueContractList',
-  components: { PageHeaderTitle, RevenueContractAduitModule },
+  components: { PageHeaderTitle, RevenueContractAduitModule, JDate },
-  mixins: [JeroListMixin],
+  mixins: [JeroListMixin, RangeDateMixin],
   data() {
     return {
       IconImg,
@@ -122,6 +138,10 @@ export default {
         xs: { span: 24 },
         sm: { span: 10 }
       },
+      dateKeyObj: {
+        beginKey: 'startTime',
+        endKey: 'endTime'
+      },
       // 来款状态checkbox选项
       incomePaymentsStatus: [
         {
@@ -210,7 +230,7 @@ export default {
   },
   methods: {
     searchQuery() {
-      this.lastQueryParam = {...this.queryParam}
+      this.lastQueryParam = { ...this.queryParam }
       this.loadData(1)
     },
     toRevenueContractDetail(id, contractNum) {
@@ -257,6 +277,39 @@ export default {
     },
     aduitOk() {
 
+    },
+    /**
+     * 存档
+     * @param id
+     */
+    handleArchive(id) {
+      console.log(id)
+      let that = this
+      this.$confirm({
+        title: '存档',
+        content: '确认存档?',
+        onOk: function () {
+          that.loading = true
+          that.loading = false
+          // getAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+          //   if (res.success) {
+          //     that.$message.success(res.message)
+          //     // 判断当前删除的数据是否是最后一页的全部数据，如果是的话页码减一
+          //     if (that.ipagination.current > 1 && (that.ipagination.current === Math.ceil(that.ipagination.total / that.ipagination.pageSize)) &&
+          //       that.selectedRowKeys.length === that.dataSource.length
+          //     ) {
+          //       that.ipagination.current -= 1
+          //     }
+          //     that.loadData()
+          //     that.onClearSelected()
+          //   } else {
+          //     that.$message.warning(res.message)
+          //   }
+          // }).finally(() => {
+          //   that.loading = false
+          // })
+        }
+      })
     }
   }
 }
@@ -266,7 +319,7 @@ export default {
 @import '~@assets/less/common.less';
 
 /deep/ .aduit {
-  color: red!important;
+  color: red !important;
   cursor: pointer;
 }
 

src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue

@@ -515,7 +515,7 @@ export default {
         this.$refs.installmentForm.initInstallmentList(record.listInstallment)
         this.model = Object.assign({}, record)
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'amountReceived', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
+          this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
           this.confirmLoading = false
         })
       })