|
@@ -35,7 +35,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="ding"></div>
|
|
|
- <div v-if="dataList.taskTypeKey == 1&dataList.taskTypeKey == 3||dataList1.taskTypeKey == 1&dataList.taskTypeKey1 == 3" class="center1">
|
|
|
+ <div v-if="dataList.taskTypeKey == 1||(dataList.taskTypeKey == 3&&inOutFlag ==1)" class="center1">
|
|
|
<img
|
|
|
style="position: relative; top: 40px; left: 300px;"
|
|
|
width="19"
|
|
@@ -239,7 +239,7 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
- <div v-show="dataList.taskTypeKey != 1||dataList1.taskTypeKey != 1" class="center1">
|
|
|
+ <div v-show="dataList.taskTypeKey == 2||dataList.taskTypeKey == 4||(dataList.taskTypeKey == 3&&inOutFlag == 2)" class="center1">
|
|
|
<img
|
|
|
style="position: relative; top: 40px; left: 300px;"
|
|
|
width="19"
|
|
@@ -768,6 +768,7 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
accessoryTFs: false,
|
|
|
+ inOutFlag:1
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
@@ -1087,6 +1088,7 @@ export default {
|
|
|
return Min + Math.round(Rand * Range)
|
|
|
},
|
|
|
getList() {
|
|
|
+ this.inOutFlag = this.$route.query.inOutFlag
|
|
|
if (this.$route.query.relevanceId) {
|
|
|
outexamine({ relevanceId: this.$route.query.relevanceId })
|
|
|
.toPromise()
|
|
@@ -1094,17 +1096,17 @@ export default {
|
|
|
if (response.length > 1) {
|
|
|
this.dataList = response[0]
|
|
|
this.dataList1 = response[1]
|
|
|
- console.log(this.dataList1.inOutTaskNo,'入库任务')
|
|
|
+ console.log(this.dataList1.inOutTaskNo,'入库任务')
|
|
|
} else {
|
|
|
- if(response[0].taskTypeKey==3){
|
|
|
+ if(response[0].taskTypeKey==3){
|
|
|
this.deletetask=true
|
|
|
this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf('C') + 1,response[0].inOutTaskNo.length)
|
|
|
}
|
|
|
if(response[0].taskTypeKey==2){
|
|
|
- this.dataList1 = response[0]
|
|
|
- }else{
|
|
|
- this.dataList = response[0]
|
|
|
- }
|
|
|
+ this.dataList1 = response[0]
|
|
|
+ }else{
|
|
|
+ this.dataList = response[0]
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
} else {
|