提交中电、箱管,达沃特

src/components/bill/billDetailList.vue

@@ -58,8 +58,8 @@
         data:[],
         selectList:[],
         page: {
-          pageSize: 10,
-          pagerCount: 5,
+          pageSize: 300,
+          pagerCount: 1,
           total: 0,
         },
         breakConfiguration:{

src/components/boxInformation/index.vue

@@ -482,6 +482,7 @@ export default {
         ...params,
         current: page.currentPage,
         size: page.pageSize,
+        status:"待使用",
         ...Object.assign(params, this.search)
       }
       this.loading = true

src/enums/column-name.js

@@ -210,28 +210,36 @@ const columnName = [{
   code: 61,
   name: '财务付费申请'
 },
-{
-  code: 62,
-  name: '财务付费申请明细'
-},
-{
-  code: 63,
-  name: '付款结算'
-},
-{
-  code: 64,
-  name: '收款结算'
-},
-{
-  code: 65,
-  name: '进口库存账'
-},
-{
-  code: 66,
-  name: '利润分析'
-},
-{
-  code: 67,
+  {
+    code: 62,
+    name: '财务付费申请明细'
+  },
+  {
+    code: 63,
+    name: '付款结算'
+  },
+  {
+    code: 63.1,
+    name: '付款结算-明细'
+  },
+  {
+    code: 64,
+    name: '收款结算'
+  },
+  {
+    code: 64.1,
+    name: '收款结算-明细'
+  },
+  {
+    code: 65,
+    name: '进口库存账'
+  },
+  {
+    code: 66,
+    name: '利润分析'
+  },
+  {
+    code: 67,
   name: '内贸锁定明细'
 },
 {
@@ -785,26 +793,29 @@ const columnName = [{
 }, {
   code: 182,
   name: '国家和地区'
-}, {
-  code: 183,
-  name: '任务统计'
-}, {
-  code: 184,
-  name: '提成统计'
-}, {
-  code: 185,
-  name: '销售利润(N)-列表页'
-}, {
-  code: 186,
-  name: '事务管理-任务'
-}, {
-  code: 187,
-  name: '橡胶库存-列表页'
-}, {
-  code: 188,
-  name: '采购管理-入库列表页'
-}, {
-  code: 189,
+  }, {
+    code: 183,
+    name: '任务统计'
+  }, {
+    code: 184,
+    name: '提成统计'
+  }, {
+    code: 185,
+    name: '销售利润(N)-列表页'
+  }, {
+    code: 185.1,
+    name: '销售利润-列表页'
+  }, {
+    code: 186,
+    name: '事务管理-任务'
+  }, {
+    code: 187,
+    name: '橡胶库存-列表页'
+  }, {
+    code: 188,
+    name: '采购管理-入库列表页'
+  }, {
+    code: 189,
   name: '采购管理-入库明细表'
 }, {
   code: 190,

src/router/views/index.js

@@ -2233,5 +2233,18 @@ export default [{
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/boxManagement/boxTrack/index')
   }]
+}, {
+  path: '/boxManagement/stockpilingManage/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/boxManagement/stockpilingManage/index',
+    name: '堆存管理',
+    meta: {
+      i18n: '/boxManagement/stockpilingManage/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/boxManagement/stockpilingManage/index')
+  }]
 }
 ]

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -102,7 +102,7 @@
             </el-dropdown-menu>
           </el-dropdown>
           <el-button style="margin-left: 0" type="success" size="small"
-                     :disabled="option.disabled || (selectionList.findIndex(function(item){return item.status == '待使用' && item.stockpilingStatus == '1'}) == -1?true:false)"
+                     :disabled="option.disabled || (selectionList.findIndex(function(item){return item.status == '空箱入场' && item.stockpilingStatus == '1'}) == -1?true:false)"
                      @click="stockpiling()">堆存
           </el-button>
         </template>
@@ -1377,6 +1377,9 @@ export default {
       })
     },
     rowUpdate(form, index, done, loading) {
+      if (!Number(item.price) || Number(item.price) < 0){
+        return  this.$message.error('超期单价/天,不能不能为0或不能为负')
+      }
       form.boxType = form.$boxTypeId
       done(form)
       this.getWorkDicts("currency").then(res => {

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -101,7 +101,7 @@
             </el-dropdown-menu>
           </el-dropdown>
           <el-button style="margin-left: 0" type="success" size="small"
-                     :disabled="option.disabled || (selectionList.findIndex(function(item){return item.status == '待使用' && item.stockpilingStatus == '1'}) == -1?true:false)"
+                     :disabled="option.disabled || (selectionList.findIndex(function(item){return item.status == '空箱入场' && item.stockpilingStatus == '1'}) == -1?true:false)"
                      @click="stockpiling()">堆存
           </el-button>
         </template>
@@ -109,10 +109,10 @@
           <port-info v-model="formTwo.addressId" type="id" :disabled="scope.disabled"
                      @balabalaTow="(val)=>{balabala(val,['formTwo','address'])}"/>
         </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>-->
+        <!--        <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>
     <!--    报表-->
@@ -831,6 +831,11 @@ export default {
     }
     this.key++
   },
+  activated() {
+    if (this.$refs.crud && this.$refs.crud.doLayout) {
+      this.$refs.crud.doLayout();
+    }
+  },
   methods: {
     //堆存
     stockpiling() {
@@ -1381,6 +1386,9 @@ export default {
       })
     },
     rowUpdate(form, index, done, loading) {
+      if (!Number(item.price) || Number(item.price) < 0){
+        return  this.$message.error('超期单价/天,不能不能为0或不能为负')
+      }
       form.boxType = form.$boxTypeId
       done(form)
       this.getWorkDicts("currency").then(res => {

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -827,6 +827,9 @@ export default {
         } else if (type === '计算租金') {
           this.optionState = this.optionStateFour
           for (let item of this.selectionList) {
+            if (!Number(item.price) || Number(item.price) < 0){
+              return this.$message.error('租金/天,不能不能为0或不能为负')
+            }
             for (let li of this.selectionList) {
               if (item.rentEndDate !== li.rentEndDate) {
                 return this.$message.error(`${item.code} - ${item.rentEndDate}，当前租金期间不相同，禁止选择`)

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -833,6 +833,9 @@ export default {
         } else if (type === '计算租金'){
           this.optionState = this.optionStateFour
           for (let item of this.selectionList) {
+            if (!Number(item.price) || Number(item.price) < 0){
+              return this.$message.error('租金/天,不能不能为0或不能为负')
+            }
             for (let li of this.selectionList) {
               if (item.rentEndDate !== li.rentEndDate) {
                   return this.$message.error(`${item.code} - ${item.rentEndDate}，当前租金期间不相同，禁止选择`)

src/views/boxManagement/stockpilingManage/detailsPage.vue

@@ -446,7 +446,7 @@ export default {
             trigger: "blur"
           }]
         }, {
-          label: '租金/天',
+          label: '堆存/天',
           prop: 'price',
           type: 'number',
           controls: false,
@@ -1168,6 +1168,9 @@ export default {
       done(form)
     },
     rowUpdate(form, index, done, loading) {
+      if (!Number(item.price) || Number(item.price) < 0){
+        return this.$message.error('堆存/天,不能不能为0或不能为负')
+      }
       form.boxType = form.$boxTypeId
       done(form)
     },

src/views/exportTrade/customerInquiry/components/goodsInfo.vue

@@ -57,7 +57,7 @@
             //产品名称
             <template slot="cnameForm" slot-scope="{type,disabled}">
                 <span style="display:flex">
-                    <el-select v-model="goodsForm.itemId" placeholder="请选择" size="small"
+                    <el-select v-model="goodsForm.itemId" placeholder="请选择" size="small" filterable
                                @change="cnameChange(goodsForm)">
                         <el-option
                             v-for="item in goodsoptions"

src/views/financialManagement/collectionSettlement/receiptSettleDetailsPage.vue

@@ -110,6 +110,8 @@
                    @selection-change="selectionChange"
                    @current-change="currentChange"
                    @size-change="sizeChange"
+                   @resetColumn="resetColumnTwo('crud','itemsOption','optionList',64.1)"
+                   @saveColumn="saveColumnTwo('crud','itemsOption','optionList',64.1)"
                    @refresh-change="refreshChange">
           <template slot="menuLeft">
             <el-button type="primary"
@@ -233,10 +235,11 @@
       return {
         category: '',
         form: {},
-        itemsForm:{},
-        params:{},
-        buttonLoading:false,
-        itemsOption: option,
+        itemsForm: {},
+        params: {},
+        buttonLoading: false,
+        itemsOption: {},
+        optionList: option,
         option: {
           menuBtn: false,
           labelWidth: 100,
@@ -244,7 +247,7 @@
             {
               label: '所属公司',
               prop: 'salesCompany',
-              sort:true,
+              sort: true,
               span: 8,
               rules: [
                 {
@@ -476,14 +479,15 @@
         statementData: {},
       }
     },
-    created() {
+    async created() {
+      this.itemsOption = await this.getColumnData(this.getColumnName(64.1), this.optionList);
       // 人民币金额默认为0
-      this.$set(this.form,"amount", 0)
-      getUserInfo().then(res=>{
+      this.$set(this.form, "amount", 0)
+      getUserInfo().then(res => {
         this.category = res.data.data.billType
         if (this.category == 2) {
-          this.$set(this.form,"overPayment", 0)
-          this.$set(this.form,"caseOverPayment", 0)
+          this.$set(this.form, "overPayment", 0)
+          this.$set(this.form, "caseOverPayment", 0)
           this.option.column.forEach(item => {
             if (item.prop == 'caseOverPayment' || item.prop == 'overPayment') {
               item.display = true
@@ -874,6 +878,29 @@
       onClose(val) {
         this.switchDialog = val;
       },
+      //自定义列保存
+      async saveColumnTwo(ref, option, optionBack, code) {
+        /**
+         * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+         * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+         * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+         */
+        const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+        if (inSave) {
+          this.$message.success("保存成功");
+          //关闭窗口
+          this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        }
+      },
+//自定义列重置
+      async resetColumnTwo(ref, option, optionBack, code) {
+        this[option] = this[optionBack];
+        const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+        if (inSave) {
+          this.$message.success("重置成功");
+          this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        }
+      },
       // 跳转页面
       jumpPage(row, index) {
         if (this.category == 2) {

src/views/financialManagement/paymentSettlement/paymentSettleDetailsPage.vue

@@ -52,6 +52,8 @@
       <basic-container>
         <avue-crud :option="itemsOption" :data="dataList" ref="crud" v-model="itemsForm" :page.sync="page"
           :cell-style="cellStyle" @search-reset="searchReset" @row-update="rowUpdate"
+                   @resetColumn="resetColumnTwo('crud','itemsOption','optionList',63.1)"
+                   @saveColumn="saveColumnTwo('crud','itemsOption','optionList',63.1)"
           @selection-change="selectionChange">
           <template slot="menuLeft">
             <el-button type="primary" size="small" :loading="buttonLoading" icon="el-icon-shopping-cart-2"
@@ -101,7 +103,7 @@
       <report-dialog
           :switchDialog="switchDialog"
           :reportId="form.id"
-          reportName="付款"
+          reportName="运费结算"
           @onClose="onClose()"
       />
     </div>
@@ -134,7 +136,8 @@ export default {
       title:'',
       switchDialog:false,
       itemsForm: {},
-      itemsOption: option,
+      itemsOption: {},
+      optionList: option,
       billDetailDialog: false,
       buttonLoading: false,
       financeDisabled: false,
@@ -409,7 +412,8 @@ export default {
   components: {
     billDetail,reportDialog
   },
-  created() {
+  async created() {
+    this.itemsOption = await this.getColumnData(this.getColumnName(63.1), this.optionList);
     // 人民币金额默认为0
     this.$set(this.form, "amount", 0)
     getUserInfo().then(res => {
@@ -833,6 +837,29 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    //自定义列保存
+    async saveColumnTwo(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+//自定义列重置
+    async resetColumnTwo(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
     // 跳转页面
     jumpPage(row, index) {
       if (this.category == 2) {

src/views/statisticAnalysis/analysisOfCoping/index.vue

@@ -11,7 +11,7 @@
           </el-button>
         </template>
         <template slot="corpNameSearch" slot-scope="scope">
-          <crop-select v-model="search.corpId" corpType="KH"/>
+          <crop-select v-model="search.corpId" corpType="KC"/>
         </template>
         <template slot="freightPay" slot-scope="{row}">
                 <span class="el-button--text" style="cursor: pointer"

src/views/statisticAnalysis/salesProfit/index.vue

@@ -16,8 +16,8 @@
         @on-load="onLoad"
         :table-loading="loading"
         :summary-method="summaryMethod"
-        @saveColumn="saveColumn"
-        @resetColumn="resetColumn"
+        @resetColumn="resetColumnTwo('crud','option','optionList',185.1)"
+        @saveColumn="saveColumnTwo('crud','option','optionList',185.1)"
         @expand-change="expandChange"
         @search-criteria-switch="searchCriteriaSwitch"
       >
@@ -113,7 +113,8 @@ export default {
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
-      option: {
+      option: {},
+      optionList: {
         searchShow: true,
         searchMenuSpan: 16,
         align: "center",
@@ -346,6 +347,9 @@ export default {
       return num ? Number(num).toFixed(2) : "0.00";
     }
   },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(185.1), this.optionList);
+  },
   methods: {
     cellStyle() {
       return "padding:0;height:40px;";
@@ -526,6 +530,29 @@ export default {
         });
       }
       return sums;
+    },
+    //自定义列保存
+    async saveColumnTwo(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+//自定义列重置
+    async resetColumnTwo(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        target: 'http://192.168.0.103:1080',
+        // target: 'http://192.168.0.103:1080',
         // target: 'http://124.222.119.174:1080',
         // 打包地址
-        // target: 'http://121.37.83.47:10004',//服务器ip
+        target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {