Explorar o código

创建采、购销售计划,为空的字段不应显示在详情中

wangchao %!s(int64=3) %!d(string=hai) anos
pai
achega
057628c489
Modificáronse 2 ficheiros con 22 adicións e 22 borrados
  1. 11 11
      pageA/product/detail.vue
  2. 11 11
      pageA/product/sales_detail.vue

+ 11 - 11
pageA/product/detail.vue

@@ -129,67 +129,67 @@
 				<text>货物要求</text>
 				<text>货物要求</text>
 			</view>
 			</view>
 			<view class="c-list">
 			<view class="c-list">
-				<view class="c-row">
+				<view class="c-row"  v-if="goods.waterContent!=null">
 					<text class="tit">水分(%){{'<='}} </text>
 					<text class="tit">水分(%){{'<='}} </text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 						<text>{{goods.waterContent}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.bulkDensity!=null">
 					<text class="tit">容重(g/L){{'>='}}</text>
 					<text class="tit">容重(g/L){{'>='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.jiaorenli!=null">
 					<text class="tit">热损伤(%){{'<='}}</text>
 					<text class="tit">热损伤(%){{'<='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.impurity!=null">
 					<text class="tit">杂质(%){{'<='}}</text>
 					<text class="tit">杂质(%){{'<='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 						<text>{{goods.impurity}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.mildewGrain!=null">
 					<text class="tit">霉变粒(%){{'<='}}</text>
 					<text class="tit">霉变粒(%){{'<='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.imperfectGrain!=null">
 					<text class="tit">不完善粒(%){{'<='}}</text>
 					<text class="tit">不完善粒(%){{'<='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.protein!=null">
 					<text class="tit">蛋白(%){{'>='}} </text>
 					<text class="tit">蛋白(%){{'>='}} </text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 						<text>{{goods.protein}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grain!=null">
 					<text class="tit">粒型</text>
 					<text class="tit">粒型</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 						<text>{{goods.grain}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grade!=null">
 					<text class="tit">品级</text>
 					<text class="tit">品级</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 						<text>{{goods.grade}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputPrivate!=null">
 					<text class="tit">产地</text>
 					<text class="tit">产地</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputYear!=null">
 					<text class="tit">产出年份</text>
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>
 						<text>{{goods.outputYear}}</text>

+ 11 - 11
pageA/product/sales_detail.vue

@@ -129,67 +129,67 @@
 				<text>货物要求</text>
 				<text>货物要求</text>
 			</view>
 			</view>
 			<view class="c-list">
 			<view class="c-list">
-				<view class="c-row">
+				<view class="c-row" v-if="goods.waterContent!=null">
 					<text class="tit">水分(%){{'<='}} </text>
 					<text class="tit">水分(%){{'<='}} </text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 						<text>{{goods.waterContent}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.bulkDensity!=null">
 					<text class="tit">容重(g/L){{'>='}}</text>
 					<text class="tit">容重(g/L){{'>='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.jiaorenli!=null">
 					<text class="tit">热损伤(%){{'<='}}</text>
 					<text class="tit">热损伤(%){{'<='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.impurity!=null">
 					<text class="tit">杂质(%){{'<='}}</text>
 					<text class="tit">杂质(%){{'<='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 						<text>{{goods.impurity}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.mildewGrain!=null">
 					<text class="tit">霉变粒(%){{'<='}}</text>
 					<text class="tit">霉变粒(%){{'<='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.imperfectGrain!=null">
 					<text class="tit">不完善粒(%){{'<='}}</text>
 					<text class="tit">不完善粒(%){{'<='}}</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.protein!=null">
 					<text class="tit">蛋白(%){{'>='}} </text>
 					<text class="tit">蛋白(%){{'>='}} </text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 						<text>{{goods.protein}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grain!=null">
 					<text class="tit">粒型</text>
 					<text class="tit">粒型</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 						<text>{{goods.grain}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grade!=null">
 					<text class="tit">品级</text>
 					<text class="tit">品级</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 						<text>{{goods.grade}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputPrivate!=null||goods.outputCity!=null">
 					<text class="tit">产地</text>
 					<text class="tit">产地</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputYear!=null">
 					<text class="tit">产出年份</text>
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>
 						<text>{{goods.outputYear}}</text>