前端更新

pages/erp/deliveryfeedback/otherfeedback.vue

@@ -52,33 +52,33 @@
 				<view class="c-row">
 					<view class="title">箱号-1</view>
 					<view class="con-list">
-						<input v-model='v_item.caseNo' placeholder="请输入箱号" name="input" maxlength="20"></input>
+						<input v-model='v_item.caseNo' placeholder="请输入箱号" name="input" maxlength="20" type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row">
 					<view class="title">箱号-2</view>
 					<view class="con-list">
-						<input v-model='v_item.caseNoOther' placeholder="请输入箱号" name="input" maxlength="20"></input>
+						<input v-model='v_item.caseNoOther' placeholder="请输入箱号" name="input" maxlength="20" type="digit"></input>
 					</view>
 				</view>
 				<!-- 封号 -->
 				<view class="c-row">
 					<view class="title">封号-1</view>
 					<view class="con-list">
-						<input v-model='v_item.titleNo' placeholder="请输入封号" name="input" maxlength="20"></input>
+						<input v-model='v_item.titleNo' placeholder="请输入封号" name="input" maxlength="20" type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row">
 					<view class="title">封号-2</view>
 					<view class="con-list">
-						<input v-model='v_item.titleNoOther' placeholder="请输入封号" name="input" maxlength="20"></input>
+						<input v-model='v_item.titleNoOther' placeholder="请输入封号" name="input" maxlength="20" type="digit"></input>
 					</view>
 				</view>
 				<!-- 装车净重 -->
 				<view class="c-row">
 					<view class="title">装车净重（吨）</view>
 					<view class="con-list">
-						<input v-model='v_item.loadNetWeight' placeholder="请输入净重" name="input"></input>
+						<input v-model='v_item.loadNetWeight' placeholder="请输入净重" name="input" type="digit"></input>
 					</view>
 				</view>
 				<!-- 装车日期 -->
@@ -173,20 +173,20 @@
 				<view class="c-row">
 					<view class="title">车厢号-1</view>
 					<view class="con-list">
-						<input v-model='item_add1.boxNo1' placeholder="请输入车厢号" name="input" maxlength="20"></input>
+						<input v-model='item_add1.boxNo1' placeholder="请输入车厢号" name="input" maxlength="20" type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row">
 					<view class="title">车厢号-2</view>
 					<view class="con-list">
-						<input v-model='item_add1.boxNo2' placeholder="请输入车厢号" name="input" maxlength="20"></input>
+						<input v-model='item_add1.boxNo2' placeholder="请输入车厢号" name="input" maxlength="20" type="digit"></input>
 					</view>
 				</view>
 				<!-- 装车净重 -->
 				<view class="c-row">
 					<view class="title">装车净重（吨）</view>
 					<view class="con-list">
-						<input v-model='item_add1.loadNetWeight' placeholder="请输入净重" name="input" ></input>
+						<input v-model='item_add1.loadNetWeight' placeholder="请输入净重" name="input" type="digit"></input>
 					</view>
 				</view>
 				<!-- 装车日期 -->
@@ -268,7 +268,7 @@
 				<view class="c-row">
 					<view class="title">装船净重（吨）</view>
 					<view class="con-list">
-						<input v-model='item_add3.loadNetWeight' placeholder="请输入装船净重" name="input"></input>
+						<input v-model='item_add3.loadNetWeight' placeholder="请输入装船净重" name="input" type="digit"></input>
 					</view>
 				</view>
 				<!-- 装船日期 -->
@@ -330,20 +330,20 @@
 				<view class="c-row">
 					<view class="title">箱号</view>
 					<view class="con-list">
-						<input v-model='item_add4.caseNo' placeholder="请输入箱号" name="input" maxlength="20"></input>
+						<input v-model='item_add4.caseNo' placeholder="请输入箱号" name="input" maxlength="20" type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row">
 					<view class="title">封号</view>
 					<view class="con-list">
-						<input v-model='item_add4.titleNo' placeholder="请输入封号" name="input" maxlength="20"></input>
+						<input v-model='item_add4.titleNo' placeholder="请输入封号" name="input" maxlength="20" type="digit"></input>
 					</view>
 				</view>
 				<!-- 装船日期 -->
 				<view class="c-row">
 					<view class="title">装船净重（吨）</view>
 					<view class="con-list">
-						<input v-model='item_add4.loadNetWeight' placeholder="请输入装船净重" name="input"></input>
+						<input v-model='item_add4.loadNetWeight' placeholder="请输入装船净重" name="input" type="digit"></input>
 					</view>
 				</view>
 				<!-- 装船日期 -->

pages/erp/exWarehousing/exWarehousing.vue

@@ -120,23 +120,23 @@
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom"
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" type="digit"
 					placeholder="请输入箱号"></input>
 			</view>
 			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 				<input v-model='detailData.titleNoOther' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
 				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
-					placeholder="请输入车厢号"></input>
+					placeholder="请输入车厢号" type="digit"></input>
 				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
-					placeholder="请输入车厢号"></input>
+					placeholder="请输入车厢号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">航次</view>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -59,7 +59,7 @@
 			</view>
 			<view class="row row-bottom" v-if="detailData.type == '潮粮'">
 				<view class="left">纯重（吨）</view>
-				<input v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"></input>
+				<input v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算" type="digit"></input>
 			</view>
 			<view class="row">
 				<view class="left">品级</view>
@@ -107,22 +107,22 @@
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo'  class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom"
+				<input v-model='detailData.boxNo'  class="right-bottom" placeholder="请输入箱号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" type="digit"
 					placeholder="请输入箱号"></input>
 			</view>
 			<view v-if='!detailData.outType||detailData.outType=="汽运"' class="row row-bottom">
 				<view class="left">封号</view>
-				<input v-model='detailData.titleNo' class="right-bottom"
+				<input v-model='detailData.titleNo' class="right-bottom" type="digit"
 					placeholder="请输入封号"></input>
-				<input v-model='detailData.titleNoOther' class="right-bottom"
+				<input v-model='detailData.titleNoOther' class="right-bottom" type="digit"
 					placeholder="请输入封号"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
-				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
+				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom" type="digit"
 					placeholder="请输入车厢号"></input>
-				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
+				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom" type="digit"
 					placeholder="请输入车厢号"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -67,7 +67,7 @@
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重（吨）</view>
-				<input type="number" @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+				<input type="digit" @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
 					:disabled="true"></input>
 			</view>
 			<view class="row">
@@ -124,21 +124,20 @@
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom"
-					placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
 			</view>
 			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 				<input v-model='detailData.titleNoOther' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
-				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号"></input>
-				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入车厢号"></input>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入车厢号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>

pages/erp/receivingfeedback/list.vue

@@ -127,7 +127,6 @@
 					url: '/pages/erp/receivingfeedback/details?id=' + val.id,
 				    })
 				}
-				
 			}
 		}
 	}

pages/erp/receivingfeedback/otherfeedback.vue

@@ -76,7 +76,7 @@
 				<view class="c-row">
 					<view class="title">卸车净重（吨）</view>
 					<view class="con-list">  
-						<input v-model='item.unloadNetWeight' placeholder="请输入卸车净重" :disabled="item.status == '已送达'" name="input"></input>
+						<input v-model='item.unloadNetWeight' placeholder="请输入卸车净重" :disabled="item.status == '已送达'" name="input" type="digit"></input>
 					</view>
 				</view>
 				<view class="flex">
@@ -123,7 +123,7 @@
 				<view class="c-row">
 					<view class="title">卸车净重（吨）</view>
 					<view class="con-list">
-						<input v-model='item.unloadNetWeight' placeholder="请输入卸车净重" :disabled="item.status == '已送达'" name="input"></input>
+						<input v-model='item.unloadNetWeight' placeholder="请输入卸车净重" :disabled="item.status == '已送达'" name="input" type="digit"></input>
 					</view>
 				</view>
 				<view class="flex">
@@ -163,7 +163,7 @@
 				<view class="c-row">
 					<view class="title">装船净重（吨）</view>
 					<view class="con-list">
-						<input v-model='item.unloadNetWeight' placeholder="请输入卸船净重" :disabled="item.status == '已送达'"  name="input"></input>
+						<input v-model='item.unloadNetWeight' placeholder="请输入卸船净重" :disabled="item.status == '已送达'" name="input" type="digit"></input>
 					</view>
 				</view>
 				<view class="flex">
@@ -203,7 +203,7 @@
 				<view class="c-row">
 					<view class="title">卸船净重（吨）</view>
 					<view class="con-list">
-						<input v-model='item.unloadNetWeight' placeholder="请输入卸船净重" :disabled="item.status == '已送达'" name="input"></input>
+						<input v-model='item.unloadNetWeight' placeholder="请输入卸船净重" :disabled="item.status == '已送达'" name="input" type="digit"></input>
 					</view>
 				</view>
 				<view class="flex">
@@ -241,9 +241,6 @@
 				action: this.$uploadUrl, //磅单上传地址
 				detailData: {},
 				show: false,
-				show1: false,
-				show2: false,
-				val: "", //假
 				carShow: false,
 				carurl: "../../../static/img/authentication/up2.png",
 				trainCarShow: false,
@@ -261,7 +258,6 @@
 				trainCarList: "",
 				shipList: "",
 				containerList: "",
-
 			}
 		},
 		onLoad(options) {
@@ -309,19 +305,6 @@
 					this.containerUrl = "../../../static/img/authentication/up2.png"
 				}
 			},
-
-			dateChange(e, num) {
-				this.sendCar[num].loadingDate = e.year + "-" + e.month + "-" + e.day
-			},
-			dateChange1(e, num) {
-				this.huoYun[num].loadingDate = e.year + "-" + e.month + "-" + e.day
-			},
-			dateChange2(e, num) {
-				this.looseShip[num].loadingDate = e.year + "-" + e.month + "-" + e.day
-			},
-			dateChange3(e, num) {
-				this.container[num].loadingDate = e.year + "-" + e.month + "-" + e.day
-			},
 			//完货
 			finishedgoods() {
 				for(let i = 0 ; i < this.detailData.tranCarInfoList1.length;i++){
@@ -370,66 +353,6 @@
 					}
 				})
 			},
-			//添加
-			add(index) {
-				if (index == 1) {
-					let _a = []
-					this.sendCar.push({
-						tranCarNo: "",
-						carNo: "",
-						caseNo: "",
-						caseNoOther: "",
-						titleNo: "",
-						titleNoOther: "",
-						loadNetWeight: "",
-						loadingDate: "",
-					})
-				} else if (index == 2) {
-					this.huoYun.push({
-						carNo: "",
-						boxNo1: "",
-						boxNo2: "",
-						loadNetWeight: "",
-						loadingDate: "",
-					})
-				} else if (index == 3) {
-					this.looseShip.push({
-						shipName: "",
-						shipNo: "",
-						loadNetWeight: "",
-						loadingDate: "",
-					})
-				} else if (index == 4) {
-					this.container.push({
-						caseNo: "",
-						titleNo: "",
-						loadNetWeight: "",
-						loadingDate: "",
-					})
-				}
-			},
-			// 删除
-			del(num, index) {
-				var that = this
-				uni.showModal({
-					content: "确定删除反馈信息？",
-					success(res) {
-						if (res.confirm) {
-							if (num == 1) {
-								that.sendCar.splice(index, 1)
-								// array.splice(start,delCount);//从start的位置开始向后删除delCount个元素
-							} else if (num == 2) {
-								that.huoYun.splice(index, 1)
-							} else if (num == 3) {
-								that.loadingDate.splice(index, 1)
-							} else if (num == 4) {
-								that.container.splice(index, 1)
-							}
-						}
-					}
-				})
-
-			},
 			//保存
 			pass(num, index) {
 				if(num == 1){

pages/erp/warehousing/warehousing.vue

@@ -72,7 +72,7 @@
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重（吨）</view>
-				<input type="number" @input='calculate' v-model='detailData.pureWeight' class="right-bottom"
+				<input type="digit" @input='calculate' v-model='detailData.pureWeight' class="right-bottom"
 					placeholder="不可编辑,自动计算" :disabled="true"></input>
 			</view>
 			<view class="row">
@@ -130,22 +130,22 @@
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
 			</view>
 			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo'  class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 				<input v-model='detailData.titleNoOther' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
 				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
-					placeholder="请输入车厢号"></input>
+					placeholder="请输入车厢号" type="digit"></input>
 				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
-					placeholder="请输入车厢号"></input>
+					placeholder="请输入车厢号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>

pages/erpbusiness/add_quality_testing.vue

@@ -64,7 +64,7 @@
 			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input type='number' v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
+					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">

pages/erpbusiness/edit_quality_testing.vue

@@ -97,7 +97,7 @@
 					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价" name="input"></input>
 				</view>
 			</view>
-			<view class="c-row-fj" v-if="flag==1">
+			<view class="c-row-fj" v-if="flag==2">
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注" maxlength="300"></textarea>
 			</view>

pages/erpbusiness/quality_testing.vue

@@ -29,12 +29,16 @@
 			<view class="item-style" v-for='item in gridList' @click='examine(item)'>
 				<view class="row1">
 					<view class="row1-left">
-						<view class="left status1" v-if="item.status=='已质检'">检</view>
-						<view class="left status2" v-if="item.status=='已称皮重'">皮</view>
-						<view class="left status3" v-if="item.status=='已称毛重'">毛</view>
-						<view class="left status1" v-if="item.status=='已初检'">初</view>
-						<view class="left status2" v-if="item.status=='已复检'&&item.confirm!='1'">复</view>
 						<view class="left status3" v-if="item.confirm=='1'">确</view>
+						<view v-else>
+							<view class="left status1" v-if="item.status=='已质检'">检</view>
+							<view class="left status2" v-if="item.status=='已称皮重'">皮</view>
+							<view class="left status3" v-if="item.status=='已称毛重'">毛</view>
+							<view class="left status1" v-if="item.status=='已初检'">初</view>
+							<view class="left status2" v-if="item.status=='已复检'">复</view>
+							<view class="left status3" v-if="item.confirm=='1'">确</view>
+						</view>
+						
 						<view>
 							<view class="top-title">
 								<view v-if='managementType==1'>{{item.qualityNo}}</view>