Merge remote-tracking branch 'origin/dev' into dev

src/components/fee-info/main.vue

@@ -46,7 +46,7 @@
             @click.stop="billingDetails('申请')"
             :disabled="disabled || selectionList.length == 0"
             v-if="selectTab === 2"
-          >申请货款</el-button>
+          >申请付费</el-button>
      <!--     <el-button
             type="info"
             size="small"

src/components/finance/applyPayment.vue

@@ -364,25 +364,24 @@ export default {
                 if(res.data.success){
                   this.$message.success("操作成功!")
                   this.$emit("choceFun");
+                  //跳转付款申请页面
+                  if(this.$store.getters.pqStatus){
+                    this.$alert("无法自动跳转到付款申请页面,因为页面已存在。", "温馨提示", {
+                      confirmButtonText: "确定",
+                      type: 'warning',
+                      callback: action => {
+                      }
+                    });
+                  }else{
+                    //关闭一下存在的列表页  跳转
+                    this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/paymentRequest');
+                    this.$router.push({
+                      path: "/financialManagement/paymentRequest/paymentRequest",
+                      query: {params: res.data.data.id},
+                    });
+                  }
                 }
               })
-              //跳转付款申请页面
-              //不在跳转
-              // if(this.$store.getters.pqStatus){
-              //   this.$alert("无法自动跳转到付款申请页面,因为页面已存在。", "温馨提示", {
-              //     confirmButtonText: "确定",
-              //     type: 'warning',
-              //     callback: action => {
-              //     }
-              //   });
-              // }else{
-              //   //关闭一下存在的列表页  跳转
-              //   this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/paymentRequest');
-              //   this.$router.push({
-              //     path: "/financialManagement/paymentRequest/paymentRequest",
-              //     query: {params: res.data.data.id},
-              //   });
-              // }
             }
             //采购退款结算 销售收款结算  不需申请请核 直接结算  => 结算
             if(this.billType === "收费"){

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -6,14 +6,42 @@
                    @click="backToList">返回列表
         </el-button>
         <div v-if="!auditDisabled" class="upper_right_button">
-          <el-button type="info"
-                     size="small"
-                     :loading="buttonLoading"
-                     :disabled="checkDisabled"
-                     class="el-button--small-yh"
-                     @click.stop="paymentCheck">
-            {{form.checkStatus == '审核中'?'审核中':'申请'}}
-          </el-button>
+
+          <el-dropdown style="padding: 0 8px;line-height: 0">
+            <el-button
+              type="warning"
+              :loading="buttonLoading"
+              size="small"
+            >
+              审核处理<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 == '审核中'?'审核中':'请核'}}
+              </el-dropdown-item>
+              <el-dropdown-item
+                :disabled="!checkDisabled"
+                :loading="buttonLoading"
+                @click.native="checkScheduleDialog = true,checkId=form.id">审核进度
+              </el-dropdown-item>
+              <el-dropdown-item
+                :disabled="!checkDisabled"
+                @click.native="openApplicationDialog">撤销审核
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+
+<!--          <el-button type="info"-->
+<!--                     size="small"-->
+<!--                     class="el-button&#45;&#45;small-yh"-->
+<!--                     :loading="buttonLoading"-->
+<!--                     :disabled="checkDisabled"-->
+<!--                     @click.stop="paymentCheck">-->
+<!--            {{form.checkStatus == '审核中'?'审核中':'申请'}}-->
+<!--          </el-button>-->
+
           <el-button type="warning"
                      size="small"
                      :loading="buttonLoading"
@@ -25,7 +53,7 @@
                      size="small"
                      :loading="buttonLoading"
                      class="el-button--small-yh"
-                     @click.stop="confirmEdit">确认修改
+                     @click.stop="confirmEdit">保存数据
           </el-button>
         </div>
         <div v-if="auditDisabled" class="upper_right_button">
@@ -143,6 +171,22 @@
         </avue-crud>
       </basic-container>
     </div>
+    <el-dialog
+      append-to-body
+      title="审核进度"
+      class="el-dialogDeep"
+      :visible.sync="checkScheduleDialog"
+      width="60%"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :close-on-press-escape="false"
+      v-dialog-drag
+    >
+      <check-schedule
+        :checkId="checkId"
+      >
+      </check-schedule>
+    </el-dialog>
   </div>
 </template>
 
@@ -152,6 +196,7 @@
   import { getDetails,modify,submit, paymentCheck,getlistBankBy,saveOrEdit } from "@/api/financialManagement/paymentRequest";
   import _ from "lodash";
   import { approvePass } from "@/api/approveData/main"
+  import checkSchedule from "../../../components/check/checkSchedule";
 
   export default {
     name: "paymentDetailsPage",
@@ -160,6 +205,9 @@
         type: Object
       }
     },
+    components:{
+      checkSchedule
+    },
     data() {
       return {
         form:{},
@@ -169,6 +217,8 @@
         auditDisabled:false,
         buttonDisabled:true,
         buttonLoading:false,
+        checkScheduleDialog:false,
+        checkId:'',
         parentId:0,
         id:"",
         dataList: [],

src/views/purchase/contract/detailsPage.vue

@@ -32,12 +32,12 @@
             <el-dropdown-item
               :loading="buttonLoading"
               :disabled="!form.id  || viewDisabled"
-              @click.native="applyPayment('收费')">退款
+              @click.native="applyPayment('收费')">申请退款
             </el-dropdown-item>
             <el-dropdown-item
               :loading="buttonLoading"
               :disabled="!form.id  || viewDisabled"
-              @click.native="openApplicationDialog">查看付款记录
+              @click.native="openApplicationDialog">查看账单
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>

src/views/salesManagement/salesContract/detailsPage.vue

@@ -33,11 +33,11 @@
             <el-dropdown-item
               :disabled="!form.id  || viewDisabled"
               :loading="buttonLoading"
-              @click.native="applySettlement('申请')">退款
+              @click.native="applySettlement('申请')">申请退款
             </el-dropdown-item>
             <el-dropdown-item
               :loading="buttonLoading"
-              @click.native="openApplicationDialog">查看收款记录
+              @click.native="openApplicationDialog">查看账单
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>