caojunjie 2 år sedan
förälder
incheckning
89cecc1723

+ 15 - 0
src/enums/column-name.js

@@ -1084,6 +1084,21 @@ const columnName = [{
   }, {
     code: 247.3,
     name: '租入-附件'
+  }, {
+    code: 248,
+    name: '出口-出口报关'
+  }, {
+    code: 248.1,
+    name: '出口-出口报关-商品'
+  }, {
+    code: 248.2,
+    name: '出口-出口报关-集装箱'
+  }, {
+    code: 248.21,
+    name: '出口-出口报关-单证'
+  }, {
+    code: 248.3,
+    name: '出口-出口报关-附件'
   }
 ]
 export const getColumnName = (key) => {

+ 21 - 1
src/views/boxManagement/boxRepair/detailsPage.vue

@@ -84,12 +84,22 @@
           <port-info v-model="formTwo.addressId" type="id" :disabled="scope.disabled"
                      @balabalaTow="(val)=>{balabala(val,['formTwo','address'])}"/>
         </template>
+        <template slot="menuLeft" slot-scope="scope">
+          <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
+        </template>
         <!--        <template slot="boxMakingCompanyIdForm" slot-scope="scope">-->
         <!--          <crop-select v-model="formTwo.boxMakingCompanyId" :disabled="scope.disabled" :refresh="false"-->
         <!--                       @getCorpData="(row)=>{getGSData(row,['formTwo','boxMakingCompany'])}" corpType="GS"/>-->
         <!--        </template>-->
       </avue-crud>
     </trade-card>
+    <!--    报表-->
+    <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="修箱"
+        @onClose="onClose()"
+    />
     <!--    费用信息组件-->
     <box-cost v-model="dataListTwo" :codeValue="242.2" :tabShow="3" activeName="second" ref="boxCost"
               url="/api/blade-box-tube/files/remove" @resetTrigger="resetTrigger"></box-cost>
@@ -136,6 +146,7 @@ import {
 
 import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";
+import reportDialog from "@/components/report-dialog/main.vue";
 
 export default {
   name: "detailsPage",
@@ -143,10 +154,11 @@ export default {
     onLoad: Object,
     detailData: Object
   },
-  components: {checkSchedule},
+  components: {checkSchedule,reportDialog},
   data() {
     return {
       key: 0,
+      switchDialog: false,
       checkScheduleDialog: false,
       checkId: '',
       batchNo: '',
@@ -290,6 +302,14 @@ export default {
     this.key++
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     confirmEdit() {
       if (this.form.status > 0) {
         //基础资料

+ 21 - 1
src/views/boxManagement/boxWashing/detailsPage.vue

@@ -84,12 +84,22 @@
           <port-info v-model="formTwo.addressId" type="id" :disabled="scope.disabled"
                      @balabalaTow="(val)=>{balabala(val,['formTwo','address'])}"/>
         </template>
+        <template slot="menuLeft" slot-scope="scope">
+          <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
+        </template>
         <!--        <template slot="boxMakingCompanyIdForm" slot-scope="scope">-->
         <!--          <crop-select v-model="formTwo.boxMakingCompanyId" :disabled="scope.disabled" :refresh="false"-->
         <!--                       @getCorpData="(row)=>{getGSData(row,['formTwo','boxMakingCompany'])}" corpType="GS"/>-->
         <!--        </template>-->
       </avue-crud>
     </trade-card>
+    <!--    报表-->
+    <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="洗箱"
+        @onClose="onClose()"
+    />
     <!--    费用信息组件-->
     <box-cost v-model="dataListTwo" :codeValue="243.2" :tabShow="3" activeName="second" ref="boxCost"
               url="/api/blade-box-tube/files/remove" @resetTrigger="resetTrigger"></box-cost>
@@ -136,6 +146,7 @@ import {
 
 import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";
+import reportDialog from "@/components/report-dialog/main.vue";
 
 export default {
   name: "detailsPage",
@@ -143,10 +154,11 @@ export default {
     onLoad: Object,
     detailData: Object
   },
-  components: {checkSchedule},
+  components: {checkSchedule,reportDialog},
   data() {
     return {
       key: 0,
+      switchDialog: false,
       checkScheduleDialog: false,
       checkId: '',
       batchNo: '',
@@ -290,6 +302,14 @@ export default {
     this.key++
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     confirmEdit() {
       if (this.form.status > 0) {
         //基础资料

+ 19 - 1
src/views/boxManagement/buyContainer/detailsPage.vue

@@ -70,9 +70,17 @@
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBox">
             导入
           </el-button>
+          <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
         </template>
       </avue-crud>
     </trade-card>
+    <!--    报表-->
+    <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="买箱"
+        @onClose="onClose()"
+    />
 <!--    费用信息组件-->
     <box-cost v-model="dataListTwo" activeName="second" ref="boxCost" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
@@ -131,6 +139,7 @@ import {
   repealCancel
 } from "@/api/boxManagement/buyContainer";
 
+import reportDialog from "@/components/report-dialog/main";
 import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";
 import {getToken} from "@/util/auth";
@@ -140,10 +149,11 @@ export default {
     onLoad: Object,
     detailData: Object
   },
-  components:{checkSchedule},
+  components:{checkSchedule,reportDialog},
   data() {
     return {
       key: 0,
+      switchDialog: false,
       excelBox: false,
       excelOption: {
         submitBtn: false,
@@ -555,6 +565,14 @@ export default {
     }
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     importBox() {
       this.findObject(this.excelOption.column, "excelFile").data = {
         corpId: this.form.purchaseCompanyId,

+ 1 - 0
src/views/boxManagement/buyContainer/index.vue

@@ -50,6 +50,7 @@ export default {
   },
   data() {
     return {
+      switchDialog: false,
       detailsOpen: false,
       loading: false,
       search: {},

+ 19 - 1
src/views/boxManagement/exportShipment/detailsPage.vue

@@ -79,6 +79,7 @@
         <template slot="menuLeft" slot-scope="scope">
           <el-button type="success" size="small" :disabled="option.disabled" @click="importBox">提取</el-button>
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBoxTwo">导入</el-button>
+          <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
           <el-dropdown>
             <el-button type="primary" size="small" :disabled="selectionList.length === 0 || option.disabled">
               起运港<i class="el-icon-arrow-down el-icon--right"></i>
@@ -110,6 +111,13 @@
 <!--        </template>-->
       </avue-crud>
     </trade-card>
+    <!--    报表-->
+    <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="出口装运"
+        @onClose="onClose()"
+    />
     <!--    费用信息组件-->
     <box-cost v-model="dataListTwo" :codeValue="237.2" activeName="first" ref="boxCost"
               url="/api/blade-box-tube/transportItemFees/remove" @resetTrigger="resetTrigger"></box-cost>
@@ -239,6 +247,7 @@ import {selectByName} from "@/api/boxManagement";
 import {selectArchivesList} from "@/api/boxManagement/buyContainer";
 import {dateFormat} from "@/util/date";
 import {getToken} from "@/util/auth";
+import reportDialog from "@/components/report-dialog/main.vue";
 
 export default {
   name: "detailsPage",
@@ -246,9 +255,10 @@ export default {
     onLoad: Object,
     detailData: Object
   },
-  components: {checkSchedule},
+  components: {checkSchedule,reportDialog},
   data() {
     return {
+      switchDialog: false,
       excelBox: false,
       excelOption: {
         submitBtn: false,
@@ -764,6 +774,14 @@ export default {
     this.key++
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     confirmEdit() {
       if (this.form.status > 0) {
         //基础资料

+ 19 - 1
src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -78,6 +78,7 @@
         <template slot="menuLeft" slot-scope="scope">
           <el-button type="success" size="small" :disabled="option.disabled" @click="importBox">提取</el-button>
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBoxTwo">导入</el-button>
+          <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
           <el-dropdown>
             <el-button type="primary" size="small" :disabled="selectionList.length === 0 || option.disabled">
               起运港<i class="el-icon-arrow-down el-icon--right"></i>
@@ -109,6 +110,13 @@
 <!--        </template>-->
       </avue-crud>
     </trade-card>
+    <!--    报表-->
+    <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="进口返程"
+        @onClose="onClose()"
+    />
     <!--    费用信息组件-->
     <box-cost v-model="dataListTwo" :codeValue="237.2" activeName="second" ref="boxCost"
               url="/api/blade-box-tube/transportItemFees/remove" @resetTrigger="resetTrigger"></box-cost>
@@ -238,6 +246,7 @@ import {selectByName} from "@/api/boxManagement";
 import {selectArchivesList} from "@/api/boxManagement/buyContainer";
 import {dateFormat} from "@/util/date";
 import {getToken} from "@/util/auth";
+import reportDialog from "@/components/report-dialog/main.vue";
 
 export default {
   name: "detailsPage",
@@ -245,10 +254,11 @@ export default {
     onLoad: Object,
     detailData: Object
   },
-  components: {checkSchedule},
+  components: {checkSchedule,reportDialog},
   data() {
     return {
       excelBox: false,
+      switchDialog: false,
       excelOption: {
         submitBtn: false,
         emptyBtn: false,
@@ -768,6 +778,14 @@ export default {
     this.key++
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     confirmEdit() {
       if (this.form.status > 0) {
         //基础资料

+ 19 - 1
src/views/boxManagement/leaseIn/detailsPage.vue

@@ -91,9 +91,17 @@
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom"
                      @click="excelBox = true">导入
           </el-button>
+          <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
         </template>
       </avue-crud>
     </trade-card>
+    <!--    报表-->
+    <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="租入"
+        @onClose="onClose()"
+    />
 <!--    费用信息组件-->
     <box-cost v-model="dataListTwo" type="ZR" activeName="second" :codeValue="245.2" ref="boxCost"
               @resetTrigger="resetTrigger"></box-cost>
@@ -179,6 +187,7 @@ import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";
 import {getToken} from "@/util/auth";
 import {dateFormat, defaultDate} from "@/util/date";
+import reportDialog from "@/components/report-dialog/main.vue";
 export default {
   name: "detailsPage",
   props: {
@@ -186,10 +195,11 @@ export default {
     detailData: Object
   },
   components:{
-    checkSchedule
+    checkSchedule,reportDialog
   },
   data() {
     return {
+      switchDialog:false,
       excelOption: {
         submitBtn: false,
         emptyBtn: false,
@@ -730,6 +740,14 @@ export default {
     }
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     derivation() {
       window.open(`/api/blade-box-tube/tradingBoxRent/export-tradingBox-info?${this.website.tokenHeader}=${getToken()}`);
     },

+ 19 - 1
src/views/boxManagement/leaseOut/detailsPage.vue

@@ -81,9 +81,17 @@
                      @click="statusUpdate('3','撤销租金')">撤销租金
           </el-button>
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBox">导入</el-button>
+          <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
         </template>
       </avue-crud>
     </trade-card>
+    <!--    报表-->
+    <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="租出"
+        @onClose="onClose()"
+    />
 <!--    费用信息组件-->
     <box-cost v-model="dataListTwo" type="ZC" activeName="first" :codeValue="247.2" ref="boxCost"
               @resetTrigger="resetTrigger"></box-cost>
@@ -169,15 +177,17 @@ import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";
 import {getToken} from "@/util/auth";
 import {dateFormat} from "@/util/date";
+import reportDialog from "@/components/report-dialog/main.vue";
 export default {
   name: "detailsPage",
   props: {
     onLoad: Object,
     detailData: Object
   },
-  components:{checkSchedule},
+  components:{checkSchedule,reportDialog},
   data() {
     return {
+      switchDialog:false,
       excelOption: {
         submitBtn: false,
         emptyBtn: false,
@@ -718,6 +728,14 @@ export default {
     }
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     importBox() {
       this.findObject(this.excelOption.column, "excelFile").data = {
         billType: "ZC"

+ 19 - 1
src/views/boxManagement/sellingContainers/detailsPage.vue

@@ -69,9 +69,17 @@
           <el-button :disabled="option.disabled" type="success" size="small" icon="el-icon-bottom" @click="importBox">
             导入
           </el-button>
+          <el-button class="el-icon-download" type="info" size="small" :disabled="!form.id" @click="openReport">报表打印</el-button>
         </template>
       </avue-crud>
     </trade-card>
+    <!--    报表-->
+    <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="卖箱"
+        @onClose="onClose()"
+    />
     <!--    费用信息组件-->
     <box-cost v-model="dataListTwo" ref="boxCost" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
@@ -132,15 +140,17 @@ import {
 
 import checkSchedule from "@/components/check/checkSchedule";
 import {selectByName} from "@/api/boxManagement";
+import reportDialog from "@/components/report-dialog/main.vue";
 export default {
   name: "detailsPage",
   props: {
     onLoad: Object,
     detailData: Object
   },
-  components:{checkSchedule},
+  components:{checkSchedule,reportDialog},
   data() {
     return {
+      switchDialog: false,
       excelBox: false,
       excelOption: {
         submitBtn: false,
@@ -561,6 +571,14 @@ export default {
     }
   },
   methods: {
+    // 报表
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    // 报表关闭
+    onClose(val) {
+      this.switchDialog = val;
+    },
     uploadBefore(file, done, loading) {
       loading = true;
       done();

+ 3 - 4
src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -19,10 +19,9 @@
                @on-load="onLoad"
                @search-criteria-switch="searchCriteriaSwitch">
       <template slot="corpIdSearch">
-        <select-component
-          v-model="search.corpId"
-          :configuration="configuration"
-        ></select-component>
+        <crop-select v-model="search.corpId"
+                     :refresh="false"
+                     corpType="KG"/>
       </template>
       <template slot="menuLeft">
         <el-button type="primary"

+ 3 - 1
src/views/maintenance/integral/index.vue

@@ -107,9 +107,11 @@ export default {
       dataList: [],
       form: {},
       page: {
-        pageSize: 10,
+        pageSize: 20,
         pagerCount: 5,
+        currentPage: 1,
         total: 0,
+        pageSizes: [20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       search: {},
       loading: false,

+ 3 - 1
src/views/maintenance/overpayment/index.vue

@@ -58,9 +58,11 @@ export default {
       dataList: [],
       form: {},
       page: {
-        pageSize: 10,
+        pageSize: 20,
         pagerCount: 5,
+        currentPage: 1,
         total: 0,
+        pageSizes: [20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       search: {},
       loading: false,

+ 3 - 1
src/views/maintenance/rebate/index.vue

@@ -66,9 +66,11 @@ export default {
       dataList: [],
       form: {},
       page: {
-        pageSize: 10,
+        pageSize: 20,
         pagerCount: 5,
+        currentPage: 1,
         total: 0,
+        pageSizes: [20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       search: {},
       loading: false,

+ 10 - 10
src/views/purchase/exportDeclaration/detailsPage.vue

@@ -96,8 +96,8 @@
           :before-open="beforeOpen"
           @row-save="rowSave"
           @row-update="rowUpdate"
-          @resetColumn="resetColumnTwo('crud','option','optionBack',246.1)"
-          @saveColumn="saveColumnTwo('crud','option','optionBack',246.1)">
+          @resetColumn="resetColumnTwo('crud','option','optionBack',248.1)"
+          @saveColumn="saveColumnTwo('crud','option','optionBack',248.1)">
         <template slot-scope="{type,size,row,index,disabled}" slot="menu">
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
                      @click="$refs.crud.rowEdit(row,index)">编辑
@@ -128,8 +128,8 @@
           :before-open="beforeOpen"
           @row-save="rowSave"
           @row-update="rowUpdate"
-          @resetColumn="resetColumnTwo('crudTwo','optionTwo','optionTwoBack',246.2)"
-          @saveColumn="saveColumnTwo('crudTwo','optionTwo','optionTwoBack',246.2)">
+          @resetColumn="resetColumnTwo('crudTwo','optionTwo','optionTwoBack',248.2)"
+          @saveColumn="saveColumnTwo('crudTwo','optionTwo','optionTwoBack',248.2)">
         <template slot-scope="{type,size,row,index,disabled}" slot="menu">
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
                      @click="$refs.crudTwo.rowEdit(row,index)">编辑
@@ -150,8 +150,8 @@
           :before-open="beforeOpen"
           @row-save="rowSave"
           @row-update="rowUpdate"
-          @resetColumn="resetColumnTwo('crudThree','optionThree','optionThreeBack',246.21)"
-          @saveColumn="saveColumnTwo('crudThree','optionThree','optionThreeBack',246.21)">
+          @resetColumn="resetColumnTwo('crudThree','optionThree','optionThreeBack',248.21)"
+          @saveColumn="saveColumnTwo('crudThree','optionThree','optionThreeBack',248.21)">
         <template slot-scope="{type,size,row,index,disabled}" slot="menu">
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
                      @click="$refs.crudThree.rowEdit(row,index)">编辑
@@ -170,7 +170,7 @@
           :data="tradingBoxFilesList"
           :disabled="disabled"
           deleteUrl="/api/blade-box-tube/declareCustomsFiles/remove"
-          :enumerationValue="246.3"
+          :enumerationValue="248.3"
           display
       />
     </trade-card>
@@ -853,9 +853,9 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(246.1), this.optionBack);
-    this.optionTwo = await this.getColumnData(this.getColumnName(246.2), this.optionTwoBack);
-    this.optionThree = await this.getColumnData(this.getColumnName(246.21), this.optionThreeBack);
+    this.option = await this.getColumnData(this.getColumnName(248.1), this.optionBack);
+    this.optionTwo = await this.getColumnData(this.getColumnName(248.2), this.optionTwoBack);
+    this.optionThree = await this.getColumnData(this.getColumnName(248.21), this.optionThreeBack);
     selectByName("买箱费").then(res => {
       this.costData = res.data.data
     })

+ 8 - 3
src/views/purchase/exportDeclaration/index.vue

@@ -13,8 +13,8 @@
           @search-change="searchChange"
           @row-del="rowDel"
           @refresh-change="refreshChange"
-          @resetColumn="resetColumnTwo('crud','option','optionList',246)"
-          @saveColumn="saveColumnTwo('crud','option','optionList',246)"
+          @resetColumn="resetColumnTwo('crud','option','optionList',248)"
+          @saveColumn="saveColumnTwo('crud','option','optionList',248)"
           :page.sync="page">
         <template slot-scope="{type,size,row,$index}" slot="menu">
           <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
@@ -156,7 +156,7 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(246), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(248), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -196,8 +196,13 @@ export default {
             type: 'success',
             message: '删除成功!'
           });
+          this.onLoad(this.page,this.search)
         })
       }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消!'
+        });
       });
     },
     searchChange(params, done) {

+ 5 - 0
src/views/purchase/importDeclaration/index.vue

@@ -197,7 +197,12 @@ export default {
             message: '删除成功!'
           });
         })
+        this.onLoad(this.page,this.search)
       }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消!'
+        });
       });
     },
     searchChange(params, done) {

+ 8 - 0
src/views/purchasingManagement/inStock/config/customerContact.json

@@ -206,6 +206,14 @@
       "index": 12,
       "prop": "itemType",
       "label": "品牌",
+      "type": "select",
+      "dicData": [],
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "filterable": true,
+      "dataType": "string",
       "overHidden": true,
       "cell": true,
       "width": 100

+ 4 - 0
src/views/purchasingManagement/inStock/detailsPage.vue

@@ -592,6 +592,10 @@ export default {
         this.findObject(this.tableOption.column, "grade").dicData =
             res.data.data;
       });
+      this.getWorkDicts("brand").then(res => {
+        this.findObject(this.tableOption.column, "itemType").dicData =
+            res.data.data;
+      });
     },
     cellStyle() {
       return "padding:0;height:40px;";

+ 9 - 1
src/views/salesManagement/outStock/config/customerContact.json

@@ -131,8 +131,16 @@
       "index": 12,
       "prop": "itemType",
       "label": "品牌",
+      "type": "select",
+      "filterable": true,
+      "dicData": [],
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dataType": "string",
       "overHidden": true,
-      "width": 100
+      "cell": true
     },{
       "index": 13,
       "prop": "itemProp",

+ 4 - 0
src/views/salesManagement/outStock/detailsPage.vue

@@ -504,6 +504,10 @@ export default {
       this.findObject(this.option.column, "businessType").dicData =
           res.data.data;
     });
+    this.getWorkDicts("brand").then(res => {
+      this.findObject(this.tableOption.column, "itemType").dicData =
+          res.data.data;
+    });
     if (this.$route.query.generateId) {
       this.getGenerate(this.$route.query.generateId);
     }