优化收纳模块

src/views/iosBasicData/ComputationCenter/index.vue

@@ -4,10 +4,10 @@
       <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>
+            <span slot="label">对账收费</span>
           </el-tab-pane>
           <el-tab-pane label="待付" name="FFSQ">
-            <span slot="label">待付</span>
+            <span slot="label">付费申请</span>
           </el-tab-pane>
           <el-tab-pane label="收付相抵" name="DCDD">
             <span slot="label">收付相抵</span>

src/views/iosBasicData/PaymentApplication/assembly/cashierItem.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-dialog title="指示" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
-      <el-tag type="success" style="margin-right: 10px;">剩余出纳收费(RMB){{ Number(form.amountDr - form.actualAmountDr).toFixed(2) }}</el-tag>
-      <el-tag type="info" style="margin-right: 10px;">剩余出纳收费(USD){{ Number(form.amountDrUsd - form.actualAmountDrUsd).toFixed(2) }}</el-tag>
-      <el-tag type="warning" style="margin-right: 10px;">剩余出纳付费(RMB){{ Number(form.amountCr - form.actualAmountCr).toFixed(2) }}</el-tag>
-      <el-tag type="danger">剩余出纳付费(USD){{ Number(form.amountCrUsd - form.actualAmountCrUsd).toFixed(2) }}</el-tag>
+      <el-tag type="success" style="margin-right: 10px;">剩余收费(RMB){{ Number(form.amountDr - form.actualAmountDr).toFixed(2) }}</el-tag>
+      <el-tag type="info" style="margin-right: 10px;">剩余收费(USD){{ Number(form.amountDrUsd - form.actualAmountDrUsd).toFixed(2) }}</el-tag>
+      <el-tag type="warning" style="margin-right: 10px;">剩余付费(RMB){{ Number(form.amountCr - form.actualAmountCr).toFixed(2) }}</el-tag>
+      <el-tag type="danger">剩余付费(USD){{ Number(form.amountCrUsd - form.actualAmountCrUsd).toFixed(2) }}</el-tag>
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -28,6 +28,10 @@
         <template slot="index" slot-scope="{ row, index }">
           <span>{{ index + 1 }}</span>
         </template>
+        <template slot="status" slot-scope="{ row }">
+          <span v-if="row.status == 0">{{ row.dc == "D" ? "未收款" : "未支付" }}</span>
+          <span v-if="row.status == 1">{{ row.dc == "D" ? "已收款" : "已支付" }}</span>
+        </template>
         <template slot="curCode" slot-scope="{ row }">
           <dic-select
             v-if="row.$cellEdit"
@@ -69,13 +73,7 @@
           <el-select v-if="row.$cellEdit" v-model="row.dc" placeholder="请选择" size="small" @change="dcChange(row)">
             <el-option v-for="item in dcOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
           </el-select>
-         <span v-else>{{ row.dc == "D" ? "收" : "付" }}</span>
-        </template>
-        <template slot="isTax" slot-scope="{ row }">
-          <el-select v-if="row.$cellEdit" v-model="row.isTax" placeholder="请选择" size="small" @change="isTaxChange(row)">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-          </el-select>
-          <span v-else>{{ row.isTax == 1 ? "含税" : "不含税" }}</span>
+          <span v-else>{{ row.dc == "D" ? "收" : "付" }}</span>
         </template>
         <template slot="taxRate" slot-scope="{ row }">
           <el-input-number
@@ -87,7 +85,6 @@
             size="small"
             :controls="false"
             :min="0"
-            :disabled="row.isTax == 0"
           ></el-input-number>
           <span v-else>{{ row.taxRate }}</span>
         </template>
@@ -100,9 +97,9 @@
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
-        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" :disabled="disabled">申请出纳</el-button>
+        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" :disabled="disabled">付费申请</el-button>
         <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')" :disabled="disabled"
-          >撤销申请出纳</el-button
+          >撤销付费申请</el-button
         >
       </span>
     </el-dialog>
@@ -171,24 +168,13 @@ export default {
           {
             label: "状态",
             prop: "status",
-            width: "100",
-            type: "select",
-            dicData: [
-              {
-                label: "未出纳",
-                value: "0"
-              },
-              {
-                label: "已出纳",
-                value: "1"
-              }
-            ],
+            width: "60",
             overHidden: true
           },
           {
             label: "收/付",
             prop: "dc",
-            width: "100",
+            width: "90",
             overHidden: true
           },
           {
@@ -200,7 +186,7 @@ export default {
           {
             label: "汇率",
             prop: "exrate",
-            width: "100",
+            width: "70",
             overHidden: true
           },
           {
@@ -216,27 +202,21 @@ export default {
             overHidden: true
           },
           {
-            label: "是否含税",
-            prop: "isTax",
-            width: "100",
+            label: "税率(%)",
+            prop: "taxRate",
+            width: "80",
             overHidden: true
           },
           {
-            label: "税率",
-            prop: "taxRate",
+            label: "净额",
+            prop: "amountNet",
             width: "100",
             overHidden: true
           },
           {
             label: "税额",
             prop: "amountTax",
-            width: "100",
-            overHidden: true
-          },
-          {
-            label: "净额",
-            prop: "amountNet",
-            width: "100",
+            width: "80",
             overHidden: true
           },
           {
@@ -323,7 +303,7 @@ export default {
             return this.$message.error("请保存数据");
           }
         }
-        this.$confirm("是否申请出纳?", "提示", {
+        this.$confirm("是否申请付费?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -346,10 +326,10 @@ export default {
       if (name == "撤销申请出纳") {
         for (let item of this.data) {
           if (item.status == 1) {
-            return this.$message.error("数据已出纳,不允许撤销申请出纳");
+            return this.$message.error("数据已支付,不允许撤销申请付费");
           }
         }
-        this.$confirm("是否撤销申请出纳?", "提示", {
+        this.$confirm("是否撤销申请付费?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -394,10 +374,6 @@ export default {
       row.amountTax = Number(Number(row.amountLoc ? row.amountLoc : 0) * Number(row.taxRate ? row.taxRate / 100 : 0)).toFixed(2);
       row.amountNet = Number(Number(row.amountLoc ? row.amountLoc : 0) - Number(row.amountTax ? row.amountTax : 0)).toFixed(2);
     },
-    isTaxChange(row) {
-      row.taxRate = 0;
-      this.calculateChange(row);
-    },
     dcChange(row) {
       if (row.dc == "D" && row.curCode == "CNY") {
         row.amount = Number(this.form.amountDr - this.form.actualAmountDr).toFixed(2);
@@ -425,7 +401,7 @@ export default {
       }
     },
     addRow() {
-      this.data.push({ $cellEdit: true, isTax: 1, srcId: this.form.id, dc: "C" });
+      this.data.push({ $cellEdit: true, srcId: this.form.id, dc: this.form.dc, taxRate: 0 });
     },
     openDialog(row) {
       this.dialogVisible = true;

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -266,41 +266,6 @@ export default {
             overHidden: true
           },
           {
-            label: "签收",
-            prop: "isSignfor",
-            width: 60,
-            overHidden: true,
-            type: "select",
-            dicData: [
-              {
-                label: "否",
-                value: 0
-              },
-              {
-                label: "是",
-                value: 1
-              }
-            ]
-          },
-          {
-            label: "签收日期",
-            prop: "signforDate",
-            width: 120,
-            overHidden: true
-          },
-          {
-            label: "发票CNY",
-            prop: "currentInvoiceAmountRMB",
-            width: 90,
-            overHidden: true
-          },
-          {
-            label: "发票USD",
-            prop: "currentInvoiceAmountUSD",
-            width: 90,
-            overHidden: true
-          },
-          {
             label: "ETD",
             prop: "etd",
             width: 90,
@@ -355,24 +320,6 @@ export default {
             overHidden: true
           },
           {
-            label: "税票号",
-            prop: "taxInvoiceNumber",
-            width: 120,
-            overHidden: true
-          },
-          {
-            label: "税票日期",
-            prop: "taxInvoiceDate",
-            width: 120,
-            overHidden: true
-          },
-          {
-            label: "扣款时间",
-            prop: "deductionTime",
-            width: 120,
-            overHidden: true
-          },
-          {
             label: "ETA",
             prop: "eta",
             width: 120,

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems2.vue

@@ -266,41 +266,6 @@ export default {
             overHidden: true
           },
           {
-            label: "签收",
-            prop: "isSignfor",
-            width: 60,
-            overHidden: true,
-            type: "select",
-            dicData: [
-              {
-                label: "否",
-                value: 0
-              },
-              {
-                label: "是",
-                value: 1
-              }
-            ]
-          },
-          {
-            label: "签收日期",
-            prop: "signforDate",
-            width: 120,
-            overHidden: true
-          },
-          {
-            label: "发票CNY",
-            prop: "currentInvoiceAmountRMB",
-            width: 90,
-            overHidden: true
-          },
-          {
-            label: "发票USD",
-            prop: "currentInvoiceAmountUSD",
-            width: 90,
-            overHidden: true
-          },
-          {
             label: "ETD",
             prop: "etd",
             width: 90,
@@ -355,24 +320,6 @@ export default {
             overHidden: true
           },
           {
-            label: "税票号",
-            prop: "taxInvoiceNumber",
-            width: 120,
-            overHidden: true
-          },
-          {
-            label: "税票日期",
-            prop: "taxInvoiceDate",
-            width: 120,
-            overHidden: true
-          },
-          {
-            label: "扣款时间",
-            prop: "deductionTime",
-            width: 120,
-            overHidden: true
-          },
-          {
             label: "ETA",
             prop: "eta",
             width: 120,

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -582,7 +582,7 @@
     </el-dialog>
     <!--报表组件-->
     <reportContainer ref="reportContainer"></reportContainer>
-    <cashier-item ref="cashier" @update="updateCashier" :disabled="editSave"></cashier-item>
+    <cashier-item ref="cashier" @update="updateCashier" :disabled="!(form.status == '0' || form.status == '4')"></cashier-item>
   </div>
 </template>
 
@@ -615,6 +615,7 @@ import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import dicSelect from "@/components/dicSelect/main";
 import cashierItem from "./assembly/cashierItem.vue";
+import { getListAll } from "@/api/iosBasicData/cashier.js";
 export default {
   components: {
     checkSchedule,
@@ -995,14 +996,24 @@ export default {
     },
     submit(type) {
       if (this.form.cashierStatus == 0) {
-        return this.$message.error("请申请出纳!");
+        return this.$message.error("请申请付费!");
       }
-      this.$confirm("确定进行申请操作?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        this.editCustomer(type);
+      getListAll({ srcId: this.form.id }).then(res => {
+        if (res.data.data.length == 0) {
+          return this.$message.error("请在指示维护费用");
+        }
+        for (let item of res.data.data) {
+          if (item.status == 0) {
+            return this.$message.error("请在指示维护未支付数据!");
+          }
+        }
+        this.$confirm("确定进行申请操作?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.editCustomer(type);
+        });
       });
     },
     newbillFun() {

src/views/iosBasicData/cashier/components/cashierItem.vue

@@ -12,6 +12,10 @@
         @selection-change="selectionChange"
         @on-load="onLoad"
       >
+        <template slot="status" slot-scope="{ row }">
+          <span v-if="row.status == 0">{{ row.dc == "D" ? "未收款" : "未支付" }}</span>
+          <span v-if="row.status == 1">{{ row.dc == "D" ? "已收款" : "已支付" }}</span>
+        </template>
         <template slot="curCode" slot-scope="{ row }">
           <dic-select
             v-if="row.$cellEdit"
@@ -49,17 +53,15 @@
           ></el-input-number>
           <span v-else>{{ row.amount }}</span>
         </template>
-        <template slot="isTax" slot-scope="{ row }">
-          <el-select v-if="row.$cellEdit" v-model="row.isTax" placeholder="请选择" size="small" @change="isTaxChange(row)">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-          </el-select>
-          <span v-else>{{ row.isTax == 1 ? "含税" : "不含税" }}</span>
-        </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
-        <el-button size="mini" type="danger" @click="allClick('撤销出纳')" :disabled="selectionList.length == 0">撤销出纳</el-button>
-        <el-button size="mini" type="success" @click="allClick('确认出纳')" :disabled="selectionList.length == 0">确认出纳</el-button>
+        <el-button size="mini" type="danger" @click="allClick('撤销出纳')" :disabled="selectionList.length == 0"
+          >撤销{{ form.dc == "D" ? "收款" : "支付" }}</el-button
+        >
+        <el-button size="mini" type="success" @click="allClick('确认出纳')" :disabled="selectionList.length == 0"
+          >确认{{ form.dc == "D" ? "收款" : "支付" }}</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -109,47 +111,25 @@ export default {
           {
             label: "状态",
             prop: "status",
-            width: "100",
-            type: "select",
-            dicData: [
-              {
-                label: "未出纳",
-                value: "0"
-              },
-              {
-                label: "已出纳",
-                value: "1"
-              }
-            ],
+            width: "60",
             overHidden: true
           },
           {
             label: "收/付",
             prop: "dc",
-            width: "100",
-            type: "select",
-            dicData: [
-              {
-                label: "收",
-                value: "D"
-              },
-              {
-                label: "付",
-                value: "C"
-              }
-            ],
+            width: "60",
             overHidden: true
           },
           {
             label: "币别",
             prop: "curCode",
-            width: "100",
+            width: "60",
             overHidden: true
           },
           {
             label: "汇率",
             prop: "exrate",
-            width: "100",
+            width: "80",
             overHidden: true
           },
           {
@@ -165,38 +145,21 @@ export default {
             overHidden: true
           },
           {
-            label: "是否含税",
-            prop: "isTax",
-            width: "100",
-            type: "select",
-            dicData: [
-              {
-                label: "不含税",
-                value: "0"
-              },
-              {
-                label: "含税",
-                value: "1"
-              }
-            ],
+            label: "税率(%)",
+            prop: "taxRate",
+            width: "80",
             overHidden: true
           },
           {
-            label: "税率",
-            prop: "taxRate",
+            label: "净额",
+            prop: "amountNet",
             width: "100",
             overHidden: true
           },
           {
             label: "税额",
             prop: "amountTax",
-            width: "100",
-            overHidden: true
-          },
-          {
-            label: "净额",
-            prop: "amountNet",
-            width: "100",
+            width: "80",
             overHidden: true
           },
           {

src/views/iosBasicData/cashier/index.vue

@@ -34,7 +34,7 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 324)"
       >
         <template slot="menu" slot-scope="{ row }">
-          <el-button type="text" size="small" @click="allClick('出纳', row)">出纳</el-button>
+          <el-button type="text" size="small" @click="allClick('出纳', row)">{{ row.dc=="D"?'收款':'支付' }}</el-button>
         </template>
         <template slot="menuLeft">
           <span style="font-size: 24px;font-weight: 600;">

src/views/iosBasicData/fininvoicesApplyfor/assembly/cashierItem.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-dialog title="指示" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
-      <el-tag type="success" style="margin-right: 10px;">剩余出纳收费(RMB){{ Number(form.amountDr - form.actualAmountDr).toFixed(2) }}</el-tag>
-      <el-tag type="info" style="margin-right: 10px;">剩余出纳收费(USD){{ Number(form.amountDrUsd - form.actualAmountDrUsd).toFixed(2) }}</el-tag>
-      <el-tag type="warning" style="margin-right: 10px;">剩余出纳付费(RMB){{ Number(form.amountCr - form.actualAmountCr).toFixed(2) }}</el-tag>
-      <el-tag type="danger">剩余出纳付费(USD){{ Number(form.amountCrUsd - form.actualAmountCrUsd).toFixed(2) }}</el-tag>
+      <el-tag type="success" style="margin-right: 10px;">剩余收费(RMB){{ Number(form.amountDr - form.actualAmountDr).toFixed(2) }}</el-tag>
+      <el-tag type="info" style="margin-right: 10px;">剩余收费(USD){{ Number(form.amountDrUsd - form.actualAmountDrUsd).toFixed(2) }}</el-tag>
+      <el-tag type="warning" style="margin-right: 10px;">剩余付费(RMB){{ Number(form.amountCr - form.actualAmountCr).toFixed(2) }}</el-tag>
+      <el-tag type="danger">剩余付费(USD){{ Number(form.amountCrUsd - form.actualAmountCrUsd).toFixed(2) }}</el-tag>
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -16,11 +16,22 @@
         @on-load="onLoad"
       >
         <template slot="indexHeader" slot-scope="{ row }">
-          <el-button type="primary" size="small" icon="el-icon-plus" circle @click="addRow" :disabled="form.cashierStatus == 2||disabled"></el-button>
+          <el-button
+            type="primary"
+            size="small"
+            icon="el-icon-plus"
+            circle
+            @click="addRow"
+            :disabled="form.cashierStatus == 2 || disabled"
+          ></el-button>
         </template>
         <template slot="index" slot-scope="{ row, index }">
           <span>{{ index + 1 }}</span>
         </template>
+        <template slot="status" slot-scope="{ row }">
+          <span v-if="row.status == 0">{{ row.dc == "D" ? "未收款" : "未支付" }}</span>
+          <span v-if="row.status == 1">{{ row.dc == "D" ? "已收款" : "已支付" }}</span>
+        </template>
         <template slot="curCode" slot-scope="{ row }">
           <dic-select
             v-if="row.$cellEdit"
@@ -64,12 +75,6 @@
           </el-select>
           <span v-else>{{ row.dc == "D" ? "收" : "付" }}</span>
         </template>
-        <template slot="isTax" slot-scope="{ row }">
-          <el-select v-if="row.$cellEdit" v-model="row.isTax" placeholder="请选择" size="small" @change="isTaxChange(row)">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-          </el-select>
-          <span v-else>{{ row.isTax == 1 ? "含税" : "不含税" }}</span>
-        </template>
         <template slot="taxRate" slot-scope="{ row }">
           <el-input-number
             v-if="row.$cellEdit"
@@ -80,19 +85,22 @@
             size="small"
             :controls="false"
             :min="0"
-            :disabled="row.isTax == 0"
           ></el-input-number>
           <span v-else>{{ row.taxRate }}</span>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
-          <el-button type="text" size="small" @click="rowEdit(row)" :disabled="row.status == 1||disabled">{{ row.$cellEdit ? "保存" : "编辑" }}</el-button>
-          <el-button type="text" size="small" @click="rowDel(row, index)" :disabled="row.status == 1||disabled">删除</el-button>
+          <el-button type="text" size="small" @click="rowEdit(row)" :disabled="row.status == 1 || disabled">{{
+            row.$cellEdit ? "保存" : "编辑"
+          }}</el-button>
+          <el-button type="text" size="small" @click="rowDel(row, index)" :disabled="row.status == 1 || disabled">删除</el-button>
         </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
-        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" :disabled="disabled">申请出纳</el-button>
-        <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')" :disabled="disabled">撤销申请出纳</el-button>
+        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" :disabled="disabled">收费申请</el-button>
+        <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')" :disabled="disabled"
+          >撤销收费申请</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -160,24 +168,13 @@ export default {
           {
             label: "状态",
             prop: "status",
-            width: "100",
-            type: "select",
-            dicData: [
-              {
-                label: "未出纳",
-                value: "0"
-              },
-              {
-                label: "已出纳",
-                value: "1"
-              }
-            ],
+            width: "60",
             overHidden: true
           },
           {
             label: "收/付",
             prop: "dc",
-            width: "100",
+            width: "90",
             overHidden: true
           },
           {
@@ -189,7 +186,7 @@ export default {
           {
             label: "汇率",
             prop: "exrate",
-            width: "100",
+            width: "70",
             overHidden: true
           },
           {
@@ -205,27 +202,21 @@ export default {
             overHidden: true
           },
           {
-            label: "是否含税",
-            prop: "isTax",
-            width: "100",
+            label: "税率(%)",
+            prop: "taxRate",
+            width: "80",
             overHidden: true
           },
           {
-            label: "税率",
-            prop: "taxRate",
+            label: "净额",
+            prop: "amountNet",
             width: "100",
             overHidden: true
           },
           {
             label: "税额",
             prop: "amountTax",
-            width: "100",
-            overHidden: true
-          },
-          {
-            label: "净额",
-            prop: "amountNet",
-            width: "100",
+            width: "80",
             overHidden: true
           },
           {
@@ -297,9 +288,9 @@ export default {
             type: "success",
             message: "保存成功!"
           });
-          
+
           for (let [key, value] of Object.entries(res.data.data)) {
-             this.$set(row, key,value);
+            this.$set(row, key, value);
           }
         });
       } else {
@@ -313,7 +304,7 @@ export default {
             return this.$message.error("请保存数据");
           }
         }
-        this.$confirm("是否申请出纳?", "提示", {
+        this.$confirm("是否申请收费?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -336,10 +327,10 @@ export default {
       if (name == "撤销申请出纳") {
         for (let item of this.data) {
           if (item.status == 1) {
-            return this.$message.error("数据已出纳,不允许撤销申请出纳");
+            return this.$message.error("数据已收款,不允许撤销申请收费");
           }
         }
-        this.$confirm("是否撤销申请出纳?", "提示", {
+        this.$confirm("是否撤销申请收费?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -384,10 +375,6 @@ export default {
       row.amountTax = Number(Number(row.amountLoc ? row.amountLoc : 0) * Number(row.taxRate ? row.taxRate / 100 : 0)).toFixed(2);
       row.amountNet = Number(Number(row.amountLoc ? row.amountLoc : 0) - Number(row.amountTax ? row.amountTax : 0)).toFixed(2);
     },
-    isTaxChange(row) {
-      row.taxRate = 0;
-      this.calculateChange(row);
-    },
     dcChange(row) {
       if (row.dc == "D" && row.curCode == "CNY") {
         row.amount = Number(this.form.amountDr - this.form.actualAmountDr).toFixed(2);
@@ -415,7 +402,7 @@ export default {
       }
     },
     addRow() {
-      this.data.push({ $cellEdit: true, isTax: 1, srcId: this.form.id, dc: "D" });
+      this.data.push({ $cellEdit: true, srcId: this.form.id, dc: this.form.dc, taxRate: 0 });
     },
     openDialog(row) {
       this.dialogVisible = true;

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -854,7 +854,7 @@
     </el-dialog>
     <!--报表组件-->
     <reportContainer ref="reportContainer"></reportContainer>
-    <cashier-item ref="cashier" @update="updateCashier" :disabled="editSave"></cashier-item>
+    <cashier-item ref="cashier" @update="updateCashier" :disabled="statusType"></cashier-item>
   </div>
 </template>
 
@@ -1562,15 +1562,15 @@ export default {
     },
     submit(type) {
       if (this.form.cashierStatus == 0) {
-        return this.$message.error("请申请出纳!");
+        return this.$message.error("请申请收费!");
       }
       getListAll({ srcId: this.form.id }).then(res => {
         if (res.data.data.length == 0) {
-          return this.$message.error("请在指示维护出纳数据");
+          return this.$message.error("请在指示维护费用");
         }
         for (let item of res.data.data) {
           if (item.status == 0) {
-            return this.$message.error("请在指示维护未出纳数据");
+            return this.$message.error("请在指示维护未收款数据");
           }
         }
         this.$confirm("确定进行发票申请操作?", {

src/views/iosBasicData/finstlbills/assembly/cashierItem.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-dialog title="指示" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
-      <el-tag type="success" style="margin-right: 10px;">剩余出纳收费(RMB){{ Number(form.amountDr - form.actualAmountDr).toFixed(2) }}</el-tag>
-      <el-tag type="info" style="margin-right: 10px;">剩余出纳收费(USD){{ Number(form.amountDrUsd - form.actualAmountDrUsd).toFixed(2) }}</el-tag>
-      <el-tag type="warning" style="margin-right: 10px;">剩余出纳付费(RMB){{ Number(form.amountCr - form.actualAmountCr).toFixed(2) }}</el-tag>
-      <el-tag type="danger">剩余出纳付费(USD){{ Number(form.amountCrUsd - form.actualAmountCrUsd).toFixed(2) }}</el-tag>
+      <el-tag type="success" style="margin-right: 10px;">剩余收费(RMB){{ Number(form.amountDr - form.actualAmountDr).toFixed(2) }}</el-tag>
+      <el-tag type="info" style="margin-right: 10px;">剩余收费(USD){{ Number(form.amountDrUsd - form.actualAmountDrUsd).toFixed(2) }}</el-tag>
+      <el-tag type="warning" style="margin-right: 10px;">剩余付费(RMB){{ Number(form.amountCr - form.actualAmountCr).toFixed(2) }}</el-tag>
+      <el-tag type="danger">剩余付费(USD){{ Number(form.amountCrUsd - form.actualAmountCrUsd).toFixed(2) }}</el-tag>
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -16,11 +16,22 @@
         @on-load="onLoad"
       >
         <template slot="indexHeader" slot-scope="{ row }">
-          <el-button type="primary" size="small" icon="el-icon-plus" circle @click="addRow" :disabled="form.cashierStatus == 2||disabled"></el-button>
+          <el-button
+            type="primary"
+            size="small"
+            icon="el-icon-plus"
+            circle
+            @click="addRow"
+            :disabled="form.cashierStatus == 2 || disabled"
+          ></el-button>
         </template>
         <template slot="index" slot-scope="{ row, index }">
           <span>{{ index + 1 }}</span>
         </template>
+        <template slot="status" slot-scope="{ row }">
+          <span v-if="row.status == 0">{{ row.dc == "D" ? "未收款" : "未支付" }}</span>
+          <span v-if="row.status == 1">{{ row.dc == "D" ? "已收款" : "已支付" }}</span>
+        </template>
         <template slot="curCode" slot-scope="{ row }">
           <dic-select
             v-if="row.$cellEdit"
@@ -62,13 +73,7 @@
           <el-select v-if="row.$cellEdit" v-model="row.dc" placeholder="请选择" size="small" @change="dcChange(row)">
             <el-option v-for="item in dcOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
           </el-select>
-            <span v-else>{{ row.dc == "D" ? "收" : "付" }}</span>>
-        </template>
-        <template slot="isTax" slot-scope="{ row }">
-          <el-select v-if="row.$cellEdit" v-model="row.isTax" placeholder="请选择" size="small" @change="isTaxChange(row)">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-          </el-select>
-          <span v-else>{{ row.isTax == 1 ? "含税" : "不含税" }}</span>
+          <span v-else>{{ row.dc == "D" ? "收" : "付" }}</span>
         </template>
         <template slot="taxRate" slot-scope="{ row }">
           <el-input-number
@@ -80,19 +85,24 @@
             size="small"
             :controls="false"
             :min="0"
-            :disabled="row.isTax == 0"
           ></el-input-number>
           <span v-else>{{ row.taxRate }}</span>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
-          <el-button type="text" size="small" @click="rowEdit(row)" :disabled="row.status == 1||disabled">{{ row.$cellEdit ? "保存" : "编辑" }}</el-button>
-          <el-button type="text" size="small" @click="rowDel(row, index)" :disabled="row.status == 1||disabled">删除</el-button>
+          <el-button type="text" size="small" @click="rowEdit(row)" :disabled="row.status == 1 || disabled">{{
+            row.$cellEdit ? "保存" : "编辑"
+          }}</el-button>
+          <el-button type="text" size="small" @click="rowDel(row, index)" :disabled="row.status == 1 || disabled">删除</el-button>
         </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
-        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" :disabled="disabled">申请出纳</el-button>
-        <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')" :disabled="disabled">撤销申请出纳</el-button>
+        <el-button v-if="form.cashierStatus == 0" size="mini" type="success" @click="allClick('申请出纳')" :disabled="disabled"
+          >{{ form.dc == "D" ? "收费" : "付费" }}申请</el-button
+        >
+        <el-button v-if="form.cashierStatus == 1" size="mini" type="danger" @click="allClick('撤销申请出纳')" :disabled="disabled"
+          >撤销{{ form.dc == "D" ? "收费" : "付费" }}申请</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -160,24 +170,13 @@ export default {
           {
             label: "状态",
             prop: "status",
-            width: "100",
-            type: "select",
-            dicData: [
-              {
-                label: "未出纳",
-                value: "0"
-              },
-              {
-                label: "已出纳",
-                value: "1"
-              }
-            ],
+            width: "60",
             overHidden: true
           },
           {
             label: "收/付",
             prop: "dc",
-            width: "100",
+            width: "90",
             overHidden: true
           },
           {
@@ -189,7 +188,7 @@ export default {
           {
             label: "汇率",
             prop: "exrate",
-            width: "100",
+            width: "70",
             overHidden: true
           },
           {
@@ -205,27 +204,21 @@ export default {
             overHidden: true
           },
           {
-            label: "是否含税",
-            prop: "isTax",
-            width: "100",
+            label: "税率(%)",
+            prop: "taxRate",
+            width: "80",
             overHidden: true
           },
           {
-            label: "税率",
-            prop: "taxRate",
+            label: "净额",
+            prop: "amountNet",
             width: "100",
             overHidden: true
           },
           {
             label: "税额",
             prop: "amountTax",
-            width: "100",
-            overHidden: true
-          },
-          {
-            label: "净额",
-            prop: "amountNet",
-            width: "100",
+            width: "80",
             overHidden: true
           },
           {
@@ -297,9 +290,9 @@ export default {
             type: "success",
             message: "保存成功!"
           });
-        
-           for (let [key, value] of Object.entries(res.data.data)) {
-             this.$set(row, key,value);
+
+          for (let [key, value] of Object.entries(res.data.data)) {
+            this.$set(row, key, value);
           }
         });
       } else {
@@ -313,7 +306,7 @@ export default {
             return this.$message.error("请保存数据");
           }
         }
-        this.$confirm("是否申请出纳?", "提示", {
+        this.$confirm("是否申请"+(this.form.dc=="D"?"收费?":"付费?"), "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -336,10 +329,10 @@ export default {
       if (name == "撤销申请出纳") {
         for (let item of this.data) {
           if (item.status == 1) {
-            return this.$message.error("数据已出纳,不允许撤销申请出纳");
+            return this.$message.error("数据已"+(this.form.dc=="D"?"收款":"支付")+",不允许撤销申请"+(this.form.dc=="D"?"收费":"付费"));
           }
         }
-        this.$confirm("是否撤销申请出纳?", "提示", {
+        this.$confirm("是否撤销申请"+(this.form.dc=="D"?"收费?":"付费?"), "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -384,10 +377,6 @@ export default {
       row.amountTax = Number(Number(row.amountLoc ? row.amountLoc : 0) * Number(row.taxRate ? row.taxRate / 100 : 0)).toFixed(2);
       row.amountNet = Number(Number(row.amountLoc ? row.amountLoc : 0) - Number(row.amountTax ? row.amountTax : 0)).toFixed(2);
     },
-    isTaxChange(row) {
-      row.taxRate = 0;
-      this.calculateChange(row);
-    },
     dcChange(row) {
       if (row.dc == "D" && row.curCode == "CNY") {
         row.amount = Number(this.form.amountDr - this.form.actualAmountDr).toFixed(2);
@@ -415,7 +404,7 @@ export default {
       }
     },
     addRow() {
-      this.data.push({ $cellEdit: true, isTax: 1, srcId: this.form.id, dc: "D" });
+      this.data.push({ $cellEdit: true, srcId: this.form.id, dc: this.form.dc, taxRate: 0 });
     },
     openDialog(row) {
       this.dialogVisible = true;

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems2.vue

@@ -131,8 +131,7 @@ export default {
               }
             ]
           },
-          
-                    {
+          {
             label: "对账",
             prop: "isChecked",
             width: 60,

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -415,7 +415,7 @@
                       :datalist="dcData"
                       :selectValue="form.dc"
                       :clearable="true"
-                      :disabled="true"
+                      :disabled="editSave"
                       :buttonIf="false"
                       placeholder="请选择收/付"
                       @corpChange="corpChange($event, 'dc')"
@@ -751,7 +751,7 @@
 
     <!--报表组件-->
     <reportContainer ref="reportContainer"></reportContainer>
-    <cashier-item ref="cashier" @update="updateCashier" :disabled="editSave"></cashier-item>
+    <cashier-item ref="cashier" @update="updateCashier" :disabled="form.status==3"></cashier-item>
   </div>
 </template>
 
@@ -1199,15 +1199,15 @@ export default {
         }
       }
       if (this.form.cashierStatus == 0) {
-        return this.$message.error("请申请出纳!");
+        return this.$message.error("请申请"+(this.form.dc=="D"?"收费!":"付费!"));
       }
       getListAll({ srcId: this.form.id }).then(res => {
         if (res.data.data.length == 0) {
-          return this.$message.error("请在指示维护出纳数据");
+          return this.$message.error("请在指示维护费用");
         }
         for (let item of res.data.data) {
           if (item.status == 0) {
-            return this.$message.error("请在指示维护未出纳数据");
+            return this.$message.error("请在指示维护"+(this.form.dc=="D"?"未收款数据!":"未支付数据!"));
           }
         }
         this.$confirm("确定进行确认完成操作?", {