|
@@ -24,8 +24,8 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<div style='text-align:center;'>
|
|
|
- <el-button @click='add' type="primary" v-if="qyJurisdiction || serviceManagementType == 1">新增</el-button>
|
|
|
- <el-button @click='deletelist' type="danger" v-if="qyJurisdiction || serviceManagementType == 1">删除
|
|
|
+ <el-button @click='add' type="primary" v-if="qyJurisdiction&&statusTypetext == '初检' || serviceManagementType == 1">新增</el-button>
|
|
|
+ <el-button @click='deletelist' type="danger" v-if="qyJurisdiction&&statusTypetext == '初检' || serviceManagementType == 1">删除
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</el-col>
|
|
@@ -46,7 +46,7 @@
|
|
|
<div style="margin: 0 auto">
|
|
|
<div class="title">
|
|
|
基本信息
|
|
|
- <el-checkbox v-if="statusTypetext == '初检' && !qyJurisdiction" v-model="directselling">原箱直销
|
|
|
+ <el-checkbox v-if="statusTypetext == '初检' && zjJurisdiction" v-model="directselling">原箱直销
|
|
|
<el-tooltip class="item" effect="dark" content="集装箱入库不开箱直接销售" placement="top-start">
|
|
|
<i class="el-icon-question"></i>
|
|
|
</el-tooltip>
|
|
@@ -64,7 +64,7 @@
|
|
|
<ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取,不可编辑" maxlength="100" disabled
|
|
|
size="small" />
|
|
|
</ws-form-item> -->
|
|
|
- <ws-form-item v-if='serviceManagementType == 3 && !qyJurisdiction' label="购粮性质" span="1"
|
|
|
+ <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="购粮性质" span="1"
|
|
|
prop="natureOfGrainPurchase">
|
|
|
<ws-input v-model="deptBudgetList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10"
|
|
|
size="small" :disabled="disabled" />
|
|
@@ -77,7 +77,7 @@
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
|
|
|
- <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction' label="货名" span="1"
|
|
|
+ <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="货名" span="1"
|
|
|
prop="inOutTaskNo">
|
|
|
<el-select :disabled='disablednotarize || goodsdisabled' v-model="deptBudgetList.goodsName" clearable
|
|
|
filterable placeholder="请选择" class="typeselect" @change="goodsNameChange">
|
|
@@ -85,13 +85,13 @@
|
|
|
:value="item.goodsName" />
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item label="类型" span="1" prop="type" v-if="!qyJurisdiction">
|
|
|
+ <ws-form-item label="类型" span="1" prop="type" v-if="zjJurisdiction && statusTypetext == '初检'||statusTypetext != '初检'">
|
|
|
<ws-select v-model="deptBudgetList.type">
|
|
|
<ws-option v-for="item in typeList" :key="'leixin' + item" :label="item" :value="item" />
|
|
|
</ws-select>
|
|
|
</ws-form-item>
|
|
|
|
|
|
- <ws-form-item v-if='serviceManagementType == 3 && !qyJurisdiction' label="仓位号" span="1"
|
|
|
+ <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="仓位号" span="1"
|
|
|
prop="inOutTaskNo">
|
|
|
<el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.binNumber"
|
|
|
placeholder="请选择仓位号" class="typeselect" @change="binNumberChange">
|
|
@@ -99,23 +99,23 @@
|
|
|
:value="item.binNumber" />
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="serviceManagementType == 3 && qyJurisdiction">
|
|
|
+ <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="serviceManagementType == 3 && qyJurisdiction && statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
|
|
|
<ws-input :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
|
|
|
size="small" />
|
|
|
</ws-form-item>
|
|
|
|
|
|
|
|
|
- <ws-form-item v-if='serviceManagementType == 3 && !qyJurisdiction' label="囤位号" span="1"
|
|
|
+ <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction && statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="囤位号" span="1"
|
|
|
prop="storageTagNo">
|
|
|
<ws-input :disabled='recheck' v-model="deptBudgetList.storageTagNo" placeholder="选填,1-10个字符"
|
|
|
maxlength="10" size="small" />
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="serviceManagementType == 3 && qyJurisdiction">
|
|
|
+ <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
|
|
|
<ws-input :disabled='recheck' v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
|
|
|
size="small" />
|
|
|
</ws-form-item>
|
|
|
|
|
|
- <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction' label="运输方式" span="1" prop="outType">
|
|
|
+ <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="运输方式" span="1" prop="outType">
|
|
|
<el-select v-if='serviceManagementType == 3' @change='outTypechange' :disabled='recheck'
|
|
|
v-model="outType" placeholder="请选择运输方式">
|
|
|
<el-option v-for="item in multiSelector1" :key="item.id"
|
|
@@ -124,11 +124,11 @@
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="箱号-2" span="1" prop="boxNoOther"
|
|
|
- v-if="serviceManagementType == 3 && qyJurisdiction">
|
|
|
+ v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
|
|
|
<ws-input :disabled='recheck' v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
|
|
|
size="small" />
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction' label="客户" span="1"
|
|
|
+ <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="客户" span="1"
|
|
|
prop="customerName">
|
|
|
<el-select v-model="deptBudgetList.customerName" clearable filterable placeholder="请选择"
|
|
|
class="typeselect" @change="customerChange" :disabled="disabled1">
|
|
@@ -137,11 +137,11 @@
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="封号-2" span="1" prop="titleNoOther"
|
|
|
- v-if="serviceManagementType == 3 && qyJurisdiction">
|
|
|
+ v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'">
|
|
|
<ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
|
|
|
size="small" />
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item v-if="serviceManagementType == 3 && qyJurisdiction" label="车牌号" span="1" prop="carNo">
|
|
|
+ <ws-form-item v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'" label="车牌号" span="1" prop="carNo">
|
|
|
<ws-input :disabled="disabled2"
|
|
|
v-if="options2.length == 0 && serviceManagementType == 1 || serviceManagementType == 3 && carNumberList.length == 0"
|
|
|
v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
|
|
@@ -319,10 +319,10 @@
|
|
|
|
|
|
</ws-info-table>
|
|
|
|
|
|
- <div class="title" v-if="!qyJurisdiction || serviceManagementType == 1">质检数据 <span class="bulu">补录:</span>
|
|
|
+ <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 <span class="bulu">补录:</span>
|
|
|
<el-switch v-model="value1"></el-switch>
|
|
|
</div>
|
|
|
- <ws-info-table v-if="!qyJurisdiction || serviceManagementType == 1">
|
|
|
+ <ws-info-table v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">
|
|
|
<ws-form-item label="等级" span="1" prop="outType">
|
|
|
<ws-select style="margin-right:10px;" v-if='statusTypetext != "复检"' v-model="deptBudgetList.grade"
|
|
|
placeholder class="typeselect" @change="selectpackingMethod">
|
|
@@ -387,7 +387,7 @@
|
|
|
placeholder="请输入不完善粒占比" maxlength="40" size="small" />
|
|
|
</ws-form-item>
|
|
|
</ws-info-table>
|
|
|
- <ws-info-table v-if="!qyJurisdiction">
|
|
|
+ <ws-info-table v-if="zjJurisdiction&&statusTypetext == '初检'||statusTypetext != '初检'">
|
|
|
<ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice"
|
|
|
v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
|
|
|
<ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.tidalGrainPrice"
|
|
@@ -421,7 +421,7 @@
|
|
|
<el-table highlight-current-row @cell-click='listclick' :data="inspect" style="width: 100%; margin-top: 20px"
|
|
|
ref="inspect" border>
|
|
|
<el-table-column prop="qualityNo" width="100" label="业务编号"></el-table-column>
|
|
|
- <el-table-column prop="carNumber" label="车牌号"></el-table-column>
|
|
|
+ <el-table-column v-if='serviceManagementType == 1||serviceManagementType == 3&&statusTypetext == "初检"&&qyJurisdiction||serviceManagementType == 3&&statusTypetext != "初检"' prop="carNumber" label="车牌号"></el-table-column>
|
|
|
<el-table-column prop="status" label="状态">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if='scope.row.confirm == "1"'>
|
|
@@ -533,7 +533,7 @@ export default {
|
|
|
//分页
|
|
|
currentPage: 1,
|
|
|
cost: '',
|
|
|
- pageSize: 50,
|
|
|
+ pageSize: 10,
|
|
|
isShowPrint: false,
|
|
|
typeList: ['干粮', '潮粮'],
|
|
|
disablednotarize: false,
|
|
@@ -660,16 +660,18 @@ export default {
|
|
|
isQy: false,
|
|
|
isZj: false,
|
|
|
qyJurisdiction: false,
|
|
|
+ zjJurisdiction: false,
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
- debugger
|
|
|
+ // debugger
|
|
|
// const roleName = localStorage.getItem('ws-pf_roleName');
|
|
|
// if(roleName=='钎样员'){
|
|
|
// this.isQy= true
|
|
|
// }
|
|
|
//获取钎样员权限
|
|
|
this.qyJurisdiction = getHp('acquisitionManagement.acquisitionQuality.qview')
|
|
|
+ this.zjJurisdiction= getHp('acquisitionManagement.acquisitionQuality.initial')
|
|
|
console.log(111111111)
|
|
|
console.log(this.qyJurisdiction)
|
|
|
//获取质检员权限
|
|
@@ -724,6 +726,8 @@ export default {
|
|
|
if (type == 1) {
|
|
|
if (this.serviceManagementType == 3 && this.qyJurisdiction) {
|
|
|
this.statusType = 0
|
|
|
+ }else{
|
|
|
+ this.statusType=1
|
|
|
}
|
|
|
getinspectList({
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
@@ -751,6 +755,8 @@ export default {
|
|
|
that.refresh = 60
|
|
|
if (this.serviceManagementType == 3 && this.qyJurisdiction) {
|
|
|
this.statusType = 0
|
|
|
+ }else{
|
|
|
+ this.statusType=1
|
|
|
}
|
|
|
getinspectList({
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
@@ -764,7 +770,7 @@ export default {
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- debugger
|
|
|
+ // debugger
|
|
|
that.inspect = response.records
|
|
|
that.deptBudgetTotal = response.total
|
|
|
|
|
@@ -887,7 +893,7 @@ export default {
|
|
|
this.$set(this.deptBudgetList, 'dryGrainPrice', response)
|
|
|
})
|
|
|
}
|
|
|
- debugger
|
|
|
+ // debugger
|
|
|
//客户
|
|
|
getcustomer({
|
|
|
warehouseId: this.cangid,
|
|
@@ -1196,7 +1202,7 @@ export default {
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- debugger
|
|
|
+ // debugger
|
|
|
console.log(response)
|
|
|
this.deptBudgetList = response
|
|
|
if (this.statusTypetext == '复检') {
|
|
@@ -1367,10 +1373,12 @@ export default {
|
|
|
// }
|
|
|
},
|
|
|
statustypechangelist(status) {
|
|
|
- debugger
|
|
|
+ // debugger
|
|
|
this.statusType = status
|
|
|
if (this.serviceManagementType == 3 && this.qyJurisdiction) {
|
|
|
this.statusType = 0
|
|
|
+ }else{
|
|
|
+ this.statusType=1
|
|
|
}
|
|
|
getinspectList({
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
@@ -1913,11 +1921,12 @@ export default {
|
|
|
this.getList()
|
|
|
},
|
|
|
submit() {
|
|
|
- debugger
|
|
|
if (this.reader) {
|
|
|
this.reader.cancel()
|
|
|
}
|
|
|
- if (!this.qyJurisdiction) {
|
|
|
+ if (this.serviceManagementType==3&&this.zjJurisdiction&&this.statusTypetext=='初检'
|
|
|
+ ||this.serviceManagementType==3&&this.statusTypetext!='初检'
|
|
|
+ ||this.serviceManagementType==1) {
|
|
|
if (!this.deptBudgetList.binNumber) {
|
|
|
this.$message({
|
|
|
message: '请选择仓位号',
|
|
@@ -2398,7 +2407,9 @@ export default {
|
|
|
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+ if (this.serviceManagementType==3&&this.qyJurisdiction&&this.statusTypetext=='初检'
|
|
|
+ ||this.serviceManagementType==3&&this.statusTypetext!='初检'
|
|
|
+ ||this.serviceManagementType==1) {
|
|
|
if (!this.deptBudgetList.goodsName) {
|
|
|
this.$message({
|
|
|
message: '货名不能为空',
|
|
@@ -2421,7 +2432,7 @@ export default {
|
|
|
// })
|
|
|
// return
|
|
|
// }
|
|
|
-
|
|
|
+
|
|
|
if (this.serviceManagementType == 3) {
|
|
|
|
|
|
if (!this.deptBudgetList.customerName) {
|
|
@@ -2522,7 +2533,7 @@ export default {
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+ }
|
|
|
|
|
|
|
|
|
// if (
|
|
@@ -2575,13 +2586,17 @@ export default {
|
|
|
this.deptBudgetList.inOutFlag = 2
|
|
|
this.deptBudgetList.pcFlag = 1
|
|
|
this.deptBudgetList.statusFlag = 1
|
|
|
- this.deptBudgetList.brazer = this.qyJurisdiction ? 1 : 0
|
|
|
+ if (this.serviceManagementType==3&&this.statusTypetext=='初检') {
|
|
|
+ this.deptBudgetList.brazer = this.qyJurisdiction ? 1 : 0
|
|
|
+ }
|
|
|
+
|
|
|
if (this.statusTypetext == '初检') {
|
|
|
addstorageputList(this.deptBudgetList)
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.deptBudgetList.warehouseInOutId = response
|
|
|
- inspectAdd(this.deptBudgetList)
|
|
|
+ if(!this.deptBudgetList.id){
|
|
|
+ inspectAdd(this.deptBudgetList)
|
|
|
.toPromise()
|
|
|
.then((response1) => {
|
|
|
if (this.reader) {
|
|
@@ -2629,6 +2644,58 @@ export default {
|
|
|
console.log(response)
|
|
|
// this.$message.warning(response)
|
|
|
})
|
|
|
+ }else{
|
|
|
+ getinspectEdit(this.deptBudgetList)
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ if (this.reader) {
|
|
|
+ this.reader.cancel()
|
|
|
+ }
|
|
|
+ if (this.serviceManagementType == 3) {
|
|
|
+ this.warehouseCount += 1
|
|
|
+ } else {
|
|
|
+ this.warehouseTradeCount = Number(this.warehouseTradeCount) + 1
|
|
|
+ this.warehouseTradeCount1 = Number(this.warehouseTradeCount1) + 1
|
|
|
+ }
|
|
|
+
|
|
|
+ this.$message.success('编辑成功')
|
|
|
+ this.getList()
|
|
|
+ this.selectWarehouse()
|
|
|
+ // this.$router.push({
|
|
|
+ // path: 'warehouseManagementList',
|
|
|
+ // })
|
|
|
+ getinspectLook({
|
|
|
+ id: this.deptBudgetList.id
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response2) => {
|
|
|
+ // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid
|
|
|
+ // getQRcode({printString}).toPromise()
|
|
|
+ // .then((res) => {
|
|
|
+ this.deptBudgetList = response2
|
|
|
+ if (!this.qyJurisdiction) {
|
|
|
+ this.isShowPrint = true
|
|
|
+ this.printData = response2
|
|
|
+ // this.printData.qrCodeUrl = res
|
|
|
+ // })
|
|
|
+ }
|
|
|
+
|
|
|
+ if (this.serviceManagementType == 1) {
|
|
|
+ this.deptBudgetList.customerName = this.customerName
|
|
|
+ this.deptBudgetList.customerPhone = this.customerPhone
|
|
|
+ }
|
|
|
+ if (response.compName == '黑龙江秋收有限公司') {
|
|
|
+ this.deptBudgetList.compName = '黑龙江中天昊元贸易有限公司'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+ console.log(response)
|
|
|
+ // this.$message.warning(response)
|
|
|
+ })
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
// this.$message.success('保存成功')
|
|
|
|
|
@@ -3235,6 +3302,8 @@ export default {
|
|
|
|
|
|
if (this.serviceManagementType == 3 && this.qyJurisdiction) {
|
|
|
this.statusType = 0
|
|
|
+ }else{
|
|
|
+ this.statusType = 1
|
|
|
}
|
|
|
getinspectList({
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
@@ -3247,7 +3316,7 @@ export default {
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- debugger
|
|
|
+ // debugger
|
|
|
this.inspect = response.records
|
|
|
this.deptBudgetTotal = response.total
|
|
|
// this.$forceUpdate();
|