细节修改

src/components/check/check.vue

@@ -113,6 +113,9 @@
           }else{
             //单个
             this.buttonLoading = true
+            this.checkData.auditName = this.form.auditName
+            this.checkData.auditMsg = this.form.auditMsg
+            this.checkData.auditOpTime = this.form.auditOpTime
             approvePass(this.checkData).then(res=>{
               if(res.data.success){
                 this.$message.success("操作成功!")

src/components/check/checkSchedule.vue

@@ -25,7 +25,7 @@
               </tr>
               <tr>
                 <td>
-                  <span >备注:&nbsp;&nbsp;&nbsp;</span><span>{{item.auditMsg}}</span>
+                  <span >{{index === 0?'备注':'审批意见'}}:&nbsp;&nbsp;&nbsp;</span><span>{{item.auditMsg}}</span>
                 </td>
               </tr>
             </table>
@@ -66,6 +66,13 @@
         },
       }
     },
+    watch:{
+      checkId(val, oldVal) {
+        if(val != oldVal){
+          this.init()
+        }
+      }
+    },
     created() {
 
     },

src/views/approveData/index.vue

@@ -101,9 +101,7 @@
   import option from "./configuration/mainList.json";
   import { getList,approvePass } from "@/api/approveData/main";
   import checkSchedule from "@/components/check/checkSchedule";
-  import { batchOperation } from "@/api/approveData/main"
   import check from "@/components/check/check";
-  import _ from "lodash";
 
   export default {
     components:{
@@ -255,8 +253,8 @@
       selectionChange(list) {
         this.selectionList = list
       },
-      currentChange() {
-        console.log('1')
+      currentChange(val) {
+        this.page.currentPage = val
       },
       sizeChange() {
         console.log('1')
@@ -264,14 +262,21 @@
       refreshChange() {
         this.onLoad(this.page);
       },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        if(!params.auditStatus && this.search.auditStatus != ""){
+      paramsAdjustment(params) {
+        params = Object.assign({}, this.search);
+        if(!params.auditStatus && params.auditStatus !== ""){
           params.auditStatus = "S";
         }
+        return params
+      },
+      onLoad(page, params) {
+        this.loading = true
+        params = this.paramsAdjustment(params)
+
         getList(page.currentPage, page.pageSize,params).then(res=>{
           this.dataList = res.data.data.records
           this.page.total = res.data.data.total
+        }).finally(()=>{
           this.loading = false;
         })
       },

src/views/financialManagement/billDetails/billDetails.vue

@@ -52,7 +52,6 @@
         loading : false,
         form: {},
         search:{},
-        show:true,
         detailData:{},
         option: option,
         parentId:0,
@@ -92,28 +91,20 @@
       // option.height = window.innerHeight - 200 ;
     },
     methods: {
+      rowStyle(data){
+        if(_.subtract(data.row.settlementAmount, data.row.amount) < 0){
+          return  {
+            background: "rgba(248,203,203,0.56)"
+          }
+        }
+      },
       //新单打开
       addReceipt(row){
-        this.detailData = {
-          id: row.id,
-          status: 1
-        };
-        this.show = false;
+        console.log(1)
       },
       //编辑打开
-      editOpen(row, status){
-        this.detailData = {
-          id: row.id,
-          status: status
-        };
-        this.show = false;
-      },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done()
+      editOpen(row){
+        console.log(1)
       },
       searchReset() {
         console.log('1')
@@ -121,39 +112,43 @@
       selectionChange() {
         console.log('1')
       },
-      currentChange() {
-        console.log('1')
-      },
       sizeChange() {
         console.log('1')
       },
-      refreshChange() {
-        this.onLoad(this.page);
+      currentChange(val) {
+        this.page.currentPage = val
       },
-      rowStyle(data){
-        if(_.subtract(data.row.settlementAmount, data.row.amount) < 0){
-            return  {
-              background: "rgba(248,203,203,0.56)"
-            }
-        }
+      refreshChange(params) {
+        this.onLoad(this.page,params);
       },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        if (params.createTime != undefined) {  //合同
+      //点击搜索按钮触发
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done()
+      },
+
+      paramsAdjustment(params) {
+        params = Object.assign({}, this.search);
+        if (params.createTime &&  params.createTime.length !==0 ) {  //合同
           params.createStartDate = params.createTime[0]+ " " + "00:00:00";
           params.createEndDate = params.createTime[1] + " " + "23:59:59";
           this.$delete(params,'createTime')
         }
+        return params
+      },
+
+      onLoad(page, params = {}) {
+        this.loading = true;
+        params = this.paramsAdjustment(params)
         getBillList(page.currentPage, page.pageSize,params).then(res=>{
           this.dataList = res.data.data.records
           this.page.total = res.data.data.total
+        }).finally(()=>{
           this.loading = false;
         })
       },
-      goBack() {
-        this.detailData=this.$options.data().detailData
-        this.show = true;
-      }
     }
   }
 </script>

src/views/financialManagement/billDetails/configuration/mainList.json

@@ -59,7 +59,7 @@
       "overHidden": true
     },
     {
-      "label": "客户名称",
+      "label": "往来单位",
       "prop": "corpName",
       "overHidden": true,
       "width": 200,

src/views/financialManagement/paymentRequest/configuration/mainList.json

@@ -74,12 +74,20 @@
       "width": 120,
       "dicData": [
         {
-          "label": "未请核",
-          "value":"未请核"
+          "label": "录入",
+          "value":"录入"
         },
         {
-          "label": "请核成功",
-          "value": "请核成功"
+          "label": "提交",
+          "value": "提交"
+        },
+        {
+          "label": "审核中",
+          "value": "审核中"
+        },
+        {
+          "label": "审核通过",
+          "value": "审核通过"
         }
       ]
     },

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -588,7 +588,7 @@
         this.oldForm = Object.assign({},data);
 
         this.checkDisabled = data.checkStatus === "录入"?false:true;
-        this.recallDisabled = data.checkStatus === "审核中" || data.checkStatus === "审批通过" ?false:true;
+        this.recallDisabled = data.checkStatus === "提交"?true:false;
 
         this.option.column.forEach(item =>{
           if( item.prop == "remark" ){

src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -47,7 +47,7 @@
       "index": 3
     },
     {
-      "label": "客户名称",
+      "label": "往来单位",
       "prop": "corpId",
       "search": true,
       "hide": true

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -427,7 +427,8 @@
         done(row);
       },
       rowCell(row,index){
-        row.$cellEdit = !row.$cellEdit
+        this.$refs.crud.rowCell(row, index)
+        // row.$cellEdit = !row.$cellEdit
       },
       rowDel(row,index){
         this.dataList.splice(index, 1);

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -47,7 +47,7 @@
       "index": 3
     },
     {
-      "label": "客户名称",
+      "label": "往来单位",
       "prop": "corpId",
       "search": true,
       "hide": true

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -406,8 +406,8 @@
         done(row);
       },
       rowCell(row,index){
-        row.$cellEdit = !row.$cellEdit
-        // this.$refs.crud.rowCell(row, index)
+        // row.$cellEdit = !row.$cellEdit
+        this.$refs.crud.rowCell(row, index)
       },
       rowDel(row,index){
         this.dataList.splice(index, 1);

src/views/statisticAnalysis/profit/index.vue

@@ -76,8 +76,11 @@
         getProfitList(1, -1,param).then(res =>{
           const fileData = this.deepClone(res.data.data.records)
 
+          option.column.shift();
+          option.column.shift();
+
           this.$Export.excel({
-            title: "统计列表",
+            title: "利润分析",
             columns: option.column,
             data: fileData,
           });