|
|
@@ -252,6 +252,30 @@
|
|
|
</view>
|
|
|
<view v-show="edit" class="con-list">{{gridList.type?gridList.type:'请选择类型'}}</view>
|
|
|
</view>
|
|
|
+ <view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
|
|
|
+ <view class="title">箱号-1</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
|
|
|
+ <view class="title">封号-1</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
|
|
|
+ <view class="title">箱号-2</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
|
|
|
+ <view class="title">封号-2</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
|
|
|
class="c-row">
|
|
|
<view class="title">净重单价（元/公斤）</view>
|
|
|
@@ -286,30 +310,7 @@
|
|
|
placeholder="请输入干粮单价" name="input" type="digit"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
|
|
|
- <view class="title">箱号-1</view>
|
|
|
- <view class="con-list">
|
|
|
- <input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
|
|
|
- <view class="title">封号-1</view>
|
|
|
- <view class="con-list">
|
|
|
- <input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
|
|
|
- <view class="title">箱号-2</view>
|
|
|
- <view class="con-list">
|
|
|
- <input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
|
|
|
- <view class="title">封号-2</view>
|
|
|
- <view class="con-list">
|
|
|
- <input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
+
|
|
|
</view>
|
|
|
<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
|
|
|
<view class='wrap'>
|
|
|
@@ -464,6 +465,8 @@
|
|
|
username: "请更改昵称",
|
|
|
contractFlag: 10,
|
|
|
gridList: {
|
|
|
+
|
|
|
+ outType: '汽运',
|
|
|
natureOfGrainPurchase: '贸易粮',
|
|
|
type: '',
|
|
|
tidalGrainPrice: '',
|
|
|
@@ -507,7 +510,7 @@
|
|
|
grossWeight: 0,
|
|
|
tare: 0,
|
|
|
grade: '',
|
|
|
- // inOutDate: new Date().toISOString().slice(0, 10),
|
|
|
+ inOutDate: new Date().toISOString().slice(0, 10),
|
|
|
netWeight: 0,
|
|
|
pureWeight: 0,
|
|
|
deductionWeight: 0,
|
|
|
@@ -685,6 +688,8 @@
|
|
|
}
|
|
|
},
|
|
|
onLoad(options) {
|
|
|
+ console.log( this.cangid)
|
|
|
+ debugger
|
|
|
this.commonWarehouseNo = options.commonWarehouseNo
|
|
|
this.warehouseCount = Number(options.warehouseCount) + 1
|
|
|
this.warehouseTradeCount = Number(options.warehouseTradeCount) + 1
|
|
|
@@ -693,6 +698,12 @@
|
|
|
this.gridList.warehouseName = options.warehouseName
|
|
|
// this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
|
|
|
this.cangid = options.cangid
|
|
|
+ this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
|
|
|
+ id: this.cangid
|
|
|
+ }).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ this.warehouseList = res.data.data.warehousePositionInfoList
|
|
|
+ })
|
|
|
this.gridList.compName = uni.getStorageSync('compName1')
|
|
|
this.gridList.person = options.personCharge
|
|
|
this.gridList.personPhone = options.personPhone
|
|
|
@@ -727,11 +738,7 @@
|
|
|
// }
|
|
|
this.gridList.grade = this.gradeList[0].value
|
|
|
this.gridList.gradeKey = this.gradeList[0].key
|
|
|
- this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
|
|
|
- id: this.cangid
|
|
|
- }).then(res => {
|
|
|
- this.warehouseList = res.data.data.warehousePositionInfoList
|
|
|
- })
|
|
|
+
|
|
|
this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
|
|
|
warehouseId: this.cangid
|
|
|
}).then(res => {
|
|
|
@@ -1198,7 +1205,7 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if(this.inType == "收购入库"){ //收购入库 价格取自合同
|
|
|
+ if(this.inType != "收购入库"){ //收购入库 价格取自合同
|
|
|
return
|
|
|
}
|
|
|
if (this.gridList.goodsName && this.cangid) {
|
|
|
@@ -1439,6 +1446,7 @@
|
|
|
count + '吨', )
|
|
|
|
|
|
} else {
|
|
|
+ that.gridList.inOutFlag = 2
|
|
|
that.$api.doRequest('post',
|
|
|
'/warehouseInOutInfo/InOutWarehouse',
|
|
|
that.gridList)
|
|
|
@@ -1496,6 +1504,8 @@
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
|
+
|
|
|
+ that.gridList.inOutFlag = 2
|
|
|
that.$api.doRequest('post',
|
|
|
'/warehouseInOutInfo/InOutWarehouse',
|
|
|
that.gridList)
|
