鑫畅途9.19修改内容

src/lang/index.js

@@ -1,9 +1,9 @@
 import Vue from 'vue'
-import VueI18n from 'vue-i18n'
+import VueI18n from 'vue-i18n' // 下载的组建引入
 import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang
 import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang
-import enLocale from './en'
-import zhLocale from './zh'
+import enLocale from './en' // 英文包数据
+import zhLocale from './zh' // 中文包数据 用于 使用 $t 切换中英文
 import { getStore } from '@/util/store'
 Vue.use(VueI18n)
 const Avue = window.AVUE;
@@ -25,4 +25,4 @@ const i18n = new VueI18n({
   messages
 })
 
-export default i18n
+export default i18n

src/page/login/index.vue

@@ -8,8 +8,9 @@
         <div class="login-time">
           {{time}}
         </div>
-        <!-- <img class="img" src="/img/logoTubao.png" alt=""> -->
+         <!--<img class="img" src="/img/logoTubao.png" alt="">-->
         <p class="title">{{ $t('login.info') }}</p>
+          <!--$t 国际化vue-i18n中英文切换 -->
       </div>
       <div class="login-border">
         <div class="login-main">
@@ -32,14 +33,14 @@
   </div>
 </template>
 <script>
-  import userLogin from "./userlogin";
-  import codeLogin from "./codelogin";
-  import thirdLogin from "./thirdlogin";
+  import userLogin from "./userlogin"; // 账号密码登录按钮
+  import codeLogin from "./codelogin";  // 手机号登录按钮
+  import thirdLogin from "./thirdlogin"; // 第三方登录按钮
   import {mapGetters} from "vuex";
-  import {dateFormat} from "@/util/date";
-  import {validatenull} from "@/util/validate";
-  import topLang from "@/page/index/top/top-lang";
-  import topColor from "@/page/index/top/top-color";
+  import {dateFormat} from "@/util/date";  // 处理日期格式
+  import {validatenull} from "@/util/validate"; // 判断是否是空null
+  import topLang from "@/page/index/top/top-lang"; // 左侧背景颜色版
+  import topColor from "@/page/index/top/top-color"; // 中英文翻译组建
   import {getQueryString, getTopUrl} from "@/util/util";
 
   export default {
@@ -90,6 +91,7 @@
         this.socialForm.source = getQueryString("source");
         this.socialForm.code = getQueryString("code");
         this.socialForm.state = getQueryString("state");
+          console.log(this.socialForm,'socialForm')
         if (validatenull(this.socialForm.source) && topUrl.includes(redirectUrl)) {
           let source = topUrl.split("?")[0];
           source = source.split(redirectUrl)[1];

src/views/financialManagement/compareBill/receiptSettleDetailsPage.vue

@@ -133,7 +133,8 @@
             >报表打印</el-button>
           </template>
           <template slot-scope="{ row }" slot="currency">
-            <el-select  v-if="row.$cellEdit" v-model="row.currency" size="small" placeholder="请选择 币别" clearable filterable>
+            <el-select  v-if="row.$cellEdit" v-model="row.currency" size="small"
+                        placeholder="请选择 币别" clearable filterable @change="thisAmountBlur">
               <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
             </el-select>
             <span v-else>{{ row.currency }}</span>
@@ -147,6 +148,7 @@
               placeholder="请输入"
               size="small"
               @input="thisAmountVerify(row)"
+              @blur="thisAmountBlur"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
             ></el-input>
             <span v-else>{{ row.thisAmount }}</span>
@@ -368,6 +370,7 @@
               label: '人民币金额',
               prop: 'amount',
               span: 8,
+                disabled:true,
               rules: [
                 {
                   pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -385,6 +388,7 @@
               label: '外币金额',
               prop: 'foreignAmount',
               display: true,
+                disabled:true,
               span: 8,
               rules: [
                 {
@@ -570,6 +574,24 @@
           }
         })
       },
+        // 本次金额的失焦
+        thisAmountBlur(){
+            if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') return
+            let sumUSD = 0
+            let sumCNY = 0
+            this.dataList.map(item=>{
+                if (item.currency == 'CNY') {
+                    // 人民币
+                    sumCNY += Number(item.thisAmount)
+                }else if (item.currency == 'USD') {
+                    // 美金
+                    sumUSD += Number(item.thisAmount)
+                }else {}
+                // sum += Number(item.thisAmount)
+            })
+            this.form.amount = sumCNY.toFixed(2)
+            this.form.foreignAmount = sumUSD.toFixed(2)
+        },
       //本次金额验证
       thisAmountVerify(row){
         if(parseFloat(row.thisAmount) > parseFloat(row.amount)){
@@ -614,6 +636,7 @@
         //明细列表所有合同号 去重 加， 为主表合同号
         this.$set(this.form,'srcOrderno',Array.from(new Set(this.dataList.map(item =>{ return item.srcOrderno}))).join(','))
 
+          this.thisAmountBlur()
         this.billDetailDialog = false;
       },
       rowUpdate(row, index, done) {
@@ -791,6 +814,14 @@
           })
         }
 
+          // 达沃特租户人民币可以编辑不需要计算
+          if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
+              // this.findObject(this.option.column, "amount").disabled = false
+          }else {
+              this.findObject(this.option.column, "amount").disabled = true
+              this.findObject(this.option.column, "foreignAmount").disabled = true
+          }
+
         if(data.itemsList){
           this.dataList = data.itemsList
           this.oldDataList = this.deepClone(data.itemsList)

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -78,8 +78,8 @@
               @click="jumpPage(scope.row, scope.index)">{{ scope.row.srcOrderno }}</span>
           </template>
           <template slot-scope="{ row }" slot="currency">
-            <el-select v-if="row.$cellEdit" v-model="row.currency" size="small" placeholder="请选择 币别" clearable
-              filterable>
+            <el-select v-if="row.$cellEdit" v-model="row.currency" size="small"
+                       placeholder="请选择 币别" clearable filterable @change="thisAmountBlur">
               <el-option v-for="(item, index) in currencyDic" :key="index" :label="item.dictValue"
                 :value="item.dictValue"></el-option>
             </el-select>
@@ -300,6 +300,7 @@ export default {
           {
             label: '人民币金额',
             prop: 'amount',
+              disabled:true,
             span: 8,
             rules: [
               {
@@ -317,6 +318,7 @@ export default {
           {
             label: '外币金额',
             prop: 'foreignAmount',
+              disabled:true,
             span: 8,
             rules: [
               {
@@ -481,7 +483,10 @@ export default {
 
   },
   mounted() {
-
+      // 达沃特租户人民币可以编辑不需要计算
+      if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
+          this.findObject(this.option.column, "amount").disabled = false
+      }
   },
   methods: {
     // 报表
@@ -567,11 +572,21 @@ export default {
       // 本次金额的失焦
       thisAmountBlur(row){
           this.form.thisAmount = this.form.thisAmount?this.form.thisAmount:0
-          let sum = 0
+          if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') return
+          let sumUSD = 0
+          let sumCNY = 0
           this.dataList.map(item=>{
-              sum += Number(item.thisAmount)
+              if (item.currency == 'CNY') {
+                  // 人民币
+                  sumCNY += Number(item.thisAmount)
+              }else if (item.currency == 'USD') {
+                  // 美金
+                  sumUSD += Number(item.thisAmount)
+              }else {}
+              // sum += Number(item.thisAmount)
           })
-          this.form.amount = sum
+          this.form.amount = sumCNY.toFixed(2)
+          this.form.foreignAmount = sumUSD.toFixed(2)
       },
     selectPurchase() {
       if (!this.form.corpId) {
@@ -604,7 +619,9 @@ export default {
         this.$refs.crud.rowCellAdd(item);
       })
       this.$set(this.form, 'srcOrderno', Array.from(new Set(this.dataList.map(item => { if (item.srcOrderno) { return item.srcOrderno } }))).join(','))
-      this.billDetailDialog = false;
+
+        this.thisAmountBlur()
+        this.billDetailDialog = false;
     },
     rowUpdate(row, index, done) {
       done(row);
@@ -770,6 +787,14 @@ export default {
         })
       }
 
+        // 达沃特租户人民币可以编辑不需要计算
+        if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
+            // this.findObject(this.option.column, "amount").disabled = false
+        }else {
+            this.findObject(this.option.column, "amount").disabled = true
+            this.findObject(this.option.column, "foreignAmount").disabled = true
+        }
+
       if (data.itemsList) {
         this.dataList = data.itemsList
         this.oldDataList = this.deepClone(data.itemsList)

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -135,8 +135,10 @@
             >报表打印</el-button>
           </template>
           <template slot-scope="{ row }" slot="currency">
-            <el-select  v-if="row.$cellEdit" v-model="row.currency" size="small" placeholder="请选择 币别" clearable filterable>
-              <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
+            <el-select  v-if="row.$cellEdit" v-model="row.currency" size="small"
+                        placeholder="请选择 币别" clearable filterable @change="thisAmountBlur">
+              <el-option v-for="(item,index) in currencyDic" :key="index"
+                         :label="item.dictValue"  :value="item.dictValue"></el-option>
             </el-select>
             <span v-else>{{ row.currency }}</span>
           </template>
@@ -408,6 +410,7 @@
               label: '外币金额',
               prop: 'foreignAmount',
               display: true,
+                disabled:true,
               span: 8,
               rules: [
                 {
@@ -567,7 +570,10 @@
       }
     },
     mounted() {
-
+        // 达沃特租户人民币可以编辑不需要计算
+        if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
+            this.findObject(this.option.column, "amount").disabled = false
+        }
     },
     methods: {
       //选择客户
@@ -643,11 +649,21 @@
       },
         // 本次金额的失焦
         thisAmountBlur(){
-            let sum = 0
+            if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') return
+            let sumUSD = 0
+            let sumCNY = 0
             this.dataList.map(item=>{
-                sum += Number(item.thisAmount)
+                if (item.currency == 'CNY') {
+                    // 人民币
+                    sumCNY += Number(item.thisAmount)
+                }else if (item.currency == 'USD') {
+                    // 美金
+                    sumUSD += Number(item.thisAmount)
+                }else {}
+                // sum += Number(item.thisAmount)
             })
-            this.form.amount = sum
+            this.form.amount = sumCNY.toFixed(2)
+            this.form.foreignAmount = sumUSD.toFixed(2)
         },
       selectRecipt(){
         if(!this.form.corpId){
@@ -678,9 +694,11 @@
           delete item.id;
           this.$refs.crud.rowCellAdd(item);
         })
+
         //明细列表所有合同号 去重 加， 为主表合同号
         this.$set(this.form,'srcOrderno',Array.from(new Set(this.dataList.map(item =>{ return item.srcOrderno}))).join(','))
 
+          this.thisAmountBlur()
         this.billDetailDialog = false;
       },
       rowUpdate(row, index, done) {
@@ -865,6 +883,14 @@
           })
         }
 
+          // 达沃特租户人民币可以编辑不需要计算
+          if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
+              // this.findObject(this.option.column, "amount").disabled = false
+          }else {
+              this.findObject(this.option.column, "amount").disabled = true
+              this.findObject(this.option.column, "foreignAmount").disabled = true
+          }
+
         if(data.itemsList){
           this.dataList = data.itemsList
           this.oldDataList = this.deepClone(data.itemsList)

src/views/tirePartsMall/basicData/accountManagement/detailsPage.vue

@@ -90,6 +90,7 @@
 
 import { typeSave, detail, editenable } from "@/api/tirePartsMall/basicData/accountManagement";
 import { getList } from "@/api/collectionSettlement/index";
+import { getUser } from "@/api/system/user";
 import { corpsDescListAll } from "@/api/tirePartsMall/salesManagement/saleOrder";
 
 export default {
@@ -146,6 +147,7 @@ export default {
           label: '公司名称',
           prop: "corporateName",
           type: 'select',
+            disabled: true,
           dicUrl: "/api/blade-system/dept/lazy-list?parentId=",
           props: {
             label: "deptName",
@@ -191,6 +193,11 @@ export default {
   async created() {
     if (this.onLoad.id) {
       this.queryData(this.onLoad.id)
+    }else {
+        getUser(JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id).then(res=>{
+            this.form.corporateName = res.data.data.deptName
+            this.form.corporateId = res.data.data.deptId
+        })
     }
   },
   methods: {

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

@@ -15,13 +15,15 @@
             @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 273)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 273)" :page.sync="page">
             <template slot="filesListForm">
-              <span style="font-size: 12px;">(图片文件像素推荐700X750，有且只允许有一张主图，其余均为副图)</span>
+              <span style="font-size: 12px;">(图片文件像素推荐700X700，有且只允许有一张主图，其余均为副图)</span>
               <c-upload :data="form.filesList" display basic deleteUrl="/api/blade-sales-part/productLaunchFiles/remove"
                 :enumerationValue="160" />
             </template>
 
             <template slot="detailsTextForm">
-              <avue-ueditor v-model="form.detailsText" :options="optionsUeditor"></avue-ueditor>
+              <avue-ueditor v-model="form.detailsText"
+                            :options="optionsUeditor">
+              </avue-ueditor>
             </template>
             <template slot-scope="{type,size,row,index}" slot="menu">
               <el-button :size="size" :type="type" :disabled="row.upAndDownShelves"
@@ -185,10 +187,11 @@ import {
     getDetail,
     remove,
     productLaunch,
-    deptList, listAllP
+    deptList
 } from "@/api/tirePartsMall/basicData/listingManagement/index.js";
 import { getToken } from "@/util/auth";
 import commodity from "./commodity.json"
+import {getCorpTypes} from "@/api/tirePartsMall/basicData/commodityInformation";
 export default {
   name: "index",
   data() {
@@ -252,7 +255,7 @@ export default {
         size: "small",
         props: {
           labelText: "标题",
-          label: "cname",
+          label: "title",
           value: "id",
         }
       },
@@ -353,10 +356,24 @@ export default {
           }]
         }, {
           label: "品牌",
-          prop: "brandName",
+          prop: "brandId",
+            search: true,
+            type: 'select',
+            props: {
+                label: 'cname',
+                value: 'id'
+            },
+            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1',
+            hide: true,
           disabled: true,
           overHidden: false,
         }, {
+            label: "品牌",
+            prop: "brandName",
+            disabled: true,
+            overHidden: false,
+        },
+            {
           label: "售价1",
           prop: "priceOne",
           hide: false,
@@ -455,9 +472,9 @@ export default {
     }
   },
   activated() {
-      listAllP().then(res => {
-      this.treeData = res.data.data
-    })
+      getCorpTypes().then(res=>{
+          this.treeData = res.data.data
+      })
     this.onLoad(this.page, this.search)
   },
   async created() {
@@ -531,7 +548,7 @@ export default {
       done();
     },
     nodeClick(data) {
-      this.search.brandId = data.id
+      this.search.goodsTypeId = data.id
       this.page.currentPage = 1;
       this.onLoad(this.page, this.search);
   },
@@ -648,6 +665,7 @@ export default {
             }
         })
     }
+      console.log({...this.form}.detailsText,651)
     submit({
       ...this.form
     }).then(res => {
@@ -657,14 +675,6 @@ export default {
     }).catch((err) => {
       loading()
     })
-    // submit({
-    //   ...form
-    // }).then(res => {
-    //   this.onLoad(this.page, this.search)
-    //   done()
-    // }).catch(() => {
-    //   loading()
-    // })
   },
   resetChange() {
     if(document.getElementsByClassName("is-current")[0]){

src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -93,6 +93,7 @@ import {
 } from "@/api/tirePartsMall/basicData/listingManagement/index.js";
 import {getToken} from "@/util/auth";
 import fa from "element-ui/src/locale/lang/fa";
+import {getCorpTypes} from "@/api/tirePartsMall/basicData/commodityInformation";
 
 export default {
   name: "index",
@@ -145,7 +146,7 @@ export default {
         size: "small",
         props: {
           labelText: "标题",
-          label: "cname",
+          label: "title",
           value: "id",
         }
       },
@@ -236,7 +237,21 @@ export default {
             label: "下架",
             value: 0
           }]
-        }, {
+        },{
+            label: "品牌",
+            prop: "brandId",
+            search: true,
+            type: 'select',
+            props: {
+                label: 'cname',
+                value: 'id'
+            },
+            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1',
+            hide: true,
+            disabled: true,
+            overHidden: false,
+        },
+            {
           label: "品牌",
           prop: "brandName",
           disabled: true,
@@ -343,9 +358,12 @@ export default {
     }
   },
   activated() {
-    listAll().then(res=>{
-      this.treeData = res.data.data
-    })
+    // listAll().then(res=>{
+    //   this.treeData = res.data.data
+    // })
+      getCorpTypes().then(res=>{
+          this.treeData = res.data.data
+      })
     this.onLoad(this.page, this.search)
   },
   async created() {
@@ -412,7 +430,8 @@ export default {
       done();
     },
     nodeClick(data) {
-      this.search.brandId = data.id
+      // this.search.brandId = data.id
+        this.search.goodsTypeId = data.id
       this.page.currentPage = 1;
       this.onLoad(this.page, this.search);
     },

src/views/tirePartsMall/basicData/warehouse/index.vue

@@ -6,6 +6,9 @@
       @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 264)"
       @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 264)" @search-criteria-switch="searchCriteriaSwitch"
       @tree-load="treeLoad">
+        <template slot-scope="{type,size,row,$index}" slot="menuLeft">
+            <el-button icon="el-icon-plus" type="primary" :size="size" @click="handleAdd">新增</el-button>
+        </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -20,6 +23,7 @@ import {
 import {
   customerListAll
 } from "@/api/tirePartsMall/basicData/warehouse";
+import {getUser} from "@/api/system/user";
 export default {
   name: "customerInformation",
   data() {
@@ -27,6 +31,7 @@ export default {
       form: {},
       option: {},
       optionBack: {
+          addBtn:false,
         headerAlign: "center",
         align: "center",
         border: true,
@@ -136,6 +141,7 @@ export default {
           prop: "salesCompanyId",
           search: true,
           overHidden: true,
+            disabled: true,
           // width: 120,
           type: 'select',
           props: {
@@ -242,12 +248,17 @@ export default {
         }
       );
     },
-    //新增子项触发
+    //新增按钮触发
     handleAdd(row) {
-      this.parentId = row.id;
+      // this.parentId = row.id;
       // const column = this.findObject(this.option.column, "parentId");
       // column.value = row.id;
       // column.addDisabled = true;
+        getUser(JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id).then(res=>{
+            this.form.salesCompanyName = res.data.data.deptName
+            this.form.salesCompanyId = res.data.data.deptId
+        })
+
       this.$refs.crud.rowAdd();
     },
     //新增子项和新增触发查询所有

src/views/tirePartsMall/statisticAnalysis/customerTransactions/index.vue

@@ -119,7 +119,7 @@
             </avue-crud>
           </el-col>
         </el-row>
-  
+
       </basic-container>
       <details-page v-if="!show" @goBack="goBack()" :detailData="detailData" />
       <details-info v-if="!showInfo" @goBack="goBack()" @editOpen="editOpen" :detailData="detailData" />
@@ -151,7 +151,7 @@
       </el-dialog>
     </div>
   </template>
-  
+
   <script>
   import detailsInfo from "./detailsInfo";
   import detailsPage from "./detailsPage";
@@ -162,6 +162,7 @@
   import { getList, pageStatistics, remove, addCorpType, customerList } from "@/api/basicData/customerTransactions";
   import corpType from '@/components/corpType/index'
   import {getToken} from "@/util/auth";
+  import {getUser} from "@/api/system/user";
   export default {
     name: "index",
     data() {
@@ -408,9 +409,15 @@
         // this.getWorkDicts("client_status").then(res => {
         //   this.findObject(this.option.column, "status").dicData = res.data.data;
         // });
-        getCorpType({ corpType: 'KH' }).then(res => {
-          this.treeData = res.data.data
-        });
+          getUser(JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id).then(res=>{
+              // this.form.salesCompanyName = res.data.data.deptName
+              // this.form.salesCompanyId = res.data.data.deptId
+              getCorpType({ corpType: 'KH'}).then(res => {
+                  this.treeData = res.data.data
+              });
+          })
+
+
         // customerList({ corpType: "KH" }).then(res => {
         //   this.findObject(this.option4.column, "parentId").dicData = res.data.data.records
         // });
@@ -563,46 +570,46 @@
     }
   }
   </script>
-  
+
   <style  lang="scss"  scoped>
   .page-crad ::v-deep .basic-container__card {
     height: 94.2vh;
   }
-  
+
   ::v-deep .el-form-item__error {
     display: none !important;
   }
-  
+
   ::v-deep .el-input-group__append {
     padding: 0 0px !important;
   }
-  
+
   .el-dialog ::v-deep .el-form-item__error {
     display: none !important;
   }
-  
+
   .stat-td {
     text-align: center;
     position: relative;
   }
-  
+
   .stat-img {
     width: 95%;
     height: 100px;
   }
-  
+
   .stat-tip {
     position: absolute;
     left: 15px;
     top: 5px;
-  
+
     .money {
       color: #fff;
       font-size: 28px;
       text-align: left;
       font-weight: 600;
     }
-  
+
     .title {
       color: #fff;
       font-size: 14px;
@@ -612,4 +619,3 @@
     }
   }
   </style>
-  

src/views/tirePartsMall/statisticAnalysis/generalLedgerPayable/index.vue

@@ -213,8 +213,8 @@ export default {
     }
   },
   async created() {
-    // this.option = await this.getColumnData(this.getColumnName(285), this.defaultOption);
-    this.option = this.defaultOption;
+    this.option = await this.getColumnData(this.getColumnName(285), this.defaultOption);
+    // this.option = this.defaultOption;
     this.getWorkDicts('brand').then(res => {
       this.brandOption = res.data.data;
     })
@@ -349,7 +349,7 @@ export default {
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(
-        this.getColumnName(138),
+        this.getColumnName(285),
         this.option
       );
       if (inSave) {

src/views/tirePartsMall/statisticAnalysis/generalLedgerReceivable/index.vue

@@ -179,8 +179,9 @@ export default {
     }
   },
   async created() {
-    // this.option = await this.getColumnData(this.getColumnName(284), this.defaultOption);
-    this.option = this.defaultOption;
+      // this.option = this.defaultOption;
+    this.option = await this.getColumnData(this.getColumnName(284), this.defaultOption);
+
     this.getWorkDicts('brand').then(res => {
       this.brandOption = res.data.data;
     })
@@ -312,10 +313,7 @@ export default {
     },
     //列保存触发
     async saveColumn() {
-      const inSave = await this.saveColumnData(
-        this.getColumnName(137),
-        this.option
-      );
+        const inSave = this.saveColumnData(this.getColumnName(284), this.option);
       if (inSave) {
         this.$nextTick(() => {
           this.$refs.crud.doLayout();
@@ -327,6 +325,7 @@ export default {
     },
     async resetColumn() {
       this.option = this.defaultOption;
+      //   this.option = await this.getColumnData(this.getColumnName(284), this.defaultOption);
       const inSave = await this.delColumnData(this.getColumnName(284), this.defaultOption);
       if (inSave) {
         this.$nextTick(() => {

src/views/tirePartsMall/statisticAnalysis/profitLedger/index.vue

@@ -173,8 +173,8 @@ export default {
     }
   },
   async created() {
-    // this.option = await this.getColumnData(this.getColumnName(286), this.defaultOption);
-    this.option = this.defaultOption;
+    this.option = await this.getColumnData(this.getColumnName(286), this.defaultOption);
+    // this.option = this.defaultOption;
     this.getWorkDicts('brand').then(res => {
       this.brandOption = res.data.data;
     })
@@ -308,7 +308,7 @@ export default {
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(
-        this.getColumnName(139),
+        this.getColumnName(286),
         this.option
       );
       if (inSave) {

src/views/tirePartsMall/statisticAnalysis/salesReconciliation/index.vue

@@ -67,12 +67,6 @@ export default {
         searchIndex: 2,
         menu: false,
         column: [
-          {
-            label: "系统编号",
-            prop: "ordNo",
-            search: true,
-            overHidden: true
-          },
           // {
           //   label: "客户名称",
           //   prop: "corpName",
@@ -83,7 +77,8 @@ export default {
             label: '业务对象',
             prop: "customerId",
             search: true,
-            remote: true,
+              filterable:true,
+            remote: false,
             overHidden: true,
             type: 'select',
             props: {
@@ -107,7 +102,6 @@ export default {
           {
             label: '业务日期',
             prop: "businesDate",
-            overHidden: true,
             searchProp: "businesDateList",
             type: "date",
             overHidden: true,
@@ -142,6 +136,12 @@ export default {
               trigger: "blur"
             }]
           },
+            {
+                label: "系统编号",
+                prop: "ordNo",
+                search: true,
+                overHidden: true
+            },
           {
             label: "收入",
             prop: "totalMoney",
@@ -165,7 +165,7 @@ export default {
             prop: "paymentAmountTl",
             search: false,
             overHidden: true
-          }
+          },
         ]
       },
       // 仓库配置
@@ -188,7 +188,9 @@ export default {
     //   this.getColumnName(126),
     //   this.defaultOption
     // );
-    this.option = this.defaultOption;
+      this.option = this.defaultOption;
+      this.option = await this.getColumnData(this.getColumnName(126), this.defaultOption);
+
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++;