ccj vor 2 Jahren
Ursprung
Commit
51ef18d4f3
2 geänderte Dateien mit 10 neuen und 10 gelöschten Zeilen
  1. 2 2
      manifest.json
  2. 8 8
      pages/erpbusiness/add_quality_testing.vue

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.160",
-    "versionCode" : 21160,
+    "versionName" : "2.1.162",
+    "versionCode" : 21162,
     "transformPx" : false,
     "transformPx" : false,
     /* SDK配置 */
     /* SDK配置 */
     "quickapp" : {},
     "quickapp" : {},

+ 8 - 8
pages/erpbusiness/add_quality_testing.vue

@@ -123,13 +123,13 @@
 			</view>
 			</view>
 			<view v-show='typevalue==1' class="c-row ">
 			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="title">车牌号</view>
-				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType!="移库入库"||gridList.outType!="汽运"'>
 				<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
 				<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
 				</view>
-				<view class="con-list" v-show='gridList.inOutType=="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"'>
 				<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 				<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 					v-model="show9" mode="selector">
 					v-model="show9" mode="selector">
@@ -137,26 +137,26 @@
 				
 				
 				</view>
 				</view>
 			</view>
 			</view>
-			<view v-show="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
+			<view v-show="typevalue==1 " class="c-row ">
 				<view class="title">箱号-1</view>
 				<view class="title">箱号-1</view>
 				<view class="con-list">
 				<view class="con-list">
 					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view v-show="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
+			<view v-show="typevalue==1 "
 				class="c-row ">
 				class="c-row ">
 				<view class="title">封号-1</view>
 				<view class="title">封号-1</view>
 				<view class="con-list">
 				<view class="con-list">
 					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view v-show="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
+			<view v-show="typevalue==1 " class="c-row ">
 				<view class="title">箱号-2</view>
 				<view class="title">箱号-2</view>
 				<view class="con-list">
 				<view class="con-list">
 					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view v-show="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
+			<view v-show="typevalue==1 "
 				class="c-row ">
 				class="c-row ">
 				<view class="title">封号-2</view>
 				<view class="title">封号-2</view>
 				<view class="con-list">
 				<view class="con-list">
@@ -193,13 +193,13 @@
 			</view>
 			</view>
 			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="title">车牌号</view>
-				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType!="移库入库" ||gridList.outType!="汽运"'>
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard1" :disabled="true"
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard1" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard1" keyboardtype="car" :randomNumber="true" :newCar="false"
 					<master-keyboard ref="keyboard1" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
 				</view>
-				<view class="con-list" v-show='gridList.inOutType=="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"'>
 				<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 				<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 					v-model="show9" mode="selector">
 					v-model="show9" mode="selector">