Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/api/basicData/customerInformation.js

@@ -106,3 +106,22 @@ export function areaTypeTree() {
     method: 'get'
   })
 }
+
+//客户地址查询
+export function corpsAddrSelect(data) {
+  return request({
+    url: '/api/blade-client/corpsAddr/list',
+    method: 'get',
+    params: data
+  })
+}
+//客户地址删除
+export function corpsAddrDelete(data) {
+  return request({
+    url: '/api/blade-client/corpsAddr/remove',
+    method: 'post',
+    data: {
+      ids:data
+    }
+  })
+}

src/api/check/check.js

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

src/api/maintenance/integral.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-mocha-item/businesspoints/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/api/maintenance/overpayment.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-mocha-item/businessoverpayment/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/components/check/checkSchedule.vue

@@ -0,0 +1,67 @@
+<template>
+  <div>
+    <el-row style="height: 0;">
+      <el-col :span="3">
+        <div style="height: 300px;margin-top:90px">
+          <el-steps direction="vertical" :active="1" space="40px">
+            <el-step title="发起"></el-step>
+            <el-step title="审批1"></el-step>
+            <el-step title="审批2"></el-step>
+          </el-steps>
+        </div>
+      </el-col>
+      <el-col :span="16">
+        <avue-crud
+          :option="option"
+          :table-loading="loading"
+          :data="data"
+          ref="crud"
+          @refresh-change="refreshChange"
+          :page.sync="page"
+          @on-load="onLoad"
+        >
+        </avue-crud>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import option from './config/mainList.json'
+  import { auditProcessList } from "@/api/check/check";
+
+  export default {
+    name: "checkSchedule",
+    props: {
+      checkId: {
+        type: String
+      },
+    },
+    data(){
+      return {
+        loading:false,
+        option:option,
+        data:[],
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+      }
+    },
+    methods:{
+      refreshChange(){
+
+      },
+      onLoad(){
+        auditProcessList(this.checkId).then(res =>{
+          console.log(res.data)
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/check/config/mainList.json

@@ -0,0 +1,56 @@
+{
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": false,
+  "addBtn":false,
+  "editBtn":false,
+  "addRowBtn":false,
+  "cellBtn":false,
+  "cancelBtn":false,
+  "refreshBtn": false,
+  "searchMenuPosition": "right",
+  "searchMenuSpan": 24,
+  "searchSpan": 8,
+  "align": "center",
+  "delBtn":true,
+  "dialogWidth": "60%",
+  "tree": true,
+  "columnBtn": false,
+  "border": true,
+  "index": true,
+  "selection": false,
+  "menu": false,
+  "menuWidth": 0,
+  "dialogClickModal": false,
+  "column": [
+    {
+      "label": "操作人",
+      "prop": "accSysNo",
+      "overHidden": true,
+      "width": 150,
+      "index": 2
+    },
+    {
+      "label": "操作状态",
+      "prop": "srcBillNo",
+      "overHidden": true,
+      "width": 150,
+      "index": 2
+    },
+    {
+      "label": "操作日期",
+      "prop": "corpName",
+      "overHidden": true,
+      "width": 150,
+      "index": 2
+    },
+    {
+      "label": "备注",
+      "prop": "itemName",
+      "overHidden": true,
+      "width": 150,
+      "index": 4
+    }
+  ]
+}

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/components/function/corpAddrSelect.js

@@ -0,0 +1,22 @@
+import {detail} from "@/api/basicData/customerInformation";
+
+export async function corpAddr(id) {
+  let addrList = [];
+  await detail(id).then(data => {
+    console.log(data.data.data)
+    if (data.data.data.storageAddr) {
+      addrList.push({
+        label: data.data.data.storageAddr
+      })
+    }
+    if (data.data.data.corpsAddrList.length > 0) {
+      data.data.data.corpsAddrList.forEach(item => {
+        addrList.push({
+          label: item.addr
+        })
+      })
+    }
+    console.log(addrList)
+  })
+  return addrList
+}

src/components/titleComponent/main.vue

@@ -27,7 +27,7 @@ export default {
     width: 4px;
     height: 13px;
     background-color: #d6000f;
-    margin: 2px 4px 0 0;
+    margin: 3px 4px 0 0;
   }
   .container-title {
     font-size: 12px;

src/enums/column-name.js

@@ -158,6 +158,10 @@ const columnName = [{
   {
     code: 51,
     name: '客户、供应商、公司'
+  },
+  {
+    code: 52,
+    name: '产品属性Label设置'
   }
 
 ]

src/main.js

@@ -52,6 +52,8 @@ import {
 } from "@/util/columnSetting"
 // 导入弹窗放大样式
 import '@/assets/css/form.css'
+// 客户调出收发货地址
+import {corpAddr} from "@/components/function/corpAddrSelect"
 Vue.component('selectComponent', selectComponent);
 Vue.component('warehouseSelect', warehouseSelect);
 Vue.component('goodsSelect', goodsSelect);
@@ -106,6 +108,7 @@ Vue.prototype.getColumnData = getColumnData
 Vue.prototype.saveColumnData = saveColumnData
 Vue.prototype.delColumnData=delColumnData
 Vue.config.productionTip = false;
+Vue.prototype.corpAddr = corpAddr;
 new Vue({
   router,
   store,

src/page/index/logo.vue

@@ -51,7 +51,7 @@ export default {
   position: fixed;
   top: 0;
   left: 0;
-  width: 180px;
+  width: 140px;
   height: 40px;
   line-height: 40px;
   background-color: #20222a;
@@ -64,8 +64,8 @@ export default {
   &_title {
     display: block;
     text-align: center;
-    font-weight: 300;
-    font-size: 20px;
+    font-weight: 500;
+    font-size: 16px;
   }
   &_subtitle {
     display: block;

src/styles/media.scss

@@ -21,7 +21,7 @@
   position: fixed;
   left: 0;
   top: 0;
-  width: 180px;
+  width: 140px;
   height: 100%;
   z-index: 1025;
 }
@@ -43,7 +43,7 @@
 }
 
 .avue-header {
-  padding-left: 180px;
+  padding-left: 140px;
   width: 100%;
   background-color: #fff;
   box-sizing: border-box;
@@ -51,10 +51,10 @@
 
 .avue-main {
   position: absolute;
-  left: 180px;
+  left: 140px;
   padding: 0;
   // padding-bottom: 20px;
-  width: calc(100% - 180px);
+  width: calc(100% - 140px);
   height: calc(100% - 40px);
   box-sizing: border-box;
   overflow: hidden;

src/styles/tags.scss

@@ -26,7 +26,7 @@
         margin: 0 3px;
         height: 40px;
         line-height:40px;
-        font-size: 13px;
+        font-size: 12px;
         font-weight: normal;
         color: #ccc;
         &.is-active {

src/styles/variables.scss

@@ -10,11 +10,13 @@ p{
   margin: 0 !important;
 }
 .el-submenu__icon-arrow {
-  right: 10px !important;
+  right: 3px !important;
+  margin-top: -3px !important;
 }
 .el-menu-item, .el-submenu__title{
-  height: 40px !important;
-  line-height:40px !important;
+  font-size: 12px !important;
+  height: 30px !important;
+  line-height:30px !important;
 }
 
 .el-submenu .el-menu-item {

src/views/basicData/customerInformation/configuration/addressOption.json

@@ -11,12 +11,13 @@
   "selection": true,
   "menuWidth": 180,
   "dialogClickModal": false,
+  "addBtnText": "录入明细",
   "column": [
     {
-      "label": "客户",
-      "prop": "a",
-      "index": 1,
-      "width":240,
+      "label": "地址",
+      "prop": "addr",
+      "index": 4,
+      "width":350,
       "rules": [
         {
           "required": true,
@@ -26,7 +27,7 @@
       ]
     },{
       "label": "联系人",
-      "prop": "b",
+      "prop": "attn",
       "index": 2,
       "width":200,
       "rules": [
@@ -38,7 +39,7 @@
       ]
     },{
       "label": "电话",
-      "prop": "c",
+      "prop": "tel",
       "index": 3,
       "width":200,
       "rules": [
@@ -49,13 +50,13 @@
         }
       ]
     },{
-      "label": "地址",
-      "prop": "d",
+      "label": "备注",
+      "prop": "remarks",
       "index": 4,
       "width":350,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": "请输入账户名称",
           "trigger": "blur"
         }

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -229,7 +229,8 @@ import {
   corpsbank,
   corpsfiles,
   corpsitem,
-  areaTypeTree
+  areaTypeTree,
+  corpsAddrDelete,
 } from "@/api/basicData/customerInformation";
 import customerContact from "./configuration/customerContact.json";
 import advantageProject from "./configuration/advantageProject.json";
@@ -585,10 +586,12 @@ export default {
         this.contactsData = this.form.corpsAttnList;
         this.bankOfDepositData = this.form.corpsBankList;
         this.advantageProjectData = this.form.corpsItems;
+        this.addressData = this.form.corpsAddrList;
 
         delete this.form.corpsAttnList;
         delete this.form.corpsBankList;
         delete this.form.corpsItems;
+        delete this.form.corpsAddrList;
       });
     } else {
       //新增时根据左侧选中树结构给客户类别赋值
@@ -718,7 +721,6 @@ export default {
     },
     //新增收发货地址保存触发
     rowSaveAddress(row, done, loading) {
-      console.log(row, done, loading);
       this.addressData.push(row);
       done();
     },
@@ -734,7 +736,7 @@ export default {
         type: "warning"
       }).then(() => {
         if (row.id) {
-          corpsbank(row.id).then(res => {
+          corpsAddrDelete(row.id).then(res => {
             this.$message({
               type: "success",
               message: "操作成功!"
@@ -757,6 +759,7 @@ export default {
           this.form.corpsAttnList = this.contactsData;
           this.form.corpsBankList = this.bankOfDepositData;
           this.form.corpsItems = this.advantageProjectData;
+          this.form.corpsAddrList = this.addressData;
           if (typeof this.form.corpsTypeId == "object") {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",");
           }

src/views/businessManagement/deliveryNotice/configuration/mainList.json

@@ -1,6 +1,7 @@
 {
   "lazy": true,
   "tip": false,
+  "addBtnText": "创建单据",
   "simplePage": true,
   "searchShow": true,
   "searchMenuPosition": "right",

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -35,7 +35,7 @@
           size="small"
           type="success" @click="copyOrder"
           :disabled="detailData.seeDisabled || !form.id">
-          复制新单
+          复制单据
         </el-button>
         <el-button
           class="el-button--small-yh"
@@ -44,7 +44,7 @@
           @click="editCustomer(false)"
           :loading="saveLoading"
           size="small"
-        >{{ form.id ? '确认修改' : '确认新增' }}
+        >保 存
         </el-button>
       </div>
     </div>
@@ -193,69 +193,75 @@
             </template>
           </avue-crud>
         </basic-container>
-        <containerTitle title="费用明细"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
-          <avue-crud
-              :option="advantageProject"
-              v-model="advantageProjectForm"
-              :data="advantageProjectData"
-              ref="crudProject"
-              @row-save="rowSaveProject"
-              @row-update="rowUpdateProject"
-              @row-del="rowDelProject"
-              @saveColumn="saveColumn('fees')"
-          >
-            <template slot="code" slot-scope="{row,index}">
-              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
-              <span>{{ row.code }}</span>
-            </template>
-            <template slot="corpId" slot-scope="{ row }">
-              <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
-                               :configuration="configuration" @receiveList="receiveList"/>
-              <span v-else>
-                <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>
-              </span>
-            </template>
-            <template slot="amount" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit" v-model.trim="row.amount"
-                        size="small" v-input-limit="2"
-              ></el-input>
-              <span v-else>{{ row.amount }}</span>
-            </template>
-            <template slot="settlmentAmount" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"
-                        size="small" v-input-limit="2"
-              ></el-input>
-              <span v-else>{{ row.settlmentAmount }}</span>
-            </template>
-            <template slot-scope="{row,index}" slot="menu">
-              <el-button
-                  type="text"
-                  size="small"
-                  @click="rowCellTwo(row,index)"
-                  :disabled="detailData.seeDisabled"
-              >{{ row.$cellEdit ? '保存' : '修改' }}
-              </el-button>
-              <el-button
-                size="small"
-                icon="el-icon-delete"
-                type="text"
-                @click="rowDelProject(row, index)"
-                :disabled="detailData.seeDisabled"
-                v-if="!row.$cellEdit"
-              >删 除</el-button>
-            </template>
-            <template slot="menuLeft" slot-scope="{size}">
-              <el-button type="primary"
-                         icon="el-icon-plus"
-                         size="small"
-                         @click="costIncrease"
-                         :disabled="detailData.seeDisabled"
-              >录入明细
-              </el-button>
-            </template>
-          </avue-crud>
-        </basic-container>
+        <fee-info
+          ref="feeInfo"
+          :orderFeesList="advantageProjectData"
+          :disabled="detailData.seeDisabled"
+          feeUrl="/blade-deliver-goods/deliveryfees/update"
+        />
+<!--        <containerTitle title="费用明细"></containerTitle>-->
+<!--        <basic-container style="margin-bottom: 10px">-->
+<!--          <avue-crud-->
+<!--              :option="advantageProject"-->
+<!--              v-model="advantageProjectForm"-->
+<!--              :data="advantageProjectData"-->
+<!--              ref="crudProject"-->
+<!--              @row-save="rowSaveProject"-->
+<!--              @row-update="rowUpdateProject"-->
+<!--              @row-del="rowDelProject"-->
+<!--              @saveColumn="saveColumn('fees')"-->
+<!--          >-->
+<!--            <template slot="code" slot-scope="{row,index}">-->
+<!--              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>-->
+<!--              <span>{{ row.code }}</span>-->
+<!--            </template>-->
+<!--            <template slot="corpId" slot-scope="{ row }">-->
+<!--              <selectComponent v-if="row.$cellEdit" v-model="row.corpId"-->
+<!--                               :configuration="configuration" @receiveList="receiveList"/>-->
+<!--              <span v-else>-->
+<!--                <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>-->
+<!--              </span>-->
+<!--            </template>-->
+<!--            <template slot="amount" slot-scope="{ row }">-->
+<!--              <el-input v-if="row.$cellEdit" v-model.trim="row.amount"-->
+<!--                        size="small" v-input-limit="2"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.amount }}</span>-->
+<!--            </template>-->
+<!--            <template slot="settlmentAmount" slot-scope="{ row }">-->
+<!--              <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"-->
+<!--                        size="small" v-input-limit="2"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.settlmentAmount }}</span>-->
+<!--            </template>-->
+<!--            <template slot-scope="{row,index}" slot="menu">-->
+<!--              <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  @click="rowCellTwo(row,index)"-->
+<!--                  :disabled="detailData.seeDisabled"-->
+<!--              >{{ row.$cellEdit ? '保存' : '修改' }}-->
+<!--              </el-button>-->
+<!--              <el-button-->
+<!--                size="small"-->
+<!--                icon="el-icon-delete"-->
+<!--                type="text"-->
+<!--                @click="rowDelProject(row, index)"-->
+<!--                :disabled="detailData.seeDisabled"-->
+<!--                v-if="!row.$cellEdit"-->
+<!--              >删 除</el-button>-->
+<!--            </template>-->
+<!--            <template slot="menuLeft" slot-scope="{size}">-->
+<!--              <el-button type="primary"-->
+<!--                         icon="el-icon-plus"-->
+<!--                         size="small"-->
+<!--                         @click="costIncrease"-->
+<!--                         :disabled="detailData.seeDisabled"-->
+<!--              >录入明细-->
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </avue-crud>-->
+<!--        </basic-container>-->
         <containerTitle title="附件上传"></containerTitle>
         <basic-container style="margin-bottom: 40px">
           <avue-crud
@@ -427,6 +433,7 @@ import {customerList as selectWareHouse} from "@/api/basicData/basicStorageDesc"
 import {selectGoodsNum} from "@/api/basicData/inventoryAccount"
 import { contrastObj, contrastList } from "@/util/contrastData";
 import  marketDetail from "@/components/procurement/market";
+import feeInfo from "@/components/fee-info/main";
 
 export default {
   name: "detailsPage",
@@ -437,6 +444,7 @@ export default {
   },
   components: {
     marketDetail,
+    feeInfo,
   },
   data() {
     return {
@@ -1002,6 +1010,7 @@ export default {
     },
     getcorpId(row) {
       this.contactsData[row.index].corpId = row.id;
+      this.contactsData[row.index].corpName = row.cname;
     },
     // 出库数量变化时调用
     actualQuantityChange(row) {

src/views/businessManagement/deliveryNotice/index.vue

@@ -23,7 +23,7 @@
                  @tree-load="treeLoad"
                  @saveColumn="saveColumn">
         <template slot="menuLeft" slot-scope="{size}">
-          <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制新单</el-button>
+          <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">

src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -1,6 +1,7 @@
 {
   "lazy": true,
   "tip": false,
+  "addBtnText": "创建单据",
   "simplePage": true,
   "searchShow": true,
   "searchMenuPosition": "right",

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -23,7 +23,9 @@
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :disabled="true">请核</el-dropdown-item>
+            <el-dropdown-item :disabled="true">请核数据</el-dropdown-item>
+            <el-dropdown-item v-if="false">审核进度</el-dropdown-item>
+            <el-dropdown-item v-if="false">撤销请核</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-dropdown style="margin-right: 8px;">
@@ -36,19 +38,19 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
               :disabled="detailData.seeDisabled || !form.id"
-              @click="applyPayment('申请')"
+              @click.native="applyPayment('申请')"
             >
               申请货款
             </el-dropdown-item>
             <el-dropdown-item
-               @click="openApplicationDialog"
-               :disabled="!form.id"
-            >查看申请记录
+              @click.stop.native="applyPayment('收费')"
+              :disabled="!this.form.id"
+            >申请退款
             </el-dropdown-item>
             <el-dropdown-item
-               @click.stop="applyPayment('收费')"
-               :disabled="!this.form.id"
-            >退款
+               @click.native="openApplicationDialog"
+               :disabled="!form.id"
+            >查看账单
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -59,7 +61,7 @@
           @click="copyOrder"
           :disabled="detailData.seeDisabled || !this.form.id"
         >
-          复制新单
+          复制单据
         </el-button>
         <el-button
           size="small"
@@ -68,7 +70,7 @@
           :disabled="disabled || detailData.seeDisabled"
           @click="editCustomer(false)"
           :loading="saveLoading"
-        >{{ form.id ? '确认修改' : '确认新增' }}
+        >保 存
         </el-button>
       </div>
     </div>
@@ -218,69 +220,75 @@
             </template>
           </avue-crud>
         </basic-container>
-        <containerTitle title="费用明细"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
-          <avue-crud
-              :option="advantageProject"
-              v-model="advantageProjectForm"
-              :data="advantageProjectData"
-              ref="crudProject"
-              @row-save="rowSaveProject"
-              @row-update="rowUpdateProject"
-              @row-del="rowDelProject"
-              @saveColumn="saveColumn('fees')"
-          >
-            <template slot="code" slot-scope="{row,index}">
-              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
-              <span>{{ row.code }}</span>
-            </template>
-            <template slot="corpId" slot-scope="{ row }">
-              <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
-                               :configuration="configuration" @receiveList="receiveList" typeData="GYS"/>
-              <span v-else>
-                <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>
-              </span>
-            </template>
-            <template slot="amount" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit" v-model.trim="row.amount"
-                        size="small" v-input-limit="2"
-              ></el-input>
-              <span v-else>{{ row.amount }}</span>
-            </template>
-            <template slot="settlmentAmount" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"
-                        size="small" v-input-limit="2"
-              ></el-input>
-              <span v-else>{{ row.settlmentAmount }}</span>
-            </template>
-            <template slot-scope="{row,index}" slot="menu">
-              <el-button
-                  type="text"
-                  size="small"
-                  @click="rowCellTwo(row,index)"
-                  :disabled="detailData.seeDisabled"
-              >{{ row.$cellEdit ? '保存' : '修改' }}
-              </el-button>
-              <el-button
-                size="small"
-                icon="el-icon-delete"
-                type="text"
-                @click="rowDelProject(row, index)"
-                :disabled="detailData.seeDisabled"
-                v-if="!row.$cellEdit"
-              >删 除</el-button>
-            </template>
-            <template slot="menuLeft" slot-scope="{size}">
-              <el-button type="primary"
-                         icon="el-icon-plus"
-                         size="small"
-                         @click="costIncrease"
-                         :disabled="detailData.seeDisabled"
-              >录入明细
-              </el-button>
-            </template>
-          </avue-crud>
-        </basic-container>
+        <fee-info
+          ref="feeInfo"
+          :orderFeesList="advantageProjectData"
+          :disabled="detailData.seeDisabled"
+          feeUrl="/trade-purchase/purchase-order/removeByFees"
+        />
+<!--        <containerTitle title="费用明细"></containerTitle>-->
+<!--        <basic-container style="margin-bottom: 10px">-->
+<!--          <avue-crud-->
+<!--              :option="advantageProject"-->
+<!--              v-model="advantageProjectForm"-->
+<!--              :data="advantageProjectData"-->
+<!--              ref="crudProject"-->
+<!--              @row-save="rowSaveProject"-->
+<!--              @row-update="rowUpdateProject"-->
+<!--              @row-del="rowDelProject"-->
+<!--              @saveColumn="saveColumn('fees')"-->
+<!--          >-->
+<!--            <template slot="code" slot-scope="{row,index}">-->
+<!--              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>-->
+<!--              <span>{{ row.code }}</span>-->
+<!--            </template>-->
+<!--            <template slot="corpId" slot-scope="{ row }">-->
+<!--              <selectComponent v-if="row.$cellEdit" v-model="row.corpId"-->
+<!--                               :configuration="configuration" @receiveList="receiveList" typeData="GYS"/>-->
+<!--              <span v-else>-->
+<!--                <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>-->
+<!--              </span>-->
+<!--            </template>-->
+<!--            <template slot="amount" slot-scope="{ row }">-->
+<!--              <el-input v-if="row.$cellEdit" v-model.trim="row.amount"-->
+<!--                        size="small" v-input-limit="2"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.amount }}</span>-->
+<!--            </template>-->
+<!--            <template slot="settlmentAmount" slot-scope="{ row }">-->
+<!--              <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"-->
+<!--                        size="small" v-input-limit="2"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.settlmentAmount }}</span>-->
+<!--            </template>-->
+<!--            <template slot-scope="{row,index}" slot="menu">-->
+<!--              <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  @click="rowCellTwo(row,index)"-->
+<!--                  :disabled="detailData.seeDisabled"-->
+<!--              >{{ row.$cellEdit ? '保存' : '修改' }}-->
+<!--              </el-button>-->
+<!--              <el-button-->
+<!--                size="small"-->
+<!--                icon="el-icon-delete"-->
+<!--                type="text"-->
+<!--                @click="rowDelProject(row, index)"-->
+<!--                :disabled="detailData.seeDisabled"-->
+<!--                v-if="!row.$cellEdit"-->
+<!--              >删 除</el-button>-->
+<!--            </template>-->
+<!--            <template slot="menuLeft" slot-scope="{size}">-->
+<!--              <el-button type="primary"-->
+<!--                         icon="el-icon-plus"-->
+<!--                         size="small"-->
+<!--                         @click="costIncrease"-->
+<!--                         :disabled="detailData.seeDisabled"-->
+<!--              >录入明细-->
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </avue-crud>-->
+<!--        </basic-container>-->
         <containerTitle title="附件上传"></containerTitle>
         <basic-container style="margin-bottom: 40px">
           <avue-crud
@@ -472,6 +480,7 @@ import { contrastObj, contrastList } from "@/util/contrastData";
 import ApplyPayment from "../../../components/finance/applyPayment";
 import  billApplication from "@/components/bill/billApplication";
 import { getlistBankBy } from "@/api/basicData/configuration"
+import feeInfo from "@/components/fee-info/main";
 
 export default {
   name: "detailsPage",
@@ -485,7 +494,8 @@ export default {
   },
   components:{
     ApplyPayment,
-    billApplication
+    billApplication,
+    feeInfo,
   },
   data() {
     return {
@@ -644,7 +654,7 @@ export default {
             prop: 'packageRemarks',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -1331,6 +1341,8 @@ export default {
                 });
               })
             }
+          }).catch(() => {
+            this.saveLoading = false
           })
         } else {
           return false;

src/views/businessManagement/purchaseOrder/index.vue

@@ -21,7 +21,7 @@
                  @tree-load="treeLoad"
                  @saveColumn="saveColumn">
         <template slot="menuLeft" slot-scope="{size}">
-          <el-button type="success" :size="size" icon="el-icon-copy-document" @click="copyOrder" :disabled="single">复制新单</el-button>
+          <el-button type="success" :size="size" icon="el-icon-copy-document" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
           <el-button type="warning" :size="size" icon="el-icon-thumb" :disabled="multiple" @click="applyPayment">申请货款</el-button>
         </template>

src/views/businessManagement/receipt/configuration/mainList.json

@@ -1,6 +1,7 @@
 {
   "lazy": true,
   "tip": false,
+  "addBtnText": "创建单据",
   "simplePage": true,
   "searchShow": true,
   "searchMenuPosition": "right",

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -35,7 +35,7 @@
           size="small"
           type="success" @click="copyOrder"
           :disabled="detailData.seeDisabled || !this.form.id">
-          复制新单
+          复制单据
         </el-button>
         <el-button
           class="el-button--small-yh"
@@ -44,7 +44,7 @@
           @click="editCustomer(false)"
           size="small"
           :loading="saveLoading"
-        >{{ form.id ? '确认修改' : '确认新增' }}
+        >保 存
         </el-button>
       </div>
     </div>
@@ -155,69 +155,75 @@
             </template>
           </avue-crud>
         </basic-container>
-        <containerTitle title="费用明细"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
-          <avue-crud
-              :option="advantageProject"
-              v-model="advantageProjectForm"
-              :data="advantageProjectData"
-              ref="crudProject"
-              @row-save="rowSaveProject"
-              @row-update="rowUpdateProject"
-              @row-del="rowDelProject"
-              @saveColumn="saveColumn('fees')"
-          >
-            <template slot="code" slot-scope="{row,index}">
-              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
-              <span>{{ row.code }}</span>
-            </template>
-            <template slot="corpId" slot-scope="{ row }">
-              <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
-                               :configuration="configuration" @receiveList="receiveList"/>
-              <span v-else>
-                <span v-for="(item, index) in configuration.dicData" :key="index" v-if="item.id == row.corpId">{{ item.cname }}</span>
-              </span>
-            </template>
-            <template slot="amount" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit" v-model.trim="row.amount"
-                        size="small" v-input-limit="2"
-              ></el-input>
-              <span v-else>{{ row.amount }}</span>
-            </template>
-            <template slot="settlmentAmount" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"
-                        size="small" v-input-limit="2"
-              ></el-input>
-              <span v-else>{{ row.settlmentAmount }}</span>
-            </template>
-            <template slot-scope="{row,index}" slot="menu">
-              <el-button
-                  type="text"
-                  size="small"
-                  @click="rowCellTwo(row,index)"
-                  :disabled="detailData.seeDisabled"
-              >{{ row.$cellEdit ? '保存' : '修改' }}
-              </el-button>
-              <el-button
-                size="small"
-                icon="el-icon-delete"
-                type="text"
-                @click="rowDelProject(row, index)"
-                :disabled="detailData.seeDisabled"
-                v-if="!row.$cellEdit"
-              >删 除</el-button>
-            </template>
-            <template slot="menuLeft" slot-scope="{size}">
-              <el-button type="primary"
-                         icon="el-icon-plus"
-                         size="small"
-                         @click="costIncrease"
-                         :disabled="detailData.seeDisabled"
-              >录入明细
-              </el-button>
-            </template>
-          </avue-crud>
-        </basic-container>
+        <fee-info
+          ref="feeInfo"
+          :orderFeesList="advantageProjectData"
+          :disabled="detailData.seeDisabled"
+          feeUrl="/blade-deliver-goods/deliveryfees/update"
+        />
+<!--        <containerTitle title="费用明细"></containerTitle>-->
+<!--        <basic-container style="margin-bottom: 10px">-->
+<!--          <avue-crud-->
+<!--              :option="advantageProject"-->
+<!--              v-model="advantageProjectForm"-->
+<!--              :data="advantageProjectData"-->
+<!--              ref="crudProject"-->
+<!--              @row-save="rowSaveProject"-->
+<!--              @row-update="rowUpdateProject"-->
+<!--              @row-del="rowDelProject"-->
+<!--              @saveColumn="saveColumn('fees')"-->
+<!--          >-->
+<!--            <template slot="code" slot-scope="{row,index}">-->
+<!--              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>-->
+<!--              <span>{{ row.code }}</span>-->
+<!--            </template>-->
+<!--            <template slot="corpId" slot-scope="{ row }">-->
+<!--              <selectComponent v-if="row.$cellEdit" v-model="row.corpId"-->
+<!--                               :configuration="configuration" @receiveList="receiveList"/>-->
+<!--              <span v-else>-->
+<!--                <span v-for="(item, index) in configuration.dicData" :key="index" v-if="item.id == row.corpId">{{ item.cname }}</span>-->
+<!--              </span>-->
+<!--            </template>-->
+<!--            <template slot="amount" slot-scope="{ row }">-->
+<!--              <el-input v-if="row.$cellEdit" v-model.trim="row.amount"-->
+<!--                        size="small" v-input-limit="2"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.amount }}</span>-->
+<!--            </template>-->
+<!--            <template slot="settlmentAmount" slot-scope="{ row }">-->
+<!--              <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"-->
+<!--                        size="small" v-input-limit="2"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.settlmentAmount }}</span>-->
+<!--            </template>-->
+<!--            <template slot-scope="{row,index}" slot="menu">-->
+<!--              <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  @click="rowCellTwo(row,index)"-->
+<!--                  :disabled="detailData.seeDisabled"-->
+<!--              >{{ row.$cellEdit ? '保存' : '修改' }}-->
+<!--              </el-button>-->
+<!--              <el-button-->
+<!--                size="small"-->
+<!--                icon="el-icon-delete"-->
+<!--                type="text"-->
+<!--                @click="rowDelProject(row, index)"-->
+<!--                :disabled="detailData.seeDisabled"-->
+<!--                v-if="!row.$cellEdit"-->
+<!--              >删 除</el-button>-->
+<!--            </template>-->
+<!--            <template slot="menuLeft" slot-scope="{size}">-->
+<!--              <el-button type="primary"-->
+<!--                         icon="el-icon-plus"-->
+<!--                         size="small"-->
+<!--                         @click="costIncrease"-->
+<!--                         :disabled="detailData.seeDisabled"-->
+<!--              >录入明细-->
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </avue-crud>-->
+<!--        </basic-container>-->
         <containerTitle title="附件上传"></containerTitle>
         <basic-container style="margin-bottom: 40px">
           <avue-crud
@@ -370,6 +376,7 @@ import {customerList as wareHouseType} from "@/api/basicData/basicStorageType"
 import {customerList as selectWareHouse} from "@/api/basicData/basicStorageDesc"
 import {selectGoodsNum} from "@/api/basicData/inventoryAccount"
 import { contrastObj, contrastList } from "@/util/contrastData";
+import feeInfo from "@/components/fee-info/main";
 
 export default {
   name: "detailsPage",
@@ -378,6 +385,9 @@ export default {
       type: Object
     }
   },
+  components: {
+    feeInfo,
+  },
   data() {
     return {
       saveLoading: false,
@@ -1054,8 +1064,6 @@ export default {
     },
     //新增商品信息保存触发
     rowSave(row, done, loading) {
-      console.log(row)
-      console.log(this.contactsData)
       // this.contactsData.push(row)
       done()
     },

src/views/businessManagement/receipt/index.vue

@@ -23,7 +23,7 @@
                  @tree-load="treeLoad"
                  @saveColumn="saveColumn">
         <template slot="menuLeft" slot-scope="{size}">
-          <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制新单</el-button>
+          <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -1,6 +1,6 @@
 {
   "height": "auto",
-  "addBtnText": "新单",
+  "addBtnText": "创建单据",
   "lazy": true,
   "tip": false,
   "searchMenuPosition": "right",

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -23,7 +23,9 @@
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :disabled="true">请核</el-dropdown-item>
+            <el-dropdown-item :disabled="true">请核数据</el-dropdown-item>
+            <el-dropdown-item v-if="false">审核进度</el-dropdown-item>
+            <el-dropdown-item v-if="false">撤销请核</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-dropdown style="margin-right: 8px;">
@@ -36,12 +38,12 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
               :disabled="detailData.seeDisabled"
-              @click="applySettlement('收费')">生成账单
+              @click.native="applySettlement('收费')">生成账单
             </el-dropdown-item>
             <el-dropdown-item
               :disabled="detailData.seeDisabled"
-              @click="applySettlement('申请')"
-            >退款</el-dropdown-item>
+              @click.native="applySettlement('申请')"
+            >申请退款</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-dropdown style="margin-right: 8px;">
@@ -54,12 +56,12 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
               :disabled="detailData.seeDisabled"
-              @click="saveSell">生成采购单
+              @click.native="saveSell">生成采购
             </el-dropdown-item>
             <el-dropdown-item
               :disabled="detailData.seeDisabled || !this.form.id"
-              @click="copyOrder"
-            >复制新单</el-dropdown-item>
+              @click.native="copyOrder"
+            >复制单据</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button
@@ -69,7 +71,7 @@
           :loading="saveLoading"
           size="small"
           @click="editCustomer(false)"
-        >{{ form.id ? '确认修改' : '确认新增' }}
+        >保 存
         </el-button>
       </div>
     </div>
@@ -130,6 +132,12 @@
                 <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
+                <el-select v-else-if="item.prop === 'arrivalAddress'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled" allow-create default-first-option>
+                  <el-option v-for="(item,index) in arrivalOptions" :key="index" :label="item.label" :value="item.label"></el-option>
+                </el-select>
+                <el-select v-else-if="item.prop === 'shippingAddress'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled" allow-create default-first-option>
+                  <el-option v-for="(item,index) in shippingOptions" :key="index" :label="item.label" :value="item.label"></el-option>
+                </el-select>
                 <el-select v-else-if="item.prop === 'banks'"
                            v-model="form[item.prop]" placeholder="请选择"
                            clearable
@@ -167,12 +175,28 @@
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 :disabled="detailData.seeDisabled"/>
                 <el-input
-                  v-else-if="(item.prop === 'advancePayment') || (item.prop === 'orderAmount') || (item.prop === 'settlmentAmount') || (item.prop === 'overPayment')"
+                  v-else-if="(item.prop === 'advancePayment') || (item.prop === 'orderAmount') || (item.prop === 'settlmentAmount')"
                   v-model.trim="form[item.prop]" size="small" autocomplete="off"
                   @change="computedCost"
                   :disabled="detailData.seeDisabled"
                   v-input-limit="2"
                 ></el-input>
+                <span v-else-if="item.prop === 'overPayment'">
+                  <el-input
+                    v-model="form['overPayment']"
+                    size="small"
+                    autocomplete="off"
+                    @change="computedCost"
+                    :disabled="detailData.seeDisabled"
+                    style="width: 50%"
+                    v-input-limit="2"></el-input>
+                   <el-input
+                     v-model="form['abc']"
+                     size="small"
+                     autocomplete="off"
+                     disabled
+                     style="width: 50%"></el-input>
+                </span>
                 <el-select v-else-if="item.prop === 'orderStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
@@ -364,69 +388,75 @@
             </template>
           </avue-crud>
         </basic-container>
-        <containerTitle title="费用明细"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
-          <avue-crud
-              :option="advantageProject"
-              v-model="advantageProjectForm"
-              :data="advantageProjectData"
-              ref="crudProject"
-              @row-save="rowSaveProject"
-              @row-update="rowUpdateProject"
-              @row-del="rowDelProject"
-              @saveColumn="saveColumn('fees')"
-          >
-            <template slot="code" slot-scope="{row,index}">
-              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
-              <span>{{ row.code }}</span>
-            </template>
-            <template slot="corpId" slot-scope="{ row }">
-              <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
-                               :configuration="configuration" @receiveList="receiveList"/>
-              <span v-else>
-                <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>
-              </span>
-            </template>
-            <template slot="amount" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit" v-model.trim="row.amount"
-                        size="small" v-input-limit="2"
-              ></el-input>
-              <span v-else>{{ row.amount }}</span>
-            </template>
-            <template slot="settlmentAmount" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"
-                        size="small" v-input-limit="2"
-              ></el-input>
-              <span v-else>{{ row.settlmentAmount }}</span>
-            </template>
-            <template slot-scope="{row,index}" slot="menu">
-              <el-button
-                  type="text"
-                  size="small"
-                  @click="rowCellTwo(row,index)"
-                  :disabled="detailData.seeDisabled"
-              >{{ row.$cellEdit ? '保 存' : '修 改 ' }}
-              </el-button>
-              <el-button
-                size="small"
-                icon="el-icon-delete"
-                type="text"
-                @click="rowDelProject(row, index)"
-                :disabled="detailData.seeDisabled"
-                v-if="!row.$cellEdit"
-              >删 除</el-button>
-            </template>
-            <template slot="menuLeft" slot-scope="{size}">
-              <el-button type="primary"
-                         icon="el-icon-plus"
-                         size="small"
-                         @click="costIncrease"
-                         :disabled="detailData.seeDisabled"
-              >录入明细
-              </el-button>
-            </template>
-          </avue-crud>
-        </basic-container>
+        <fee-info
+          ref="feeInfo"
+          :orderFeesList="advantageProjectData"
+          :disabled="detailData.seeDisabled"
+          feeUrl="/blade-purchase-sales/orderfees/update"
+        />
+<!--        <containerTitle title="费用明细"></containerTitle>-->
+<!--        <basic-container style="margin-bottom: 10px">-->
+<!--          <avue-crud-->
+<!--              :option="advantageProject"-->
+<!--              v-model="advantageProjectForm"-->
+<!--              :data="advantageProjectData"-->
+<!--              ref="crudProject"-->
+<!--              @row-save="rowSaveProject"-->
+<!--              @row-update="rowUpdateProject"-->
+<!--              @row-del="rowDelProject"-->
+<!--              @saveColumn="saveColumn('fees')"-->
+<!--          >-->
+<!--            <template slot="code" slot-scope="{row,index}">-->
+<!--              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>-->
+<!--              <span>{{ row.code }}</span>-->
+<!--            </template>-->
+<!--            <template slot="corpId" slot-scope="{ row }">-->
+<!--              <selectComponent v-if="row.$cellEdit" v-model="row.corpId"-->
+<!--                               :configuration="configuration" @receiveList="receiveList"/>-->
+<!--              <span v-else>-->
+<!--                <span v-for="item in configuration.dicData" v-if="item.id == row.corpId">{{ item.cname }}</span>-->
+<!--              </span>-->
+<!--            </template>-->
+<!--            <template slot="amount" slot-scope="{ row }">-->
+<!--              <el-input v-if="row.$cellEdit" v-model.trim="row.amount"-->
+<!--                        size="small" v-input-limit="2"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.amount }}</span>-->
+<!--            </template>-->
+<!--            <template slot="settlmentAmount" slot-scope="{ row }">-->
+<!--              <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"-->
+<!--                        size="small" v-input-limit="2"-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.settlmentAmount }}</span>-->
+<!--            </template>-->
+<!--            <template slot-scope="{row,index}" slot="menu">-->
+<!--              <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  @click="rowCellTwo(row,index)"-->
+<!--                  :disabled="detailData.seeDisabled"-->
+<!--              >{{ row.$cellEdit ? '保 存' : '修 改 ' }}-->
+<!--              </el-button>-->
+<!--              <el-button-->
+<!--                size="small"-->
+<!--                icon="el-icon-delete"-->
+<!--                type="text"-->
+<!--                @click="rowDelProject(row, index)"-->
+<!--                :disabled="detailData.seeDisabled"-->
+<!--                v-if="!row.$cellEdit"-->
+<!--              >删 除</el-button>-->
+<!--            </template>-->
+<!--            <template slot="menuLeft" slot-scope="{size}">-->
+<!--              <el-button type="primary"-->
+<!--                         icon="el-icon-plus"-->
+<!--                         size="small"-->
+<!--                         @click="costIncrease"-->
+<!--                         :disabled="detailData.seeDisabled"-->
+<!--              >录入明细-->
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </avue-crud>-->
+<!--        </basic-container>-->
         <containerTitle title="附件上传"></containerTitle>
         <basic-container style="margin-bottom: 40px">
           <avue-crud
@@ -698,6 +728,8 @@ import ApplyPayment from "../../../components/finance/applyPayment";
 import reportDialog from "@/components/report-dialog/main";
 import { getToken } from "@/util/auth";
 import Cookies from 'js-cookie'
+import feeInfo from "@/components/fee-info/main";
+import {corpsAddrSelect}  from "@/api/basicData/customerInformation";
 
 export default {
   name: "detailsPage",
@@ -710,6 +742,7 @@ export default {
     customerDialog,
     ApplyPayment,
     reportDialog,
+    feeInfo,
   },
   data() {
     return {
@@ -1338,6 +1371,8 @@ export default {
       giftData: [],
       // 商品信息展示数据
       goodsShowData: [],
+      arrivalOptions: [],
+      shippingOptions: [],
     }
   },
   mounted() {
@@ -1512,6 +1547,7 @@ export default {
     },
     getcorpId(row) {
       this.contactsData[row.index].corpId = row.id;
+      this.contactsData[row.index].corpName = row.cname;
     },
     // 采购金额获取
     getPurchasePrice(row) {
@@ -1799,13 +1835,46 @@ export default {
       this.goodsConfiguration.dicData = this.goodsConfiguration.dicData.concat(data)
       this.removeGoodsRepeat()
     },
-    getCorpRow(data) {
+    async getCorpRow(data) {
+      this.arrivalOptions = [];
+      this.arrivalOptions = await this.corpAddr(data.id)
       this.$set(this.form, 'paymentType', data.paymentType)
       this.$set(this.form, 'packageRemarks', data.packageRemarks)
-      this.$set(this.form, 'arrivalAddress', data.storageAddr)
+      if (this.arrivalOptions.length > 0) {
+        this.$set(this.form, 'arrivalAddress', this.arrivalOptions[0].label)
+      } else {
+        this.$set(this.form, 'arrivalAddress', null)
+      }
+      // if (data.storageAddr) {
+      //   this.arrivalOptions.push({
+      //     label: data.storageAddr
+      //   })
+      // }
+      // corpsAddrSelect({pid: data.id}).then(res => {
+      //   if (res.data.data.records.length > 0) {
+      //     res.data.data.records.forEach(item => {
+      //       this.arrivalOptions.push({
+      //         label: item.addr
+      //       })
+      //     })
+      //   }
+      //   this.$set(this.form, 'paymentType', data.paymentType)
+      //   this.$set(this.form, 'packageRemarks', data.packageRemarks)
+      //   if (this.arrivalOptions.length > 0) {
+      //     this.$set(this.form, 'arrivalAddress', this.arrivalOptions[0].label)
+      //   } else {
+      //     this.$set(this.form, 'arrivalAddress', null)
+      //   }
+      // })
     },
-    getPlantRow(data) {
-      this.$set(this.form, 'shippingAddress', data.storageAddr)
+    async getPlantRow(data) {
+      this.shippingOptions = [];
+      this.shippingOptions = await this.corpAddr(data.id)
+      if (this.shippingOptions.length > 0) {
+        this.$set(this.form, 'shippingAddress', this.shippingOptions[0].label)
+      } else {
+        this.$set(this.form, 'shippingAddress', null)
+      }
     },
     getRow(event,row) {
       row.priceCategory = event[0].goodsTypeName
@@ -1856,7 +1925,6 @@ export default {
       // this.advantageProjectForm = this.advantageProjectForm.concat(this.tableDataCost)
       if (this.tableDataCost.length > 0) {
         for (let item in this.tableDataCost) {
-          console.log(this.tableDataCost[item])
           this.tableDataCost[item].itemId = this.tableDataCost[item].id
           this.tableDataCost[item].feeName = this.tableDataCost[item].cname
           this.$set(this.tableDataCost[item], 'amount', 0)

src/views/businessManagement/salesOrder/index.vue

@@ -25,6 +25,7 @@
                  :cell-style="tableRowClassName"
                  :table-loading="loading"
                  @expand-change="expandChange"
+                 @resetColumn="resetColumn"
       >
         <template slot-scope="scope" slot="expand">
           <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
@@ -58,7 +59,7 @@
           {{ scope.row.createUserName }}
         </template>
         <template slot="menuLeft" slot-scope="{size}">
-          <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制新单</el-button>
+          <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
         </template>
         <template slot-scope="scope" slot="menu">
@@ -237,23 +238,6 @@ export default {
         done()
       })
     },
-    //列保存触发
-    async saveColumn() {
-      /**
-       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
-       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
-       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
-       */
-      const inSave = await this.saveColumnData(
-        this.getColumnName(14),
-        this.option
-      );
-      if (inSave) {
-        this.$message.success("保存成功");
-        //关闭窗口
-        this.$refs.crud.$refs.dialogColumn.columnBox = false;
-      }
-    },
     //查询全部
     initData() {
       customerList().then(res => {
@@ -372,16 +356,11 @@ export default {
     onLoad(page, params) {
       if (this.search.businesDate && this.search.businesDate.length > 0) {
         params = {
-          // ...this.search,
           ...params,
           orderStartDate: this.search.businesDate[0]+ " " + "00:00:00",
           orderEndDate: this.search.businesDate[1]+ " " + "23:59:59",
         }
-        // delete params.businesDate;
-        // delete params.actualDeliveryDate;
-        // delete params.requiredDeliveryDate;
-        // delete params.requiredArrivalDate;
-        // delete params.createTime;
+        delete params.businesDate;
       }
 
       let queryParams = Object.assign({}, params, {
@@ -411,18 +390,21 @@ export default {
     },
     goBack() {
       this.detailData=this.$options.data().detailData
+      this.dataList.forEach(item => {
+        this.$refs.crud.toggleRowExpansion(item, false)
+      })
       this.isShow = true;
       this.gobackSearch(this.search)
     },
     gobackSearch(params) {
       let data = {};
       data = Object.assign({}, params)
-      console.log(data.businesDate)
-      if (data.businesDate && data.businessDate != '') {
-        data.orderStartDate = data.businesDate[0]+ " " + "00:00:00"
-        data.orderEndDate = data.businesDate[1]+ " " + "23:59:59"
-        delete data.businesDate;
-      }
+      // console.log(data.businesDate)
+      // if (data.businesDate && data.businessDate != '') {
+      //   data.orderStartDate = data.businesDate[0]+ " " + "00:00:00"
+      //   data.orderEndDate = data.businesDate[1]+ " " + "23:59:59"
+      //   delete data.businesDate;
+      // }
       if (data.requiredDeliveryDate && data.requiredDeliveryDate != '') {
         data.deliveryStartDate = data.requiredDeliveryDate[0]+ " " + "00:00:00"
         data.deliveryEndDate = data.requiredDeliveryDate[1]+ " " + "23:59:59"
@@ -446,6 +428,35 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page, data);
     },
+    //列保存触发
+    async saveColumn() {
+      /**
+       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(
+        this.getColumnName(14),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      const inSave = await this.delColumnData(
+        this.getColumnName(14),
+        option
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.option = option;
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
   }
 }
 </script>

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -62,16 +62,9 @@
     },
     {
       "label": "配件信息",
-      "prop": "partsList",
-      "index": 8,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "配件描述",
       "prop": "partsDescribe",
-      "index": 9,
-      "width": 120,
+      "index": 8,
+      "width": 200,
       "overHidden": true
     },
     {
@@ -174,9 +167,16 @@
       "overHidden": true
     },
     {
+      "label": "单品毛利率",
+      "prop": "itemMargin",
+      "index": 23,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "税率",
       "prop": "taxRate",
-      "index": 23,
+      "index": 24,
       "width": 100,
       "overHidden": true
     },

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -180,6 +180,7 @@
           @row-del="rowDel"
           :summary-method="summaryMethod"
           @saveColumn="saveColumn"
+          @resetColumn="resetColumn"
           :cell-style="cellStyle"
         >
           <template slot="menuLeft">
@@ -302,14 +303,21 @@
 
             <span v-else> {{ row.cname }}</span>
           </template>
-          <template slot="partsList" slot-scope="{ row, index }">
-            <el-button
-              size="small"
-              type="text"
-              @click="partrePick(row, index)"
-              :disabled="disabled"
-              >操作</el-button
-            >
+          <template slot="partsDescribe" slot-scope="{ row, index }">
+            <span v-if="row.$cellEdit" style="display:flex">
+              <el-input
+                v-model="row.partsDescribe"
+                :readonly="true"
+                size="small"
+                placeholder="请点击右边按钮"
+              ></el-input>
+              <el-button
+                icon="el-icon-edit"
+                size="mini"
+                @click="partrePick(row, index)"
+              ></el-button>
+            </span>
+            <span v-else>{{ row.partsDescribe }}</span>
           </template>
           <template slot="priorityReferrer" slot-scope="{ row }">
             <el-checkbox
@@ -1519,6 +1527,20 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    async resetColumn() {
+      this.tableOption = tableOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(5),
+        tableOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
+    },
     async saveGoodsColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(26),

src/views/exportTrade/salesContract/config/customerContact.json

@@ -64,50 +64,43 @@
     },
     {
       "label": "配件信息",
-      "prop": "partsList",
+      "prop": "partsDescribe",
       "index": 8,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "配件描述",
-      "prop": "partsDescribe",
-      "index": 9,
-      "width": 120,
-      "overHidden": true
-    },
-    {
       "label": "配件价格",
       "prop": "partsPrice",
-      "index": 10,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "配件价格描述",
       "prop": "partsPriceDescribe",
-      "index": 11,
+      "index": 10,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "供应商",
       "prop": "corpId",
-      "index": 12,
+      "index": 11,
       "width": 200,
       "overHidden": true
     },
     {
       "label": "重点推荐",
       "prop": "priorityReferrer",
-      "index": 13,
+      "index": 12,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "推荐理由",
       "prop": "referrerReason",
-      "index": 14,
+      "index": 13,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -115,14 +108,14 @@
     {
       "label": "销售价",
       "prop": "price",
-      "index": 15,
+      "index": 14,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 16,
+      "index": 15,
       "width": 100,
       "overHidden": true,
       "cell": true,
@@ -136,56 +129,56 @@
     {
       "label": "数量",
       "prop": "orderQuantity",
-      "index": 17,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "发货数量",
       "prop": "actualQuantity",
-      "index": 18,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "保险",
       "prop": "insurance",
-      "index": 19,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "运费",
       "prop": "freight",
-      "index": 20,
+      "index": 19,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "折扣",
       "prop": "discount",
-      "index": 21,
+      "index": 20,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "金额",
       "prop": "amount",
-      "index": 22,
+      "index": 21,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
-      "index": 23,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 24,
+      "index": 23,
       "width": 100,
       "overHidden": true,
       "cell": true

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1623,15 +1623,14 @@ export default {
       }
     },
     async resetColumn() {
+      this.tableOption = tableOption;
       const inSave = await this.delColumnData(
         this.getColumnName(5),
         tableOption
       );
       if (inSave) {
         this.$message.success("重置成功");
-        this.tableOption = tableOption;
-        //关闭窗口
-        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+       this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
     summaryMethod({ columns, data }) {

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/maintenance/integral/config/mainList.json

@@ -26,7 +26,7 @@
       "searchSpan": 8
     },{
       "label": "积分",
-      "prop": "a",
+      "prop": "inPoints",
       "search": false,
       "index": 2,
       "minWidth": 80,
@@ -34,7 +34,7 @@
       "searchSpan": 8
     },{
       "label": "兑换",
-      "prop": "b",
+      "prop": "outPoints",
       "search": false,
       "index": 3,
       "minWidth": 80,
@@ -42,7 +42,7 @@
       "searchSpan": 8
     },{
       "label": "积分余额",
-      "prop": "c",
+      "prop": "balancePoints",
       "search": false,
       "index": 4,
       "minWidth": 80,

src/views/maintenance/integral/index.vue

@@ -15,13 +15,24 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
-      ></avue-crud>
+      >
+        <template slot="corpIdSearch">
+          <crop-select
+            v-model="search.corpId"
+            corpType="KH"
+          ></crop-select>
+        </template>
+        <template slot-scope="scope" slot="corpId">
+          {{ scope.row.corpName }}
+        </template>
+      </avue-crud>
     </basic-container>
   </div>
 </template>
 
 <script>
-import option from './config/mainList.json'
+import option from './config/mainList.json';
+import {getList} from '@/api/maintenance/integral';
 
 export default {
   name: "index",
@@ -53,6 +64,7 @@ export default {
   },
   methods: {
     searchChange(params, done) {
+      this.onLoad(this.page, params);
       done();
     },
     currentChange(val) {
@@ -65,7 +77,20 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search);
     },
-    onLoad(page, params) {},
+    onLoad(page, params) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, params)
+        .then(res => {
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
+          if (this.page.total) {
+            this.option.height = window.innerHeight - 260;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     async saveColumn() {},
   },
 }

src/views/maintenance/overpayment/config/mainList.json

@@ -26,7 +26,7 @@
       "searchSpan": 8
     },{
       "label": "增加",
-      "prop": "a",
+      "prop": "inOverpayment",
       "search": false,
       "index": 2,
       "minWidth": 80,
@@ -34,7 +34,7 @@
       "searchSpan": 8
     },{
       "label": "使用",
-      "prop": "b",
+      "prop": "outOverpaymen",
       "search": false,
       "index": 3,
       "minWidth": 80,
@@ -42,7 +42,7 @@
       "searchSpan": 8
     },{
       "label": "余额",
-      "prop": "c",
+      "prop": "balanceOverpaymen",
       "search": false,
       "index": 4,
       "minWidth": 80,

src/views/maintenance/overpayment/index.vue

@@ -15,13 +15,24 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
-      ></avue-crud>
+      >
+        <template slot="corpIdSearch">
+          <crop-select
+            v-model="search.corpId"
+            corpType="KH"
+          ></crop-select>
+        </template>
+        <template slot-scope="scope" slot="corpId">
+          {{ scope.row.corpName }}
+        </template>
+      </avue-crud>
     </basic-container>
   </div>
 </template>
 
 <script>
 import option from './config/mainList.json';
+import {getList} from '@/api/maintenance/overpayment';
 
 export default {
   name: "index",
@@ -53,6 +64,7 @@ export default {
   },
   methods: {
     searchChange(params, done) {
+      this.onLoad(this.page, params);
       done();
     },
     currentChange(val) {
@@ -65,7 +77,20 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search);
     },
-    onLoad(page, params) {},
+    onLoad(page, params) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, params)
+        .then(res => {
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
+          if (this.page.total) {
+            this.option.height = window.innerHeight - 260;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     async saveColumn() {},
   },
 }

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>