修改bug

src/api/landTransportation/index.js

@@ -294,7 +294,7 @@ export function getCorp() {
 //查询业务员
 export function getSalesman(data) {
     return request({
-        url: '/api/blade-user/userList',
+        url: '/api/blade-user/salerList',
         method: 'get',
         params:{
             roleAlias:'业务员',

src/components/bill/config/mainLists.json

@@ -27,20 +27,6 @@
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",
-  "sumColumnList": [
-    {
-      "name": "amount",
-      "type": "sum"
-    },
-    {
-      "name": "settlementAmount",
-      "type": "sum"
-    },
-    {
-      "name": "invoiceAmount",
-      "type": "sum"
-    }
-  ],
   "column": [
     {
       "label": "业务编号",
@@ -70,18 +56,32 @@
       "index": 4
     },
     {
+      "label": "余额",
+      "prop": "balanceAmount",
+      "overHidden": true,
+      "width": 150,
+      "index": 5
+    },
+    {
       "label": "退货数量",
       "prop": "returnsNumber",
       "overHidden": true,
       "width": 150,
-      "index": 5
+      "index": 6
     },
     {
       "label": "退货金额",
       "prop": "returnsAmount",
       "overHidden": true,
       "width": 150,
-      "index":6
+      "index":7
+    },
+    {
+      "label": "退款余额",
+      "prop": "returnsBalanceAmount",
+      "overHidden": true,
+      "width": 150,
+      "index":8
     },
     {
       "label": "业务日期",
@@ -94,7 +94,7 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 7,
+      "index": 9,
       "width": 250
     },
     {
@@ -108,7 +108,7 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 8,
+      "index": 10,
       "width": 250
     }
   ]

src/components/bill/config/mainListsCG.json

@@ -27,20 +27,6 @@
   "dialogClickModal": false,
   "showSummary": true,
   "summaryText": "合计",
-  "sumColumnList": [
-    {
-      "name": "amount",
-      "type": "sum"
-    },
-    {
-      "name": "settlementAmount",
-      "type": "sum"
-    },
-    {
-      "name": "invoiceAmount",
-      "type": "sum"
-    }
-  ],
   "column": [
     {
       "label": "业务编号",
@@ -70,18 +56,32 @@
       "index": 4
     },
     {
+      "label": "余额",
+      "prop": "balanceAmount",
+      "overHidden": true,
+      "width": 150,
+      "index": 5
+    },
+    {
       "label": "退货数量",
       "prop": "returnsNumber",
       "overHidden": true,
       "width": 150,
-      "index": 5
+      "index": 6
     },
     {
       "label": "退货金额",
       "prop": "returnsAmount",
       "overHidden": true,
       "width": 150,
-      "index":6
+      "index":7
+    },
+    {
+      "label": "退款余额",
+      "prop": "returnsBalanceAmount",
+      "overHidden": true,
+      "width": 150,
+      "index":8
     },
     {
       "label": "业务日期",
@@ -94,7 +94,7 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 7,
+      "index": 9,
       "width": 250
     },
     {
@@ -108,7 +108,7 @@
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 8,
+      "index": 10,
       "width": 250
     }
   ]

src/components/bill/selectOrderDetailList.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
-      @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange" @search-reset="searchReset"
-      @saveColumn="saveColumn" @current-change="currentChange" @size-change="sizeChange" :page.sync="page" @on-load="onLoad">
+      @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange"
+      @search-reset="searchReset" @saveColumn="saveColumn" @current-change="currentChange" @size-change="sizeChange"
+      :summaryMethod="summaryMethod" :page.sync="page" @on-load="onLoad">
       <template slot="costTypeSearch">
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
       </template>
@@ -14,8 +15,7 @@
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button type="text" icon="el-icon-edit" size="small" @click.stop="importStagList(scope.row, scope.index)"
-          v-if="activeName == 'searchList'"
-          :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
+          v-if="activeName == 'searchList'" :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
         </el-button>
         <el-button type="text" icon="el-icon-delete" size="small" @click.stop="removeStagList(scope.row, scope.index)"
           v-else>移除
@@ -33,7 +33,7 @@
 
 <script>
 import option from './config/mainLists.json'
-import {getListOrder, orderListBySettlement} from "@/api/financialManagement/paymentRequest";
+import { getListOrder, orderListBySettlement } from "@/api/financialManagement/paymentRequest";
 
 export default {
   name: "index",
@@ -84,7 +84,7 @@ export default {
   },
   watch: {
     'params.corpId'(newVal, oldVal) {
-        console.log(newVal,87)
+      console.log(newVal, 87)
       if (newVal != oldVal) {
         this.onLoad(this.page, this.search)
       }
@@ -93,10 +93,10 @@ export default {
   async created() {
     // this.option = await this.getColumnData(this.getColumnName(281), option);
   },
-    mounted() {
-        this.onLoad(this.page,this.params)
-    },
-    methods: {
+  mounted() {
+    this.onLoad(this.page, this.params)
+  },
+  methods: {
     importStagList(row, index) {
       // this.goodsListSave.push(row);
       this.$refs.crud.toggleSelection([row]);
@@ -120,18 +120,18 @@ export default {
     refreshChange() {
       this.onLoad(this.page);
     },
-    searchReset(){
-       this.onLoad(this.page,this.params);
+    searchReset() {
+      this.onLoad(this.page, this.params);
     },
     searchChange(params, done) {
       if (params.createStart) {
         params.createStartDate = params.createStart[0]
         params.createEndDate = params.createStart[1]
       }
-        params = {
-            ...this.params,
-            ...params,
-        }
+      params = {
+        ...this.params,
+        ...params,
+      }
       this.onLoad(this.page, params);
       done()
     },
@@ -139,6 +139,36 @@ export default {
       // this.selectList = row
       this.goodsListSave = row
     },
+    summaryMethod({ columns, data }) {
+      const sums = [];
+      if (columns.length > 0) {
+        columns.forEach((column, index) => {
+          let prop = column.property
+          if (['goodsTotalNum', 'totalMoney', 'returnsNumber', 'returnsAmount'].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') {
+                sums[index] = all
+              }
+            } else {
+              let values = this.data.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') {
+                sums[index] = all
+              }
+            }
+          } else {
+            sums[index] = '-'
+          }
+        });
+      }
+      return sums;
+    },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
     },
@@ -146,50 +176,50 @@ 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":'';
-        params.createEndDate = params.rentStartDate[1] + " " + "23:59:59"?params.rentStartDate[1] + " " + "23:59:59":'';
+      if (params && params.rentStartDate) {
+        params.createStartDate = params.rentStartDate[0] + " " + "00:00:00" ? params.rentStartDate[0] + " " + "00:00:00" : '';
+        params.createEndDate = params.rentStartDate[1] + " " + "23:59:59" ? params.rentStartDate[1] + " " + "23:59:59" : '';
         this.$delete(params, 'rentStartDate')
       }
       this.loading = true;
-        // 把老数据进行更新  从父组件调用的子组件方法
-        if (params.customerId != this.params.customerId) {
-            this.params = params
-        }
+      // 把老数据进行更新  从父组件调用的子组件方法
+      if (params.customerId != this.params.customerId) {
+        this.params = params
+      }
       // params = {
       //   // ...params,
       //     ...page,
       //     ...this.params
       // }
 
-    // ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
+      // ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
       params.billType = this.billType
       if (this.$store.getters.userInfo.tenant_id === "673511") {
         params.type = "CMY"
       }
       params.flag = this.flag
-        if (this.params.bsType == 'XS,TKXS') {
-            params.settlementType = 'd'
-        }else {
-            params.settlementType = 'c'
-        }
+      if (this.params.bsType == 'XS,TKXS') {
+        params.settlementType = 'd'
+      } else {
+        params.settlementType = 'c'
+      }
       orderListBySettlement(page.currentPage, page.pageSize, params).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
       }).finally(() => {
         this.loading = false;
       })
-        // getListOrder(page.currentPage, page.pageSize, params).then(res => {
-        //     console.log(res,155)
-        //     this.data = res.data.data.records
-        //     this.page.total = res.data.data.total
-        // }).finally(() => {
-        //     this.loading = false;
-        // })
+      // getListOrder(page.currentPage, page.pageSize, params).then(res => {
+      //     console.log(res,155)
+      //     this.data = res.data.data.records
+      //     this.page.total = res.data.data.total
+      // }).finally(() => {
+      //     this.loading = false;
+      // })
     },
     importProMent() {
       this.$emit('importProMent', this.goodsListSave);

src/components/bill/selectOrderDetailListCG.vue

@@ -3,7 +3,7 @@
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
       @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange"
       @search-reset="searchReset" @saveColumn="saveColumn" @current-change="currentChange" @size-change="sizeChange"
-      :page.sync="page" @on-load="onLoad">
+      :page.sync="page" @on-load="onLoad" :summaryMethod="summaryMethod">
       <template slot="costTypeSearch">
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
       </template>
@@ -140,6 +140,36 @@ export default {
       // this.selectList = row
       this.goodsListSave = row
     },
+    summaryMethod({ columns, data }) {
+      const sums = [];
+      if (columns.length > 0) {
+        columns.forEach((column, index) => {
+          let prop = column.property
+          if (['goodsTotalNum', 'totalMoney', 'returnsNumber', 'returnsAmount'].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') {
+                sums[index] = all
+              }
+            } else {
+              let values = this.data.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') {
+                sums[index] = all
+              }
+            }
+          } else {
+            sums[index] = '-'
+          }
+        });
+      }
+      return sums;
+    },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
     },
@@ -184,13 +214,6 @@ export default {
       }).finally(() => {
         this.loading = false;
       })
-      // getListOrder(page.currentPage, page.pageSize, params).then(res => {
-      //     console.log(res,155)
-      //     this.data = res.data.data.records
-      //     this.page.total = res.data.data.total
-      // }).finally(() => {
-      //     this.loading = false;
-      // })
     },
     importProMent() {
       this.$emit('importProMent', this.goodsListSave);

src/views/tirePartsMall/basicData/listingManagement/config/LTdetail.json

@@ -0,0 +1,102 @@
+{
+    "searchShow": true,
+    "searchMenuSpan": 8,
+    "border": true,
+    "index": true,
+    "viewBtn": false,
+    "editBtn": false,
+    "delBtn": false,
+    "addBtn": false,
+    "align": "center",
+    "menuWidth": "120",
+    "menu": false,
+    "showSummary": true,
+    "searchIcon": true,
+    "searchIndex": 2,
+    "selection": true,
+    "tip": false,
+    "expand": false,
+    "expandWidth": 38,
+    "sumColumnList": [
+        {
+            "name": "addQuantity",
+            "type": "sum"
+        },
+        {
+            "name": "subQuantity",
+            "type": "sum"
+        },
+        {
+            "name": "totalQuantity",
+            "type": "sum"
+        }
+    ],
+    "column": [
+        {
+            "label": "业务编号",
+            "prop": "billno",
+            "search": false,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        },
+        {
+            "label": "名称",
+            "prop": "corpName",
+            "search": false,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        },
+        {
+            "label": "状态",
+            "prop": "statusName",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "商品名称",
+            "prop": "goodsName",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "花纹",
+            "prop": "brandItem",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "规格",
+            "prop": "specificationAndModel",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "类型",
+            "prop": "bizTypeName",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "增加",
+            "prop": "addSendTotalNum",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "减少",
+            "prop": "subSendTotalNum",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "业务日期",
+            "prop": "updateTime",
+            "search": false,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        }
+    ]
+}

src/views/tirePartsMall/basicData/listingManagement/config/detail.json

@@ -0,0 +1,85 @@
+{
+    "searchShow": true,
+    "searchMenuSpan": 8,
+    "border": true,
+    "index": true,
+    "viewBtn": false,
+    "editBtn": false,
+    "delBtn": false,
+    "addBtn": false,
+    "align": "center",
+    "menuWidth": "120",
+    "menu": false,
+    "showSummary": true,
+    "searchIcon": true,
+    "searchIndex": 2,
+    "selection": true,
+    "tip": false,
+    "expand": false,
+    "expandWidth": 38,
+    "sumColumnList": [
+        {
+            "name": "addQuantity",
+            "type": "sum"
+        },
+        {
+            "name": "subQuantity",
+            "type": "sum"
+        },
+        {
+            "name": "totalQuantity",
+            "type": "sum"
+        }
+    ],
+    "column": [
+        {
+            "label": "业务编号",
+            "prop": "billno",
+            "search": false,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        },
+        {
+            "label": "名称",
+            "prop": "corpName",
+            "search": false,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        },
+        {
+            "label": "状态",
+            "prop": "statusName",
+            "minWidth": 80,
+            "overHidden": true
+        },
+         
+        {
+            "label": "类型",
+            "prop": "bizTypeName",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "增加",
+            "prop": "addSendTotalNum",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "减少",
+            "prop": "subSendTotalNum",
+            "minWidth": 80,
+            "overHidden": true
+        },
+        {
+            "label": "业务日期",
+            "prop": "updateTime",
+            "search": false,
+            "minWidth": 80,
+            "overHidden": true,
+            "searchSpan": 8
+        }
+    ]
+}

src/views/tirePartsMall/basicData/listingManagement/detail.vue

@@ -0,0 +1,226 @@
+<template>
+    <basic-container>
+      <avue-crud ref="crud" :data="dataList" :option="option" v-model="form" :search.sync="search" :table-loading="loading"
+        @saveColumn="saveColumn" @resetColumn="resetColumn" @search-change="searchChange" @current-change="currentChange"
+        @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+        <template slot="billno" slot-scope="{ row, index }">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(row, index)">{{ row.billno }}</span>
+        </template>
+      </avue-crud>
+    </basic-container>
+  </template>
+  
+  <script>
+  import option from "./config/detail.json";
+  import LTdetail from './config/LTdetail.json'
+  import {AppPartsStockDataDetails, stockDataDetails} from "@/api/basicData/inventoryAccount";
+  
+  export default {
+    name: "detail",
+    data() {
+      return {
+        option: {},
+        dataList: [],
+        form: {},
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+        search: {},
+        loading: false,
+        params: null,
+      }
+    },
+    async created() {
+      // this.option = option
+      console.log('打开了');
+      if (JSON.parse(localStorage.getItem('saber-tenantId')).content == 883868){
+          this.option = LTdetail;
+      }else {
+          this.option = await this.getColumnData(this.getColumnName(279), option);
+      }
+      this.$store.commit("DOMAS_IN_DETAIL");
+    },
+    activated() {
+      this.$store.commit("DOMAS_IN_DETAIL");
+      if (this.$route.query.type == 'JL'){
+          this.params = {
+              goodsId: this.$route.query.goodsId,
+              storageId: this.$route.query.stockId
+          }
+      }else {
+          this.params = {
+              goodsId: this.$route.query.goodsId,
+              stockId: this.$route.query.stockId,
+              dot:this.$route.query.dot
+          }
+      }
+        this.onLoad(this.page)
+    },
+    methods: {
+      onLoad(page, params) {
+        if (!this.params) return
+        params = { ...params, ...this.params }
+        this.dataList.forEach(item => {
+          this.$refs.crud.toggleRowExpansion(item, false)
+        })
+        this.loading = true;
+        if (this.$route.query.type == 'JL') {
+            AppPartsStockDataDetails(params).then(res=>{
+                console.log(res)
+                this.dataList = res.data.data ? res.data.data : [];
+                this.page.total = res.data.data.total;
+                if (this.page.total) {
+                    this.option.height = window.innerHeight - 260;
+                }
+            }).finally(() => {
+                this.loading = false;
+            });
+        }else {
+            stockDataDetails(params)
+                .then(res => {
+                    console.log('res', res);
+                    this.dataList = res.data.data ? res.data.data : [];
+                    this.page.total = res.data.data.total;
+                    if (this.page.total) {
+                        this.option.height = window.innerHeight - 260;
+                    }
+                })
+                .finally(() => {
+                    this.loading = false;
+                });
+        }
+      },
+      searchChange(params, done) {
+        this.onLoad(this.page, params);
+        done();
+      },
+      currentChange(val) {
+        this.page.currentPage = val;
+      },
+      sizeChange(val) {
+        this.page.currentPage = 1;
+        this.page.pageSize = val;
+      },
+      refreshChange() {
+        this.dataList.forEach(item => {
+          this.$refs.crud.toggleRowExpansion(item, false)
+        })
+        this.page.currentPage = 1;
+        this.onLoad(this.page, this.search);
+      },
+      async saveColumn() {
+        const inSave = await this.saveColumnData(
+          this.getColumnName(279),
+          this.option
+        );
+        if (inSave) {
+          this.$message.success("保存成功");
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+      async resetColumn() {
+        this.option = option;
+        const inSave = await this.delColumnData(
+          this.getColumnName(279),
+          option
+        );
+        if (inSave) {
+          this.$message.success("重置成功");
+          //关闭窗口
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }
+      },
+      // 跳转
+      beforeOpenPage(row, index) {
+          if(row.bizTypeName == '盘点') {
+              console.log(this.$store.getters,139)
+              if (this.$store.getters.Inventory) {
+                  this.$alert("明细账已存在,请保存关闭明细账再进行操作", "温馨提示", {
+                      confirmButtonText: "确定",
+                      type: "warning",
+                      callback: action => {
+                          console.log(action);
+                      }
+                  });
+              }else {
+                  this.$router.$avueRouter.closeTag("/tirePartsMall/salesManagement/Inventory/index");
+                  this.$router.push({
+                      path: "/tirePartsMall/salesManagement/Inventory/index",
+                      query: {
+                          orderId: row.id
+                      },
+                  });
+              }
+          }else {
+              if (this.$store.getters.inboundAndOutbound) {
+                  this.$alert("明细账已存在,请保存关闭明细账再进行操作", "温馨提示", {
+                      confirmButtonText: "确定",
+                      type: "warning",
+                      callback: action => {
+                          console.log(action);
+                      }
+                  });
+              } else {
+                  if (row.bizTypeName == '出库') {
+                      this.$router.$avueRouter.closeTag("/tirePartsMall/salesManagement/outboundWorkOrder/index");
+                      this.$router.push({
+                          path: "/tirePartsMall/salesManagement/outboundWorkOrder/index",
+                          query: {
+                              id: row.id
+                          },
+                      });
+                  }else if (row.bizTypeName == '销售') {
+                      this.$router.$avueRouter.closeTag("/salesOrder/index");
+                      this.$router.push({
+                          path: "/salesOrder/index",
+                          query: {
+                              orderId: row.id
+                          },
+                      });
+                  } else if (row.bizTypeName == '采购') {
+                      this.$router.$avueRouter.closeTag("/purchaseOrder/index");
+                      this.$router.push({
+                          path: "/purchaseOrder/index",
+                          query: {
+                              orderId: row.id
+                          },
+                      });
+                  } else if (row.bizTypeName == '调出') {
+                      if (this.$store.getters.Allocateandtransfer) {
+                          this.$alert("调拨明细已存在,请保存关闭明细账再进行操作", "温馨提示", {
+                              confirmButtonText: "确定",
+                              type: "warning",
+                              callback: action => {
+                                  console.log(action);
+                              }
+                          });
+                      }else {
+                          this.$router.$avueRouter.closeTag("/tirePartsMall/salesManagement/outboundWorkOrderL/index");
+                          this.$router.push({
+                              path: "/tirePartsMall/salesManagement/outboundWorkOrderL/index",
+                              query: {
+                                  id: row.id
+                              },
+                          });
+                      }
+                  } else {
+                      this.$router.$avueRouter.closeTag("/tirePartsMall/purchasingManagement/warehouseEntryOrder/index");
+                      this.$router.push({
+                          path: "/tirePartsMall/purchasingManagement/warehouseEntryOrder/index",
+                          query: {
+                              id: row.id
+                          },
+                      });
+                  }
+              }
+          }
+      },
+    },
+  }
+  </script>
+  
+  <style scoped></style>
+  

src/views/tirePartsMall/financialManagement/collectionSettlement/detailsPage.vue

@@ -139,6 +139,9 @@ export default {
             label: 'cname',
             value: 'id'
           },
+          click: () => {
+            this.$refs.form.dicInit()
+          },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
           rules: [{
             required: true,
@@ -180,6 +183,9 @@ export default {
             label: "name",
             value: "name"
           },
+          click: () => {
+            this.$refs.form.dicInit()
+          },
           dicUrl: "/api/blade-user/financeList",
           rules: [{
             required: true,

src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -109,10 +109,14 @@ export default {
           label: '供应商',
           prop: "corpId",
           type: "select",
+          remote: true,
           props: {
             label: 'cname',
             value: 'id'
           },
+          click: () => {
+            this.$refs.form.dicInit()
+          },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
           rules: [{
             required: true,
@@ -131,9 +135,10 @@ export default {
           dicFormatter: (res => {
             return res.data.records
           }),
+          click: () => {
+            this.$refs.form.dicInit()
+          },
           change: (data => {
-            console.log(data);
-            console.log(this.$refs.form.DIC);
             const targetObject = this.$refs.form.DIC.accountName.find(obj => obj.cname == data.value);
             this.form.accountId = targetObject.id
           }),
@@ -159,6 +164,9 @@ export default {
             label: "name",
             value: "name"
           },
+          click: () => {
+            this.$refs.form.dicInit()
+          },
           dicUrl: "/api/blade-user/financeList",
           rules: [{
             required: true,

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

@@ -28,8 +28,8 @@
             </template>
             <template slot="storageIdSearch">
                 <search-query :datalist="storageData" :selectValue="query.storageId" :clearable="true" :buttonIf="false"
-                    :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择品牌"
-                    @corpFocus="storageIdfun" @corpChange="corpChange($event, 'storageId')">
+                    :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择品牌" @corpFocus="storageIdfun"
+                    @corpChange="corpChange($event, 'storageId')">
                 </search-query>
             </template>
             <!--<template slot="goodsNameSearch">-->
@@ -85,7 +85,7 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getToken } from "@/util/auth";
 import { getSalesman } from "@/api/landTransportation";
-import { listAll,storageDesc } from "@/api/tirePartsMall/basicData/listingManagement";
+import { listAll, storageDesc } from "@/api/tirePartsMall/basicData/listingManagement";
 
 export default {
     components: { SearchQuery },
@@ -94,7 +94,7 @@ export default {
             key: 0,
             data: [],
             total: [],
-            storageData:[],
+            storageData: [],
             query: {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
@@ -277,7 +277,7 @@ export default {
                     type: "date",
                     format: "yyyy-MM-dd",
                     valueFormat: "yyyy-MM-dd",
-                }, 
+                },
                 {
                     label: '出库结束',
                     prop: 'dateEnd',
@@ -374,8 +374,8 @@ export default {
         })
     },
     methods: {
-        resetChange(){
-            this.query=this.$options.data().query
+        resetChange() {
+            this.query = this.$options.data().query
         },
         cellStyle({ row, rowIndex }) {
             if (row.status == '已取消') {
@@ -416,9 +416,9 @@ export default {
             })
         },
         //获取仓库
-        storageIdfun(){
-            storageDesc().then(res=>{
-                this.storageData= res.data.data
+        storageIdfun() {
+            storageDesc().then(res => {
+                this.storageData = res.data.data
             })
         },
         // 获取客户数据
@@ -483,6 +483,8 @@ export default {
                     this.commodityData = [re.data.data]
 
                 })
+            }).finally(() => {
+                this.$refs.crud.doLayout();
             })
         },
         //自定义列保存

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

@@ -469,6 +469,8 @@ export default {
                     this.commodityData = [re.data.data]
 
                 })
+            }).finally(() => {
+                this.$refs.crud.doLayout();
             })
         },
         //自定义列保存

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

@@ -2,13 +2,14 @@
     <basic-container>
         <avue-crud :key="key" ref="crud" :option="option" :data="data" :search.sync="query" @on-load="onLoad"
             @search-reset="resetChange" :page.sync="page" :cell-style="cellStyle" @search-change="searchChange"
-            @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 369)"
+            :table-loading="loading" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 369)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 369)">
             <template slot="menuLeft">
                 <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
             </template>
             <template slot="header">
-                <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">
+                <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%"
+                    v-loading="itemloading">
                     <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop"
                         show-overflow-tooltip :label="item.label" />
                 </el-table>
@@ -54,6 +55,8 @@ export default {
             data: [],
             total: [],
             storageData: [],
+            loading: false,
+            itemloading: false,
             query: {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
@@ -168,6 +171,7 @@ export default {
                     searchslot: true,
                     hide: true,
                     searchOrder: 6,
+                    clearable:false,
                     dicData: [{
                         label: '客户',
                         value: 1
@@ -214,27 +218,27 @@ export default {
             commodityData: [], // 合计数据
             // 合计的配置项
             commodityLabel: [
-            {
-                id: 1,
-                label: '销售数量',
-                prop: 'salesQuantity',
-            }, {
-                id: 2,
-                label: '退货数量',
-                prop: 'returnQuantity'
-            }, {
-                id: 3,
-                label: '销售金额',
-                prop: 'salesAmount',
-            }, {
-                id: 4,
-                label: '退货金额',
-                prop: 'returnAmount'
-            }, {
-                id: 5,
-                label: '销售利润',
-                prop: 'salesProfit'
-            }],
+                {
+                    id: 1,
+                    label: '销售数量',
+                    prop: 'salesQuantity',
+                }, {
+                    id: 2,
+                    label: '退货数量',
+                    prop: 'returnQuantity'
+                }, {
+                    id: 3,
+                    label: '销售金额',
+                    prop: 'salesAmount',
+                }, {
+                    id: 4,
+                    label: '退货金额',
+                    prop: 'returnAmount'
+                }, {
+                    id: 5,
+                    label: '销售利润',
+                    prop: 'salesProfit'
+                }],
         }
     },
     async created() {
@@ -312,14 +316,20 @@ export default {
                 current: page.currentPage,
                 ...Object.assign(params, this.query)
             }
-            console.log(queryParams)
+            this.loading = true
             getList(queryParams).then(res => {
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total
+                this.itemloading = true;
                 salespersonCustomerSum({ ...Object.assign(params, this.query) }).then(re => {
                     this.commodityData = [re.data.data]
-                })
-            })
+                }).finally(() => {
+                    this.itemloading = false;
+                });
+            }).finally(() => {
+                this.loading = false;
+                this.$refs.crud.doLayout();
+            });
         },
         //自定义列保存
         async saveColumnTwo(ref, option, optionBack, code) {

src/views/tirePartsMall/purchaseService/returns/index.vue

@@ -79,7 +79,7 @@ export default {
         size: "small",
         menuWidth: 50,
         searchSpan: 6,
-        searchMenuSpan: 18,
+        searchMenuSpan: 6,
         searchIcon: true,
         // expand: true,
         // expandWidth: 60,
@@ -119,6 +119,14 @@ export default {
             },
             dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS&cname={{key}}',
           },
+          {
+            label: '显示已完成',
+            prop: 'notComplete',
+            overHidden: true,
+            hide: true,
+            search: true,
+            searchslot: true
+          },
           // {
           //   label: '业务员',
           //   disabled: false,
@@ -139,14 +147,14 @@ export default {
           // },
           {
             label: '仓库',
-            prop: "storageId",
+            prop: "storageName",
             search: true,
             overHidden: true,
             // remote: true,
             type: 'select',
             props: {
               label: 'cname',
-              value: 'id'
+              value: 'cname'
             },
             dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
           },
@@ -158,7 +166,17 @@ export default {
           {
             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}}"
           },
           {
             label: '数量',
@@ -296,11 +314,11 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 3 !== 0) {
-      const num = 3 - Number(i % 3)
-      this.option.searchMenuSpan = num * 8;
-      this.option.searchMenuPosition = "right";
-    }
+    // if (i % 3 !== 0) {
+    //   const num = 3 - Number(i % 3)
+    //   this.option.searchMenuSpan = num * 8;
+    //   this.option.searchMenuPosition = "right";
+    // }
     this.getWorkDicts("sales_Status").then(res => {
       this.orderStatusList = res.data.data
       console.log(this.orderStatusList);

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

@@ -191,10 +191,8 @@ export default {
         column: [{
           label: "入库单号",
           prop: "billno",
-          // billno
           search: true,
           overHidden: true,
-          // width: 120,
           rules: [
             {
               required: true,
@@ -207,7 +205,6 @@ export default {
           prop: "ordNo",
           search: true,
           overHidden: true,
-          // width: 120,
           rules: [
             {
               required: true,
@@ -220,42 +217,35 @@ export default {
           prop: "customerId",
           search: true,
           overHidden: true,
+          filterable:true,
           type: 'select',
           props: {
             label: 'cname',
             value: 'id'
           },
             dicData: [],
-          // dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS',
         }, {
           label: "仓库",
           prop: "storageName",
-          // searchProp:"storageId",
-          // searchProp: "createUser",
           search: true,
           overHidden: true,
-          // width: 120,
+          filterable:true,
           type: 'select',
           dicUrl: "/api/blade-sales-part/storageDesc/listAll",
           props: {
             label: 'cname',
             value: 'id'
           },
-          // change:(data)=>{
-          //   console.log(this.$refs.crud.DIC.storageName[0].salesCompanyId);
-          // }
         }, {
           label: "订单数量",
           prop: "goodsTotalNum",
           search: false,
           overHidden: true,
-          // width: 120,
         }, {
           label: "实际数量",
           prop: "sendTotalNum",
           search: false,
           overHidden: true,
-          // width: 120,
         }, {
           label: "状态",
           prop: "statusName",
@@ -272,7 +262,6 @@ export default {
             label: "已撤销",
             value: "已撤销"
           }],
-          // width: 120,
         }, {
           label: '业务日期',
           prop: "businesDate",
@@ -296,12 +285,6 @@ export default {
             value: 'id'
           },
           dicUrl: '/api/blade-user/stockClerkList',
-          // props: {
-          //   label: 'name',
-          //   value: 'id'
-          // },
-          // dicUrl: "/api/blade-user/getWarehouseKeeper?salesCompanyId=" + JSON.parse(localStorage.getItem("saber-userInfo")).content.dept_id,
-          // width: 200
         }, {
           label: "制单人",
           prop: "createUserName",

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

@@ -245,6 +245,7 @@ export default {
           prop: "customerId",
           search: true,
           overHidden: true,
+          filterable:true,
           type: 'select',
           props: {
             label: 'cname',
@@ -256,6 +257,7 @@ export default {
           prop: "storageId",
           search: true,
           overHidden: true,
+          filterable:true,
           type: 'select',
           props: {
             label: 'cname',

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

@@ -798,7 +798,6 @@ export default {
                     label: '库存',
                     prop: 'inventory',
                     overHidden: true,
-                    hide: true,
                     width: 100
                 }, {
                     label: '批次号',
@@ -1360,9 +1359,6 @@ export default {
         //确认导入触发
         async importGoods() {
             this.surplusRouteQuantityOption.push({ storageQuantity: '0' });
-            console.log(this.goodsListSave, '导入按钮')
-            console.log(this.surplusRouteQuantityOption, '导入按钮2')
-            console.log(this.tableData, '导入按钮3')
             if (this.goodsListSave.length > 0) {
                 this.goodsListSaveHandle()
             } else {
@@ -1413,6 +1409,7 @@ export default {
 
                         goodsNum: item.goodsNum,
                         units: item.unit,
+                        inventory:item.inventory,
                         // sendNum:res.data.data[0],
                         // 小计
                         subTotalMoney: item.goodsNum * item.price,
@@ -1806,7 +1803,7 @@ export default {
                         spinner: 'el-icon-loading',
                         background: 'rgba(255,255,255,0.7)'
                     });
-
+                    this.form.storageName=this.form.$storageId?this.form.$storageId:''
                     submit({
                         bsType: "CG",
                         ...this.form

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

@@ -228,7 +228,6 @@ export default {
           {
             label: '收货数量',
             prop: 'sendNum',
-            disabled: false,
             overHidden: true,
             width: 100,
             disabled: true,
@@ -252,7 +251,7 @@ export default {
         size: "small",
         menuWidth: 50,
         searchSpan: 6,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         searchIcon: true,
         searchIndex: 3,
         highlightCurrentRow: true,
@@ -300,14 +299,14 @@ export default {
           overHidden: true,
         }, {
           label: '业务对象',
-          prop: "customerId",
+          prop: "customerName",
           type: 'select',
           remote:true,
           search: true,
           overHidden: true,
           props: {
             label: 'cname',
-            value: 'id'
+            value: 'cname'
           },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS',
         },
@@ -320,14 +319,14 @@ export default {
           searchslot: true
         }, {
           label: '仓库',
-          prop: "storageId",
+          prop: "storageName",
           search: true,
           // remote:true,
           overHidden: true,
           type: 'select',
           props: {
             label: 'cname',
-            value: 'id'
+            value: 'cname'
           },
           dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
         }, {
@@ -335,6 +334,20 @@ export default {
           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}}"
+        }, {
           label: '数量',
           prop: "goodsTotalNum",
           overHidden: true,
@@ -493,14 +506,13 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 3 !== 0) {
-      const num = 3 - Number(i % 3)
-      this.option.searchMenuSpan = num * 8;
-      this.option.searchMenuPosition = "right";
-    }
+    // if (i % 3 !== 0) {
+    //   const num = 3 - Number(i % 3)
+    //   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

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

@@ -109,19 +109,18 @@
                             </template>
 
                             <template slot="goodsNum" slot-scope="{ row }">
-                                <el-input v-if="!mingxibaocun && form.businessSource != '外部销售'" size="small" v-model="row.goodsNum" style="width: 100%"
-                                    @blur="goodsNumblurfun(row)"></el-input>
+                                <el-input v-if="!mingxibaocun && form.businessSource != '外部销售'" size="small"
+                                    v-model="row.goodsNum" style="width: 100%" @blur="goodsNumblurfun(row)"></el-input>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </template>
                             <template slot="price" slot-scope="{ row }">
-                                <el-input v-if="!mingxibaocun && form.businessSource != '外部销售'" size="small" v-model="row.price"
-                                    style="width: 100%"></el-input>
+                                <el-input v-if="!mingxibaocun && form.businessSource != '外部销售'" size="small"
+                                    v-model="row.price" style="width: 100%"></el-input>
                                 <span v-else>{{ row.price }}</span>
                             </template>
                             <template slot="dot" slot-scope="{ row }">
-                                <el-select v-if="!mingxibaocun" v-model="row.dot" filterable
-                                    default-first-option @focus="picihaolistfun(row.goodsId)"
-                                    @change="dotchangefun($event, row)">
+                                <el-select v-if="!mingxibaocun" v-model="row.dot" filterable default-first-option
+                                    @focus="picihaolistfun(row.goodsId)" @change="dotchangefun($event, row)">
                                     <el-option v-for="(item, index) in picihaolist" :key="index" :label="item.dot"
                                         :value="item.dot"></el-option>
                                 </el-select>
@@ -1998,6 +1997,8 @@ export default {
                             break
                         }
                     }
+                    this.form.salerName=this.form.$salerId?this.form.$salerId:''
+                    this.form.storageName=this.form.$storageId?this.form.$storageId:''
                     submit({
                         bsType: "XS",
                         ...this.form

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

@@ -198,7 +198,7 @@ export default {
         size: "small",
         menuWidth: 50,
         searchSpan: 6,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         searchIcon: true,
         expand: true,
         expandWidth: 60,
@@ -252,26 +252,26 @@ export default {
         },
         {
           label: '业务对象',
-          prop: "customerId",
+          prop: "customerName",
           search: true,
           remote: true,
           overHidden: true,
           type: 'select',
           props: {
             label: 'cname',
-            value: 'id'
+            value: 'cname'
           },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&cname={{key}}',
         },
         {
           label: '业务员',
           disabled: false,
-          prop: "salerId",
+          prop: "salerName",
           search: true,
           type: "select",
           props: {
             label: "name",
-            value: "id"
+            value: "name"
           },
           dicUrl: "/api/blade-user/client/getUserByRole",
           filterable: true,
@@ -282,14 +282,14 @@ export default {
           }]
         }, {
           label: '仓库',
-          prop: "storageId",
+          prop: "storageName",
           search: true,
           overHidden: true,
           // remote: true,
           type: 'select',
           props: {
             label: 'cname',
-            value: 'id'
+            value: 'cname'
           },
           dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
         }, {
@@ -299,7 +299,17 @@ export default {
         }, {
           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}}"
         }, {
           label: '数量',
           prop: "goodsTotalNum",
@@ -360,12 +370,12 @@ export default {
           label: '退货状态',
           prop: "returnsStatus",
           overHidden: true,
-        }, 
+        },
         {
           label: '应结日期',
           prop: "dueDate",
           overHidden: true,
-        }, 
+        },
         {
           label: '业务日期',
           prop: "businesDate",
@@ -479,11 +489,11 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 3 !== 0) {
-      const num = 3 - Number(i % 3)
-      this.option.searchMenuSpan = num * 8;
-      this.option.searchMenuPosition = "right";
-    }
+    // if (i % 3 !== 0) {
+    //   const num = 3 - Number(i % 3)
+    //   this.option.searchMenuSpan = num * 8;
+    //   this.option.searchMenuPosition = "right";
+    // }
     this.getWorkDicts("sales_Status").then(res => {
       this.orderStatusList = res.data.data
       console.log(this.orderStatusList);
@@ -654,7 +664,8 @@ export default {
   color: #fff;
   font-size: 10px;
 }
+
 /deep/ .el-col-md-8 {
-    width: 24.33333%;
+  width: 24.33333%;
 }
 </style>

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -722,6 +722,8 @@ export default {
                         spinner: 'el-icon-loading',
                         background: 'rgba(255,255,255,0.7)'
                     });
+                    this.form.salerName=this.form.$salerId?this.form.$salerId:''
+                    this.form.storageName=this.form.$storageId?this.form.$storageId:''
                     submit({
                         bsType: "TKXS",
                         ...this.form

src/views/tirePartsMall/salesService/returns/index.vue

@@ -8,7 +8,7 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 342)" :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"
+          <el-button :size="size" :type="type" :disabled="row.status != '录入' || row.numberRows != 0"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
@@ -71,7 +71,7 @@ export default {
         delBtn: false,
         addBtn: false,
         index: true,
-        span: 8,
+        span: 6,
         border: true,
         height: "auto",
         searchMenuPosition: "right",
@@ -79,7 +79,7 @@ export default {
         size: "small",
         menuWidth: 50,
         searchSpan: 6,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         searchIcon: true,
         // expand: true,
         // expandWidth: 60,
@@ -129,12 +129,12 @@ export default {
           {
             label: '业务员',
             disabled: false,
-            prop: "salerId",
+            prop: "salerName",
             search: true,
             type: "select",
             props: {
               label: "name",
-              value: "id"
+              value: "name"
             },
             dicUrl: "/api/blade-user/client/getUserByRole",
             filterable: true,
@@ -146,14 +146,14 @@ export default {
           },
           {
             label: '仓库',
-            prop: "storageId",
+            prop: "storageName",
             search: true,
             overHidden: true,
             // remote: true,
             type: 'select',
             props: {
               label: 'cname',
-              value: 'id'
+              value: 'cname'
             },
             dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
           },
@@ -165,7 +165,17 @@ export default {
           {
             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}}"
           },
           {
             label: '数量',
@@ -245,7 +255,7 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           }
-          ]
+        ]
       }
     }
   },
@@ -283,11 +293,11 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 3 !== 0) {
-      const num = 3 - Number(i % 3)
-      this.option.searchMenuSpan = num * 8;
-      this.option.searchMenuPosition = "right";
-    }
+    // if (i % 3 !== 0) {
+    //   const num = 3 - Number(i % 3)
+    //   this.option.searchMenuSpan = num * 8;
+    //   this.option.searchMenuPosition = "right";
+    // }
     this.getWorkDicts("sales_Status").then(res => {
       this.orderStatusList = res.data.data
       console.log(this.orderStatusList);
@@ -458,7 +468,8 @@ export default {
   color: #fff;
   font-size: 10px;
 }
+
 /deep/ .el-col-md-8 {
-    width: 24.33333%;
+  width: 24.33333%;
 }
 </style>