Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

oa-ui/src/views/oa/tender/index.vue

@@ -38,8 +38,8 @@
 
     <el-table v-loading="loading" :data="tenderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" min-width="100px" />
-      <el-table-column type="index" label="序号" width="55" align="center" min-width="100px" />
-      <el-table-column label="投标项目名称" align="center" prop="projectName" min-width="100px" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column label="投标项目名称" align="center" prop="projectName" min-width="200px" />
       <el-table-column label="招标业主" align="center" prop="partyAName" min-width="100px" />
       <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
       <el-table-column label="招标地点" align="center" prop="place" min-width="100px" />
@@ -48,20 +48,20 @@
           {{ getNameByDeptId(scope.row.dept) }}
         </template>
 </el-table-column> -->
-      <el-table-column label="投标委托人" align="center" prop="trustee" min-width="100px">
+      <el-table-column label="投标委托人" align="center" prop="trustee" width="100px">
         <template slot-scope="scope">
           {{ scope.row.trusteeUser ? scope.row.trusteeUser.nickName : '' }}
         </template>
       </el-table-column>
-      <el-table-column label="业主预算" align="center" prop="budget" min-width="100px" />
-      <el-table-column label="拟报价金额" align="center" prop="quote" min-width="100px" />
-      <el-table-column label="保证金" align="center" prop="deposit" min-width="100px" />
-      <el-table-column label="投标时间" align="center" prop="tenderTime" width="180">
+      <el-table-column label="业主预算" align="center" prop="budget" width="120px" />
+      <el-table-column label="拟报价金额" align="center" prop="quote" width="120px" />
+      <el-table-column label="保证金" align="center" prop="deposit"  width="120px" />
+      <el-table-column label="投标时间" align="center" prop="tenderTime" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.tenderTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="标书购买截止时间" align="center" prop="bidBuyDeadline" width="180">
+      <el-table-column label="标书购买截止时间" align="center" prop="bidBuyDeadline" width="130">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bidBuyDeadline, '{y}-{m}-{d}') }}</span>
         </template>