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

src/views/auxiliaryFittings/salesManagement/transaction/index.vue

@@ -5,7 +5,7 @@
 		  :operation="operation" :exportList="exportList">
 		</template-page>
 		<div class="detail" v-if="formDialog">
-			<auxiliarySalesOrderDetail v-if="goosType == 'P'" :id="id" @back="backList" :formType="2" title="辅材销售订单详情"></auxiliarySalesOrderDetail>
+			<auxiliarySalesOrderDetail v-if="goosType == 'M'" :id="id" @back="backList" :formType="2" title="辅材销售订单详情"></auxiliarySalesOrderDetail>
 			<attachmentSalesOrderDetail v-else :id="id" @back="backList" :formType="2" title="配件销售订单详情"></attachmentSalesOrderDetail>
 		</div>
 	</div>