Merge remote-tracking branch 'origin/develop' into develop

src/views/setting/sample/index.vue

@@ -17,7 +17,7 @@
       >
         <el-input
           v-model="queryParams.identificationCode"
-          placeholder="请输入车辆识别码"
+          placeholder="请输入"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -25,7 +25,7 @@
       <el-form-item label="样品编号" prop="address">
         <el-input
           v-model="queryParams.sampleNumber"
-          placeholder="请输入样品编号"
+          placeholder="请输入"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -33,7 +33,7 @@
       <el-form-item label="样品名称" prop="postcode">
         <el-input
           v-model="queryParams.sampleName"
-          placeholder="请输入样品名称"
+          placeholder="请输入"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -75,9 +75,10 @@
       :data="tableData"
       style="width: 100%"
       border
+      :cell-style="taskNameCellStyle"
       @sort-change="sortClick"
     >
-      <el-table-column type="index" label="序号" min-width="80">
+      <el-table-column type="index" width="55" label="序号" align="center">
       </el-table-column>
       <el-table-column
         v-if="activeName === 'completeSample'"
@@ -118,20 +119,20 @@
         prop="numberOfSamples"
         label="样品数量"
         show-overflow-tooltip
-        min-width="150"
+        min-width="100"
       />
       <el-table-column
         prop="deliveryDate"
         label="送样日期"
         sortable="'custom"
         show-overflow-tooltip
-        min-width="200"
+        min-width="150"
       />
       <el-table-column
         prop="manufactureDate"
         label="生产日期"
         show-overflow-tooltip
-        min-width="200"
+        min-width="150"
       />
       <el-table-column
         prop="manufacturingEnterprise"
@@ -139,7 +140,7 @@
         show-overflow-tooltip
         min-width="200"
       />
-      <el-table-column prop="name" label="相关任务" min-width="200">
+      <el-table-column label="相关任务">
         <template slot-scope="scope">
           <div v-if="scope.row.taskSampleRelation.length > 0">
             <el-link
@@ -158,17 +159,22 @@
           <div v-else>--</div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" fixed="right" min-width="160">
+      <el-table-column
+        label="操作"
+        fixed="right"
+        min-width="160"
+        align="center"
+      >
         <template slot-scope="scope">
           <div class="button-bar">
             <page-button
-              v-hasPermi="['setting:standard:update']"
+              v-hasPermi="['setting:sample:edit']"
               icon="edit"
               title="修改"
               @click="handleUpdate(scope.row.id)"
             ></page-button>
             <page-button
-              v-hasPermi="['setting:standard:update']"
+              v-hasPermi="['setting:sample:del']"
               icon="delete"
               title="删除"
               @click="handleDelete(scope.row.id)"
@@ -481,6 +487,11 @@ export default {
     this.getList()
   },
   methods: {
+    taskNameCellStyle(row, column, rowIndex, columnIndex) {
+      if (row.columnIndex === 9) {
+        return { whiteSpace: 'nowrap' }
+      }
+    },
     closeMaterial(data) {
       this.materialShow = data
     },