|
|
@@ -11,13 +11,15 @@
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
<view class="left">货名</view>
|
|
|
- <view class="right">{{detailData.goodsName}}</view>
|
|
|
+ <view class="right">{{detailData.goodsName ? detailData.goodsName : "选择合同，自动获取"}}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
<view class="left">类型</view>
|
|
|
- <view @click='show1=true'>请选择类型</view>
|
|
|
+ <view @click='show1=true'>{{detailData.type}}</view>
|
|
|
<u-picker :range="typeList" range-key="type" @confirm='typePicker($event)' v-model="show1"
|
|
|
mode="selector">
|
|
|
+ <view class="">{{detailData.type}}</view>
|
|
|
</u-picker>
|
|
|
</view>
|
|
|
<view class="row row-bottom">
|
|
|
@@ -35,62 +37,70 @@
|
|
|
<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="不可编辑,自动计算"></input>
|
|
|
</view>
|
|
|
- <view class="row row-bottom">
|
|
|
+ <view class="row row-bottom" v-if="detailData.type == '潮粮'">
|
|
|
<view class="left">扣重比</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入扣重比"></input>
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ placeholder="输入扣重比"></input>
|
|
|
</view>
|
|
|
- <view class="row row-bottom">
|
|
|
+ <view class="row row-bottom" v-if="detailData.type == '潮粮'">
|
|
|
<view class="left">干粮水分（%）</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入干粮水分占比"></input>
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ placeholder="输入干粮水分占比"></input>
|
|
|
</view>
|
|
|
- <view class="row row-bottom">
|
|
|
+ <view class="row row-bottom" v-if="detailData.type == '潮粮'">
|
|
|
<view class="left">潮粮水分（%）</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入潮粮水分占比"></input>
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ placeholder="输入潮粮水分占比"></input>
|
|
|
</view>
|
|
|
- <view class="row row-bottom">
|
|
|
+ <view class="row row-bottom" v-if="detailData.type == '潮粮'">
|
|
|
<view class="left">纯重（吨）</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="不可编辑,自动计算"></input>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
<view class="left">品级</view>
|
|
|
- <view @click='show3=true'>请选择品级</view>
|
|
|
- <u-picker :range="pjList" range-key="name" @confirm='handlerPicker($event)' v-model="show3" mode="selector">
|
|
|
+ <view @click='show3=true'>{{detailData.grade}}</view>
|
|
|
+ <u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show3" mode="selector">
|
|
|
</u-picker>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
<view class="left">经办人</view>
|
|
|
- <view @click='show6=true'>请选择经办人</view>
|
|
|
- <u-picker :range="handlerList" range-key="name" @confirm='handlerPicker($event)' v-model="show6" mode="selector">
|
|
|
+ <view @click='show6=true'>{{detailData.agent}}</view>
|
|
|
+ <u-picker :range="handlerList" range-key="name" @confirm='handlerPicker($event)' v-model="show6"
|
|
|
+ mode="selector">
|
|
|
</u-picker>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
<view class="left">出库日期</view>
|
|
|
- <view @click='show4=true'>请选择日期</view>
|
|
|
- <u-calendar v-model="show4" mode="date" @change='dateChange'></u-calendar>
|
|
|
+ <view @click='show7=true'>{{detailData.inOutDate}}</view>
|
|
|
+ <u-picker v-model="show7" mode="time" @confirm='dateChange($event)' :params="params">
|
|
|
+ <!-- <view >{{detailData.inOutDate ? detailData.inOutDate:"请选择日期" }}</view> -->
|
|
|
+ </u-picker>
|
|
|
+ <!-- <u-calendar v-model="show4" mode="date" @change='dateChange'></u-calendar> -->
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
<view class="left">出库类型</view>
|
|
|
<view @click='show5=true'>请选择入库类型</view>
|
|
|
- <u-picker :range="warehousingTypeList" range-key="type" @confirm='warehousingTypePicker($event)' v-model="show5" mode="selector">
|
|
|
+ <u-picker :range="warehousingTypeList" range-key="type" @confirm='warehousingTypePicker($event)'
|
|
|
+ v-model="show5" mode="selector">
|
|
|
</u-picker>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
<view class="left">车牌号</view>
|
|
|
<view @click='slectCarNo'>{{detailData.carNo}}</view>
|
|
|
</view>
|
|
|
- <view class="row row-bottom has-btn">
|
|
|
+ <!-- <view class="row row-bottom has-btn">
|
|
|
<view class="left">成本（元/吨）</view>
|
|
|
<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="自动获取"></input>
|
|
|
- <u-button class="edit-btn">编辑</u-button>
|
|
|
+ <u-button class="edit-btn">编辑</u-button>
|
|
|
</view>
|
|
|
<view class="row row-bottom has-btn">
|
|
|
<view class="left">运费（元/吨）</view>
|
|
|
<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="自动获取"></input>
|
|
|
- <u-button class="edit-btn">编辑</u-button>
|
|
|
- </view>
|
|
|
+ <u-button class="edit-btn">编辑</u-button>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
<view class="content2">
|
|
|
<view class="left">上传磅单</view>
|
|
|
@@ -104,12 +114,12 @@
|
|
|
</view>
|
|
|
<view class="row row-bottom">
|
|
|
<view class="left">质检员</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="输入质检员姓名"></input>
|
|
|
</view>
|
|
|
<view class="row row-bottom">
|
|
|
<view class="left">水分（%）</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="输入水分占比"></input>
|
|
|
</view>
|
|
|
<view class="row row-bottom" style="border: 0;">
|
|
|
@@ -118,22 +128,22 @@
|
|
|
</view>
|
|
|
<view class="row row-bottom">
|
|
|
<view class="left">热损伤（%）</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="输入热损伤占比"></input>
|
|
|
</view>
|
|
|
<view class="row row-bottom">
|
|
|
<view class="left">杂质（%）</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="输入杂质占比"></input>
|
|
|
</view>
|
|
|
<view class="row row-bottom">
|
|
|
<view class="left">霉变粒（%）</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="输入霉变粒占比"></input>
|
|
|
</view>
|
|
|
<view class="row row-bottom">
|
|
|
<view class="left">不完善粒（%）</view>
|
|
|
- <input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
|
|
|
+ <input v-model='detailData.grossWeight' class="right-bottom"
|
|
|
placeholder="输入不完善粒占比"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -160,6 +170,7 @@
|
|
|
show4: false,
|
|
|
show5: false,
|
|
|
show6: false,
|
|
|
+ show7: false,
|
|
|
contractNoList: [{
|
|
|
contractNo: "123"
|
|
|
}],
|
|
|
@@ -171,13 +182,13 @@
|
|
|
}
|
|
|
],
|
|
|
pjList: [{
|
|
|
- type: "一等"
|
|
|
+ type: "一等品"
|
|
|
},
|
|
|
{
|
|
|
- type: "二等"
|
|
|
+ type: "二等品"
|
|
|
},
|
|
|
{
|
|
|
- type: "三等"
|
|
|
+ type: "三等品"
|
|
|
},
|
|
|
{
|
|
|
type: "等外"
|
|
|
@@ -214,13 +225,25 @@
|
|
|
btnLoading: false, //防止重复点击
|
|
|
isAdd: true,
|
|
|
detailData: {
|
|
|
- contractNo: "123",
|
|
|
- carNo:'辽H12345',
|
|
|
+ contractNo: "请选择合同编号或移库任务编号",
|
|
|
+ carNo: '辽H12345',
|
|
|
name: "",
|
|
|
- goodsName: "123",
|
|
|
+ type: "请选择类型",
|
|
|
+ grade: "请输入品级",
|
|
|
+ agent: "请选择经办人",
|
|
|
+ inOutDate: "请选择出库日期",
|
|
|
qualityInspectionManagement: {}
|
|
|
- }
|
|
|
+ },
|
|
|
+ params: {
|
|
|
+ year: true,
|
|
|
+ month: true,
|
|
|
+ day: true,
|
|
|
+ hour: true,
|
|
|
+ minute: true,
|
|
|
+ second: true
|
|
|
+ },
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
onLoad(options) {
|
|
|
this.id = options.id
|
|
|
@@ -232,16 +255,16 @@
|
|
|
methods: {
|
|
|
contractNopicker(e) {},
|
|
|
typePicker(e) {
|
|
|
- console.log(e)
|
|
|
+ this.detailData.type = this.typeList[e].type
|
|
|
},
|
|
|
pjPicker(e) {
|
|
|
- console.log(e)
|
|
|
+ this.detailData.grade = this.pjList[e].type
|
|
|
},
|
|
|
handlerPicker(e) {
|
|
|
- console.log(e)
|
|
|
+ this.detailData.agent = this.handlerList[e].name
|
|
|
},
|
|
|
- dateChange(e){
|
|
|
- console.log(e)
|
|
|
+ dateChange(e) {
|
|
|
+ this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
|
|
|
},
|
|
|
warehousingTypePicker(e) {
|
|
|
console.log(e)
|
|
|
@@ -340,14 +363,14 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- slectcontractNo(){
|
|
|
+ slectcontractNo() {
|
|
|
uni.navigateTo({
|
|
|
- url:'/pages/erp/exWarehousing/selectContractNo'
|
|
|
+ url: '/pages/erp/warehousing/selectContractNo?compId=' + this.compId
|
|
|
})
|
|
|
},
|
|
|
- slectCarNo(){
|
|
|
+ slectCarNo() {
|
|
|
uni.navigateTo({
|
|
|
- url:'/pages/erp/exWarehousing/selectCarNo'
|
|
|
+ url: '/pages/erp/exWarehousing/selectCarNo'
|
|
|
})
|
|
|
},
|
|
|
}
|
|
|
@@ -428,17 +451,20 @@
|
|
|
background: #22C572;
|
|
|
border-radius: 10rpx;
|
|
|
}
|
|
|
- .edit-btn{
|
|
|
+
|
|
|
+ .edit-btn {
|
|
|
background: #22C572;
|
|
|
width: 100rpx;
|
|
|
height: 50rpx;
|
|
|
margin: 0;
|
|
|
color: white;
|
|
|
}
|
|
|
- .has-btn{
|
|
|
+
|
|
|
+ .has-btn {
|
|
|
align-items: center;
|
|
|
}
|
|
|
- .bottom-btn{
|
|
|
+
|
|
|
+ .bottom-btn {
|
|
|
width: 92%;
|
|
|
position: fixed;
|
|
|
bottom: 40rpx;
|
