修改费用

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

@@ -211,13 +211,13 @@ export default {
             overHidden: true
           },
           {
-            label: "已出纳金额",
+            label: "已确认金额",
             prop: "applyCashierAmount",
             width: "100",
             overHidden: true
           },
           {
-            label: "剩余出纳金额",
+            label: "剩余金额",
             prop: "remainingCashierAmount",
             width: "100",
             overHidden: true

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

@@ -143,6 +143,23 @@ export default {
         align: "center",
         column: [
           {
+            label: "开票状态",
+            prop: "status",
+            width: 70,
+            type: "select",
+            dicData: [
+              {
+                label: "未开票",
+                value: 0
+              },
+              {
+                label: "已开票",
+                value: 1
+              }
+            ],
+            overHidden: true
+          },
+          {
             label: "收/付",
             prop: "dc",
             width: 60,

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -1276,9 +1276,8 @@ export default {
       // 开票项目
       generateFinInvoicesDetail(obj).then(res => {
         this.$message.warning("操作成功");
-        this.fininvoicesDetailfun(this.form.id);
+        this.fininvoicesDetailfun(this.form.id,'finstlbills');
       });
-      this.activeName = "3";
     },
     // 撤销开票信息
     invoicingRevokefun() {

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -7,7 +7,7 @@
         <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button v-if="form.status == 3" size="small" type="success" @click="allClick('指示')">指示</el-button>
+        <el-button v-if="form.status == 3 && !(form.srcType == '对账')" size="small" type="success" @click="allClick('指示')">指示</el-button>
         <el-button type="success" size="small" :disabled="!form.id" plain @click="newbillFun">新建发票 </el-button>
         <el-button
           size="small"
@@ -708,7 +708,7 @@
                 ref="fininvoicesitems"
                 :tableData="tableData"
                 :handleSelectionData="handleSelectionData"
-                :editSave="editSave"
+                :editSave="editSave || form.applyNo"
                 :form="form"
                 @handleSelectionChange="handleSelectionChange"
                 @deletefun="detailsdeletionfun"
@@ -1213,9 +1213,8 @@ export default {
       // 开票项目
       generateFinInvoicesDetail(obj).then(res => {
         this.$message.warning("操作成功");
-        this.fininvoicesDetailfun(this.form.id);
+        this.fininvoicesDetailfun(this.form.id, "finstlbills");
       });
-      this.activeName = "3";
     },
     // 撤销开票信息
     invoicingRevokefun() {
@@ -1760,7 +1759,7 @@ export default {
       obj.businessType = this.form.businessTypes; // 业务类型
       obj.feeCnName = this.form.feeCnName;
       obj.dc = this.form.dc;
-      obj.isSignfor ="2"
+      obj.isSignfor = "2";
       // 判断是否有对账单号
       if (this.form.checkNo) {
         obj.corpId = this.form.corpId; // 结算单位
@@ -1904,7 +1903,11 @@ export default {
     },
     // 详情接口
     fininvoicesDetailfun(id, type) {
-      this.activeName = "2";
+      if (type == "finstlbills") {
+        this.activeName = "3";
+      } else {
+        this.activeName = "2";
+      }
       this.pageLoading = true;
       fininvoicesDetail(id)
         .then(res => {

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -568,7 +568,7 @@
               <el-col span="24">
                 <div style="text-align: right">
                   <el-button size="small" type="primary" :disabled="editSave" :loading="saveLoading" @click="retrievalfun">检 索</el-button>
-                  <el-button size="small" :disabled="queryData.length > 0" @click="ResetFilter">重置条件 </el-button>
+                  <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件 </el-button>
                 </div>
               </el-col>
             </el-row>
@@ -701,10 +701,10 @@
           </el-tab-pane>
           <el-tab-pane label="开票明细" name="3">
             <div style="margin-bottom: 10px;display: flex;">
-              <el-button style="margin-left: 10px" :disabled="!form.id" size="small" type="primary" @click="addRow">新增</el-button>
+              <el-button style="margin-left: 10px" :disabled="!form.id||InvoicingList.filter(item=>item.invoiceStatus==1).length" size="small" type="primary" @click="addRow">新增</el-button>
               <el-button
                 style="margin-left: 10px"
-                :disabled="!form.id || invoicingCheckboxData.length == 0"
+                :disabled="!form.id"
                 size="small"
                 type="success"
                 @click="invoicingfun"
@@ -712,7 +712,7 @@
               >
               <el-button
                 style="margin-left: 10px"
-                :disabled="!form.id || invoicingCheckboxData.length == 0"
+                :disabled="!form.id"
                 size="small"
                 type="danger"
                 @click="invoicingRevokefun"
@@ -822,7 +822,7 @@
 
     <!--报表组件-->
     <reportContainer ref="reportContainer"></reportContainer>
-    <cashier-item ref="cashier" @update="updateCashier" :disabled="form.status == 3"></cashier-item>
+    <cashier-item ref="cashier" @update="updateCashier"></cashier-item>
   </div>
 </template>
 
@@ -1254,16 +1254,16 @@ export default {
     },
     // 确认开票信息
     invoicingfun() {
-      if (this.invoicingCheckboxData.length == 0) {
-        this.$message.error("请选择数据");
-        return;
-      }
-      for (let item of this.invoicingCheckboxData) {
+      // if (this.invoicingCheckboxData.length == 0) {
+      //   this.$message.error("请选择数据");
+      //   return;
+      // }
+      for (let item of this.InvoicingList) {
         if (!item.id) {
           return this.$message.error("请保存开票明细");
         }
         if (item.invoiceStatus == 1) {
-          return this.$message.error("请选择未开开票明细");
+          return this.$message.error("开票明细已开票,请正确操作");
         }
       }
       this.form.billNoFormat = "HYDZ";
@@ -1296,20 +1296,20 @@ export default {
     },
     // 撤销开票信息
     invoicingRevokefun() {
-      if (this.invoicingCheckboxData.length == 0) {
-        this.$message.warning("请选择数据");
-        return;
-      }
-      if (this.invoicingCheckboxData.length == 0) {
-        this.$message.error("请选择数据");
-        return;
-      }
-      for (let item of this.invoicingCheckboxData) {
+      // if (this.invoicingCheckboxData.length == 0) {
+      //   this.$message.warning("请选择数据");
+      //   return;
+      // }
+      // if (this.invoicingCheckboxData.length == 0) {
+      //   this.$message.error("请选择数据");
+      //   return;
+      // }
+      for (let item of this.InvoicingList) {
         if (!item.id) {
           return this.$message.error("请保存开票明细");
         }
         if (item.invoiceStatus == 0) {
-          return this.$message.error("请选择已开开票明细");
+          return this.$message.error("开票明细未开票,请正确操作");
         }
       }
       this.form.billNoFormat = "HYDZ";
@@ -1498,24 +1498,14 @@ export default {
           Number(this.form.amountDrUsd) != Number(this.form.actualAmountDrUsd) ||
           Number(this.form.amountCrUsd) != Number(this.form.actualAmountCrUsd)
         ) {
-          this.$confirm("对账金额与实际金额不符是否完成?", {
+          this.$confirm("对账金额与实际金额不符是否确认对账?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
-          }).then(() => {
-            this.$confirm("确定进行确认完成操作?", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
+          })
+            .then(() => {
+              this.editCustomer(type);
             })
-              .then(() => {
-                this.editCustomer(type);
-              })
-              .catch(() => {
-                this.pageLoading = false;
-                this.saveLoading = false;
-              });
-          });
         } else {
           this.$confirm("确定进行确认完成操作?", {
             confirmButtonText: "确定",
@@ -1525,10 +1515,6 @@ export default {
             .then(() => {
               this.editCustomer(type);
             })
-            .catch(() => {
-              this.pageLoading = false;
-              this.saveLoading = false;
-            });
         }
       });
     },

src/views/iosBasicData/writeOff/assembly/advancePayment.vue

@@ -80,6 +80,11 @@ export default {
             overHidden: true
           },
           {
+            label: "备注",
+            prop: "remarks",
+            overHidden: true
+          },
+          {
             label: "使用金额",
             prop: "usedAmount",
             overHidden: true

src/views/iosBasicData/writeOff/finstlbillsDetails.vue

@@ -7,7 +7,7 @@
         <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button type="success" size="small" :disabled="!form.id" @click="allClick('预付款')">预付款</el-button>
+        <el-button type="success" size="small" :disabled="!form.id||(form.status != 3&&editSave)" @click="allClick('预付款')">预付款</el-button>
         <el-button size="small" :loading="saveLoading" :disabled="!form.id" @click="previewreportfun">预 览</el-button>
         <el-button size="small" v-if="roleName.indexOf('admin') != -1" :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true"
           >报表设计