Parcourir la source

修改对账中心
发票 明细税率 备注可编辑
发票税率 新加业务参数设置

Qukatie il y a 3 semaines
Parent
commit
bfd3975ea5

+ 16 - 0
src/api/iosBasicData/fininvoices.js

@@ -141,3 +141,19 @@ export const generateFinStlBills = (row) => {
     params: row
   })
 }
+// 业务-获取税率
+export const getParamService = (row) => {
+  return request({
+    url: '/api/blade-system/paramservice/getParamService',
+    method: 'get',
+    params: row
+  })
+}
+// 业务-修改税率
+export const updateParamService = (row) => {
+  return request({
+    url: '/api/blade-system/paramservice/update',
+    method: 'post',
+    data: row
+  })
+}

+ 4 - 4
src/views/iosBasicData/ComputationCenter/index.vue

@@ -3,11 +3,11 @@
     <basic-container v-show="isShow">
       <div style="margin-top: 10px">
         <el-tabs type="card" v-model="tabsValue" @tab-click="handleClick">
-          <el-tab-pane label="对账中心" name="CHK">
-            <span slot="label">对账中心</span>
+          <el-tab-pane label="待收" name="CHK">
+            <span slot="label">待收</span>
           </el-tab-pane>
-          <el-tab-pane label="付费申请" name="FFSQ">
-            <span slot="label">付费申请</span>
+          <el-tab-pane label="付" name="FFSQ">
+            <span slot="label">付</span>
           </el-tab-pane>
           <el-tab-pane label="收付相抵" name="DCDD">
             <span slot="label">收付相抵</span>

+ 123 - 103
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -565,6 +565,9 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="税率(%)" prop="taxRate">
+                    <span slot="label">
+                      <span style="color: #1e9fff" @click="allCLick('税率')">税率(%)</span>
+                    </span>
                     <el-input
                       style="width: 100%;"
                       v-model="form.taxRate"
@@ -645,110 +648,103 @@
           </div>
         </trade-card>
         <el-card style="margin-top: 10px">
-                  <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="查询结果" name="1">
-                  <query-fininvoicesitems
-                    ref="fininvoicesitems"
-                    :queryData="queryData"
-                    :handleSelectionData="handleSelectionData"
-                    :editSave="editSave"
-                    :form="form"
-                    @handleSelectionChange="addSelectionChange"
-                    @deletefun="detailsdeletionfun"
-                  >
-                    <template slot="menuLeft">
-                      <div style="display: flex;">
-                        <el-button size="small" type="success" :disabled="statusType" :loading="saveLoading" @click="SelectedRows"
-                          >确认选定行</el-button
-                        >
-                      </div>
-                    </template>
-                  </query-fininvoicesitems>
-                </el-tab-pane>
-                <el-tab-pane label="选定数据" name="2">
-                  <fininvoicesitems
-                    ref="fininvoicesitems"
-                    :tableData="tableData"
-                    :handleSelectionData="handleSelectionData"
-                    :editSave="editSave"
-                    :form="form"
-                    @handleSelectionChange="handleSelectionChange"
-                    @deletefun="detailsdeletionfun"
-                  >
-                    <template slot="menuLeft">
-                      <div style="display: flex;">
-                        <search-query
-                          :datalist="serverData"
-                          :selectValue="form.serverName"
-                          :clearable="true"
-                          :buttonIf="false"
-                          :filterable="true"
-                          :forParameter="{
-                            key: 'dictKey',
-                            label: 'dictValue',
-                            value: 'dictValue'
-                          }"
-                          placeholder="请选择开票项目"
-                          @corpChange="corpChange($event, 'serverName')"
-                          @corpFocus="serverWorkDictsfun"
-                        >
-                        </search-query>
-                        <el-button style="margin-left: 10px" :disabled="!form.id || statusType" size="small" type="primary" @click="invoicingfun"
-                          >生成开票明细</el-button
-                        >
-                        <el-button
-                          style="margin-left: 10px"
-                          :disabled="!form.id || statusType"
-                          size="small"
-                          type="warning"
-                          @click="invoicingRevokefun"
-                          >撤销开票明细</el-button
-                        >
-                        <el-button size="small" :disabled="statusType" type="danger" @click="batchDeletefun">一键删除</el-button>
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="查询结果" name="1">
+              <query-fininvoicesitems
+                ref="fininvoicesitems"
+                :queryData="queryData"
+                :handleSelectionData="handleSelectionData"
+                :editSave="editSave"
+                :form="form"
+                @handleSelectionChange="addSelectionChange"
+                @deletefun="detailsdeletionfun"
+              >
+                <template slot="menuLeft">
+                  <div style="display: flex;">
+                    <el-button size="small" type="success" :disabled="statusType" :loading="saveLoading" @click="SelectedRows">确认选定行</el-button>
+                  </div>
+                </template>
+              </query-fininvoicesitems>
+            </el-tab-pane>
+            <el-tab-pane label="选定数据" name="2">
+              <fininvoicesitems
+                ref="fininvoicesitems"
+                :tableData="tableData"
+                :handleSelectionData="handleSelectionData"
+                :editSave="editSave"
+                :form="form"
+                @handleSelectionChange="handleSelectionChange"
+                @deletefun="detailsdeletionfun"
+              >
+                <template slot="menuLeft">
+                  <div style="display: flex;">
+                    <search-query
+                      :datalist="serverData"
+                      :selectValue="form.serverName"
+                      :clearable="true"
+                      :buttonIf="false"
+                      :filterable="true"
+                      :forParameter="{
+                        key: 'dictKey',
+                        label: 'dictValue',
+                        value: 'dictValue'
+                      }"
+                      placeholder="请选择开票项目"
+                      @corpChange="corpChange($event, 'serverName')"
+                      @corpFocus="serverWorkDictsfun"
+                    >
+                    </search-query>
+                    <el-button style="margin-left: 10px" :disabled="!form.id || statusType" size="small" type="primary" @click="invoicingfun"
+                      >生成开票明细</el-button
+                    >
+                    <el-button style="margin-left: 10px" :disabled="!form.id || statusType" size="small" type="warning" @click="invoicingRevokefun"
+                      >撤销开票明细</el-button
+                    >
+                    <el-button size="small" :disabled="statusType" type="danger" @click="batchDeletefun">一键删除</el-button>
 
-                        <el-input
-                          style="width: 10%;margin-left: 10px;"
-                          v-model="invoiceAmountCNY"
-                          size="small"
-                          autocomplete="off"
-                          type="numbers"
-                          clearable
-                          placeholder="开票金额"
-                        >
-                          <span style="line-height: 32px;" slot="suffix">CNY</span>
-                        </el-input>
-                        <el-input
-                          style="width: 10%;margin-left: 5px;"
-                          v-model="invoiceAmountUSD"
-                          size="small"
-                          autocomplete="off"
-                          type="numbers"
-                          clearable
-                          placeholder="开票金额"
-                        >
-                          <span style="line-height: 32px;" slot="suffix">USD</span>
-                        </el-input>
-                        <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()"
-                          >匹配金额</el-button
-                        >
-                      </div>
-                    </template>
-                  </fininvoicesitems>
-                </el-tab-pane>
-                <el-tab-pane label="开票明细" name="3">
-                  <div style="margin-bottom: 10px;display: flex;">
-                    <el-button :disabled="statusType" size="small" type="danger" @click="invoicingBatchDelete">一键删除</el-button>
+                    <el-input
+                      style="width: 10%;margin-left: 10px;"
+                      v-model="invoiceAmountCNY"
+                      size="small"
+                      autocomplete="off"
+                      type="numbers"
+                      clearable
+                      placeholder="开票金额"
+                    >
+                      <span style="line-height: 32px;" slot="suffix">CNY</span>
+                    </el-input>
+                    <el-input
+                      style="width: 10%;margin-left: 5px;"
+                      v-model="invoiceAmountUSD"
+                      size="small"
+                      autocomplete="off"
+                      type="numbers"
+                      clearable
+                      placeholder="开票金额"
+                    >
+                      <span style="line-height: 32px;" slot="suffix">USD</span>
+                    </el-input>
+                    <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()"
+                      >匹配金额</el-button
+                    >
                   </div>
-                  <fininvoiceitemdetail
-                    :tableData="InvoicingList"
-                    :handleSelectionData="invoicingCheckboxData"
-                    @handleSelectionChange="invoicingCheckboxChange"
-                    @deletefun="invoiceDeletionfun"
-                    @savefun="invoiceSavefun"
-                  >
-                  </fininvoiceitemdetail>
-                </el-tab-pane>
-              </el-tabs>
+                </template>
+              </fininvoicesitems>
+            </el-tab-pane>
+            <el-tab-pane label="开票明细" name="3">
+              <div style="margin-bottom: 10px;display: flex;">
+                <el-button :disabled="statusType" size="small" type="danger" @click="invoicingBatchDelete">一键删除</el-button>
+              </div>
+              <fininvoiceitemdetail
+                :tableData="InvoicingList"
+                :handleSelectionData="invoicingCheckboxData"
+                @handleSelectionChange="invoicingCheckboxChange"
+                @deletefun="invoiceDeletionfun"
+                @savefun="invoiceSavefun"
+              >
+              </fininvoiceitemdetail>
+            </el-tab-pane>
+          </el-tabs>
         </el-card>
         <el-card class="box-card" style="margin-top: 10px">
           <el-row>
@@ -880,7 +876,9 @@ import {
   generateFinInvoicesDetail,
   fininvoiceitemdetailRemove,
   revokeFinInvoicesDetail,
-  fininvoiceitemdetailSubmit
+  fininvoiceitemdetailSubmit,
+  getParamService,
+  updateParamService
 } from "@/api/iosBasicData/fininvoices";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getCurrentDate } from "@/util/date";
@@ -906,6 +904,7 @@ export default {
   },
   data() {
     return {
+      paramForm: {},
       activeName: "1",
       options: [
         {
@@ -1099,6 +1098,12 @@ export default {
       this.form.corpCnName = this.$route.query.corpCnName;
       this.form.corpId = this.$route.query.corpId;
     }
+    getParamService({ paramKey: "taxRate" }).then(res => {
+      this.paramForm = res.data.data;
+      if (!this.form.id) {
+        this.$set(this.form, "taxRate", res.data.data ? res.data.data.paramValue : 0);
+      }
+    });
   },
   methods: {
     SelectedRows() {
@@ -1533,6 +1538,21 @@ export default {
     editHandle() {
       this.editSave = false;
     },
+    allCLick(name) {
+      if (name == "税率") {
+        this.$confirm("是否确认修改业务参数配置?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let obj = {
+            ...this.paramForm,
+            paramValue: this.form.taxRate
+          };
+          updateParamService(obj);
+        });
+      }
+    },
     submit(type) {
       this.$confirm("确定进行发票申请操作?", {
         confirmButtonText: "确定",

+ 122 - 97
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -605,6 +605,9 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="税率(%)" prop="taxRate">
+                      <span slot="label">
+                        <span style="color: #1e9fff" @click="allCLick('税率')">税率(%)</span>
+                      </span>
                       <el-input
                         style="width: 100%;"
                         v-model="form.taxRate"
@@ -685,100 +688,98 @@
           </div>
         </trade-card>
         <el-card style="margin-top: 10px">
-         <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="查询结果" name="1">
-                  <query-fininvoicesitems
-                    ref="fininvoicesitems"
-                    :queryData="queryData"
-                    :handleSelectionData="handleSelectionData"
-                    :editSave="editSave"
-                    :form="form"
-                    @handleSelectionChange="addSelectionChange"
-                    @deletefun="detailsdeletionfun"
-                  >
-                    <template slot="menuLeft">
-                      <div style="display: flex;">
-                        <el-button size="small" type="success" :disabled="statusType" :loading="saveLoading" @click="SelectedRows"
-                          >确认选定行</el-button
-                        >
-                        <span style="font-size: 18px;font-weight: 600;margin-left: 50px;">
-                          <span style="color: #67C23A;margin-right: 10px;"> CNY:¥{{ amountSubSum }}元 </span>
-                          <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum }}元 </span>
-                        </span>
-                      </div>
-                    </template>
-                  </query-fininvoicesitems>
-                </el-tab-pane>
-                <el-tab-pane label="选定数据" name="2">
-                  <fininvoicesitems
-                    ref="fininvoicesitems"
-                    :tableData="tableData"
-                    :handleSelectionData="handleSelectionData"
-                    :editSave="editSave"
-                    :form="form"
-                    @handleSelectionChange="handleSelectionChange"
-                    @deletefun="detailsdeletionfun"
-                  >
-                    <template slot="menuLeft">
-                      <div style="display: flex;">
-                        <search-query
-                          :datalist="serverData"
-                          :selectValue="form.serverName"
-                          :clearable="true"
-                          :buttonIf="false"
-                          :filterable="true"
-                          :forParameter="{
-                            key: 'dictKey',
-                            label: 'dictValue',
-                            value: 'dictValue'
-                          }"
-                          placeholder="请选择开票项目"
-                          @corpChange="corpChange($event, 'serverName')"
-                          @corpFocus="serverWorkDictsfun"
-                        >
-                        </search-query>
-                        <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoicingfun"
-                          >生成开票明细</el-button
-                        >
-                        <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="warning" @click="invoicingRevokefun"
-                          >撤销开票明细</el-button
-                        >
-                        <el-button size="small" :disabled="editSave" type="danger" @click="batchDeletefun">一键删除</el-button>
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="查询结果" name="1">
+              <query-fininvoicesitems
+                ref="fininvoicesitems"
+                :queryData="queryData"
+                :handleSelectionData="handleSelectionData"
+                :editSave="editSave"
+                :form="form"
+                @handleSelectionChange="addSelectionChange"
+                @deletefun="detailsdeletionfun"
+              >
+                <template slot="menuLeft">
+                  <div style="display: flex;">
+                    <el-button size="small" type="success" :disabled="statusType" :loading="saveLoading" @click="SelectedRows">确认选定行</el-button>
+                    <span style="font-size: 18px;font-weight: 600;margin-left: 50px;">
+                      <span style="color: #67C23A;margin-right: 10px;"> CNY:¥{{ amountSubSum }}元 </span>
+                      <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum }}元 </span>
+                    </span>
+                  </div>
+                </template>
+              </query-fininvoicesitems>
+            </el-tab-pane>
+            <el-tab-pane label="选定数据" name="2">
+              <fininvoicesitems
+                ref="fininvoicesitems"
+                :tableData="tableData"
+                :handleSelectionData="handleSelectionData"
+                :editSave="editSave"
+                :form="form"
+                @handleSelectionChange="handleSelectionChange"
+                @deletefun="detailsdeletionfun"
+              >
+                <template slot="menuLeft">
+                  <div style="display: flex;">
+                    <search-query
+                      :datalist="serverData"
+                      :selectValue="form.serverName"
+                      :clearable="true"
+                      :buttonIf="false"
+                      :filterable="true"
+                      :forParameter="{
+                        key: 'dictKey',
+                        label: 'dictValue',
+                        value: 'dictValue'
+                      }"
+                      placeholder="请选择开票项目"
+                      @corpChange="corpChange($event, 'serverName')"
+                      @corpFocus="serverWorkDictsfun"
+                    >
+                    </search-query>
+                    <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoicingfun"
+                      >生成开票明细</el-button
+                    >
+                    <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="warning" @click="invoicingRevokefun"
+                      >撤销开票明细</el-button
+                    >
+                    <el-button size="small" :disabled="editSave" type="danger" @click="batchDeletefun">一键删除</el-button>
 
-                        <el-input
-                          style="width: 10%;margin-left: 10px;"
-                          v-model="invoiceAmountCNY"
-                          size="small"
-                          autocomplete="off"
-                          type="numbers"
-                          clearable
-                          placeholder="开票金额"
-                        >
-                          <span style="line-height: 32px;" slot="suffix">CNY</span>
-                        </el-input>
-                        <el-input
-                          style="width: 10%;margin-left: 5px;"
-                          v-model="invoiceAmountUSD"
-                          size="small"
-                          autocomplete="off"
-                          type="numbers"
-                          clearable
-                          placeholder="开票金额"
-                        >
-                          <span style="line-height: 32px;" slot="suffix">USD</span>
-                        </el-input>
-                        <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()"
-                          >匹配金额</el-button
-                        >
-                        <span style="font-size: 18px;font-weight: 600;margin-left: 50px;">
-                          <span style="color: #67C23A;margin-right: 10px;"> CNY:¥{{ amountSubSum }}元 </span>
-                          <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum }}元 </span>
-                        </span>
-                      </div>
-                    </template>
-                  </fininvoicesitems>
-                </el-tab-pane>
-                <el-tab-pane label="开票明细" name="3">
+                    <el-input
+                      style="width: 10%;margin-left: 10px;"
+                      v-model="invoiceAmountCNY"
+                      size="small"
+                      autocomplete="off"
+                      type="numbers"
+                      clearable
+                      placeholder="开票金额"
+                    >
+                      <span style="line-height: 32px;" slot="suffix">CNY</span>
+                    </el-input>
+                    <el-input
+                      style="width: 10%;margin-left: 5px;"
+                      v-model="invoiceAmountUSD"
+                      size="small"
+                      autocomplete="off"
+                      type="numbers"
+                      clearable
+                      placeholder="开票金额"
+                    >
+                      <span style="line-height: 32px;" slot="suffix">USD</span>
+                    </el-input>
+                    <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()"
+                      >匹配金额</el-button
+                    >
+                    <span style="font-size: 18px;font-weight: 600;margin-left: 50px;">
+                      <span style="color: #67C23A;margin-right: 10px;"> CNY:¥{{ amountSubSum }}元 </span>
+                      <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum }}元 </span>
+                    </span>
+                  </div>
+                </template>
+              </fininvoicesitems>
+            </el-tab-pane>
+            <el-tab-pane label="开票明细" name="3">
               <div style="margin-bottom: 10px;display: flex;">
                 <el-button size="small" :disabled="editSave" type="danger" @click="invoicingBatchDelete">一键删除</el-button>
                 <span style="font-size: 18px;font-weight: 600;margin-left: 100px;">
@@ -794,7 +795,7 @@
               >
               </fininvoiceitemdetail>
             </el-tab-pane>
-              </el-tabs>
+          </el-tabs>
         </el-card>
         <el-card class="box-card" style="margin-top: 10px">
           <el-row>
@@ -877,7 +878,9 @@ import {
   fininvoiceitemdetailSubmit,
   fininvoicesGenerateFinInvoices,
   fininvoicesConfirmFinInvoices,
-  fininvoicesRevokeFinInvoices
+  fininvoicesRevokeFinInvoices,
+  getParamService,
+  updateParamService
 } from "@/api/iosBasicData/fininvoices";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getCurrentDate } from "@/util/date";
@@ -1080,11 +1083,33 @@ export default {
       //         }
       //     }
       // })
+
+      getParamService({ paramKey: "taxRate" }).then(res => {
+        this.paramForm = res.data.data;
+        if (!this.form.id) {
+          this.$set(this.form, "taxRate", res.data.data ? res.data.data.paramValue : 0);
+        }
+      });
     }
   },
   methods: {
+    allCLick(name) {
+      if (name == "税率") {
+        this.$confirm("是否确认修改业务参数配置?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let obj = {
+            ...this.paramForm,
+            paramValue: this.form.taxRate
+          };
+          updateParamService(obj);
+        });
+      }
+    },
     SelectedRows() {
-         if(this.addData.length==0){
+      if (this.addData.length == 0) {
         return this.$message.error("请选择明细");
       }
       this.editCustomer("选定行");
@@ -1580,7 +1605,7 @@ export default {
           this.form.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + " 00:00:00";
         }
         if (this.form.id) {
-         if (this.addData.length) {
+          if (this.addData.length) {
             this.form.finInvoicesItemsList = this.addData.map(item => {
               if (item.currentCurCode == "CNY") {
                 item.currentAmount = item.currentAmountCNY;

+ 8 - 8
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -1641,9 +1641,9 @@ export default {
         return;
       }
       for (let item of this.handleSelectionData) {
-        if (item.isSignfor == 0) {
-          return this.$message.error("请选择已签收的数据");
-        }
+        // if (item.isSignfor == 0) {
+        //   return this.$message.error("请选择已签收的数据");
+        // }
         if (item.isChecked == 1) {
           return this.$message.error("请选择未对账的数据");
         }
@@ -1683,11 +1683,11 @@ export default {
         this.$message.error("请选择至少一条数据");
         return;
       }
-      for (let item of this.handleSelectionData) {
-        if (item.isChecked == 0) {
-          return this.$message.error("请选择已对账的数据");
-        }
-      }
+      // for (let item of this.handleSelectionData) {
+      //   if (item.isChecked == 0) {
+      //     return this.$message.error("请选择已对账的数据");
+      //   }
+      // }
       this.$confirm("是否撤销对账?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",