修改bug

src/api/tirePartsMall/financingManagement/balanceRecharge.js

@@ -0,0 +1,45 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (params) => {
+  return request({
+    url: '/api/blade-sales-part/pjpfbalancereset/list',
+    method: 'get',
+    params: params
+  })
+}
+//删除
+export const remove = (data) => {
+  return request({
+    url: '/api/blade-sales-part/pjpfbalancereset/remove',
+    method: 'post',
+    params: data
+  })
+}
+export const getDetails = (data) => {
+  return request({
+    url: '/api/blade-sales-part/pjpfbalancereset/detail',
+    method: 'get',
+    params: data
+  })
+}
+export const submit = (data) => {
+  return request({
+    url: '/api/blade-sales-part/pjpfbalancereset/submit',
+    method: 'POST',
+    data: data
+  })
+}
+export const confirming = (data) => {
+    return request({
+      url: '/api/blade-sales-part/pjpfbalancereset/confirming',
+      method: 'POST',
+      data: data
+    })
+  }
+  export const revoke = (data) => {
+    return request({
+      url: '/api/blade-sales-part/pjpfbalancereset/revoke',
+      method: 'POST',
+      data: data
+    })
+  }

src/api/tirePartsMall/financingManagement/financingManagement.js

@@ -0,0 +1,31 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (params) => {
+  return request({
+    url: '/api/blade-sales-part/pjpffunding/list',
+    method: 'get',
+    params: params
+  })
+}
+//删除
+export const remove = (data) => {
+  return request({
+    url: '/api/blade-sales-part/pjpffunding/remove',
+    method: 'post',
+    params:data
+  })
+}
+export const getDetails = (data) => {
+  return request({
+    url: '/api/blade-sales-part/pjpffunding/detail',
+    method: 'get',
+    params: data
+  })
+}
+export const submit = (data) => {
+  return request({
+    url: '/api/blade-sales-part/pjpffunding/submit',
+    method: 'POST',
+    data: data
+  })
+}

src/components/bill/selectOrderDetailList.vue

@@ -8,10 +8,24 @@
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
       </template>
       <template slot="menuLeft">
-        <el-tabs v-model="activeName" @tab-click="tabHandle">
-          <el-tab-pane label="查询结果" name="searchList"></el-tab-pane>
-          <el-tab-pane label="已选定数据" name="importStaging"></el-tab-pane>
-        </el-tabs>
+        <div style="display: flex;">
+          <el-tabs v-model="activeName" @tab-click="tabHandle">
+            <el-tab-pane label="查询结果" name="searchList"></el-tab-pane>
+            <el-tab-pane label="已选定数据" name="importStaging"></el-tab-pane>
+          </el-tabs>
+          <el-form ref="form" :model="form" label-width="80px" style="display: flex;">
+            <el-form-item label="数量">
+              <el-input v-model="form.Num1" disabled size="mini"></el-input>
+            </el-form-item>
+            <el-form-item label="金额">
+              <el-input v-model="form.Num2" disabled size="mini"></el-input>
+            </el-form-item>
+            <el-form-item label="余额">
+              <el-input v-model="form.Num3" disabled size="mini"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button type="text" icon="el-icon-edit" size="small" @click.stop="importStagList(scope.row, scope.index)"
@@ -56,6 +70,11 @@ export default {
   },
   data() {
     return {
+      form: {
+        Num1: 0,
+        Num2: 0,
+        Num3: 0,
+      },
       activeName: "searchList",
       option: option,
       loading: false,
@@ -138,6 +157,16 @@ export default {
     selectionChange(row) {
       // this.selectList = row
       this.goodsListSave = row
+      this.form = {
+        Num1: 0,
+        Num2: 0,
+        Num3: 0,
+      }
+      row.forEach(e => {
+        this.form.Num1 += (Number(e.goodsTotalNum) - Number(e.returnsNumber))
+        this.form.Num2 += (Number(e.totalMoney) - Number(e.returnsAmount))
+        this.form.Num3 += (Number(e.balanceAmount) - Number(e.returnsBalanceAmount))
+      })
     },
     summaryMethod({ columns, data }) {
       const sums = [];

src/components/bill/selectOrderDetailListCG.vue

@@ -8,10 +8,23 @@
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
       </template>
       <template slot="menuLeft">
-        <el-tabs v-model="activeName" @tab-click="tabHandle">
-          <el-tab-pane label="查询结果" name="searchList"></el-tab-pane>
-          <el-tab-pane label="已选定数据" name="importStaging"></el-tab-pane>
-        </el-tabs>
+        <div style="display: flex;">
+          <el-tabs v-model="activeName" @tab-click="tabHandle">
+            <el-tab-pane label="查询结果" name="searchList"></el-tab-pane>
+            <el-tab-pane label="已选定数据" name="importStaging"></el-tab-pane>
+          </el-tabs>
+          <el-form ref="form" :model="form" label-width="80px" style="display: flex;">
+            <el-form-item label="数量">
+              <el-input v-model="form.Num1" disabled size="mini"></el-input>
+            </el-form-item>
+            <el-form-item label="金额">
+              <el-input v-model="form.Num2" disabled size="mini"></el-input>
+            </el-form-item>
+            <el-form-item label="余额">
+              <el-input v-model="form.Num3" disabled size="mini"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button type="text" icon="el-icon-edit" size="small" @click.stop="importStagList(scope.row, scope.index)"
@@ -56,6 +69,11 @@ export default {
   },
   data() {
     return {
+      form: {
+        Num1: 0,
+        Num2: 0,
+        Num3: 0,
+      },
       activeName: "searchList",
       option: optionCG,
       loading: false,
@@ -139,19 +157,29 @@ export default {
     selectionChange(row) {
       // this.selectList = row
       this.goodsListSave = row
+      this.form = {
+        Num1: 0,
+        Num2: 0,
+        Num3: 0,
+      }
+      row.forEach(e => {
+        this.form.Num1 += (Number(e.goodsTotalNum) - Number(e.returnsNumber))
+        this.form.Num2 += (Number(e.totalMoney) - Number(e.returnsAmount))
+        this.form.Num3 += (Number(e.balanceAmount) - Number(e.returnsBalanceAmount))
+      })
     },
     summaryMethod({ columns, data }) {
       const sums = [];
       if (columns.length > 0) {
         columns.forEach((column, index) => {
           let prop = column.property
-          if (['goodsTotalNum', 'totalMoney', 'returnsNumber', 'returnsAmount','balanceAmount','returnsBalanceAmount'].includes(prop)) {
+          if (['goodsTotalNum', 'totalMoney', 'returnsNumber', 'returnsAmount', 'balanceAmount', 'returnsBalanceAmount'].includes(prop)) {
             if (this.goodsListSave.length > 0) {
               let values = this.goodsListSave.map(item => Number(item[prop] || 0));
               let all = values.length !== 0 ? sums[index] = values.reduce((a, b) => {
                 return a + b;
               }) : 0
-              if (prop == 'goodsTotalNum' || prop == 'totalMoney' || prop == 'returnsNumber' || prop == 'returnsAmount'|| prop == 'balanceAmount'||prop =='returnsBalanceAmount') {
+              if (prop == 'goodsTotalNum' || prop == 'totalMoney' || prop == 'returnsNumber' || prop == 'returnsAmount' || prop == 'balanceAmount' || prop == 'returnsBalanceAmount') {
                 sums[index] = all
               }
             } else {
@@ -159,7 +187,7 @@ export default {
               let all = values.length !== 0 ? sums[index] = values.reduce((a, b) => {
                 return a + b;
               }) : 0
-              if (prop == 'goodsTotalNum' || prop == 'totalMoney' || prop == 'returnsNumber' || prop == 'returnsAmount'|| prop == 'balanceAmount'||prop =='returnsBalanceAmount') {
+              if (prop == 'goodsTotalNum' || prop == 'totalMoney' || prop == 'returnsNumber' || prop == 'returnsAmount' || prop == 'balanceAmount' || prop == 'returnsBalanceAmount') {
                 sums[index] = all
               }
             }
@@ -177,9 +205,9 @@ export default {
       this.page.pageSize = pageSize;
     },
     onLoad(page, params) {
-      params= {
-          ...this.params,
-          ...params,
+      params = {
+        ...this.params,
+        ...params,
       }
       if (params && params.rentStartDate) {
         params.createStartDate = params.rentStartDate[0] + " " + "00:00:00" ? params.rentStartDate[0] + " " + "00:00:00" : '';
@@ -188,9 +216,9 @@ export default {
       }
       this.loading = true;
       // 把老数据进行更新  从父组件调用的子组件方法
-       if (params.customerId != this.params.customerId) {
-          this.params = params
-        }
+      if (params.customerId != this.params.customerId) {
+        this.params = params
+      }
       // params = {
       //   // ...params,
       //     ...page,

src/enums/column-name.js

@@ -1829,6 +1829,24 @@ const columnName = [{
   },{
     code: 400,
     name: '财务管理(F)-预付款管理(T)-明细'
+  },{
+    code: 401,
+    name: '融资采购(L)-列表页'
+  },{
+    code: 402,
+    name: '融资采购(L)-明细'
+  },{
+    code: 403,
+    name: '融资管理(L)-列表页'
+  },{
+    code: 404,
+    name: '融资管理(L)-明细'
+  },{
+    code: 405,
+    name: '余额充值(L)-列表页'
+  },{
+    code: 406,
+    name: '余额充值(L)-明细'
   },
 ]
 export const getColumnName = (key) => {

src/lang/en.js

@@ -63,7 +63,8 @@ export default {
     top: 'backtop',
     data: 'data',
     error: 'error',
-    test: 'test'
+    test: 'test',
+    saleOrderL:'saleOrder(L)'
   },
   login: {
     title: 'Login ',

src/lang/zh.js

@@ -63,7 +63,8 @@ export default {
     data: '数据展示',
     permission: '权限',
     error: '异常页面',
-    test: '测试页面'
+    test: '测试页面',
+    saleOrderL: '销售订单(L)'
   },
   login: {
     title: '登录 ',

src/page/index/tags.vue

@@ -477,6 +477,12 @@ export default {
         if (tag.label == "货款付费(T)") {
           this.$store.commit("OUT_EXPUR_DETAIL")
         }
+        if (tag.label == "余额充值(L)") {
+          this.$store.commit("OUT_BALANCE_DETAIL")
+        }
+        if (tag.label == "融资采购(L)") {
+          this.$store.commit("OUT_FINACING_DETAIL")
+        }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {
           tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个

src/router/views/index.js

@@ -2622,7 +2622,7 @@ export default [{
     path: '/tirePartsMall/salesManagement/saleOrder/index',
     name: '销售订单(L)',
     meta: {
-      i18n: '/tirePartsMall/salesManagement/saleOrder/index',
+      i18n: 'saleOrderL',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/salesManagement/saleOrder/index')
@@ -3717,7 +3717,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/financingManagement/balanceRecharge/index',
-    name: '融资管理(L)',
+    name: '余额充值(L)',
     meta: {
       i18n: '/tirePartsMall/financingManagement/balanceRecharge/index',
       keepAlive: true,

src/store/getters.js

@@ -90,6 +90,8 @@ const getters = {
   subLedgerStatus:state => state.ifdetail.subLedgerStatus,//明细账
   oceanFreightStatus:state => state.ifdetail.oceanFreightStatus,//海运进口(T)
   firstSetStatus:state => state.ifdetail.firstSetStatus,//货款收费(T)
-  exchangePurStatus:state => state.ifdetail.exchangePurStatus//货款付费(T)
+  exchangePurStatus:state => state.ifdetail.exchangePurStatus,//货款付费(T)
+  balanceStatus:state => state.ifdetail.balanceStatus,//余额充值(T)
+  financingStatus:state => state.ifdetail.financingStatus//融资采购(L)
 }
 export default getters

src/store/modules/ifdetail.js

@@ -68,9 +68,27 @@ const ifdetail = {
     oceanFreightStatus: false,//海运进口(T)
     firstSetStatus: false,//货款收费(T)
     exchangePurStatus: false,//货款付费(T)
+    balanceStatus: false,
+    financingStatus: false,//融资采购(L)
   },
   actions: {},
   mutations: {
+    //开启融资采购(L)
+    IN_FINACING_DETAIL(state) {
+      state.financingStatus = true
+    },
+    //关闭融资采购(L)
+    OUT_FINACING_DETAIL(state) {
+      state.financingStatus = false
+    },
+    //开启余额充值(T)
+    IN_BALANCE_DETAIL(state) {
+      state.balanceStatus = true
+    },
+    //关闭余额充值(T)
+    OUT_BALANCE_DETAIL(state) {
+      state.balanceStatus = false
+    },
     //开启货款收费(T)
     IN_FIRSTSET_DETAIL(state) {
       state.firstSetStatus = true
@@ -751,6 +769,12 @@ const ifdetail = {
       if (tag.label == '货款付费(T)') {
         state.exchangePurStatus = true
       }
+      if (tag.label == '余额充值(L)') {
+        state.balanceStatus = true
+      }
+      if (tag.label == '融资采购(L)') {
+        state.financingStatus = true
+      }
     }
   }
 

src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -386,7 +386,7 @@ export default {
         },
         //导出
         outExport() {
-            let config = { params: { bsType: 'CG,TKCG', ...this.query } }
+            let config = { params: { ...this.query } }
             if (config.params) {
                 for (const propName of Object.keys(config.params)) {
                     const value = config.params[propName];
@@ -405,7 +405,6 @@ export default {
                 path: '/api/blade-sales-part/statistics/saleDetailExport',   //跳转目标窗口的地址
                 query: {
                     ...config.params,    //括号内是要传递给新窗口的参数
-                    bsType: 'CG,TKCG',
                 }
             })
             window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -372,7 +372,8 @@ export default {
         },
         //导出
         outExport() {
-            let config = { params: { bsType: 'XS,TKXS', ...this.query } }
+            console.log(this.query)
+            let config = { params: { ...this.query } }
             if (config.params) {
                 for (const propName of Object.keys(config.params)) {
                     const value = config.params[propName];
@@ -391,7 +392,6 @@ export default {
                 path: '/api/blade-sales-part/statistics/saleDetailExport',   //跳转目标窗口的地址
                 query: {
                     ...config.params,    //括号内是要传递给新窗口的参数
-                    bsType: 'XS,TKXS',
                 }
             })
             window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
@@ -455,7 +455,6 @@ export default {
             let queryParams = {
                 size: page.pageSize,
                 current: page.currentPage,
-                bsType: 'XS,TKXS',
                 ...Object.assign(params, this.query)
             }
             statisticsSaleDetail(queryParams).then(res => {

src/views/tirePartsMall/financingManagement/balanceRecharge/index.vue

@@ -4,29 +4,20 @@
       <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
         ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
         @expand-change="expandChange" @refresh-change="refreshChange"
-        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 342)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 342)" :page.sync="page">
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 405)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 405)" :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
-          <el-button :size="size" :type="type" :disabled="row.status != '录入' || row.numberRows != 0"
-            @click="$refs.crud.rowDel(row, index)">删除</el-button>
-        </template>
-        <template slot="corpNameSearch">
-          <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
-        </template>
-        <template slot="notCompleteSearch">
-          <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
+          <el-button :size="size" :type="type" @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
-          <!-- <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button> -->
-          <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
+          <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建</el-button>
         </template>
-        <template slot-scope="{ row, index }" slot="ordNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
+        <template slot-scope="{ row, index }" slot="confirmingPersonName">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.confirmingPersonName }}
           </span>
         </template>
-        <template slot-scope="{ row, index }" slot="srcOrdNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
+        <template slot-scope="{ row, index }" slot="sysNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.sysNo }}
           </span>
         </template>
       </avue-crud>
@@ -37,7 +28,7 @@
 </template>
 
 <script>
-import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesService/saleOrder";
+import { getList, remove } from "@/api/tirePartsMall/financingManagement/balanceRecharge";
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesService/saleOrder";
 import { getToken } from "@/util/auth";
@@ -50,8 +41,6 @@ export default {
   data() {
     return {
       detailsOpen: false,
-      orderStatusList: [],
-      actualStatusList: [],
       loading: false,
       search: {},
       form: {},
@@ -88,27 +77,18 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
-        sumColumnList: [{
-          name: 'goodsTotalNum',
-          type: 'sum',
-          decimals: 0
-        }, {
-          name: 'returnsNumber',
-          type: 'sum',
-        }, {
-          name: 'returnsAmount',
-          type: 'sum',
-        }],
-        column: [
+        sumColumnList: [
           {
-            label: '业务编号',
-            prop: "ordNo",
-            search: true,
-            overHidden: true,
-          },
+            name: 'fundingAmount',
+            type: 'sum',
+          }, {
+            name: 'availableAmount',
+            type: 'sum',
+          }],
+        column: [
           {
-            label: '往来单位',
-            prop: "customerName",
+            label: '确认人',
+            prop: "confirmingPersonName",
             search: true,
             overHidden: true,
             type: 'select',
@@ -119,123 +99,76 @@ export default {
               value: 'cname',
               res: 'data.records'
             },
-            dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
+            dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
           },
           {
-            label: '显示已完成',
-            prop: 'notComplete',
+            label: '单号',
+            prop: "sysNo",
             overHidden: true,
-            hide: true,
-            search: true,
-            searchslot: true
           },
           {
-            label: '业务员',
-            disabled: false,
-            prop: "salerName",
-            search: true,
-            type: "select",
-            props: {
-              label: "name",
-              value: "id"
-            },
-            dicUrl: "/api/blade-user/salerList",
-            filterable: true,
-            rules: [{
-              required: true,
-              message: " ",
-              trigger: "blur"
-            }]
+            label: '金额',
+            prop: "amount",
+            overHidden: true,
           },
           {
-            label: '仓库',
-            prop: "storageName",
-            search: true,
-            overHidden: true,
-            // remote: true,
+            label: '状态',
+            prop: "status",
             type: 'select',
-            props: {
-              label: 'cname',
-              value: 'cname'
-            },
-            dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
+            dicData: [{
+              label: '已确认',
+              value: 1
+            }, {
+              label: '录入',
+              value: 0
+            }],
+            overHidden: true,
           },
           {
-            label: '行数',
-            prop: "numberRows",
+            label: "确认时间",
+            prop: "confirmingPersonDate",
+            searchProp: "confirmingPersonDateList",
+            type: "date",
+            search: true,
             overHidden: true,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '商品名称',
-            prop: "goodsNameJoin",
+            label: "制单人",
+            prop: "createUserName",
+            searchProp: "createUser",
             search: true,
             overHidden: true,
             filterable: true,
             remote: true,
-            type: 'select',
+            type: "select",
+            dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
             props: {
-              label: 'cname',
-              value: 'cname',
+              label: "account",
+              value: "id",
               res: 'data.records'
-            },
-            dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
-          },
-          {
-            label: '数量',
-            prop: "goodsTotalNum",
-            overHidden: true,
-          },
-          {
-            label: '退货数量',
-            prop: "returnsNumber",
-            overHidden: true,
-          },
-          {
-            label: '退货金额',
-            prop: "returnsAmount",
-            overHidden: true,
-          },
-          {
-            label: '销售单号',
-            prop: "srcNo",
-            search: true,
-            overHidden: true,
-          },
-          {
-            label: '状态',
-            prop: "status",
-            overHidden: true,
+            }
           },
           {
-            label: '业务日期',
-            prop: "businesDate",
-            searchProp: "businesDateList",
+            label: "制单日期",
+            prop: "createTime",
+            searchProp: "createTimeList",
             type: "date",
-            overHidden: true,
             search: true,
-            width: 100,
+            overHidden: true,
             searchRange: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
-          // {
-          //   label: '状态',
-          //   prop: "returnsStatus",
-          //   overHidden: true,
-          //   type: 'select',
-          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
-          //   props: {
-          //     label: "dictValue",
-          //     value: "dictKey"
-          //   }
-          // },
           {
-            label: "制单人",
-            prop: "createUserName",
-            searchProp: "createUser",
+            label: "更新人",
+            prop: "updateUserName",
+            searchProp: "updateUser",
             overHidden: true,
-            width: 100,
             filterable: true,
             remote: true,
             type: "select",
@@ -247,12 +180,11 @@ export default {
             }
           },
           {
-            label: "制单日期",
-            prop: "createTime",
-            searchProp: "createTimeList",
+            label: "更新日期",
+            prop: "updateTime",
+            searchProp: "updateTimeList",
             type: "date",
             overHidden: true,
-            width: 100,
             searchRange: true,
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
@@ -264,33 +196,14 @@ export default {
   },
   activated() {
     setTimeout(() => {
-      if (this.$route.query.showTrue) {
-        this.$store.commit("XSTH_IN_DETAIL");
+      if (this.$route.query.srcId) {
+        this.$store.commit("IN_BALANCE_DETAIL");
         this.detailsOpen = true;
       }
-      if (this.$route.query.check) {
-        this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
-        this.$store.commit("XSTH_IN_DETAIL");
-        this.detailData = {
-          id: this.$route.query.check.billId,
-          check: this.$route.query.check,
-          auditId: this.$route.query.check.id
-        };
-      }
-      if (this.$route.query.type == 'S') {
-        this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
-      }
-      if (this.$route.query.jumpId) {
-        this.editOpen({ id: this.$route.query.jumpId }, 1)
-      }
-      if (this.$route.query.bsType == 'TKXS') {
-        this.$store.commit("XSTH_IN_DETAIL");
-        this.editOpen({ id: this.$route.query.id }, 1)
-      }
     }, 100);
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(342), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(405), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -301,18 +214,10 @@ export default {
     //   this.option.searchMenuSpan = num * 8;
     //   this.option.searchMenuPosition = "right";
     // }
-    this.getWorkDicts("sales_Status").then(res => {
-      this.orderStatusList = res.data.data
-      console.log(this.orderStatusList);
-    });
-    this.getWorkDicts("settlement_Status").then(res => {
-      this.actualStatusList = res.data.data
-    });
   },
   methods: {
     // 导出
     outExport() {
-      console.log(this.search, 412)
       let config = { params: { ...this.search } }
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
@@ -328,8 +233,6 @@ export default {
           }
         }
       }
-      console.log(config, 427)
-      config.params.bsType = 'TKXS'
       const routeData = this.$router.resolve({
         path: '/api/blade-sales-part/returns/listExport',      //跳转目标下载地址
         query: {
@@ -348,14 +251,14 @@ export default {
       if (type === 0) {
         this.detailData = {}
       }
-      if (this.$route.query.bsType) {
+      if (this.$route.query.srcId) {
         this.$router.$avueRouter.closeTag(this.$route.fullPath);
         this.$router.push({
-          path: "/tirePartsMall/salesService/returns/index"
+          path: "/tirePartsMall/financingManagement/balanceRecharge/index"
         });
       }
       this.onLoad(this.page, this.search)
-      this.$store.commit("XSTH_OUT_DETAIL");
+      this.$store.commit("OUT_BALANCE_DETAIL");
 
     },
     editOpen(row, status) {
@@ -364,7 +267,7 @@ export default {
         id: row.id,
         status: status
       };
-      this.$store.commit("XSTH_IN_DETAIL");
+      this.$store.commit("IN_BALANCE_DETAIL");
       this.detailsOpen = true;
     },
     //刷新
@@ -409,7 +312,6 @@ export default {
         ...params,
         current: page.currentPage,
         size: page.pageSize,
-        bsType: "TKXS",
         ...Object.assign(params, this.search)
       }
       this.loading = true
@@ -428,7 +330,6 @@ export default {
           this.$refs.crud.doLayout()
           this.$refs.crud.dicInit()
         })
-        this.loading = false
       }).finally(() => {
         this.loading = false
       })

src/views/tirePartsMall/financingManagement/financingManagement/index.vue

@@ -4,31 +4,23 @@
       <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
         ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
         @expand-change="expandChange" @refresh-change="refreshChange"
-        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 342)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 342)" :page.sync="page">
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 403)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 403)" :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
-          <el-button :size="size" :type="type" :disabled="row.status != '录入' || row.numberRows != 0"
-            @click="$refs.crud.rowDel(row, index)">删除</el-button>
-        </template>
-        <template slot="corpNameSearch">
-          <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
-        </template>
-        <template slot="notCompleteSearch">
-          <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
+          <el-button :size="size" :type="type" @click="rowDel(row, index)">删除</el-button>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
-          <!-- <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button> -->
-          <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
-        </template>
-        <template slot-scope="{ row, index }" slot="ordNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
-          </span>
+          <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建</el-button>
+          <!-- <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button> -->
         </template>
-        <template slot-scope="{ row, index }" slot="srcOrdNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
+        <template slot-scope="{ row, index }" slot="fundingPartyName">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.fundingPartyName }}
           </span>
         </template>
+        <!-- <template slot="fundingPartyNameSearch">
+          <crop-select v-model="search.corpId" corpType="GYS" :refresh="false"></crop-select>
+        </template> -->
       </avue-crud>
     </basic-container>
     <detailsPage v-if="detailsOpen" @goBack="goBack" :onLoad="form" :detailData="detailData" @backToList="backToList">
@@ -37,7 +29,7 @@
 </template>
 
 <script>
-import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesService/saleOrder";
+import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/financingManagement/financingManagement";
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesService/saleOrder";
 import { getToken } from "@/util/auth";
@@ -50,8 +42,6 @@ export default {
   data() {
     return {
       detailsOpen: false,
-      orderStatusList: [],
-      actualStatusList: [],
       loading: false,
       search: {},
       form: {},
@@ -79,7 +69,7 @@ export default {
         size: "small",
         menuWidth: 50,
         searchSpan: 6,
-        searchMenuSpan: 24,
+        searchMenuSpan: 6,
         searchIcon: true,
         // expand: true,
         // expandWidth: 60,
@@ -88,175 +78,69 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
-        sumColumnList: [{
-          name: 'goodsTotalNum',
-          type: 'sum',
-          decimals: 0
-        }, {
-          name: 'returnsNumber',
-          type: 'sum',
-        }, {
-          name: 'returnsAmount',
-          type: 'sum',
-        }],
-        column: [
-          {
-            label: '业务编号',
-            prop: "ordNo",
-            search: true,
-            overHidden: true,
-          },
+        sumColumnList: [
           {
-            label: '往来单位',
-            prop: "customerName",
-            search: true,
-            overHidden: true,
-            type: 'select',
-            filterable: true,
-            remote: true,
-            props: {
-              label: 'cname',
-              value: 'cname',
-              res: 'data.records'
-            },
-            dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
-          },
-          {
-            label: '显示已完成',
-            prop: 'notComplete',
-            overHidden: true,
-            hide: true,
-            search: true,
-            searchslot: true
-          },
-          {
-            label: '业务员',
-            disabled: false,
-            prop: "salerName",
-            search: true,
-            type: "select",
-            props: {
-              label: "name",
-              value: "id"
-            },
-            dicUrl: "/api/blade-user/salerList",
-            filterable: true,
-            rules: [{
-              required: true,
-              message: " ",
-              trigger: "blur"
-            }]
-          },
+            name: 'fundingAmount',
+            type: 'sum',
+          }, {
+            name: 'availableAmount',
+            type: 'sum',
+          }],
+        column: [
           {
-            label: '仓库',
-            prop: "storageName",
+            label: '资金方',
+            prop: "fundingPartyName",
             search: true,
             overHidden: true,
-            // remote: true,
             type: 'select',
-            props: {
-              label: 'cname',
-              value: 'cname'
-            },
-            dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
-          },
-          {
-            label: '行数',
-            prop: "numberRows",
-            overHidden: true,
-          },
-          {
-            label: '商品名称',
-            prop: "goodsNameJoin",
-            search: true,
-            overHidden: true,
             filterable: true,
             remote: true,
-            type: 'select',
             props: {
               label: 'cname',
               value: 'cname',
               res: 'data.records'
             },
-            dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
+            dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
           },
           {
-            label: '数量',
-            prop: "goodsTotalNum",
+            label: '融资金额',
+            prop: "fundingAmount",
             overHidden: true,
           },
           {
-            label: '退货数量',
-            prop: "returnsNumber",
+            label: '在库融资金额',
+            prop: "surplusFundingAmount",
             overHidden: true,
           },
           {
-            label: '退货金额',
-            prop: "returnsAmount",
+            label: '可用金额',
+            prop: "availableAmount",
             overHidden: true,
           },
           {
-            label: '销售单号',
-            prop: "srcNo",
-            search: true,
+            label: "融资方",
+            prop: "createDeptName",
             overHidden: true,
           },
           {
-            label: '状态',
-            prop: "status",
+            label: '保证金',
+            prop: "bondAmount",
             overHidden: true,
           },
           {
-            label: '业务日期',
-            prop: "businesDate",
-            searchProp: "businesDateList",
-            type: "date",
+            label: '已缴保证金',
+            prop: "paidAlreadyBondAmount",
             overHidden: true,
-            search: true,
-            width: 100,
-            searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
-          // {
-          //   label: '状态',
-          //   prop: "returnsStatus",
-          //   overHidden: true,
-          //   type: 'select',
-          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
-          //   props: {
-          //     label: "dictValue",
-          //     value: "dictKey"
-          //   }
-          // },
           {
-            label: "制单人",
-            prop: "createUserName",
-            searchProp: "createUser",
+            label: '利息',
+            prop: "interest",
             overHidden: true,
-            width: 100,
-            filterable: true,
-            remote: true,
-            type: "select",
-            dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-            props: {
-              label: "account",
-              value: "id",
-              res: 'data.records'
-            }
           },
           {
-            label: "制单日期",
-            prop: "createTime",
-            searchProp: "createTimeList",
-            type: "date",
+            label: '备注',
+            prop: "remarks",
             overHidden: true,
-            width: 100,
-            searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
           }
         ]
       }
@@ -264,33 +148,10 @@ export default {
   },
   activated() {
     setTimeout(() => {
-      if (this.$route.query.showTrue) {
-        this.$store.commit("XSTH_IN_DETAIL");
-        this.detailsOpen = true;
-      }
-      if (this.$route.query.check) {
-        this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
-        this.$store.commit("XSTH_IN_DETAIL");
-        this.detailData = {
-          id: this.$route.query.check.billId,
-          check: this.$route.query.check,
-          auditId: this.$route.query.check.id
-        };
-      }
-      if (this.$route.query.type == 'S') {
-        this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
-      }
-      if (this.$route.query.jumpId) {
-        this.editOpen({ id: this.$route.query.jumpId }, 1)
-      }
-      if (this.$route.query.bsType == 'TKXS') {
-        this.$store.commit("XSTH_IN_DETAIL");
-        this.editOpen({ id: this.$route.query.id }, 1)
-      }
     }, 100);
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(342), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(403), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -301,18 +162,10 @@ export default {
     //   this.option.searchMenuSpan = num * 8;
     //   this.option.searchMenuPosition = "right";
     // }
-    this.getWorkDicts("sales_Status").then(res => {
-      this.orderStatusList = res.data.data
-      console.log(this.orderStatusList);
-    });
-    this.getWorkDicts("settlement_Status").then(res => {
-      this.actualStatusList = res.data.data
-    });
   },
   methods: {
     // 导出
     outExport() {
-      console.log(this.search, 412)
       let config = { params: { ...this.search } }
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
@@ -328,8 +181,6 @@ export default {
           }
         }
       }
-      console.log(config, 427)
-      config.params.bsType = 'TKXS'
       const routeData = this.$router.resolve({
         path: '/api/blade-sales-part/returns/listExport',      //跳转目标下载地址
         query: {
@@ -364,7 +215,6 @@ export default {
         id: row.id,
         status: status
       };
-      this.$store.commit("XSTH_IN_DETAIL");
       this.detailsOpen = true;
     },
     //刷新
@@ -409,7 +259,6 @@ export default {
         ...params,
         current: page.currentPage,
         size: page.pageSize,
-        bsType: "TKXS",
         ...Object.assign(params, this.search)
       }
       this.loading = true

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -667,6 +667,26 @@ export default {
                     disabled: true
                 },
                 {
+                    label: '资金方',
+                    prop: "fundingPartyName",
+                    disabled: true,
+                },
+                {
+                    label: '融资金额',
+                    prop: "fundingAmount",
+                    disabled: true,
+                },
+                {
+                    label: '可用金额',
+                    prop: "availableAmount",
+                    disabled: true,
+                },
+                {
+                    label: '利息',
+                    prop: "interest",
+                    disabled: true,
+                },
+                {
                     label: '备注',
                     prop: "remarks",
                     type: 'textarea',
@@ -1150,7 +1170,6 @@ export default {
             this.getDetailsfun()
         }
 
-
     },
 
     watch: {
@@ -1409,7 +1428,7 @@ export default {
 
                         goodsNum: item.goodsNum,
                         units: item.unit,
-                        inventory:item.inventory,
+                        inventory: item.inventory,
                         // sendNum:res.data.data[0],
                         // 小计
                         subTotalMoney: item.goodsNum * item.price,
@@ -1803,7 +1822,7 @@ export default {
                         spinner: 'el-icon-loading',
                         background: 'rgba(255,255,255,0.7)'
                     });
-                    this.form.storageName=this.form.$storageId?this.form.$storageId:''
+                    this.form.storageName = this.form.$storageId ? this.form.$storageId : ''
                     submit({
                         bsType: "CG",
                         ...this.form
@@ -2169,19 +2188,19 @@ export default {
             // this.$refs.formContacts.rowAdd()
         },
         uploadAfter(res, done, loading, column) {
-            if(Array.isArray(res)){
+            if (Array.isArray(res)) {
                 if (res instanceof Array) {
-                this.form.orderItemsList = this.form.orderItemsList.concat(res)
-                res.forEach(item => {
-                    dotList({
-                        storageId: this.form.storageId,
-                        goodsId: res.goodsId
-                    }).then(e => {
-                        this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data
+                    this.form.orderItemsList = this.form.orderItemsList.concat(res)
+                    res.forEach(item => {
+                        dotList({
+                            storageId: this.form.storageId,
+                            goodsId: res.goodsId
+                        }).then(e => {
+                            this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data
+                        })
                     })
-                })
-            }
-            }else{
+                }
+            } else {
                 this.$message.error(res)
             }
             this.excelBox = false;
@@ -2258,4 +2277,5 @@ export default {
 <style lang="scss" scoped>
 ::v-deep .el-form-item {
     margin-bottom: 8px !important;
-}</style>
+}
+</style>

src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -4,8 +4,8 @@
       <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
         ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
         @expand-change="expandChange" @refresh-change="refreshChange"
-        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 274.4)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 274.4)" :page.sync="page">
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 401)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 401)" :page.sync="page">
         <template slot-scope="{ row }" slot="expand">
           <avue-crud :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading" :cell-style="cellStyle"
             class="itemTable"></avue-crud>
@@ -35,8 +35,7 @@
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <!--  判断是否一键采购过 然后展示不同的判断按钮-->
           <el-button v-if="row.shortcutWarehousingStatus == '1'" :size="size" :type="type"
-                     :disabled="row.status != '录入' && row.item >= 1"
-                     @click="$refs.crud.rowDel(row, index)">删除</el-button>
+            :disabled="row.status != '录入' && row.item >= 1" @click="$refs.crud.rowDel(row, index)">删除</el-button>
 
           <el-button v-else :size="size" :type="type"
             :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.numberRows >= 1"
@@ -46,7 +45,7 @@
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
         <template slot="notCompleteSearch">
-          <el-checkbox v-model="search.notComplete" true-label="1" ></el-checkbox>
+          <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button>
@@ -71,7 +70,7 @@
 import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
-import {getToken} from "@/util/auth";
+import { getToken } from "@/util/auth";
 
 export default {
   name: "index",
@@ -82,7 +81,7 @@ export default {
     return {
       orderStatusList: [],
       actualStatusList: [],
-      returnStatusList:[],
+      returnStatusList: [],
       detailsOpen: false,
       loading: false,
       search: {},
@@ -303,8 +302,22 @@ export default {
           type: 'select',
           search: true,
           overHidden: true,
-          filterable:true,
-          remote:true,
+          filterable: true,
+          remote: true,
+          props: {
+            label: 'cname',
+            value: 'cname',
+            res: 'data.records'
+          },
+          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
+        }, {
+          label: '资金方',
+          prop: "fundingPartyName",
+          type: 'select',
+          search: true,
+          overHidden: true,
+          filterable: true,
+          remote: true,
           props: {
             label: 'cname',
             value: 'cname',
@@ -353,18 +366,33 @@ export default {
           label: '数量',
           prop: "goodsTotalNum",
           overHidden: true,
-        }, 
+        },
         // {
         //   label: '金额',
         //   prop: "totalMoney",
         //   overHidden: true,
         // }, 
         {
-                label: '已付金额',
-                prop: "paymentAmountTl",
-                disabled: true
-            }, 
-            {
+          label: '已付金额',
+          prop: "paymentAmountTl",
+          disabled: true
+        },
+        {
+          label: '融资金额',
+          prop: "fundingAmount",
+          overHidden: true,
+        },
+        {
+          label: '可用金额',
+          prop: "availableAmount",
+          overHidden: true,
+        },
+        {
+          label: '利息',
+          prop: "interest",
+          overHidden: true,
+        },
+        {
           label: '状态',
           prop: "status",
           search: true,
@@ -379,7 +407,7 @@ export default {
         {
           label: '结算状态',
           prop: "actualPaymentStatus",
-          searchProp:'actualPaymentType',
+          searchProp: 'actualPaymentType',
           search: true,
           overHidden: true,
           type: 'select',
@@ -445,7 +473,6 @@ export default {
           overHidden: true,
           searchProp: "businesDateList",
           type: "date",
-          overHidden: true,
           search: true,
           width: 100,
           searchRange: true,
@@ -484,19 +511,23 @@ export default {
   },
   activated() {
     setTimeout(() => {
-      console.log(this.$route.query,400);
-        // 主页快捷跳转来的 直接打开新建订单
-        if (this.$route.query.showTrue) {
-            this.$store.commit("IN_LTCG_STATUS");
-            this.detailsOpen = true;
-        }
+      console.log(this.$route.query, 400);
+      // 主页快捷跳转来的 直接打开新建订单
+      if (this.$route.query.showTrue) {
+        this.$store.commit("IN_FINACING_STATUS");
+        this.detailsOpen = true;
+      }
       if (this.$route.query.check) {
         this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
-        this.$store.commit("IN_LTCG_STATUS");
+        this.$store.commit("IN_FINACING_STATUS");
       }
-      if(this.$route.query.type == 'F'){
+      if (this.$route.query.type == 'F') {
         this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
       }
+      if (this.$route.query.srcId) {
+        this.editOpen({ id: this.$route.query.srcId }, 1)
+        this.$store.commit("IN_FINACING_STATUS");
+      }
       this.detailData = {
         id: this.$route.query.check.billId,
         check: this.$route.query.check,
@@ -505,7 +536,7 @@ export default {
     }, 100);
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(274.4), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(401), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -522,34 +553,34 @@ export default {
     });
   },
   methods: {
-      // 导出
-      outExport() {
-          console.log(this.search,412)
-          let config = { params: { ...this.search } }
-          if (config.params) {
-              for (const propName of Object.keys(config.params)) {
-                  const value = config.params[propName];
-                  if (value !== null && typeof (value) !== "undefined") {
-                      if (value instanceof Array) {
-                          for (const key of Object.keys(value)) {
-                              let params = propName + '[' + key + ']';
-                              config.params[params] = value[key]
-                          }
-                          delete config.params[propName]
-                      }
-                  }
+    // 导出
+    outExport() {
+      console.log(this.search, 412)
+      let config = { params: { ...this.search } }
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
               }
+              delete config.params[propName]
+            }
           }
-          config.params.bsType = 'CG'
-          console.log(config,427)
-          const routeData = this.$router.resolve({
-              path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
-              query: {
-                  ...config.params    //括号内是要传递给新窗口的参数
-              }
-          })
-          window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-      },
+        }
+      }
+      config.params.bsType = 'CG'
+      console.log(config, 427)
+      const routeData = this.$router.resolve({
+        path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+        query: {
+          ...config.params    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
     check(row) {
       this.form = row
       this.detailsOpen = true
@@ -560,7 +591,7 @@ export default {
       if (type === 0) {
         this.detailData = {}
       }
-      this.$store.commit("OUT_LTCG_STATUS");
+      this.$store.commit("OUT_FINACING_STATUS");
       this.onLoad(this.page, this.search)
     },
     editOpen(row, status) {
@@ -570,7 +601,7 @@ export default {
         status: status
       };
       console.log(status);
-      this.$store.commit("IN_LTCG_STATUS");
+      this.$store.commit("IN_FINACING_STATUS");
       this.detailsOpen = true;
     },
     //刷新
@@ -594,9 +625,9 @@ export default {
       }).catch(() => {
       });
     },
-      // 点击搜索触发
+    // 点击搜索触发
     searchChange(params, done) {
-        this.page.currentPage = 1
+      this.page.currentPage = 1
       done();
       this.onLoad(this.page, params)
     },
@@ -631,7 +662,7 @@ export default {
     },
     expandChange(row) {
       if (!row.itemData) {
-        getDetails({ id: row.id})
+        getDetails({ id: row.id })
           .then(res => {
             this.dataList[row.$index].itemData = res.data.data.orderItemsList;
           })
@@ -674,7 +705,8 @@ export default {
   color: #fff;
   font-size: 10px;
 }
+
 /deep/ .el-col-md-8 {
-    width: 24.33333%;
+  width: 24.33333%;
 }
 </style>

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -689,6 +689,9 @@ export default {
         if (this.detailData.id) {
             this.refresh()
         }
+        if (this.$route.query.srcId) {
+            this.refresh()
+        }
         this.$store.commit("DOMIO_IN_DETAIL");
     },
     components: {

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -373,12 +373,12 @@ export default {
     // this.corpsDescListAllfun()
   },
   activated() {
-    // if (this.$route.query.id) {
-    //   this.detailData = {
-    //     id: this.$route.query.id
-    //   };
-    //   this.detailsOpen = true;
-    // }
+    setTimeout(() => {
+      if (this.$route.query.srcId) {
+        this.$store.commit("DOMIO_IN_DETAIL");
+        this.detailsOpen = true;
+      }
+    }, 100);
   },
   mounted() {
     // console.log(this.$refs.crud);
@@ -394,8 +394,14 @@ export default {
       if (type === 0) {
         this.detailData = {}
       }
+      if (this.$route.query.srcId) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/tirePartsMall/purchasingManagement/warehouseEntryOrder/index"
+        });
+      }
       this.onLoad(this.page, this.search)
-      // this.$store.commit("DOMIO_OUT_DETAIL");
+      this.$store.commit("DOMIO_OUT_DETAIL");
     },
     //刷新
     refreshChange() {

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -465,6 +465,9 @@ export default {
     if (this.detailData.id) {
       this.refresh()
     }
+    if (this.$route.query.srcId) {
+            this.refresh()
+        }
     this.$store.commit("DOMIO_IN_DETAIL");
   },
   activated(){

src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue

@@ -406,6 +406,12 @@ export default {
       };
       this.detailsOpen = true;
     }
+    setTimeout(() => {
+      if (this.$route.query.srcId) {
+        this.$store.commit("DOMIO_IN_DETAIL");
+        this.detailsOpen = true;
+      }
+    }, 100);
   },
   methods: {
     check(row) {
@@ -418,7 +424,14 @@ export default {
       if (type === 0) {
         this.detailData = {}
       }
+      if (this.$route.query.srcId) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/tirePartsMall/salesManagement/outboundWorkOrder/index"
+        });
+      }
       this.onLoad(this.page, this.search)
+      this.$store.commit("DOMIO_OUT_DETAIL");
     },
     //刷新
     refreshChange() {

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -1149,8 +1149,6 @@ export default {
         if (this.detailData.id) {
             this.getDetailsfun()
         }
-
-
     },
 
     watch: {

src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -502,6 +502,10 @@ export default {
         check: this.$route.query.check,
         auditId: this.$route.query.check.id
       };
+      if (this.$route.query.srcId) {
+        this.$store.commit("IN_LTCG_STATUS");
+        this.editOpen({ id: this.$route.query.srcId }, 1)
+      }
     }, 100);
   },
   async created() {
@@ -560,6 +564,12 @@ export default {
       if (type === 0) {
         this.detailData = {}
       }
+      if (this.$route.query.srcId) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/tirePartsMall/salesManagement/purchaseOrder/index"
+        });
+      }
       this.$store.commit("OUT_LTCG_STATUS");
       this.onLoad(this.page, this.search)
     },

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -59,7 +59,7 @@
                     <tempalte slot="customerName" slot-scope="{ row }">
                         <search-query :datalist="customerData" :selectValue="form.customerName" :clearable="true"
                             :buttonIf="false" :filterable="true" :remote="true"
-                            :disabled="findObject(optionForm.column, 'customerName').disabled || form.businessSource == '外部销售'"
+                            :disabled="findObject(optionForm.column, 'customerName').disabled || form.businessSource == '外部销售' || isDisabledTask"
                             placeholder="请选择客户" :forParameter="{ key: 'id', label: 'cname', value: 'cname' }"
                             @corpFocus="KHgetListfun" @remoteMethod="KHgetListfun" @corpChange="KHcorpChange"
                             @corpClear="KHClear">
@@ -95,7 +95,7 @@
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small" @click="batchDelete"
-                                    :disabled="form.generateTask == '已生成'||form.businessSource == '外部销售'">一键删除</el-button>
+                                    :disabled="form.generateTask == '已生成' || form.businessSource == '外部销售'">一键删除</el-button>
                                 <el-button type="primary" plain size="small" @click="quickCopy">快捷复制</el-button>
                             </template>
                             <template slot="goodsId" slot-scope="{ row }">
@@ -1404,13 +1404,13 @@ export default {
             }
         },
         KHClear() {
-            this.form.customerId=''
-            this.form.customerName=''
-            this.dicUrlWithCustomId =''
-            this.form.storageId =''
+            this.form.customerId = ''
+            this.form.customerName = ''
+            this.dicUrlWithCustomId = ''
+            this.form.storageId = ''
             this.form.contacts = ''
-            this.form.phone =''
-            this.contactsOption =''
+            this.form.phone = ''
+            this.contactsOption = ''
             this.form.recAddress = ''
             this.form.salerId = ''
             this.KHgetListfun()
@@ -1734,6 +1734,9 @@ export default {
             })
             this.$set(this.optionForm, 'disabled', false)
             this.$set(this.optionContactsBack, 'disabled', false)
+            if (this.form.generateTask == '已生成') {
+                this.optionForm.disabled = true
+            }
             this.isDisabled = false
             this.isAdd = false
             if (this.form.businessSource == "外部销售") {
@@ -1952,6 +1955,7 @@ export default {
                                         this.isAdd = true
                                         this.isDisabled = true
                                         this.isAddBtn = true
+                                        this.isDisabledTask = true
                                         // this.editButton = true // 把编辑按钮显示出来
                                         loading.close();
                                     }).catch(() => {
@@ -1998,6 +2002,7 @@ export default {
                                 this.isApplySettlement = false
                                 this.isContacts = true
                                 this.isDisabled = true
+                                this.isDisabledTask = false
                                 this.$set(this.optionForm, 'disabled', false) // form 表单的禁用放开
                                 this.$set(this.optionContactsBack, 'disabled', false) // table 表格的禁用放开
                                 // this.editButton = true // 把编辑按钮显示出来
@@ -2215,6 +2220,7 @@ export default {
                     this.buttonText = '撤销任务';
                     // this.isDisabledTask = false;
                     this.buttonColor = 'warning'
+                    this.optionForm.disabled = true
                 }
                 if (this.form.status == '退款请核') {
                     this.isRevocationRequest = false;
@@ -2356,6 +2362,7 @@ export default {
                     this.buttonText = '撤销任务';
                     // this.isDisabledTask = false;
                     this.buttonColor = 'warning'
+                    this.optionForm.disabled = true
                 }
                 if (this.form.status == '退款请核') {
                     this.isRevocationRequest = false;

src/views/wel/components/losAssembly/losleftform.vue

@@ -5,9 +5,9 @@
         <div class="title">
           <span></span>
           <div class="right">
-            <el-radio v-model="businessType" label="1" @input="init">海运</el-radio>
-            <el-radio v-model="businessType" label="2" @input="init">空运</el-radio>
-            <el-radio v-model="businessType" label="3" @input="init" v-if="saberTenantId == '263057'">贸易</el-radio>
+            <el-radio v-model="type" label="1" @input="init">海运</el-radio>
+            <el-radio v-model="type" label="2" @input="init">空运</el-radio>
+            <el-radio v-model="type" label="3" @input="init" v-if="saberTenantId == '263057'">贸易</el-radio>
             <div class="right_but">
               <div class="right_but_left" :class="{ right_but_active: isActive == 1 }" @click="inDay">本日
               </div>
@@ -70,7 +70,7 @@ export default {
       isActive: 1, // 本日/本月按钮是否选中状态
       realDate: [], // 时间
       saberTenantId: '',
-      businessType: JSON.parse(localStorage.getItem('saber-tenantId')).content == '263057' ? '3' : '1',
+      type: JSON.parse(localStorage.getItem('saber-tenantId')).content == '263057' ? '3' : '1',
     };
   },
   created() {
@@ -93,7 +93,7 @@ export default {
       completionRate({
         dateStart: this.realDate[0] + ' 00:00:00',
         dateEnd: this.realDate[1] + ' 23:59:59',
-        businessType:this.businessType
+        type:this.type
       }).then(res => {
         this.data = res.data.data
       }).finally(() => {