lilei 11 月之前
父节点
当前提交
0660dcba83

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1720770853492
+  "version": 1720771956051
 }

+ 20 - 24
src/views/financialManagement/companyReceivablePayableNew/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称">
-                <a-input id="companyReceivablePayableNewList-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入客户名称"/>
+                <a-input id="crpnList-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -15,7 +15,7 @@
                 <v-select
                   v-model="queryParam.settleClientType"
                   ref="settleClientType"
-                  id="companyReceivablePayableNewList-settleClientType"
+                  id="crpnList-settleClientType"
                   code="SETTLE_CLIENT_TYPE"
                   placeholder="请选择单位类型"
                   allowClear></v-select>
@@ -23,15 +23,15 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableNewList-refresh">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyReceivablePayableNewList-reset">重置</a-button>
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="crpnList-refresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="crpnList-reset">重置</a-button>
               </span>
             </a-col>
           </a-row>
         </a-form>
       </div>
     </a-card>
-    <a-card size="small" :bordered="false" class="companyReceivablePayableNewList-wrap">
+    <a-card size="small" :bordered="false" class="crpnList-wrap">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 统计 -->
         <div class="table-operator">
@@ -67,13 +67,13 @@
               type="link"
               class="button-primary"
               @click="handleCollectionPayment(record)"
-              id="companyReceivablePayableNewList-collectionPayment-btn">收付款</a-button>
+              :id="'crpnList-collectionPayment-pay-'+record.id">收付款</a-button>
             <a-button
               size="small"
               type="link"
               class="button-success"
               @click="handleDetail(record)"
-              id="companyReceivablePayableNewList-detail-btn"
+              :id="'crpnList-collectionPayment-detail-'+record.id"
               v-if="$hasPermissions('M_companyReceivablePayable_detail')">详情</a-button>
             <span v-if="!$hasPermissions('M_collectionPayment') && !$hasPermissions('M_companyReceivablePayable_detail')">--</span>
           </template>
@@ -96,11 +96,11 @@ export default {
     return {
       spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       // 查询参数
       queryParam: {
-        settleClientNameCurrent: '',
-        settleClientType: undefined
+        settleClientNameCurrent: '', // 客户名称
+        settleClientType: undefined // 单位类型
       },
       // 表头
       columns: [
@@ -134,19 +134,16 @@ export default {
         })
       },
       total: 0, //  总条数
-      productTotal: null
+      productTotal: null // 金额统计
     }
   },
   methods: {
     //  详情
     handleDetail (row) {
-      if (row.settleClientType == 'CUSTOMER') {
-        this.$router.push({ path: `/financialManagement/companyReceivablePayableNew/detail/${row.settleClientSn}/${row.settleClientNameCurrent}/${row.settleClientType}` })
-      } else {
-        this.$router.push({ path: `/financialManagement/companyReceivablePayableNew/detail/${row.settleClientSn}/${row.settleClientName}/${row.settleClientType}` })
-      }
+      const clientName = row.settleClientType == 'CUSTOMER' ? row.settleClientNameCurrent : row.settleClientName
+      this.$router.push({ name: 'companyReceivablePayableNewDetail', params: { sn: row.settleClientSn, name: clientName, type: row.settleClientType } })
     },
-    // 合计
+    // 金额合计
     getTotal (param) {
       settleInfoQuerySum(param).then(res => {
         if (res.status == 200 && res.data) {
@@ -156,13 +153,10 @@ export default {
         }
       })
     },
-    //  收付款
+    //  收付款
     handleCollectionPayment (row) {
-      if (row.settleClientType == 'CUSTOMER') {
-        this.$router.push({ path: `/financialManagement/companyReceivablePayableNew/collectionPayment/${row.settleClientSn}/${row.settleClientNameCurrent}/${row.settleClientType}` })
-      } else {
-        this.$router.push({ path: `/financialManagement/companyReceivablePayableNew/collectionPayment/${row.settleClientSn}/${row.settleClientName}/${row.settleClientType}` })
-      }
+      const clientName = row.settleClientType == 'CUSTOMER' ? row.settleClientNameCurrent : row.settleClientName
+      this.$router.push({ name: 'companyReceivablePayableNewCollectionPayment', params: { sn: row.settleClientSn, name: clientName, type: row.settleClientType } })
     },
     //  重置
     resetSearchForm () {
@@ -170,12 +164,14 @@ export default {
       this.queryParam.settleClientType = undefined
       this.$refs.table.refresh(true)
     },
+    // 初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 260
@@ -210,7 +206,7 @@ export default {
 }
 </script>
 <style lang="less">
-  .companyReceivablePayableNewList-wrap{
+  .crpnList-wrap{
     .sTable{
       margin-top: 10px;
     }

+ 2 - 2
src/views/financialManagement/expenseManagement/detailModal.vue

@@ -42,7 +42,7 @@ export default {
       type: Boolean,
       default: false
     },
-    itemId: {
+    itemId: {// 单据id
       type: [Number, String],
       default: ''
     }
@@ -50,7 +50,7 @@ export default {
   data () {
     return {
       isShow: this.openModal, //  是否打开弹框
-      detailsData: null
+      detailsData: null// 详情信息
     }
   },
   methods: {

+ 15 - 15
src/views/financialManagement/expenseManagement/edit.vue

@@ -12,7 +12,6 @@
       </a-page-header>
       <a-card size="small" :bordered="false" class="expenseManagementEdit-table-page-wrapper">
         <a-form-model
-          id="expenseManagementEdit-form"
           ref="ruleForm"
           :model="form"
           :rules="rules"
@@ -25,14 +24,14 @@
               expand-trigger="hover"
               :options="costTypeList"
               :fieldNames="{ label: 'name', value: 'costTypeSn', children: 'children' }"
-              id="productInfoList-costType"
+              id="expenseManagementEdit-costType"
               placeholder="请选择费用类型"
               allowClear
             />
           </a-form-model-item>
           <a-form-model-item label="费用金额" prop="settleAmount">
             <a-input-number
-              id="expenseManagementEdit-name"
+              id="expenseManagementEdit-settleAmount"
               v-model="form.settleAmount"
               :precision="2"
               :min="0"
@@ -81,9 +80,9 @@
 import { commonMixin } from '@/utils/mixin'
 import { mapActions } from 'vuex'
 import { STable, VSelect } from '@/components'
+import settleAccount from '@/views/common/settleAccount'
 import { settleExpenseSave, findExpenseDetail } from '@/api/settleExpense'
 import { costTypeAllQuery } from '@/api/costType'
-import settleAccount from '@/views/common/settleAccount'
 export default {
   name: 'ExpenseManagementEdit',
   components: { STable, VSelect, settleAccount },
@@ -101,13 +100,13 @@ export default {
         expensesTypeSn1: '', // 费用类型
         expensesTypeSn2: '', // 费用类型1
         expensesTypeSn3: '', // 费用类型2
-        costType: [],
+        costType: [], // 已选费用类型
         settleAmount: '', //  费用金额
         settleStyleSn: undefined, //  结算方式
         settleStyleName: '', // 结算方式名称
         bizNo: '', //  关联单号
         remark: '', //  备注
-        settleAccountSn: undefined
+        settleAccountSn: undefined // 结算账户
       },
       rules: {
         costType: [{ required: true, message: '请选择费用类型', trigger: 'change' }],
@@ -119,6 +118,10 @@ export default {
   },
   methods: {
     ...mapActions(['GetSettleAccountState']),
+    //  返回列表
+    handleBack () {
+      this.$router.push({ name: 'expenseManagementList' })
+    },
     // 选择结算方式
     settleStyleChange (v, name) {
       this.form.settleStyleName = name.dispName
@@ -198,10 +201,7 @@ export default {
         }
       })
     },
-    //  返回列表
-    handleBack () {
-      this.$router.push({ path: '/financialManagement/expenseManagement/list' })
-    },
+    // 页面初始化
     pageInit () {
       const vm = this
       vm.$refs.ruleForm.resetFields()
@@ -224,11 +224,11 @@ export default {
     }
     // 结算账户状态查询
     if (this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')) {
-    	this.GetSettleAccountState().then(res => {
-    	  if (res.status == 200) {
-    		this.enableFundAccount = res.data.functionEnableFlag == 1
-    	  }
-    	})
+      this.GetSettleAccountState().then(res => {
+        if (res.status == 200) {
+          this.enableFundAccount = res.data.functionEnableFlag == 1
+        }
+      })
     }
   },
   beforeRouteEnter (to, from, next) {

+ 40 - 36
src/views/financialManagement/expenseManagement/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="expenseManagementList-rangeDate" ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -30,21 +30,21 @@
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-                <a-form-item label="单据状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="expenseManagementList-state"
-                    code="EXPENSE_AUDIT_TYPE"
-                    placeholder="请选择单据状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
+              <a-form-item label="单据状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="expenseManagementList-state"
+                  code="EXPENSE_AUDIT_TYPE"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="expenseManagementList-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="expenseManagementList-reset">重置</a-button>
-                <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
+                <!-- <a @click="advanced=!advanced" style="margin-left: 8px" id="expenseManagementList-advanced">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a> -->
@@ -82,7 +82,7 @@
         </template>
         <!-- 费用单号 -->
         <template slot="accountExpensesNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_expenseDetail')?'table-td-link':'common'" @click="handleDetail(record)">{{ text }}</span>
+          <span :id="'expenseManagementList-detail-'+record.id" :class="$hasPermissions('B_expenseDetail')?'table-td-link':'common'" @click="handleDetail(record)">{{ text }}</span>
         </template>
         <!-- 审核 -->
         <template slot="audit" slot-scope="text, record">
@@ -96,21 +96,22 @@
             v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseAudit')"
             class="button-primary"
             @click="handleAudit(record)"
-            id="expenseManagement-audit-btn">审核</a-button>
+            :id="'expenseManagementList-audit-'+record.id"
+          >审核</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseEdit')"
             class="button-primary"
             @click="handleEdit(record)"
-            id="expenseManagement-edit-btn">编辑</a-button>
+            :id="'expenseManagementList-edit-'+record.id">编辑</a-button>
           <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseDel')"
             class="button-error"
             @click="handleDel(record)"
-            id="expenseManagement-del-btn">删除</a-button>
+            :id="'expenseManagementList-del-'+record.id">删除</a-button>
           <span v-if="record.state != 'WAIT_AUDIT'||( !$hasPermissions('B_expenseAudit')&& !$hasPermissions('B_expenseEdit') && !$hasPermissions('B_expenseDel'))">--</span>
         </template>
       </s-table>
@@ -124,10 +125,10 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { settleExpenseQuery, delExpense, settleExpenseQuerySum, auditExpense } from '@/api/settleExpense'
 import { costTypeAllQuery } from '@/api/costType'
 import expenseManagementDetailModal from './detailModal.vue'
 import stateIcon from '@/views/common/stateIcon'
+import { settleExpenseQuery, delExpense, settleExpenseQuerySum, auditExpense } from '@/api/settleExpense'
 export default {
   name: 'ExpenseManagementList',
   components: { STable, VSelect, expenseManagementDetailModal, rangeDate, stateIcon },
@@ -136,26 +137,26 @@ export default {
     const _this = this
     return {
       spinning: false,
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       disabled: false, //  查询、重置按钮是否可操作
       advanced: true, //  高级搜索 展开/关闭
-      costTypeList: [], // 费用类型
-      costType: [],
+      costTypeList: [], // 费用类型列表
+      costType: [], // 已选费用类型
       // 查询参数
       queryParam: {
-        beginDate: '',
-        endDate: '',
-        accountExpensesNo: '',
-        expensesTypeSn1: '',
-        expensesTypeSn2: '',
-        expensesTypeSn3: '',
-        state: '',
-        settleState: ''
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        accountExpensesNo: '', // 费用单号
+        expensesTypeSn1: '', // 费用类型1
+        expensesTypeSn2: '', // 费用类型2
+        expensesTypeSn3: '', // 费用类型3
+        state: '', // 单据状态
+        settleState: ''// 结算状态
       },
       // 汇总
       totalData: {
-        count: 0,
-        totalAmount: 0
+        count: 0, // 总数量
+        totalAmount: 0 // 总金额
       },
       // 表头
       columns: [
@@ -223,10 +224,6 @@ export default {
         this.costTypeList = res.data
       })
     },
-    closeDetail () {
-      this.openModal = false
-      this.itemId = null
-    },
     //  费用类型  change
     changeCostType (val, opt) {
       this.queryParam.expensesTypeSn1 = val[0] ? val[0] : ''
@@ -241,14 +238,19 @@ export default {
         this.$router.push({ name: 'expenseManagementAdd' })
       }
     },
-    //  详情
+    //  打开详情弹框
     handleDetail (row) {
       if (this.$hasPermissions('B_expenseDetail')) {
         this.itemId = row.id
         this.openModal = true
       }
     },
-    //  审核
+    // 关闭详情弹框
+    closeDetail () {
+      this.openModal = false
+      this.itemId = null
+    },
+    //  审核确认
     handleAudit (row) {
       const _this = this
       this.$confirm({
@@ -315,12 +317,14 @@ export default {
       this.costType = []
       this.$refs.table.refresh(true)
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 表格高度计算
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 270