|
@@ -156,13 +156,15 @@
|
|
|
|
|
|
<view v-show='typevalue==1' class="c-row ">
|
|
|
<view class="title">车牌号</view>
|
|
|
- <view class="con-list" v-show='(gridList.inOutType!="移库入库"||gridList.outType!="汽运")&&gridList.tranTaskFlag!="1"'>
|
|
|
+ <view class="con-list"
|
|
|
+ v-show='(gridList.inOutType!="移库入库"||gridList.outType!="汽运")&&gridList.tranTaskFlag!="1"'>
|
|
|
<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
|
|
|
placeholder="请输入车牌号" name="input"></input>
|
|
|
<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
|
|
|
:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
|
|
|
</view>
|
|
|
- <view class="con-list" v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"||gridList.tranTaskFlag=="1"'>
|
|
|
+ <view class="con-list"
|
|
|
+ v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"||gridList.tranTaskFlag=="1"'>
|
|
|
<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
|
|
|
<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
|
|
|
v-model="show9" mode="selector">
|
|
@@ -332,11 +334,11 @@
|
|
|
<MyNumberInput :myvalue="gridList.protein" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
:myevent="'protein'" @setValue="mykeywordset" v-if="InputEvent=='protein'"
|
|
|
@Cancelword="Cancelword" @goNext="goNext('protein')"></MyNumberInput>
|
|
|
- <input v-else v-model='gridList.protein' placeholder="请输入蛋白"
|
|
|
- @click="SetInputKey('protein')" name="input" type="digit" @input="obtainPrice"></input>
|
|
|
+ <input v-else v-model='gridList.protein' placeholder="请输入蛋白" @click="SetInputKey('protein')"
|
|
|
+ name="input" type="digit" @input="obtainPrice"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
<view class="c-row " v-if="gridList.goodsName != '大豆'">
|
|
|
<view class="title">不完善粒(%)</view>
|
|
|
<view class="con-list">
|
|
@@ -353,8 +355,8 @@
|
|
|
<MyNumberInput :myvalue="gridList.completeGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
:myevent="'completeGrain'" @setValue="mykeywordset" v-if="InputEvent=='completeGrain'"
|
|
|
@Cancelword="Cancelword" @goNext="goNext('impurity')"></MyNumberInput>
|
|
|
- <input v-else v-model='gridList.completeGrain'
|
|
|
- placeholder="请输入完善粒率占比" name="input" type="digit"></input>
|
|
|
+ <input v-else v-model='gridList.completeGrain' placeholder="请输入完善粒率占比" name="input"
|
|
|
+ type="digit"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="c-row ">
|
|
@@ -393,13 +395,13 @@
|
|
|
<MyNumberInput :myvalue="gridList.transgene" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
:myevent="'transgene'" @setValue="mykeywordset" v-if="InputEvent=='transgene'"
|
|
|
@Cancelword="Cancelword" @goNext="goNext('transgene')"></MyNumberInput>
|
|
|
- <view @click="transgeneShow=true">
|
|
|
- {{gridList.transgene}}
|
|
|
- </view>
|
|
|
- <!-- 转基因 -->
|
|
|
- <u-picker :range="transgeneList" range-key="value" @confirm='transgeneClick($event)' v-model="transgeneShow"
|
|
|
- mode="selector">
|
|
|
- </u-picker>
|
|
|
+ <view @click="transgeneShow=true">
|
|
|
+ {{gridList.transgene}}
|
|
|
+ </view>
|
|
|
+ <!-- 转基因 -->
|
|
|
+ <u-picker :range="transgeneList" range-key="value" @confirm='transgeneClick($event)'
|
|
|
+ v-model="transgeneShow" mode="selector">
|
|
|
+ </u-picker>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="c-row" v-if="gridList.goodsName == '大豆'">
|
|
@@ -410,12 +412,12 @@
|
|
|
@Cancelword="Cancelword" @goNext="goNext('colorLustre')"></MyNumberInput>
|
|
|
<!-- <input v-else v-model='gridList.colorLustre' @click="SetInputKey('colorLustre')"
|
|
|
placeholder="请选择色泽/气味是否正常" name="input" type="digit"></input> -->
|
|
|
- <div @click="colorLustreShow = true">{{gridList.colorLustre}}</div>
|
|
|
-
|
|
|
- <!-- 转基因 -->
|
|
|
- <u-picker :range="colorLustreList" range-key="value" @confirm='colorLustreClick($event)' v-model="colorLustreShow"
|
|
|
- mode="selector">
|
|
|
- </u-picker>
|
|
|
+ <div @click="colorLustreShow = true">{{gridList.colorLustre}}</div>
|
|
|
+
|
|
|
+ <!-- 转基因 -->
|
|
|
+ <u-picker :range="colorLustreList" range-key="value" @confirm='colorLustreClick($event)'
|
|
|
+ v-model="colorLustreShow" mode="selector">
|
|
|
+ </u-picker>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3" class="c-row">
|
|
@@ -506,13 +508,15 @@
|
|
|
<view class="but_css" @click="close">返回</view>
|
|
|
</view>
|
|
|
</u-popup>
|
|
|
-
|
|
|
+
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
var that;
|
|
|
- const Equ_List = ['waterContent', 'bulkDensity', 'imperfectGrain', 'impurity', 'mildewGrain', 'jiaorenli','protein','completeGrain'];
|
|
|
+ const Equ_List = ['waterContent', 'bulkDensity', 'imperfectGrain', 'impurity', 'mildewGrain', 'jiaorenli', 'protein',
|
|
|
+ 'completeGrain'
|
|
|
+ ];
|
|
|
import dragButton from "@/components/drag-button/drag-button.vue";
|
|
|
import keyboard from "@/components/master-keyboard/master-keyboard.vue";
|
|
|
import MyNumberInput from "@/components/MyNumberInput.vue";
|
|
@@ -549,7 +553,7 @@
|
|
|
Isedit: false,
|
|
|
MykeywordShow: false,
|
|
|
InputEvent: '',
|
|
|
- tranTaskFlag:0,
|
|
|
+ tranTaskFlag: 0,
|
|
|
dryGrainPrice: 0,
|
|
|
tidalGrainPrice: 0,
|
|
|
modalName: '',
|
|
@@ -797,11 +801,19 @@
|
|
|
],
|
|
|
cangid: '',
|
|
|
|
|
|
- inType: "" ,//入库类型
|
|
|
- transgeneShow:false,
|
|
|
- transgeneList:[{value:'非转基因'},{value:'转基因'}],
|
|
|
- colorLustreShow : false,
|
|
|
- colorLustreList:[{value:'正常'},{value:'异常'}]
|
|
|
+ inType: "", //入库类型
|
|
|
+ transgeneShow: false,
|
|
|
+ transgeneList: [{
|
|
|
+ value: '非转基因'
|
|
|
+ }, {
|
|
|
+ value: '转基因'
|
|
|
+ }],
|
|
|
+ colorLustreShow: false,
|
|
|
+ colorLustreList: [{
|
|
|
+ value: '正常'
|
|
|
+ }, {
|
|
|
+ value: '异常'
|
|
|
+ }]
|
|
|
}
|
|
|
},
|
|
|
// #ifndef MP
|
|
@@ -938,9 +950,10 @@
|
|
|
console.log(1)
|
|
|
console.log(res)
|
|
|
for (let i = 0; i < res.data.data.length; i++) {
|
|
|
- this.$set(res.data.data[i],'inOutTaskNo1',res.data.data[i].inOutTaskNo+(res.data.data[i].taskFlag?'('+res.data.data[i].taskFlag+')':''))
|
|
|
+ this.$set(res.data.data[i], 'inOutTaskNo1', res.data.data[i].inOutTaskNo + (res.data.data[
|
|
|
+ i].taskFlag ? '(' + res.data.data[i].taskFlag + ')' : ''))
|
|
|
}
|
|
|
- console.log(res.data.data,22222)
|
|
|
+ console.log(res.data.data, 22222)
|
|
|
this.taskNolist = res.data.data
|
|
|
})
|
|
|
this.multiSelector1 = [{
|
|
@@ -1019,10 +1032,10 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- colorLustreClick(e){
|
|
|
+ colorLustreClick(e) {
|
|
|
this.gridList.colorLustre = this.colorLustreList[e[0]].value
|
|
|
},
|
|
|
- transgeneClick(e){
|
|
|
+ transgeneClick(e) {
|
|
|
this.gridList.transgene = this.transgeneList[e[0]].value
|
|
|
},
|
|
|
Cancelword() {
|
|
@@ -1146,7 +1159,7 @@
|
|
|
obtainPrice() { //根据容重获取价格
|
|
|
if (this.gridList.goodsName && this.cangid && this.gridList.bulkDensity) {
|
|
|
// if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
|
|
|
- let quality = this.gridList.goodsName=='大豆'?this.gridList.protein:this.gridList.bulkDensity
|
|
|
+ let quality = this.gridList.goodsName == '大豆' ? this.gridList.protein : this.gridList.bulkDensity
|
|
|
this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
|
|
|
warehouseId: this.cangid,
|
|
|
goodsName: this.gridList.goodsName,
|
|
@@ -1230,7 +1243,8 @@
|
|
|
}).then(res => {
|
|
|
console.log(res)
|
|
|
for (let i = 0; i < res.data.data.length; i++) {
|
|
|
- this.$set(res.data.data[i],'inOutTaskNo1',res.data.data[i].inOutTaskNo+(res.data.data[i].taskFlag?'('+res.data.data[i].taskFlag+')':''))
|
|
|
+ this.$set(res.data.data[i], 'inOutTaskNo1', res.data.data[i].inOutTaskNo + (res.data.data[
|
|
|
+ i].taskFlag ? '(' + res.data.data[i].taskFlag + ')' : ''))
|
|
|
}
|
|
|
this.taskNolist = res.data.data
|
|
|
})
|
|
@@ -1410,12 +1424,12 @@
|
|
|
this.gridList.gradeKey = this.gradeList[1].key
|
|
|
// this.gridList.grade = this.contractNolist.grade
|
|
|
this.gridList.inOutType = this.contractNolist.inOutType
|
|
|
- if(this.gridList.goodsName == "大豆"){ //货名为大豆是设置默认
|
|
|
- this.gridList.transgene= "非转基因"
|
|
|
- this.gridList.reTransgene= "非转基因"
|
|
|
+ if (this.gridList.goodsName == "大豆") { //货名为大豆是设置默认
|
|
|
+ this.gridList.transgene = "非转基因"
|
|
|
+ this.gridList.reTransgene = "非转基因"
|
|
|
this.gridList.colorLustre = "正常"
|
|
|
this.gridList.reColorLustre = "正常"
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
delete this.gridList.transgene
|
|
|
delete this.gridList.reTransgene
|
|
|
delete this.gridList.colorLustre
|
|
@@ -1451,7 +1465,7 @@
|
|
|
this.gridList.inOutTypeKey = 5
|
|
|
} else if (this.contractNolist.inOutType == '退库') {
|
|
|
//退库有无运输任务标识
|
|
|
- this.gridList.tranTaskFlag=this.contractNolist.tranTaskFlag
|
|
|
+ this.gridList.tranTaskFlag = this.contractNolist.tranTaskFlag
|
|
|
this.warehouseTradeCount = '000' + this.warehouseTradeCount
|
|
|
// this.gridList.qualityNo = 'CGRK' + this.getdate() + this.commonWarehouseNo + this
|
|
|
// .warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
|
|
@@ -1541,10 +1555,10 @@
|
|
|
},
|
|
|
print() {
|
|
|
console.log(this.printId)
|
|
|
- if(this.printId){
|
|
|
+ if (this.printId) {
|
|
|
uni.showLoading({
|
|
|
- title:"加载中",
|
|
|
- mask:true
|
|
|
+ title: "加载中",
|
|
|
+ mask: true
|
|
|
})
|
|
|
this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
|
|
|
id: this.printId
|
|
@@ -1625,7 +1639,7 @@
|
|
|
|
|
|
uni.showLoading({
|
|
|
title: "加载中",
|
|
|
- mask:true
|
|
|
+ mask: true
|
|
|
})
|
|
|
this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
|
|
|
warehouseId: this.cangid,
|
|
@@ -1693,23 +1707,29 @@
|
|
|
console.log(res)
|
|
|
this.printId = res.data.data
|
|
|
uni.hideLoading()
|
|
|
- if (res.data.code == 200) {
|
|
|
- console.log("addQualityInspection")
|
|
|
- this.$api.msg('提交成功')
|
|
|
- this.gridList.warehouseId = this.cangid
|
|
|
- this.gridList.compId = uni.getStorageSync(
|
|
|
- 'pcUserInfo').compId
|
|
|
- uni.setStorageSync("quality_print", this.gridList)
|
|
|
- if (this.isZJ) {
|
|
|
- this.isShowPrint = true
|
|
|
+ if ((this.gridList.goodsName.indexOf("潮粮") != -1 && this.gridList.type.indexOf("潮") !=
|
|
|
+ -1) ||
|
|
|
+ (this.gridList.goodsName.indexOf("潮粮") == -1 && this.gridList.type.indexOf("干") !=
|
|
|
+ -1)) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ console.log("addQualityInspection")
|
|
|
+ this.$api.msg('提交成功')
|
|
|
+ this.gridList.warehouseId = this.cangid
|
|
|
+ this.gridList.compId = uni.getStorageSync(
|
|
|
+ 'pcUserInfo').compId
|
|
|
+ uni.setStorageSync("quality_print", this.gridList)
|
|
|
+ if (this.isZJ) {
|
|
|
+ this.isShowPrint = true
|
|
|
+ } else {
|
|
|
+ uni.navigateBack({})
|
|
|
+ }
|
|
|
+ console.log('that.gridList', this.gridList)
|
|
|
+ // uni.navigateBack({})
|
|
|
} else {
|
|
|
- uni.navigateBack({})
|
|
|
+ this.$api.msg('提交失败')
|
|
|
}
|
|
|
-
|
|
|
- console.log('that.gridList', this.gridList)
|
|
|
- // uni.navigateBack({})
|
|
|
} else {
|
|
|
- this.$api.msg('提交失败')
|
|
|
+ this.$api.msg('货物种类与类型不符,请确认')
|
|
|
}
|
|
|
})
|
|
|
return
|
|
@@ -1721,27 +1741,33 @@
|
|
|
console.log("addQualityInspection")
|
|
|
this.printId = res.data.data
|
|
|
uni.hideLoading()
|
|
|
- if (res.data.code == 200) {
|
|
|
- this.$api.msg('提交成功')
|
|
|
- this.gridList.warehouseId = this.cangid
|
|
|
- this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
|
|
|
- uni.setStorageSync("quality_print", this.gridList)
|
|
|
- if (this.isZJ) {
|
|
|
- this.isShowPrint = true
|
|
|
+ if ((this.gridList.goodsName.indexOf("潮粮") != -1 && this.gridList.type.indexOf("潮") !=
|
|
|
+ -1) ||
|
|
|
+ (this.gridList.goodsName.indexOf("潮粮") == -1 && this.gridList.type.indexOf("干") !=
|
|
|
+ -1)) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ this.$api.msg('提交成功')
|
|
|
+ this.gridList.warehouseId = this.cangid
|
|
|
+ this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
|
|
|
+ uni.setStorageSync("quality_print", this.gridList)
|
|
|
+ if (this.isZJ) {
|
|
|
+ this.isShowPrint = true
|
|
|
+ } else {
|
|
|
+ uni.navigateBack({})
|
|
|
+ }
|
|
|
+ uni.setStorageSync(
|
|
|
+ 'checkcustomer', {}
|
|
|
+ )
|
|
|
+ console.log('that.gridList', this.gridList)
|
|
|
+ // uni.navigateBack({})
|
|
|
} else {
|
|
|
- uni.navigateBack({})
|
|
|
+ this.$api.msg('提交失败')
|
|
|
}
|
|
|
- uni.setStorageSync(
|
|
|
- 'checkcustomer', {}
|
|
|
- )
|
|
|
- console.log('that.gridList', this.gridList)
|
|
|
- // uni.navigateBack({})
|
|
|
} else {
|
|
|
- this.$api.msg('提交失败')
|
|
|
+ this.$api.msg('货物种类与类型不符,请确认')
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
async inOutWarehouse(type) {
|
|
|
if (type == 1) {
|
|
@@ -1749,7 +1775,7 @@
|
|
|
.then(res => {
|
|
|
console.log("InOutWarehouse")
|
|
|
this.gridList.warehouseInOutId = res.data.data
|
|
|
- if(this.gridList.warehouseInOutId){
|
|
|
+ if (this.gridList.warehouseInOutId) {
|
|
|
this.addQualityInspection(1)
|
|
|
}
|
|
|
})
|
|
@@ -1761,14 +1787,14 @@
|
|
|
console.log("InOutWarehouse")
|
|
|
if (this.isQY) {
|
|
|
if (!this.isZJ) {
|
|
|
- this.gridList.brazer=1
|
|
|
+ this.gridList.brazer = 1
|
|
|
this.gridList.statusFlag = 7
|
|
|
} else {
|
|
|
this.gridList.statusFlag = 0
|
|
|
}
|
|
|
}
|
|
|
this.gridList.warehouseInOutId = res.data.data
|
|
|
- if(this.gridList.warehouseInOutId){
|
|
|
+ if (this.gridList.warehouseInOutId) {
|
|
|
this.addQualityInspection(2)
|
|
|
}
|
|
|
})
|
|
@@ -1804,7 +1830,7 @@
|
|
|
|
|
|
this.gridList.inOutFlag = 2
|
|
|
this.inOutWarehouse(2)
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1912,8 +1938,8 @@
|
|
|
this.$api.msg('容重不能为空')
|
|
|
return
|
|
|
}
|
|
|
- }
|
|
|
- if(this.gridList.goodsName == "大豆"){
|
|
|
+ }
|
|
|
+ if (this.gridList.goodsName == "大豆") {
|
|
|
if (!this.gridList.protein) {
|
|
|
this.$api.msg('蛋白不能为空')
|
|
|
return
|
|
@@ -1963,14 +1989,14 @@
|
|
|
if (that.typevalue == 3) {
|
|
|
uni.showLoading({
|
|
|
title: "加载中",
|
|
|
- mask:true
|
|
|
+ mask: true
|
|
|
})
|
|
|
that.cumulant(1)
|
|
|
return
|
|
|
}
|
|
|
uni.showLoading({
|
|
|
title: "加载中",
|
|
|
- mask:true
|
|
|
+ mask: true
|
|
|
})
|
|
|
that.gridList.inOutFlag = 2
|
|
|
that.inOutWarehouse(1)
|