进口

src/api/check/check.js

@@ -1,11 +1,12 @@
 import request from '@/router/axios';
 
-export const auditProcessList = (id) => {
+export const auditProcessList = (id,batchNo) => {
   return request({
     url: 'api/blade-check/auditproecess/findAuditProcessList',
     method: 'get',
     params: {
-      id:id
+      id:id,
+      batchNo:batchNo
     }
   })
 }

src/components/check/check.vue

@@ -122,7 +122,8 @@
                 this.$emit("choceCheckFun")
               }
               if(!this.checkDetail){
-                this.$router.go(-1);
+                this.$router.$avueRouter.closeTag();
+                this.$router.back();
                 this.$router.push({path: "/approveData/index"})
               }
             }).finally(()=>{

src/components/check/checkSchedule.vue

@@ -49,6 +49,9 @@
       checkId: {
         type: String
       },
+      batchNo:{
+        type: String
+      },
       choceScheduleFun:{
         type: Function
       }
@@ -71,6 +74,11 @@
         if(val != oldVal){
           this.init()
         }
+      },
+      batchNo(val, oldVal) {
+        if(val != oldVal){
+          this.init()
+        }
       }
     },
     created() {
@@ -81,7 +89,7 @@
     },
     methods:{
       init(){
-        auditProcessList(this.checkId).then(res =>{
+        auditProcessList(this.checkId,this.batchNo).then(res =>{
           res.data.data.map((item,index) =>{
             if(item.auditStatus == "A"){
               this.active = index + 2

src/components/fee-info/main.vue

@@ -594,7 +594,7 @@ export default {
               return this.$message.error('批量操作结算单位必须一致')
             }
           }
-          this.buttonLoading = true
+
           this.isUpdata = false
           this.selectionList.map(item =>{
             // item.url = this.billUrl
@@ -618,14 +618,15 @@ export default {
               cancelButtonText: "取消",
               type: "warning",
             }).then(()=>{
+              this.buttonLoading = true
               applyLoan(data).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")
                 }
+              }).finally(()=>{
+                this.isUpdata = true
+                this.buttonLoading = false
               })
-            }).finally(()=>{
-              this.isUpdata = true
-              this.buttonLoading = false
             })
           }else{
             this.$confirm("您确定生成账单吗？", "提示", {
@@ -633,14 +634,15 @@ export default {
               cancelButtonText: "取消",
               type: "warning",
             }).then(()=>{
+              this.buttonLoading = true
               paymentApply(data).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")
                 }
+              }).finally(()=>{
+                this.isUpdata = true
+                this.buttonLoading = false
               })
-            }).finally(()=>{
-              this.isUpdata = true
-              this.buttonLoading = false
             })
           }
         }

src/page/index/tags.vue

@@ -241,6 +241,7 @@ export default {
         cancelButtonText: this.$t("cancelText"),
         type: "warning"
       }).then(() => {
+        this.$store.commit("DEL_ALL_DETAIL");
         this.$store.dispatch("LogOut").then(() => {
           resetRouter();
           this.$router.push({ path: "/login" });

src/views/approveData/configuration/mainList.json

@@ -99,8 +99,8 @@
       "label": "申请日期",
       "prop": "sendTime",
       "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "unlinkPanels": true,
       "searchRange": true,
       "search": true,

src/views/approveData/index.vue

@@ -47,7 +47,7 @@
           size="small"
           :disabled="scope.row.auditStatus != 'S'"
           @click.stop="openCheck(scope.row)"
-        >审核
+        >审批
         </el-button>
         <el-button
           type="text"
@@ -70,6 +70,7 @@
     >
       <check-schedule
         :checkId="checkId"
+        :batchNo="batchNo"
         @choceScheduleFun="choceScheduleFun"
       >
       </check-schedule>
@@ -116,6 +117,7 @@
         show:true,
         checkDialog:false,
         checkId:"",
+        batchNo:'',
         checkScheduleDialog:false,
         detailData:{},
         option: option,
@@ -206,6 +208,7 @@
       },
       openCheckSchedule(row){
         this.checkId = row.srcBillId
+        this.batchNo = row.batchNo
         this.checkScheduleDialog = true
       },
       //关闭审批流程页面

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

@@ -78,16 +78,16 @@
           "value":"录入"
         },
         {
-          "label": "提交",
-          "value": "提交"
+          "label": "审批提交",
+          "value": "审批提交"
         },
         {
-          "label": "审核中",
-          "value": "审核中"
+          "label": "审批中",
+          "value": "审批中"
         },
         {
-          "label": "审核通过",
-          "value": "审核通过"
+          "label": "审批通过",
+          "value": "审批通过"
         }
       ]
     },

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -13,22 +13,22 @@
               :loading="buttonLoading"
               size="small"
             >
-              审核处理<i class="el-icon-arrow-down el-icon--right"></i>
+              审批处理<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
                 :loading="buttonLoading"
                 :disabled="checkDisabled"
-                @click.native="paymentCheck">{{form.checkStatus == '审核中'?'审核中':'提交审核'}}
+                @click.native="paymentCheck">{{form.checkStatus == '审批中'?'审批中':'审批提交'}}
               </el-dropdown-item>
               <el-dropdown-item
                 :loading="buttonLoading"
                 :disabled="!checkDisabled"
-                @click.native="checkScheduleDialog = true,checkId=form.id">审核进度
+                @click.native="checkScheduleDialog = true,checkId=form.id">审批进度
               </el-dropdown-item>
               <el-dropdown-item
                 :disabled="!recallDisabled"
-                @click.native="cancelAudit">撤销审核
+                @click.native="cancelAudit">撤销审批
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -36,7 +36,7 @@
                      size="small"
                      :loading="buttonLoading"
                      class="el-button--small-yh"
-                     :disabled="!checkDisabled || form.checkStatus == '审核中'"
+                     :disabled="form.checkStatus !== '审批通过'"
                      @click.stop="settlement">结算
           </el-button>
           <el-button type="primary"
@@ -60,7 +60,7 @@
                      :loading="buttonLoading"
                      :disabled="buttonDisabled"
                      @click.stop="openCheckDialog">
-            审核
+            审批
           </el-button>
         </div>
       </div>
@@ -165,7 +165,7 @@
     </div>
     <el-dialog
       append-to-body
-      title="审核进度"
+      title="审批进度"
       class="el-dialogDeep"
       :visible.sync="checkScheduleDialog"
       width="40%"
@@ -176,6 +176,7 @@
     >
       <check-schedule
         :checkId="checkId"
+        :batchNo="batchNo"
         @choceScheduleFun="choceScheduleFun"
       >
       </check-schedule>
@@ -235,6 +236,7 @@
         recallDisabled:false,
         checkDialog:false,
         checkId:'',
+        batchNo:'',
         parentId:0,
         id:"",
         dataList: [],
@@ -415,6 +417,7 @@
         }
         this.auditDisabled = true
         this.buttonLoading = true;
+        this.batchNo = this.detailData.check.batchNo
         getDetails(this.detailData.check.srcBillId).then(res => {
           this.afterEcho(res.data.data)
         }).finally(()=>{
@@ -588,7 +591,7 @@
         this.oldForm = Object.assign({},data);
 
         this.checkDisabled = data.checkStatus === "录入"?false:true;
-        this.recallDisabled = data.checkStatus === "提交"?true:false;
+        this.recallDisabled = data.checkStatus === "审批提交"?true:false;
 
         this.option.column.forEach(item =>{
           if( item.prop == "remark" ){

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -513,7 +513,7 @@
               this.afterEcho(res.data.data)
               done();
             }).finally(()=>{
-              this.buttonLoading = true
+              this.buttonLoading = false
             })
           }})
       },

src/views/salesManagement/salesContract/detailsPage.vue

@@ -778,7 +778,7 @@ export default {
       this.viewDisabled = false
     },
     valueName(value,row){
-      this.$set(row,"priceCategory",value)
+      this.$set(row,"priceCategory",value.id)
     },
     //首付比例  带出金额
     downPaymentChange(){

src/views/statisticAnalysis/profit/config/mainList.json

@@ -107,6 +107,9 @@
         {
           "label": "日期",
           "prop": "createTime",
+          "type": "date",
+          "format": "yyyy-MM",
+          "valueFormat": "yyyy-MM",
           "width": 180,
           "index": 4,
           "overHidden": true