进口

src/api/approval/processConfig.js

@@ -20,7 +20,9 @@ export function removeList(data) {
   return request({
     url: '/api/blade-check/auditpaths/remove',
     method: 'post',
-    data: data,
+    params: {
+      ids:data
+    },
   })
 }
 // 查看详情

src/components/finance/applyPayment.vue

@@ -351,7 +351,7 @@ export default {
               itemsList: itemsList
             }
             // 采购申请货款   销售申请退款 都会走申请 走审核   => 付款申请
-            if(this.billType === "采购申请货款" || this.billType === "销售申请退款" ){
+            if(this.billType === "申请"){
               applyLoan(params).then(res =>{
                 if(res.data.success){
                   this.$message.success("操作成功!")
@@ -376,7 +376,7 @@ export default {
               })
             }
             //采购退款结算 销售收款结算  不需申请请核 直接结算  => 结算
-            if(this.billType === "采购退款" || this.billType === "销售收款"){
+            if(this.billType === "收费"){
               paymentApply(params).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")

src/views/approval/businessApproval/config/mainList.json

@@ -0,0 +1,42 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 24,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "addBtn": false,
+  "align": "center",
+  "menuWidth": "120",
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "searchLabelWidth": 120,
+  "searchSpan": 8,
+  "searchMenuPosition": "right",
+  "column": [
+    {
+      "label": "活动名",
+      "prop": "pathName",
+      "search": true,
+      "index": 1,
+      "width": 220,
+      "overHidden": true
+    },
+    {
+      "label": "审核条件",
+      "prop": "opUserName",
+      "index": 2,
+      "width": 220,
+      "overHidden": true
+    },
+    {
+      "label": "审核路径",
+      "prop": "opDate",
+      "index": 3,
+      "width": 300,
+      "overHidden": true
+    }
+  ]
+}

src/views/approval/businessApproval/index.vue

@@ -0,0 +1,115 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :data="dataList"
+               ref="crud"
+               v-model="form"
+               :page.sync="page"
+               :search.sync="search"
+               :table-loading="loading"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot-scope="scope" slot="menu">
+        <el-button
+          type="text"
+          icon="el-icon-edit"
+          size="small"
+          @click.stop="editOpen(scope.row)"
+        >编辑
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import option from "./config/mainList.json";
+
+  export default {
+    data() {
+      return {
+        loading : false,
+        form: {},
+        search:{},
+        show:true,
+        detailData:{},
+        option: option,
+        parentId:0,
+        dataList: [],
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+        query:{},
+      }
+    },
+    created() {
+
+    },
+    mounted() {
+    },
+
+    methods: {
+      //新单打开
+      addReceipt(row){
+
+      },
+      //编辑打开
+      editOpen(row, status){
+
+      },
+      rowDel(row, index, done) {
+
+      },
+      //点击搜索按钮触发
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done()
+      },
+      searchReset() {
+        console.log('1')
+      },
+      selectionChange() {
+        console.log('1')
+      },
+      currentChange() {
+        console.log('1')
+      },
+      sizeChange() {
+        console.log('1')
+      },
+      refreshChange() {
+        console.log('1')
+      },
+      onLoad(page, params = {}) {
+        // this.loading = true;
+        // if (params.createTime != undefined) {  //合同
+        //   params.createStartDate = params.createTime[0]+ " " + "00:00:00";
+        //   params.createEndDate = params.createTime[1] + " " + "23:59:59";
+        //   this.$delete(params,'createTime')
+        // }
+        // getBillList(page.currentPage, page.pageSize,params).then(res=>{
+        //   this.dataList = res.data.data.records
+        //   this.page.total = res.data.data.total
+        //   this.loading = false;
+        // })
+      },
+      goBack() {
+        this.detailData=this.$options.data().detailData
+        this.show = true;
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/approval/processConfig/config/mainList.json

@@ -12,6 +12,7 @@
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,
+  "searchLabelWidth": 120,
   "searchSpan": 8,
   "searchMenuPosition": "right",
   "column": [

src/views/approval/processConfig/index.vue

@@ -130,13 +130,20 @@
           </el-select>
         </template>
         <template slot="auditUserId" slot-scope="{row,index}">
-          <el-select
+          <el-input
             v-model="row.auditUserId"
-            filterable
-            multiple
-            collapse-tags
-            placeholder="审核人"
-          ></el-select>
+          >
+          </el-input>
+<!--          <el-select-->
+<!--            v-model="row.auditUserId"-->
+<!--            filterable-->
+<!--            multiple-->
+<!--            collapse-tags-->
+<!--            placeholder="审核人"-->
+<!--          >-->
+<!--            <el-option>-->
+<!--            </el-option>-->
+<!--          </el-select>-->
         </template>
         <template slot="menuLeft">
           <el-button
@@ -236,9 +243,7 @@ export default {
     },
     // 编辑
     editOpen(row) {
-      console.log(row)
       detailData({id: row.id}).then(res => {
-        console.log(res)
         this.dataForm = res.data.data
         this.detailData = res.data.data.auditPathsLevels
       })
@@ -251,15 +256,17 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        return removeList(row.id);
-      }).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        this.page.currentPage = 1;
-        this.onLoad(this.page);
-      });
+        removeList(row.id).then(res =>{
+          if(res.data.success){
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.page.currentPage = 1;
+            this.onLoad(this.page);
+          }
+        })
+      })
     },
     //点击搜索按钮触发
     searchChange(params, done) {
@@ -317,6 +324,17 @@ export default {
           }
         }
       };
+      const params ={
+        ...this.dataForm,
+        auditPathsLevels : this.detailData
+      }
+      modify(params).then(res =>{
+        if(res.data.success){
+          this.$message.success("操作成功!")
+          this.visible = false
+          this.refreshChange()
+        }
+      })
     },
   },
 }

src/views/purchase/contract/detailsPage.vue

@@ -35,7 +35,7 @@
                    size="small"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
-                   @click.stop="applyPayment('退款')">退款
+                   @click.stop="applyPayment('收费')">退款
         </el-button>
         <el-button type="success"
                    size="small"
@@ -961,7 +961,7 @@ export default {
       }
     },
     beforeBillData(bool,type){
-      this.billType = type === "申请"?"采购申请货款":"采购退款"
+      this.billType = type
       //采购明细提单号 list
       this.billData = {
         srcOrderno:this.form.orderNo,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -19,14 +19,14 @@
                    class="el-button--small-yh"
                    :disabled="!form.id"
                    :loading="buttonLoading"
-                   @click.stop="applySettlement('账单')">生成账单
+                   @click.stop="applySettlement('收费')">生成账单
         </el-button>
         <el-button type="warning"
                    size="small"
                    class="el-button--small-yh"
                    :disabled="!form.id"
                    :loading="buttonLoading"
-                   @click.stop="applySettlement('退款')">退款
+                   @click.stop="applySettlement('申请')">退款
         </el-button>
         <el-button type="success"
                    size="small"
@@ -767,7 +767,7 @@ export default {
       }
     },
     beforeBillData(bool,type){
-      this.billType = type ==="账单"? "销售收款":"销售申请退款"
+      this.billType = type
       this.billData = {
         srcOrderno:this.form.orderNo,
         itemType:"销售",