Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/dispatch/modules/erpInfo.vue

@@ -17,31 +17,35 @@
         width="55"
         align="center">
       </el-table-column> -->
-      <el-table-column
-        prop="erpbillno"
-        :label="$t(`erp单号`)">
-      </el-table-column>
       <el-table-column
         prop="request"
-        width="100px"
+        min-width="300"
         :label="$t(`推送信息`)">
       </el-table-column>
       <el-table-column
         prop="createdate"
-        fixed
-        :label="$t(`推送时间`)">
+        :label="$t(`推送时间`)"
+        min-width="150">
       </el-table-column>
-       <el-table-column
+      <el-table-column
+        prop="erpbillno"
+        :label="$t(`erp单号`)"
+        min-width="120">
+      </el-table-column>
+      <el-table-column
         prop="status"
-        :label="$t(`返回状态`)">
+        :label="$t(`返回状态`)"
+        min-width="200">
       </el-table-column>
       <el-table-column
         prop="errmsg"
-        :label="$t(`错误信息`)">
+        :label="$t(`错误信息`)"
+        min-width="300">
       </el-table-column>
       <el-table-column
         prop="type"
-        :label="$t(`类型`)">
+        :label="$t(`类型`)"
+        min-width="150">
       </el-table-column>
     </el-table>
     <div style="margin-top:16px;text-align:right">

src/HDrpManagement/orderManage/details/tabs/erpHistory.vue

@@ -8,28 +8,32 @@
       <el-table-column
         prop="request"
         :label="$t(`推送信息`)"
-        width="180">
+        min-width="300">
       </el-table-column>
       <el-table-column
         prop="createdate"
         :label="$t(`推送时间`)"
-        width="90">
+        min-width="150">
       </el-table-column>
       <el-table-column
-        prop="status"
-        :label="$t(`返回状态`)">
+        prop="erpbillno"
+        :label="$t(`erp单号`)"
+        min-width="120">
       </el-table-column>
       <el-table-column
-        prop="erpbillno"
-        :label="$t(`erp单据号`)">
+        prop="status"
+        :label="$t(`返回状态`)"
+        min-width="200">
       </el-table-column>
       <el-table-column
         prop="errmsg"
-        :label="$t(`错误信息`)">
+        :label="$t(`错误信息`)"
+        min-width="300">
       </el-table-column>
       <el-table-column
         prop="type"
-        :label="$t(`类型`)">
+        :label="$t(`类型`)"
+        min-width="150">
       </el-table-column>
     </el-table>
     <div class="container normal-panel" style="text-align:right">