需求31 报价单列表新增创建人

src/views/ecw/offer/detail.vue

@@ -247,6 +247,12 @@
           {{ list.remarks || "/" }}
         </el-descriptions-item>
       </el-descriptions>
+      <el-descriptions :column="4">
+        <el-descriptions-item :label="$t('创建人')"> {{ list.creatorName || "/" }} </el-descriptions-item>
+        <el-descriptions-item :label="$t('创建时间')"> {{ list.createTime || "/" }} </el-descriptions-item>
+        <el-descriptions-item :label="$t('最后更新人')"> {{ list.updaterName || "/" }} </el-descriptions-item>
+        <el-descriptions-item :label="$t('最后更新时间')"> {{ list.updateTime || "/" }} </el-descriptions-item>
+      </el-descriptions>
     </el-card>
     <el-card class="card" v-if="list.transportVO">
       <div slot="header" class="card-title">

src/views/ecw/offer/index.vue

@@ -78,6 +78,11 @@
       <el-form-item :label="$t('客户来源')" prop="sourceIds" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.CUSTOMER_SOURCE" multiple v-model="queryParams.sourceIds" clearable @change="handleQuery" />
       </el-form-item>
+
+      <el-form-item :label="$t('创建人')" prop="creatorIds">
+        <user-selector v-model="queryParams.creatorIds" multiple clearable @change="handleQuery" />
+      </el-form-item>
+
       <el-form-item :label="$t('创建时间')">
         <el-date-picker v-model="queryTmp.createTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
       </el-form-item>
@@ -109,7 +114,7 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list" border>
+    <el-table v-loading="loading" :data="list" border ref="dataTable" id="dataTable" :height="autoHeight">
       <el-table-column :label="$t('报价单号')" align="left" prop="number" width="150" fixed>
         <template slot-scope="{ row }">
           <el-link type="primary" @click.native="$router.push('detail?offerId=' + row.offerId)">{{ row.number }}</el-link>
@@ -159,7 +164,8 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="left" prop="creatorName"> </el-table-column>
+      <el-table-column :label="$t('客户经理')" align="left" prop="followUpSalesmanName"> </el-table-column>
+      <el-table-column :label="$t('创建人')" align="left" prop="creatorName"> </el-table-column>
       <el-table-column :label="$t('创建时间')" align="left" width="120">
         <template slot-scope="{ row }">
           <span>{{ parseTime(row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
@@ -273,10 +279,17 @@ export default {
       //目的仓
       destWarehouseList: [],
       curData: {},
-      dept: false // 是否部门订单
+      dept: false, // 是否部门订单
+      autoHeight: 500
     }
   },
   computed: {
+    isMobile() {
+      const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+      // 匹配常见的移动设备标识
+      const mobileIdentifiers = ['Android', 'webOS', 'iPhone', 'iPad', 'iPod', 'BlackBerry', 'Windows Phone'];
+      return mobileIdentifiers.some(identifier => userAgent.includes(identifier));
+    },
     currencyMap() {
       let map = {}
       this.currencyList.forEach((item) => {
@@ -327,6 +340,11 @@ export default {
     this.init()
   },
   watch: {
+    showSearch() {
+      this.$nextTick(() => {
+        this.getHeight()
+      })
+    },
     destCountryId: {
       //监听当前地区值的变化，于与上方地区值进行了双向绑定
       deep: true, //深度监听
@@ -573,7 +591,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1
-      this.getList()
+      this.$nextTick(this.getList)
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -644,7 +662,23 @@ export default {
           this.$message.success("操作成功")
           this.handleQuery()
         })
+    },
+    //表格高度自适应
+    getHeight() {
+      if(!this.isMobile) {
+        this.$refs.dataTable.doLayout()
+        let getHeightFromBottom = (element, variableHeight) => {
+          const elementRect = element.getBoundingClientRect().top;
+          const windowHeight = document.documentElement.clientHeight;
+          const elementHeightFromBottom = windowHeight - elementRect;
+          const result = elementHeightFromBottom - variableHeight;
+          return result;
         }
+        const element = document.getElementById('dataTable');
+        const variableHeight = 70; // 给定的变量高度 一般留于分页器高度
+        this.autoHeight =getHeightFromBottom(element, variableHeight);
+      }
+    },
   }
 }
 </script>