caojunjie 2 سال پیش
والد
کامیت
b93edc9127
2فایلهای تغییر یافته به همراه7 افزوده شده و 8 حذف شده
  1. 2 2
      src/components/boxInformation/index.vue
  2. 5 6
      src/views/statisticAnalysis/salesProfit/index.vue

+ 2 - 2
src/components/boxInformation/index.vue

@@ -255,7 +255,7 @@ export default {
           label: '状态',
           width: 100,
           overHidden: true,
-          search: true,
+          // search: true,
           filterable: true,
           prop: 'status',
           type: 'select',
@@ -482,8 +482,8 @@ export default {
         ...params,
         current: page.currentPage,
         size: page.pageSize,
+        ...Object.assign(params, this.search),
         status:"待使用",
-        ...Object.assign(params, this.search)
       }
       this.loading = true
       getList(params).then(res => {

+ 5 - 6
src/views/statisticAnalysis/salesProfit/index.vue

@@ -39,7 +39,7 @@
             </template>
           </avue-crud>
         </template>
-        <template slot="corpIdSearch">
+        <template slot="corpsNameSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
         <template slot="businesDateSearch">
@@ -158,13 +158,10 @@ export default {
           },
           {
             label: "客户名称",
-            prop: "corpId",
+            prop: "corpsName",
             overHidden: true,
             width: 100,
-            search: true,
-            formatter: row => {
-              return row.corpsName;
-            }
+            search: true
           },
           {
             label: "合同日期",
@@ -349,6 +346,7 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(185.1), this.optionList);
+    console.log(await this.getColumnData(this.getColumnName(185.1), this.optionList))
   },
   methods: {
     cellStyle() {
@@ -538,6 +536,7 @@ export default {
        * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
        * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
        */
+      console.log(this[option])
       const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
       if (inSave) {
         this.$message.success("保存成功");