Merge branch 'testToMerge' into blueBranch

# Conflicts:
#	src/utils/tool.js

src/HDrpManagement/invoicePredictionManage/details/index.vue

@@ -177,6 +177,9 @@
                         tool.formatAmount(scope.column.data.orderinvoamount, 2)
                       }}</span>
                     </div>
+                    <div
+                        v-else-if="scope.column.columnname === 'status'" :style="tool.getStatusColor(scope.column.data[scope.column.columnname])"
+                    >{{scope.column.data[scope.column.columnname]}}</div>
                     <p v-else>
                       {{
                         scope.column.data[scope.column.columnname]

src/HDrpManagement/projectPredictionManage/details/index.vue

@@ -138,6 +138,9 @@
                       tool.formatAmount(scope.column.data.projectamount, 2)
                     }}</span>
                   </div>
+                  <div
+                      v-else-if="scope.column.columnname === 'status'" :style="tool.getStatusColor(scope.column.data[scope.column.columnname])"
+                  >{{scope.column.data[scope.column.columnname]}}</div>
                   <p v-else>
                     {{
                       scope.column.data[scope.column.columnname]

src/utils/tool.js

@@ -260,6 +260,9 @@ export default {
   /*日期转化*/
   getDataChange(data){
     const newData = new Date(data)
-    return newData.getFullYear() + '-' + (newData.getMonth() + 1) +'-' + newData.getDate()
+    const year = newData.getFullYear()
+    const month = String(newData.getMonth() + 1).padStart(2,'0')
+    const date = String(newData.getDate()).padStart(2,'0')
+    return year + '-' + month +'-' + date
   }
 }