修改费用

src/router/views/index.js

@@ -4262,4 +4262,17 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/approveDataH/index')
   }]
 },
+{
+  path: '/payApproval/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/payApproval/index',
+    name: '付费审批',
+    meta: {
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/payApproval/index')
+  }]
+},
 ]

src/views/approveDataH/check.vue

@@ -21,7 +21,7 @@
 
       <el-button v-if="batch" size="small" :loading="buttonLoading" @click="$emit('choceCheckFun', false)">关闭</el-button>
     </div>
-    <mail-component ref="mail" @choceCheckFun="$emit('choceCheckFun', false)"></mail-component>
+    <mail-component ref="mail" @choceCheckFun="$emit('choceCheckFun', true)"></mail-component>
   </div>
 </template>
 
@@ -205,7 +205,6 @@ export default {
                           this.$store.commit("DEL_TAG", tag1);
                           this.$router.push({
                             path: "/approveDataH/index",
-                            query: { check: "refresh" }
                           });
                         }
                       })
@@ -236,8 +235,7 @@ export default {
                 let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0];
                 this.$store.commit("DEL_TAG", tag1);
                 this.$router.push({
-                  path: "/approveDataH/index",
-                  query: { check: "refresh" }
+                  path: "/approveDataH/index"
                 });
               }
             })

src/views/approveDataH/index.vue

@@ -245,7 +245,7 @@ export default {
     reportformsList,
     check,
     checkSchedule,
-    reportContainerlos,
+    reportContainerlos
   },
   data() {
     return {
@@ -277,7 +277,7 @@ export default {
         // pagerCount: 5,
         pageSizes: [10, 20, 50, 100, 200, 500, 1000], // 可选的分页大小
         currentPage: 1, // 当前页码
-        total: 0,
+        total: 0
       },
       query: {},
       configuration: {
@@ -288,12 +288,12 @@ export default {
         collapseTags: false,
         clearable: true,
         placeholder: "请点击右边按钮选择",
-        dicData: [],
-      },
+        dicData: []
+      }
     };
   },
   async created() {
-    getUserInfo().then(async (res) => {
+    getUserInfo().then(async res => {
       if (res.data.data.billType == 1) {
         this.option = option2;
       } else {
@@ -306,7 +306,7 @@ export default {
         } else {
           this.optionBack = JSON.parse(JSON.stringify(option));
 
-          await isProcurement({ param: "business" }).then(async (res) => {
+          await isProcurement({ param: "business" }).then(async res => {
             this.business = res.data.data;
             if (res.data.data == 1) {
               this.optionBack.column.forEach((item, index) => {
@@ -340,10 +340,10 @@ export default {
           });
         }
       }
-      await this.getWorkDicts("auditStatus").then((res) => {
-        this.findObject(this.option.column, "auditStatus").dicData = res.data.data.filter((item) => "S,A,B".indexOf(item.dictKey) >= 0);
+      await this.getWorkDicts("auditStatus").then(res => {
+        this.findObject(this.option.column, "auditStatus").dicData = res.data.data.filter(item => "S,A,B".indexOf(item.dictKey) >= 0);
       });
-      await gainUser().then((res) => {
+      await gainUser().then(res => {
         this.findObject(this.option.column, "sendUserId").dicData = res.data.data;
       });
       /*
@@ -351,37 +351,35 @@ export default {
         this.findObject(this.option.column, "processType").dicData = res.data.data;
       });
       */
-      await bbusinesstypeList(1, 1000, { enableFee: "1" }).then((res) => {
+      await bbusinesstypeList(1, 1000, { enableFee: "1" }).then(res => {
         this.findObject(this.option.column, "checkType").dicData = res.data.data.records;
       });
-      await selectListLos("业务员").then((res) => {
+      await selectListLos("业务员").then(res => {
         this.findObject(this.option.column, "srcCnName").dicData = res.data.data;
       });
 
       this.findObject(this.option.column, "profitStatus").dicData = [
-        {value: "F", label: "正常"},
-        {value: "Z", label: "为零"},
-        {value: "D", label: "不成比例且过低"},
-        {value: "T", label: "不成比例且过高"},
-        {value: "H", label: "过高"},
-        {value: "L", label: "过低"},
-        {value: "M", label: "为负"},
-        {value: "U", label: "不成比例"},
+        { value: "F", label: "正常" },
+        { value: "Z", label: "为零" },
+        { value: "D", label: "不成比例且过低" },
+        { value: "T", label: "不成比例且过高" },
+        { value: "H", label: "过高" },
+        { value: "L", label: "过低" },
+        { value: "M", label: "为负" },
+        { value: "U", label: "不成比例" }
       ];
 
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.onLoad(this.page, this.search);
-      })
+      });
     });
     // 供应商
     // corpsDescListAll({corpType: "GYS"}).then(res => {
     //   this.corpsList = res.data.data
     // })
   },
-  destroyed() {
-  },
-  deactivated() {
-  },
+  destroyed() {},
+  deactivated() {},
   mounted() {
     // option.height = window.innerHeight - 200 ;
   },
@@ -439,59 +437,59 @@ export default {
         obj = {
           businessType: "HYCK",
           classifyCode: "费用",
-          groupCode: "销售报告",
+          groupCode: "销售报告"
         };
       } else if (type == "HYJK") {
         obj = {
           businessType: "HYJK",
           classifyCode: "费用",
-          groupCode: "销售报告",
+          groupCode: "销售报告"
         };
       } else if (type == "KYCK") {
         obj = {
           businessType: "KYCK",
           classifyCode: "费用",
-          groupCode: "销售报告",
+          groupCode: "销售报告"
         };
       } else if (type == "KYJK") {
         obj = {
           businessType: "KYJK",
           classifyCode: "费用",
-          groupCode: "销售报告",
+          groupCode: "销售报告"
         };
       } else if (type == "FFSQ") {
         obj = {
           businessType: "FFSQ",
           classifyCode: "付费申请",
-          groupCode: "付费申请",
+          groupCode: "付费申请"
         };
       } else if (type == "SEA") {
         obj = {
           businessType: "AMEND",
           classifyCode: "AMENDSE",
-          groupCode: "SE",
+          groupCode: "SE"
         };
       } else if (type == "SIA") {
         obj = {
           businessType: "AMEND",
           classifyCode: "AMENDSI",
-          groupCode: "SI",
+          groupCode: "SI"
         };
       } else if (type == "AEA") {
         obj = {
           businessType: "AMEND",
           classifyCode: "AMENDAE",
-          groupCode: "AE",
+          groupCode: "AE"
         };
       } else if (type == "AIA") {
         obj = {
           businessType: "AMEND",
           classifyCode: "AMENDAI",
-          groupCode: "AI",
+          groupCode: "AI"
         };
       } else {
       }
-      getreportsList(1, 10, obj).then((res) => {
+      getreportsList(1, 10, obj).then(res => {
         this.reportRadio(res.data.data.records[0]);
         if (!this.selectionList.includes(row)) {
           this.$refs.crud.toggleRowSelection(row, true);
@@ -504,8 +502,8 @@ export default {
         billId: this.reportsData.billId,
         reportCode: val.classifyCode,
         groupCode: val.groupCode,
-        type: val.businessType,
-      }).then((res) => {
+        type: val.businessType
+      }).then(res => {
         // 关闭弹窗
         this.selectPrintingDialog = false;
         this.handleReportPreview(val.url, res.data.data.data);
@@ -519,7 +517,7 @@ export default {
       this.objMail = {
         attachments: e.fileName,
         fileType: e.formatName,
-        fileContent: e.data,
+        fileContent: e.data
       };
     },
     // 预览报表
@@ -594,7 +592,7 @@ export default {
       userButtonCell.appendChild(closeBtn);
 
       let that = this;
-      closeBtn.action = function () {
+      closeBtn.action = function() {
         if (that.$refs.reportContainer) that.$refs.reportContainer.hideContainer();
       };
     },
@@ -632,15 +630,15 @@ export default {
           this.$alert("" + row.pageLabel + "页面已存在,请关闭" + row.pageLabel + "页面再进行操作", "温馨提示", {
             confirmButtonText: "确定",
             type: "warning",
-            callback: (action) => {},
+            callback: action => {}
           });
         } else {
           this.$router.$avueRouter.closeTag(row.url);
           this.$router.push({
             path: row.url,
             query: {
-              billId: row.billId,
-            },
+              billId: row.billId
+            }
           });
         }
       } else {
@@ -652,7 +650,7 @@ export default {
       row.operate = operate;
       this.loading = true;
       approvePass(row)
-        .then((res) => {
+        .then(res => {
           this.$message.success("操作成功!");
           this.refreshChange();
         })
@@ -662,7 +660,7 @@ export default {
     },
     openCheck(row) {
       if (row.checkType == "CK") {
-        financingExcess({ id: row.corpId }).then((res) => {
+        financingExcess({ id: row.corpId }).then(res => {
           if (res.data.data == "操作成功") {
             this.batch = false; //单条操作
             this.checkDialog = true;
@@ -671,7 +669,7 @@ export default {
             this.$confirm(res.data.data, {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
-              type: "warning",
+              type: "warning"
             }).then(() => {
               this.batch = false; //单条操作
               this.checkDialog = true;
@@ -688,29 +686,30 @@ export default {
     choceCheckFun(reload, removeRow) {
       // this.checkDialog = false;
       this.$refs.reportContainer.visible = false;
+      // this.refreshChange();
       if (reload === true) {
         this.refreshChange();
-      }else if(removeRow){
-        let selList = this.selectionList.filter(item => item != removeRow)
+      } else if (removeRow) {
+        let selList = this.selectionList.filter(item => item != removeRow);
         let i1 = this.dataList.indexOf(removeRow);
-        if(i1>=0) this.dataList.splice(i1, 1)
-        this.$nextTick(()=>{
+        if (i1 >= 0) this.dataList.splice(i1, 1);
+        this.$nextTick(() => {
           selList.forEach(item => {
             this.$refs.crud.toggleRowSelection(item, true);
-          })
-        })
+          });
+        });
       }
     },
     choceCheckFFSQ(reload, removeRow) {
       this.checkDialog = false;
       if (reload === true) {
         this.refreshChange();
-      }else if(removeRow){
+      } else if (removeRow) {
         let i1 = this.dataList.indexOf(removeRow);
         let i2 = this.selectionList.indexOf(removeRow);
         console.log("choceCheckFFSQ", i1, i2);
-        if(i2>=0) this.selectionList.splice(i2, 1)
-        if(i1>=0) this.dataList.splice(i1, 1)
+        if (i2 >= 0) this.selectionList.splice(i2, 1);
+        if (i1 >= 0) this.dataList.splice(i1, 1);
       }
     },
     openCheckSchedule(row) {
@@ -728,7 +727,7 @@ export default {
     editOpen(row, status) {
       this.detailData = {
         id: row.id,
-        status: status,
+        status: status
       };
       this.show = false;
     },
@@ -758,8 +757,8 @@ export default {
       this.search = {
         // customizeThreeList: [startDate(), endDate()],
         auditStatus: "S"
-      }
-      this.onLoad(this.page)
+      };
+      this.onLoad(this.page);
     },
     selectionChange(list) {
       this.idList = [];
@@ -791,7 +790,7 @@ export default {
         delete params.sendTime;
       }
       getList(page.currentPage, page.pageSize, params)
-        .then((res) => {
+        .then(res => {
           this.dataList = res.data.data.records;
           this.page.total = res.data.data.total;
         })
@@ -826,8 +825,8 @@ export default {
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
         this.searchReset();
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/iosBasicData/ComputationCenter/index.vue

@@ -52,7 +52,7 @@
             @click="chooseSettlement()"
             >选择结算
           </el-button>
-          <el-button v-if="tabsValue == '业务单据'" type="primary" size="small" plain @click="addfun()">添加单据 </el-button>
+          <!-- <el-button v-if="tabsValue == '业务单据'" type="primary" size="small" plain @click="addfun()">添加单据 </el-button> -->
           <el-button v-if="tabsValue == '业务单据'" type="danger" size="small" plain @click="handleDelete()">一键删除 </el-button>
           <span style="font-size: 24px;font-weight: 600;">
             <span style="color: #67C23A;margin-right: 10px;"> CNY:￥{{ amountSubSum.toFixed(2) }}元 </span>

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -414,32 +414,7 @@
                   <el-button size="small" type="success" :disabled="editSave || generateStatus" :loading="saveLoading" @click="SelectedRows"
                     >确认选定行
                   </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="editSave" size="small" type="primary" @click="invoiceMatchingfun()"
-                    >匹配金额</el-button
-                  >
-                  <span style="font-size: 18px; font-weight: 600; margin-left: 50px">
+                  <span style="font-size: 18px; font-weight: 600;">
                     <span style="color: #67c23a; margin-right: 10px"> CNY:￥{{ Number(amountSubSum).toFixed(2) }}元 </span>
                     <span style="color: #e6a23c"> USD:${{ Number(amountSubUsdSum).toFixed(2) }}元 </span>
                   </span>

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -456,31 +456,6 @@
                   <el-button size="small" type="danger" style="margin-left: 10px" :disabled="editSave" :loading="saveLoading" @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="editSave" size="small" type="primary" @click="invoiceMatchingfun()"
-                    >匹配金额</el-button
-                  >
                   <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
                     <span>应收:</span>
                     <span class="weightnum">￥{{ amountDSubSum2 || 0 }}</span>

src/views/iosBasicData/PaymentApplication/index.vue

@@ -47,7 +47,7 @@
         <template slot="menuLeft">
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
             <el-tab-pane label="草稿" :name="0"></el-tab-pane>
-            <el-tab-pane label="处理中" :name="2"></el-tab-pane>
+            <el-tab-pane label="处理中" name="1,2,4"></el-tab-pane>
             <el-tab-pane label="已完成" :name="3"></el-tab-pane>
             <el-tab-pane label="已结算" :name="4"></el-tab-pane>
           </el-tabs>
@@ -927,7 +927,7 @@ export default {
       let obj = {
         ...Object.assign(params, this.query),
         businessType: "FFSQ",
-        status: this.activeName != 4 ? this.activeName : "",
+        statusRetrieve: this.activeName != 4 ? this.activeName : "",
         billStatus: this.activeName == 4 ? 1 : this.activeName == 3 ? 0 : ""
       };
       this.loading = true;

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -694,32 +694,6 @@
                       >撤销开票明细</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>

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -691,11 +691,11 @@
                 @handleSelectionChange="addSelectionChange"
               >
                 <template slot="menuLeft">
-                  <div style="display: flex;">
+                  <div style="display: flex;align-items: center;">
                     <el-button size="small" type="success" :disabled="statusType || generateStatus" :loading="saveLoading" @click="SelectedRows"
                       >确认选定行</el-button
                     >
-                    <span style="font-size: 18px;font-weight: 600;margin-left: 50px;">
+                    <span style="font-size: 18px;font-weight: 600;">
                       <span style="color: #67C23A;margin-right: 10px;"> CNY:￥{{ amountSubSum }}元 </span>
                       <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum }}元 </span>
                     </span>
@@ -714,7 +714,7 @@
                 @deletefun="detailsdeletionfun"
               >
                 <template slot="menuLeft">
-                  <div style="display: flex;">
+                  <div style="display: flex;align-items: center;">
                     <search-query
                       :datalist="serverData"
                       :selectValue="form.serverName"
@@ -738,33 +738,7 @@
                       >撤销开票明细</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: 10px;">
+                    <span style="font-size: 18px;font-weight: 600;">
                       <span style="color: #67C23A;margin-right: 10px;"> CNY:￥{{ amountSubSum }}元 </span>
                       <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum }}元 </span>
                     </span>

src/views/payApproval/component/mail-component.vue

@@ -253,7 +253,7 @@ export default {
             let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0];
             this.$store.commit("DEL_TAG", tag1);
             this.$router.push({
-              path: "/approveData/index",
+              path: "/payApproval/index",
               query: { check: "refresh" }
             });
           }