Merge branch 'greenUrgent' into allTestUrgent

src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -2,7 +2,7 @@
 <div>
   <tableDetail :layout="tablecols" :data="tableData" :opwidth="200" :custom="true" :checkbox="true" @rowClick="rowClick" fixedName="operation">
     <template v-slot:customcol="scope">
-      <div v-if="scope.column.columnname === 'shipmentstatus'" :style="{color:tool.getStatusColor(scope.column.data[scope.column.columnname])}">
+      <div v-if="scope.column.columnname === 'shipmentstatus'" :style="{color:tool.getStatusColor(scope.column.data[scope.column.columnname],true)}">
         {{scope.column.data[scope.column.columnname]}}
       </div>
       <div v-else-if="scope.column.columnname === 'province'" >

src/template/logisyticCanUseDisBill/index.vue

@@ -6,7 +6,7 @@
     </div>
     <tableDetail :layout="tablecols" :data="tableData" :opwidth="200" :custom="true" :checkbox="true" @selectionChange="selectionChange">
       <template v-slot:customcol="scope">
-        <div v-if="scope.column.columnname === 'shipmentstatus'" :style="{color:tool.getStatusColor(scope.column.data[scope.column.columnname])}">
+        <div v-if="scope.column.columnname === 'shipmentstatus'" :style="{color:tool.getStatusColor(scope.column.data[scope.column.columnname],true)}">
           {{scope.column.data[scope.column.columnname]}}
         </div>
         <div v-else-if="scope.column.columnname === 'province'" >