新增对账

3a0566b7 · 宋雄 · 1002fb43 · 3a0566b7 · 3a0566b7 · 3a0566b7
--- a/.env.development
+++ b/.env.development
 NODE_ENV=development
-VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
-# VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
+# VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
+VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 # VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

--- a/src/views/base/record/RecordDetails.vue
+++ b/src/views/base/record/RecordDetails.vue
@@ -10,7 +10,7 @@
      </div>
    </div>

-    <j-form-container :disabled="true">
+    <j-form-container :disabled="pageType !== '3'">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-card title="对账信息">
          <a-row>
@@ -45,22 +45,17 @@
          <a-row>
            <div>
              <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns"
-                :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" @change="handleTableChange">
+                :dataSource="dataSource" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" @change="handleTableChange">
              </a-table>
            </div>
          </a-row>
        </a-card>
      </a-form-model>
    </j-form-container>
-    <a-card title="转账凭证" v-if="pageType == '3'">
-      <j-image-upload bizPath="scott/pic" v-model="model.image"></j-image-upload>
-    </a-card>
  </a-spin>
 </template>

 <script>
-const mapZoom = [5, 8, 10, 12]
-let timer = null
 import { getPropertyChargruleListApi, getPropertyDetailApi, auditPropertyApi } from '@/api/api'
 import { httpAction, getAction } from '@/api/manage'
 import { isMobile, validateCreditCode } from '@/utils/validate'
@@ -205,11 +200,11 @@ export default {
      columns: columns,
      loading: false,
      dataSource: [
-        {propertyName: '汉江之星小区', creditCode: '物业费', reconciliationBeginDate: '张飒，15198765634',reaship: '租户', reconcilname: '李白，15165245634', reconciliationEndDate: '2栋2单元101', reconciliationAmount: '345.23', updateTime: '2023-04-05', empowerCommunityNum: 'LD23423843223', auditStatus: '2023-05-06'},
-        {propertyName: '汉江之星小区', creditCode: '水费', reconciliationBeginDate: '李生，1515235634',reaship: '本人', reconcilname: '李生，1515235634', reconciliationEndDate: '1栋2单元301', reconciliationAmount: '1345.45', updateTime: '2023-05-05', empowerCommunityNum: 'DFG2342342323', auditStatus: '2023-05-16'},
-        {propertyName: '汉江之星小区', creditCode: '电费', reconciliationBeginDate: '李丽，19812348976',reaship: '租户', reconcilname: '张飒，15198765634', reconciliationEndDate: '9栋1单元401', reconciliationAmount: '34234', updateTime: '2023-02-06', empowerCommunityNum: 'JTR323422', auditStatus: '2023-03-06'},
-        {propertyName: '汉江之星小区', creditCode: '水费', reconciliationBeginDate: '张盛，1890987567',reaship: '本人', reconcilname: '张盛，1890987567', reconciliationEndDate: '4栋2单元403', reconciliationAmount: '34', updateTime: '2023-06-07', empowerCommunityNum: 'DFGD32423423', auditStatus: '2023-04-23'},
-        {propertyName: '汉江之星小区', creditCode: '燃气费', reconciliationBeginDate: '李婷婷，18809875634',reaship: '租户', reconcilname: '话梅，15198765634', reconciliationEndDate: '9栋2单元1201', reconciliationAmount: '654', updateTime: '2023-05-06', empowerCommunityNum: 'FDBEWRW2342342', auditStatus: '2023-06-26'},
+        {id: 'DSF3453534',propertyName: '汉江之星小区', creditCode: '物业费', reconciliationBeginDate: '张飒，15198765634',reaship: '租户', reconcilname: '李白，15165245634', reconciliationEndDate: '2栋2单元101', reconciliationAmount: '345.23', updateTime: '2023-04-05', empowerCommunityNum: 'LD23423843223', auditStatus: '2023-05-06'},
+        {id: 'DSF32342334',propertyName: '汉江之星小区', creditCode: '水费', reconciliationBeginDate: '李生，1515235634',reaship: '本人', reconcilname: '李生，1515235634', reconciliationEndDate: '1栋2单元301', reconciliationAmount: '1345.45', updateTime: '2023-05-05', empowerCommunityNum: 'DFG2342342323', auditStatus: '2023-05-16'},
+        {id: 'DSF23423434',propertyName: '汉江之星小区', creditCode: '电费', reconciliationBeginDate: '李丽，19812348976',reaship: '租户', reconcilname: '张飒，15198765634', reconciliationEndDate: '9栋1单元401', reconciliationAmount: '34234', updateTime: '2023-02-06', empowerCommunityNum: 'JTR323422', auditStatus: '2023-03-06'},
+        {id: 'DSF36783434',propertyName: '汉江之星小区', creditCode: '水费', reconciliationBeginDate: '张盛，1890987567',reaship: '本人', reconcilname: '张盛，1890987567', reconciliationEndDate: '4栋2单元403', reconciliationAmount: '34', updateTime: '2023-06-07', empowerCommunityNum: 'DFGD32423423', auditStatus: '2023-04-23'},
+        {id: 'DS235345534',propertyName: '汉江之星小区', creditCode: '燃气费', reconciliationBeginDate: '李婷婷，18809875634',reaship: '租户', reconcilname: '话梅，15198765634', reconciliationEndDate: '9栋2单元1201', reconciliationAmount: '654', updateTime: '2023-05-06', empowerCommunityNum: 'FDBEWRW2342342', auditStatus: '2023-06-26'},
      ]
    }
  },
@@ -400,7 +395,7 @@ export default {
    } else if (this.$route.query.type == '2') {
      this.title = '审核'
    } else if (this.$route.query.type == '3') {
-      this.title = '拨款'
+      this.title = '新增对账'
    }
    console.log(this.title)
    console.log(this.pageType)

--- a/src/views/base/record/RecordList.vue
+++ b/src/views/base/record/RecordList.vue
@@ -31,14 +31,14 @@

    <!-- 操作按钮区域 -->
    <div class="table-operator">
-      <!-- <a-button @click="propertyDetails(1)" type="primary" icon="plus">新增</a-button> -->
+      <a-button @click="propertyDetails(3)" type="primary" icon="plus">新增对账</a-button>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      </a-dropdown> -->
    </div>

    <!-- table区域-begin -->
@@ -65,14 +65,13 @@
          <a href="javascript:;" @click="propertyDetails(1, record.id)">详情</a>

          <a-divider type="vertical" />
-          <a-dropdown>
+
+          <a href="javascript:;" @click="propertyDetails(2, record.id)">审核</a>
+          <!-- <a-dropdown>
            <a class="ant-dropdown-link">
              更多 <a-icon type="down" />
            </a>
            <a-menu slot="overlay">
-              <!-- <a-menu-item v-if="record.auditStatus === 'auditPass'">
-                <a @click="handlePerssion(record.roleId)">授权</a>
-              </a-menu-item> -->
              <a-menu-item>
                <a href="javascript:;" @click="propertyDetails(2, record.id)">审核</a>
              </a-menu-item>
@@ -80,25 +79,18 @@
                <a href="javascript:;" @click="propertyDetails(3, record.id)">拨款</a>
              </a-menu-item>
            </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
        </span>
      </a-table>

    </div>
    <!-- table区域-end -->
-
-    <property-settled-modal ref="modalForm" @ok="modalFormOk"></property-settled-modal>
-
-    <!-- 右侧的角色权限配置 -->
-    <user-role-modal ref="modalUserRole"></user-role-modal>
  </a-card>
 </template>

 <script>
 import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import PropertySettledModal from './modules/PropertySettledModal'
-import UserRoleModal from './modules/UserRoleModal'
 import { filterDictTextByCache } from '@/components/dict/JDictSelectUtil'

 const columns = [
@@ -114,12 +106,6 @@ const columns = [
    key: 'creditCode',
    align: 'center',
  },
-  {
-    title: '所属物业集团',
-    dataIndex: 'propertyName',
-    key: 'propertyName',
-    align: 'center',
-  },
  {
    title: '对账开始日期',
    dataIndex: 'reconciliationBeginDate',
@@ -177,10 +163,6 @@ const columns = [
 export default {
  name: 'PermissionListAsync',
  mixins: [JeecgListMixin],
-  components: {
-    PropertySettledModal,
-    UserRoleModal,
-  },
  data() {
    return {
      // 表头
@@ -207,7 +189,7 @@ export default {
  methods: {
    propertyDetails(type, id) {
      this.$router.push({
-        path: '/settled/RecordDetails?id=' + id +'&type=' + type,
+        path: '/base/RecordDetails?type=' + type +'&id=' + id
      })
    },
    onLoadDetail(record, type) {