Merge branch 'dev_v2' of https://gogs.zfire.top/zfire-front/supply-front into dev_v2

src/views/supply/price/components/modify_list-detail.vue

@@ -45,7 +45,7 @@
               <el-table-column
                 align="center"
                 label="物料编码"
-                prop="materialId"
+                prop="materialNumber"
                 min-width="160"
                 show-overflow-tooltip
               ></el-table-column>
@@ -146,7 +146,7 @@
             <el-col :xs="12" :sm="8" :lg="8" class="item">
               <div class="label">审批结果</div>
               <div class="value">
-                {{ detail.examineStatus == 'OK' ? '通过' : '驳回' }}
+                {{ detail.examineStatus == 'OK' ? '通过' : detail.examineStatus == 'FAIL' ? '驳回' : '' }}
               </div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">
@@ -235,7 +235,6 @@ export default {
       })[0]?.saleName
     },
     goBack() {
-
       this.$emit('back')
     }
   }