财务管理模块优化

zkqy-ui/src/api/system/SaleOtherCollection.js

@@ -60,3 +60,12 @@ export function getFinanceList(params) {
     params
   })
 }
+
+// 审批通过接口
+export function saleOtherCollectionPass(data) {
+  return request({
+    url: '/system/SaleOtherCollection/audit',
+    method: 'post',
+    data: data
+  })
+}

zkqy-ui/src/views/system/financialManage/finishedProductInvoice.vue

@@ -9,13 +9,22 @@
       label-width="68px"
     >
       <el-form-item label="发票日期" prop="invoiceDate">
-        <el-date-picker
+        <!-- <el-date-picker
           clearable
           v-model="queryParams.invoiceDate"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择发票日期"
         >
+        </el-date-picker> -->
+        <el-date-picker
+          v-model="timeRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="timeRangeChange"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="客户" prop="customerId">
@@ -145,7 +154,6 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="id" />
       <el-table-column
         label="发票日期"
         align="center"
@@ -156,14 +164,16 @@
           <span>{{ parseTime(scope.row.invoiceDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="客户编号" align="center" prop="customerId" />
-      <el-table-column
-        label="结算单位"
-        align="center"
-        prop="settlementUnitId"
-      />
-      <el-table-column label="发票号" align="center" prop="invoiceNumber" />
-      <el-table-column label="发票类型" align="center" prop="invoiceType" />
+      <el-table-column label="客户" align="center" prop="customName" />
+      <el-table-column label="结算单位" align="center" prop="settlementUnit" />
+      <el-table-column label="单据号" align="center" prop="invoiceNumber" />
+      <el-table-column label="发票类型" align="center" prop="invoiceType">
+        <template slot-scope="scope">
+          {{
+            getDictLabel(scope.row.invoiceType, "finished_product_invoice_type")
+          }}
+        </template>
+      </el-table-column>
       <el-table-column label="开票金额" align="center" prop="billingAmount" />
       <el-table-column label="经手人" align="center" prop="personInCharge" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -429,12 +439,14 @@ import {
   updateSettlementUnit,
   deleteSettlementUnit,
 } from "@/api/system/SaleRegistrationCollection";
+import moment from "moment";
 
 export default {
   name: "finishedProductInvoice",
   dicts: ["finished_product_invoice_type"],
   data() {
     return {
+      timeRange: [],
       queryUnitList: [], //查询表单的结算单位列表
       settleTableData: [], //结算单位列表
       innerVisible: false, //结算单位弹窗
@@ -470,6 +482,8 @@ export default {
         invoiceType: null,
         billingAmount: null,
         personInCharge: null,
+        startTime: null,
+        endTime: null,
       },
       // 表单参数
       form: {},
@@ -490,6 +504,20 @@ export default {
     },
   },
   methods: {
+    // 日期范围改变回调
+    timeRangeChange(val) {
+      this.queryParams.startTime = moment(val[0]).format("YYYY-MM-DD");
+      this.queryParams.endTime = moment(val[1]).format("YYYY-MM-DD");
+      this.handleQuery();
+    },
+    // 根据字典value获取字典label
+    getDictLabel(value, dict) {
+      return (
+        this.dict.type[dict].find((item) => {
+          return item.value === value;
+        })?.label || ""
+      );
+    },
     async queryCustomerIdChange() {
       if (!this.queryParams.customerId) {
         this.queryUnitList = [];

zkqy-ui/src/views/system/financialManage/receiveRecord.vue

@@ -62,13 +62,22 @@
         />
       </el-form-item> -->
       <el-form-item label="收款日期" prop="collectionMoneyDate">
-        <el-date-picker
+        <!-- <el-date-picker
           clearable
           v-model="queryParams.collectionMoneyDate"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择收款日期"
         >
+        </el-date-picker> -->
+        <el-date-picker
+          v-model="timeRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="timeRangeChange"
+        >
         </el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="结算单位" prop="settlementUnitId">
@@ -483,6 +492,7 @@ import {
   updateSettlementUnit,
   deleteSettlementUnit,
 } from "@/api/system/SaleRegistrationCollection";
+import moment from "moment";
 
 export default {
   name: "SaleRegistrationCollection",
@@ -492,6 +502,7 @@ export default {
   ],
   data() {
     return {
+      timeRange: [],
       customSelectData: [], //客户选择数据
       settlementUnitList: [], // 结算单位数据
       innerVisible: false, //内层弹窗
@@ -526,6 +537,8 @@ export default {
         collectionMoneyDate: null,
         settlementUnitId: null,
         bookkeepingFlag: null,
+        startTime: null,
+        endTime: null,
       },
       // 表单参数
       form: {},
@@ -547,6 +560,12 @@ export default {
     this.initSelectData();
   },
   methods: {
+    // 日期范围改变回调
+    timeRangeChange(val) {
+      this.queryParams.startTime = moment(val[0]).format("YYYY-MM-DD");
+      this.queryParams.endTime = moment(val[1]).format("YYYY-MM-DD");
+      this.handleQuery();
+    },
     // 提交回调
     handleApprove(row) {
       this.$confirm("是否确认提交？", "提示", {

zkqy-ui/src/views/system/financialManage/receiveRecordReview.vue

@@ -102,7 +102,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -147,7 +147,7 @@
           v-hasPermi="['system:SaleRegistrationCollection:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -823,9 +823,10 @@ export default {
               status: this.approveForm.status,
               customerId: this.currentRow.customerId,
               amounts: this.currentRow.amounts,
-              collectionMoneyType: this.currentRow.collectionMoneyType,
+              paymentMethod: this.currentRow.paymentMethod,
               remark: this.currentRow.remark,
               collectionMoneyDate: this.currentRow.collectionMoneyDate,
+              settlementUnitId: this.currentRow.settlementUnitId,
             };
             reviewApprovedPass(payLoad).then((response) => {
               if (response.code == 200) {

zkqy-ui/src/views/system/financialManage/saleAccountsReceivableDetail.vue

@@ -131,10 +131,14 @@
       @cell-click="cellClick"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="账务类型" align="center" prop="accountingType" />
+      <el-table-column label="账务类型" align="center" prop="accountingType">
+        <template slot-scope="scope">
+          {{ getDictLabel(scope.row.accountingType, "accounting_type") }}
+        </template>
+      </el-table-column>
       <el-table-column label="客户" align="center" prop="customName" />
       <el-table-column
-        label="应收账日期"
+        label="日期"
         align="center"
         prop="accountsReceivableDate"
         width="180"
@@ -146,29 +150,34 @@
         </template>
       </el-table-column>
       <el-table-column label="销售单号" align="center" prop="saleNo" />
-      <el-table-column label="产品编号" align="center" prop="productId" />
-      <el-table-column label="产品名称" align="center" prop="productName" />
+      <!-- <el-table-column label="产品编号" align="center" prop="productId" /> -->
+      <el-table-column label="品名" align="center" prop="productName" />
       <el-table-column
-        label="产品规格"
+        label="规格"
         align="center"
         prop="productSpecifications"
       />
-      <el-table-column label="产品等级" align="center" prop="productLevel" />
-      <el-table-column label="产品颜色" align="center" prop="productColour" />
+      <el-table-column label="等级" align="center" prop="productLevel" />
+      <el-table-column label="颜色" align="center" prop="productColour" />
       <el-table-column label="批号" align="center" prop="lotNumber" />
       <el-table-column label="箱数" align="center" prop="boxNum" />
       <el-table-column label="重量" align="center" prop="weight" />
-      <el-table-column label="产品单价" align="center" prop="productPrice" />
-      <el-table-column
-        label="应收金额"
-        align="center"
-        prop="amountReceivable"
-      />
-      <el-table-column label="已收金额" align="center" prop="receivedAmount" />
-      <el-table-column label="金额" align="center" prop="amounts" />
-      <el-table-column label="开票类型" align="center" prop="billingType" />
+      <el-table-column label="单价" align="center" prop="productPrice" />
+      <el-table-column label="应收" align="center" prop="amountReceivable" />
+      <el-table-column label="已收" align="center" prop="receivedAmount" />
+      <el-table-column label="余额" align="center" prop="amounts" />
+      <el-table-column label="开票类型" align="center" prop="billingType">
+        <template slot-scope="scope">
+          {{
+            getDictLabel(
+              scope.row.billingType,
+              "accounts_receivable_billing_type"
+            )
+          }}
+        </template>
+      </el-table-column>
       <el-table-column
-        label="应收账备注"
+        label="备注"
         align="center"
         prop="accountsReceivableRemark"
       />
@@ -226,7 +235,7 @@
         </template>
       </el-table-column>
       <el-table-column label="通知单号" align="center" prop="noticeNumber" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <!-- <el-table-column label="状态" align="center" prop="status" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column
         label="操作"
@@ -493,6 +502,7 @@ import moment from "moment";
 
 export default {
   name: "saleAccountsReceivableDetail",
+  dicts: ["accounting_type", "accounts_receivable_billing_type"],
   data() {
     return {
       receiptIds: [], //回单ids
@@ -574,6 +584,14 @@ export default {
     this.initSelectData();
   },
   methods: {
+    // 根据字典value获取字典label
+    getDictLabel(value, dict) {
+      return (
+        this.dict.type[dict].find((item) => {
+          return item.value === value;
+        })?.label || ""
+      );
+    },
     // 修改回单数据
     async returnReceiptChange(row) {
       try {

zkqy-ui/src/views/system/financialManage/saleOtherCollection.vue

@@ -153,12 +153,9 @@
         </template>
       </el-table-column>
       <el-table-column label="客户" align="center" prop="customerName" />
-      <el-table-column
-        label="经办人编号"
-        align="center"
-        prop="personInCharge"
-      />
-      <el-table-column label="付款方式" align="center" prop="paymentMethod">
+      <el-table-column label="收款金额" align="center" prop="amount" />
+      <el-table-column label="经办人" align="center" prop="personInCharge" />
+      <!-- <el-table-column label="付款方式" align="center" prop="paymentMethod">
         <template slot-scope="scope">
           <span>{{
             getDictLabel(
@@ -167,13 +164,13 @@
             )
           }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="出门证号"
         align="center"
         prop="travelCertificateNumber"
       />
-      <el-table-column label="部门" align="center" prop="deptName" />
+      <!-- <el-table-column label="部门" align="center" prop="deptName" /> -->
       <!-- <el-table-column
         label="收款明细"
         align="center"
@@ -184,11 +181,18 @@
           {{ getDictLabel(scope.row.itemReceivable, "item_receivable") }}
         </template>
       </el-table-column>
-      <el-table-column label="金额" align="center" prop="amount" />
+
       <!-- <el-table-column label="记账标志" align="center" prop="bookkeepingFlag" /> -->
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          {{ getDictLabel(scope.row.status, "registration_collection_status") }}
+          <el-tag
+            v-if="scope.row.statusStyle"
+            :type="scope.row.statusStyle.raw.listClass"
+            >{{ scope.row.statusStyle.label }}</el-tag
+          >
+          <span v-else>{{
+            getDictLabel(scope.row.status, "registration_collection_status")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="collectionDetails" />
@@ -583,6 +587,10 @@ export default {
             this.financeSelectData.find(
               (item2) => item2.userId == item.personInChargeId
             )?.nickName || "";
+          item.statusStyle =
+            this.dict.type.registration_collection_status?.find(
+              (item1) => item1.value == item.status
+            );
           return item;
         });
         this.total = response.total;

zkqy-ui/src/views/system/financialManage/saleOtherCollectionReview.vue

@@ -188,7 +188,14 @@
       <!-- <el-table-column label="记账标志" align="center" prop="bookkeepingFlag" /> -->
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          {{ getDictLabel(scope.row.status, "registration_collection_status") }}
+          <el-tag
+            v-if="scope.row.statusStyle"
+            :type="scope.row.statusStyle.raw.listClass"
+            >{{ scope.row.statusStyle.label }}</el-tag
+          >
+          <span v-else>{{
+            getDictLabel(scope.row.status, "registration_collection_status")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="collectionDetails" />
@@ -572,6 +579,10 @@ export default {
             this.financeSelectData.find(
               (item2) => item2.userId == item.personInChargeId
             )?.nickName || "";
+          item.statusStyle =
+            this.dict.type.registration_collection_status?.find(
+              (item1) => item1.value == item.status
+            );
           return item;
         });
         this.total = response.total;