完善财务管理部分模块的表格与查询逻辑

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

@@ -385,8 +385,8 @@
       >
         <el-form-item label="是否通过">
           <el-radio-group v-model="approveForm.status">
-            <el-radio :label="'3'">未通过</el-radio>
             <el-radio :label="'4'">通过</el-radio>
+            <el-radio :label="'3'">未通过</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -514,7 +514,7 @@ export default {
     return {
       currentRow: {},
       approveForm: {
-        status: "3",
+        status: "4",
       },
       customSelectData: [], //客户选择数据
       settlementUnitList: [], // 结算单位数据

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

@@ -1,31 +1,34 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="客户" prop="customerId">
-        <el-select
-          v-model="queryParams.customerId"
-          placeholder="请选择客户"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in customSelectData"
-            :key="item.id"
-            :label="item.customName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="回单日期" prop="returnReceiptDate">
+    <el-row :gutter="20">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-col :span="7">
+          <el-form-item label="客户名称" prop="customerId">
+            <el-select
+              v-model="queryParams.customerId"
+              placeholder="请选择客户"
+              clearable
+              filterable
+              @change="handleQuery"
+            >
+              <el-option
+                v-for="item in customSelectData"
+                :key="item.id"
+                :label="item.customName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- <el-form-item label="回单日期" prop="returnReceiptDate">
         <el-date-picker
           clearable
           v-model="queryParams.returnReceiptDate"
@@ -35,30 +38,89 @@
         >
         </el-date-picker>
       </el-form-item> -->
-      <el-form-item label="日期范围" prop="startTime">
-        <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>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item>
-    </el-form>
+        <el-col :span="10">
+          <el-form-item label="日期范围" prop="startTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="timeRangeChange"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="备注" prop="accountsReceivableRemark">
+            <el-input
+              v-model="queryParams.accountsReceivableRemark"
+              size="medium"
+              clearable
+              @keyup.enter.native="handleQuery"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="账务类型" prop="accountingType">
+            <el-select
+              v-model="queryParams.accountingType"
+              value-key=""
+              placeholder="请选择账务类型"
+              clearable
+              filterable
+              @change="handleQuery"
+            >
+              <el-option
+                v-for="item in dict.type.accounting_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="" prop="returnReceipt">
+            <el-radio-group
+              @change="handleQuery"
+              v-model="queryParams.returnReceipt"
+            >
+              <el-radio :label="0">未收回单</el-radio>
+              <el-radio :label="1">收到回单</el-radio>
+              <el-radio :label="''">全部</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item class="ml20" label="" prop="billingType">
+            <el-radio-group
+              @change="handleQuery"
+              v-model="queryParams.billingType"
+            >
+              <el-radio :label="1">一类开票</el-radio>
+              <el-radio :label="2">二类开票</el-radio>
+              <el-radio :label="''">全部</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
 
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
@@ -97,7 +159,7 @@
         >
       </el-col> -->
       <!-- :disabled="multiple" -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -106,7 +168,7 @@
           @click="handlerReceipt"
           >回单</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -136,7 +198,7 @@
           {{ getDictLabel(scope.row.accountingType, "accounting_type") }}
         </template>
       </el-table-column>
-      <el-table-column label="客户" align="center" prop="customName" />
+      <el-table-column label="客户名称" align="center" prop="customName" />
       <el-table-column
         label="日期"
         align="center"
@@ -166,6 +228,14 @@
       <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="paymentMethod">
+        <template slot-scope="scope">{{
+          getDictLabel(
+            scope.row.paymentMethod,
+            "collection_registration_payment_method"
+          )
+        }}</template>
+      </el-table-column>
       <el-table-column label="开票类型" align="center" prop="billingType">
         <template slot-scope="scope">
           {{
@@ -181,7 +251,11 @@
         align="center"
         prop="accountsReceivableRemark"
       />
-      <el-table-column label="结算单位" align="center" prop="settlementUnit" />
+      <el-table-column
+        label="结算单位"
+        align="center"
+        prop="settlementUnitName"
+      />
       <el-table-column label="回单" align="center" prop="returnReceipt">
         <template slot-scope="scope">
           <el-checkbox
@@ -234,9 +308,6 @@
           </span>
         </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="remark" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -502,7 +573,11 @@ import moment from "moment";
 
 export default {
   name: "saleAccountsReceivableDetail",
-  dicts: ["accounting_type", "accounts_receivable_billing_type"],
+  dicts: [
+    "accounting_type",
+    "accounts_receivable_billing_type",
+    "collection_registration_payment_method",
+  ],
   data() {
     return {
       receiptIds: [], //回单ids
@@ -557,10 +632,10 @@ export default {
         receivedAmount: null,
         amounts: null,
         paymentMethod: null,
-        billingType: null,
+        billingType: "",
         accountsReceivableRemark: null,
         settlementUnit: null,
-        returnReceipt: null,
+        returnReceipt: "",
         returnReceiptDate: null,
         returnReceiptRemark: null,
         noticeNumber: null,

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

@@ -8,14 +8,14 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="流水号" prop="serialNumber">
+      <!-- <el-form-item label="流水号" prop="serialNumber">
         <el-input
           v-model="queryParams.serialNumber"
           placeholder="请输入流水号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="日期范围" prop="otherCollectionDate">
         <!-- <el-date-picker
           clearable
@@ -648,6 +648,9 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.deptId = this.deptSelectData.find(
+        (item) => item.deptName == "财务部"
+      )?.deptId;
       this.open = true;
       this.title = "添加其他收款";
     },

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

@@ -412,8 +412,8 @@
       >
         <el-form-item label="是否通过">
           <el-radio-group v-model="approveForm.status">
-            <el-radio :label="'3'">未通过</el-radio>
             <el-radio :label="'4'">通过</el-radio>
+            <el-radio :label="'3'">未通过</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -465,7 +465,7 @@ export default {
   data() {
     return {
       approveForm: {
-        status: "3",
+        status: "4",
       },
       currentRow: {},
       timeRange: [],

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

@@ -1,31 +1,34 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="客户" prop="customerId">
-        <el-select
-          v-model="queryParams.customerId"
-          placeholder="请选择客户"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in customSelectData"
-            :key="item.id"
-            :label="item.customName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="回单日期" prop="returnReceiptDate">
+    <el-row :gutter="20">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-col :span="7">
+          <el-form-item label="客户名称" prop="customerId">
+            <el-select
+              v-model="queryParams.customerId"
+              placeholder="请选择客户"
+              clearable
+              filterable
+              @change="handleQuery"
+            >
+              <el-option
+                v-for="item in customSelectData"
+                :key="item.id"
+                :label="item.customName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- <el-form-item label="回单日期" prop="returnReceiptDate">
         <el-date-picker
           clearable
           v-model="queryParams.returnReceiptDate"
@@ -35,30 +38,89 @@
         >
         </el-date-picker>
       </el-form-item> -->
-      <el-form-item label="日期范围" prop="startTime">
-        <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>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item>
-    </el-form>
+        <el-col :span="10">
+          <el-form-item label="日期范围" prop="startTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="timeRangeChange"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="备注" prop="accountsReceivableRemark">
+            <el-input
+              v-model="queryParams.accountsReceivableRemark"
+              size="medium"
+              clearable
+              @keyup.enter.native="handleQuery"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="账务类型" prop="accountingType">
+            <el-select
+              v-model="queryParams.accountingType"
+              value-key=""
+              placeholder="请选择账务类型"
+              clearable
+              filterable
+              @change="handleQuery"
+            >
+              <el-option
+                v-for="item in dict.type.accounting_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="" prop="returnReceipt">
+            <el-radio-group
+              @change="handleQuery"
+              v-model="queryParams.returnReceipt"
+            >
+              <el-radio :label="0">未收回单</el-radio>
+              <el-radio :label="1">收到回单</el-radio>
+              <el-radio :label="''">全部</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item class="ml20" label="" prop="billingType">
+            <el-radio-group
+              @change="handleQuery"
+              v-model="queryParams.billingType"
+            >
+              <el-radio :label="1">一类开票</el-radio>
+              <el-radio :label="2">二类开票</el-radio>
+              <el-radio :label="''">全部</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
 
     <el-row :gutter="10" class="mb8">
       <right-toolbar
@@ -78,9 +140,9 @@
           {{ getDictLabel(scope.row.accountingType, "accounting_type") }}
         </template>
       </el-table-column>
-      <el-table-column label="客户" align="center" prop="customName" />
+      <el-table-column label="客户名称" align="center" prop="customName" />
       <el-table-column
-        label="应收账日期"
+        label="日期"
         align="center"
         prop="accountsReceivableDate"
         width="180"
@@ -92,26 +154,30 @@
         </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="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="paymentMethod">
+        <template slot-scope="scope">{{
+          getDictLabel(
+            scope.row.paymentMethod,
+            "collection_registration_payment_method"
+          )
+        }}</template>
+      </el-table-column>
       <el-table-column label="开票类型" align="center" prop="billingType">
         <template slot-scope="scope">
           {{
@@ -123,12 +189,67 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="应收账备注"
+        label="备注"
         align="center"
         prop="accountsReceivableRemark"
       />
-      <!-- <el-table-column label="状态" align="center" prop="status" /> -->
-      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+      <el-table-column
+        label="结算单位"
+        align="center"
+        prop="settlementUnitName"
+      />
+      <el-table-column label="回单" align="center" prop="returnReceipt">
+        <template slot-scope="scope">
+          <el-checkbox
+            disabled
+            true-label="1"
+            false-label="0"
+            v-model="scope.row.returnReceipt"
+          ></el-checkbox>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="回单日期"
+        align="center"
+        prop="returnReceiptDate"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <el-date-picker
+            style="width: 150px"
+            v-if="scope.row.returnReceiptDateShow"
+            v-model="scope.row.returnReceiptDate"
+            type="date"
+            size="mini"
+            placeholder="选择日期"
+            @change="returnReceiptChange(scope.row)"
+          >
+          </el-date-picker>
+
+          <span v-else>{{
+            parseTime(scope.row.returnReceiptDate, "{y}-{m}-{d}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="回单备注"
+        align="center"
+        width="100px"
+        prop="returnReceiptRemark"
+      >
+        <template slot-scope="scope">
+          <el-input
+            style="width: 85px"
+            v-if="scope.row.returnReceiptRemarkShow"
+            v-model="scope.row.returnReceiptRemark"
+            @blur="returnReceiptChange(scope.row)"
+            size="mini"
+          ></el-input>
+          <span v-else>
+            {{ scope.row.returnReceiptRemark }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -265,7 +386,11 @@ import moment from "moment";
 
 export default {
   name: "saleAccountsReceivableDetail",
-  dicts: ["accounting_type", "accounts_receivable_billing_type"],
+  dicts: [
+    "accounting_type",
+    "accounts_receivable_billing_type",
+    "collection_registration_payment_method",
+  ],
   data() {
     return {
       receiptShow: false, //回单弹窗
@@ -319,10 +444,10 @@ export default {
         receivedAmount: null,
         amounts: null,
         paymentMethod: null,
-        billingType: null,
+        billingType: "",
         accountsReceivableRemark: null,
         settlementUnit: null,
-        returnReceipt: null,
+        returnReceipt: "",
         returnReceiptDate: null,
         returnReceiptRemark: null,
         noticeNumber: null,