Merge branch 'lin_yb' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

src/views/engineeringMaintenance/allInclusiveExpense/index.vue

@@ -75,7 +75,6 @@ export default {
       return this.operationBtn({
         detail: {
           click: ({ row, index, column }) => {
-            console.log(row)
             enginMaterialDetail({
               id: row.orderId
             }).then(res => {

src/views/engineeringMaintenance/applicationWithoutFee/index.vue

@@ -137,7 +137,7 @@ export default {
         },
         examine: {
           conditions: ({ row, index, column }) => {
-            return res.data.examineStatus == "WAIT"
+            return row.examineStatus == "WAIT"
           },
           click: ({ row, index, column }) => {
             enginMaterialDetail({