修改费用管理进账日期

config/dev.env.js

@@ -5,12 +5,12 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
-  BASE_URL: '"http://192.168.0.36:8080/"',//靖燕龙
+  // BASE_URL: '"http://192.168.0.36:8080/"',//靖燕龙
   // BASE_URL: '"http://192.168.0.106:8080/"',//屈晨
 })
 

src/views/DistributionManage/CarInsurance/DistributionManage.vue

@@ -409,53 +409,6 @@ export default {
           })
           .catch(_ => {});
       },
-      // 右侧工具方法End
-
-      // 右侧列表的方法Start
-      findPage(data) {
-        // 获取分页数据
-        if(data && data.pageRequest){
-          this.pageRequest.pageNum = data.pageRequest.pageNum;
-          this.pageRequest.pageSize = data.pageRequest.pageSize;
-        }
-        this.$api.retail.findPage(this.pageRequest).then((res) => {
-          this.pageResult = res.data;
-        }).then(data != null ? data.callback : '')
-      },
-      //编辑
-      handleTableEdit(data) {
-        var deptid = data.row.deptid.split('D')[0];
-        this.$api.dept.getDeptById(deptid).then(res => {
-          if(res.code = 200){
-            this.deptInfo = res.data;
-            this.deptInfo.teamid = data.row.deptid;
-            this.deptInfo.teamname = data.row.deptname;
-            this.distributionForm = data.row;
-            // this.distributionForm.paytype = data.row.paytype.split(',');
-            this.retailSettingForm=[];
-            for(let i=0;i<data.row.retailtype;i++){
-              this.retailSettingForm.push({
-                retailLevel:(i+1),
-                retailRate:data.row['disrate'+(i+1)]
-              })
-            }
-            this.dialogVisible = true;
-          })
-        } else {
-          return this.$message.info("请选择门店下团队");
-        }
-      })
-    },
-    handleDialogBefore(done) {
-      // 退出对话框之前确认提示
-      var that = this;
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
-    },
-    // 右侧工具方法End
 
     // 右侧列表的方法Start
     findPage(data) {
@@ -465,13 +418,13 @@ export default {
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
       this.$api.retail.findPage(this.pageRequest).then((res) => {
-        console.log(res.data)
         this.pageResult = res.data;
       }).then(data != null ? data.callback : '')
     },
     //编辑
     handleTableEdit(data) {
       let dataObj = Object.assign({}, data.row)
+      console.log(dataObj)
       var deptid = dataObj.deptid.split('D')[0];
       this.$api.dept.getDeptById(deptid).then(res => {
         if (res.code = 200) {
@@ -601,9 +554,7 @@ export default {
          }).catch(err=>{
            this.$message.error("操作失败")
          })
-       }
       // 新增分销End
-
       this.$api.retail.saveRetail(param).then(res => {
         if (res.code == 200) {
           this.$message.success("操作成功");

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -182,7 +182,7 @@
       @current-change="refreshPageRequest"
       :current-page="pageRequest.pageNo"
       :page-size="pageRequest.pageSize"
-      :page-sizes="[ 20, 50, 100, 200, 300, 400, 500]"
+      :page-sizes="[20, 50, 100, 200, 300, 400, 500]"
       :total="pageRequest.totalSize"
       style="float: left; margin-left: 20px; margin-top: 20px"
     >
@@ -355,13 +355,11 @@
         </el-row>
         <el-row>
           <el-col :span="12" style="text-align: center"
-            ><h3 style="margin-left: 120px;">支出方资金归属</h3>
-           </el-col
-          >
+            ><h3 style="margin-left: 120px">支出方资金归属</h3>
+          </el-col>
           <el-col :span="12" style="text-align: center"
-            ><h3 style="margin-left: 120px;">收入方资金归属</h3>
-           </el-col
-          >
+            ><h3 style="margin-left: 120px">收入方资金归属</h3>
+          </el-col>
         </el-row>
         <el-row class="profit_box">
           <el-col :span="12">
@@ -742,7 +740,7 @@ export default {
         },
         {
           prop: "applyTime",
-          label: "转账日期",
+          label: "申请日期",
           minWidth: 100,
           sortable: false,
         },
@@ -782,6 +780,14 @@ export default {
     },
   },
   methods: {
+    //获取当前时间
+    getNowTime() {
+      const dateMat = new Date();
+      const year = dateMat.getFullYear();
+      const month = dateMat.getMonth() + 1;
+      const day = dateMat.getDate();
+      return year+'-'+(month>9?month:'0'+month) + '-'+(day>9?day:'0'+day)
+    },
     //获取归属数据
     getAffiliationData() {
       this.$api.expense.getList().then((res) => {
@@ -815,7 +821,7 @@ export default {
             this.$message.error("暂无导出数据，请重试！");
             return;
           }
-          this.expendFun(res.data)
+          this.expendFun(res.data);
         } else {
           this.$message.error(res.msg);
         }
@@ -829,7 +835,7 @@ export default {
             this.$message.error("暂无导出数据，请重试！");
             return;
           }
-          this.expendFun(res.data)
+          this.expendFun(res.data);
         } else {
           this.$message.error(res.msg);
         }
@@ -910,7 +916,7 @@ export default {
                   it.bankCardNum +
                   "   " +
                   it.bank;
-                it.nameValue = it.name
+                it.nameValue = it.name;
                 // it.nameValue =
                 //   item.accountName + "   " + it.bankCardNum + "   " + it.bank;
               });
@@ -947,10 +953,11 @@ export default {
       obj.entProfit = {};
       obj.outProfit = {};
       this.affiliationData.forEach((item) => {
-        obj.entProfit[item.profitEng] = item.profit==null?0:item.profit;
+        obj.entProfit[item.profitEng] = item.profit == null ? 0 : item.profit;
       });
       this.affiliationData2.forEach((item) => {
-        obj.outProfit[item.profitEng] = item.profit==0||item.profit==null?0:item.profit*-1;
+        obj.outProfit[item.profitEng] =
+          item.profit == 0 || item.profit == null ? 0 : item.profit * -1;
       });
       //转化资金归属
       this.$refs.inComeFormData.validate((valid) => {
@@ -1027,6 +1034,8 @@ export default {
         type: "warning",
       })
         .then(() => {
+          console.log(this.getNowTime())
+          return
           this.$api.expense
             .updateTransferFlag(index.row.excelAccountOperateId)
             .then((res) => {

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -680,7 +680,7 @@ export default {
           sortable: false,
         },
         {
-          prop: "createTime",
+          prop: "payoutTime",
           label: "支付时间",
           minWidth: 100,
           sortable: false,
@@ -988,6 +988,7 @@ export default {
         if (valid) {
           //进账
           if (this.formDataId && this.typeStatus == 2) {
+            console.log(params.payoutTime)
             //转化资金归属
             params.entProfit = {};
             params.outProfit = {};