Merge remote-tracking branch 'origin/master'

src/views/taskManagement/index.vue

@@ -33,12 +33,12 @@
         />
       </el-form-item>
       <el-form-item
-        label="台车编号"
+        label="托盘编号"
         prop="punchNo"
       >
         <el-input
           v-model="queryParams.containerCode"
-          placeholder="请输入台车编号"
+          placeholder="请输入托盘编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -243,6 +243,7 @@ export default {
         {
           label: '任务单号',
           prop: 'taskCode',
+          width: '150px',
           istrue: true
         },
         {
@@ -262,8 +263,9 @@ export default {
           }
         },
         {
-          label: '台车编号',
+          label: '托盘编号',
           prop: 'containerCode',
+          width: '150px',
           istrue: true
         },
         {
@@ -297,6 +299,7 @@ export default {
         {
           label: '业务单号',
           prop: 'transId',
+          width: '160px',
           istrue: true
         },
         {