소스 검색

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

gjy 2 년 전
부모
커밋
be05a9f638
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      pages/task/audit/warehouse_approval.vue
  2. 1 1
      pages/task/audit/warehouse_details.vue

+ 1 - 1
pages/task/audit/warehouse_approval.vue

@@ -45,7 +45,7 @@
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
 				<tr>
-					<td>容重(g/L)</td>
+					<td>{{list.goodsName!='大豆' ? '容重(g/L)' : '蛋白(g/L)'}}</td>
 					<td>价格(元/公斤)</td>
 					<td>价格(元/公斤)</td>
 				</tr>
 				</tr>
 				<tr v-for="(item,index) in list.detailPrints">
 				<tr v-for="(item,index) in list.detailPrints">

+ 1 - 1
pages/task/audit/warehouse_details.vue

@@ -45,7 +45,7 @@
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
 				<tr>
-					<td>容重(g/L)</td>
+					<td>{{list.goodsName!='大豆' ? '容重(g/L)' : '蛋白(g/L)'}}</td>
 					<td>价格(元/公斤)</td>
 					<td>价格(元/公斤)</td>
 				</tr>
 				</tr>
 				<tr v-for="(item,index) in list.detailPrints">
 				<tr v-for="(item,index) in list.detailPrints">