|
@@ -32,12 +32,13 @@
|
|
<div class="nav">
|
|
<div class="nav">
|
|
<span class="ziti">
|
|
<span class="ziti">
|
|
任务类型:
|
|
任务类型:
|
|
- <h1 class="ziti1">{{dataList.inOutType}}</h1>
|
|
|
|
|
|
+ <h1 v-if='dataList.inOutType' class="ziti1">{{dataList.inOutType}}</h1>
|
|
|
|
+ <h1 v-if='dataList1.inOutType' class="ziti1">{{dataList1.inOutType}}</h1>
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ding"></div>
|
|
<div class="ding"></div>
|
|
- <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
|
|
|
|
|
|
+ <div v-if="dataList.taskTypeKey == 1&dataList.taskTypeKey == 3||dataList1.taskTypeKey == 1&dataList.taskTypeKey1 == 3" class="center1">
|
|
<img
|
|
<img
|
|
style="position: relative; top: 40px; left: 300px;"
|
|
style="position: relative; top: 40px; left: 300px;"
|
|
width="19"
|
|
width="19"
|
|
@@ -241,7 +242,7 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</div>
|
|
</div>
|
|
- <div v-show="dataList.taskTypeKey != 1" class="center1">
|
|
|
|
|
|
+ <div v-show="dataList.taskTypeKey != 1||dataList1.taskTypeKey != 1" class="center1">
|
|
<img
|
|
<img
|
|
style="position: relative; top: 40px; left: 300px;"
|
|
style="position: relative; top: 40px; left: 300px;"
|
|
width="19"
|
|
width="19"
|
|
@@ -922,7 +923,7 @@ export default {
|
|
addoreditoutput(list)
|
|
addoreditoutput(list)
|
|
.toPromise()
|
|
.toPromise()
|
|
.then((response) => {
|
|
.then((response) => {
|
|
- this.$message.success('添加成功')
|
|
|
|
|
|
+ this.$message.success('编辑成功')
|
|
this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
|
|
this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -1093,12 +1094,17 @@ export default {
|
|
this.dataList = response[0]
|
|
this.dataList = response[0]
|
|
this.dataList1 = response[1]
|
|
this.dataList1 = response[1]
|
|
} else {
|
|
} else {
|
|
|
|
+ console.log(response[0].taskTypeKey)
|
|
if(response[0].taskTypeKey==3){
|
|
if(response[0].taskTypeKey==3){
|
|
this.deletetask=true
|
|
this.deletetask=true
|
|
this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
|
|
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.dataList = response[0]
|
|
}
|
|
}
|
|
|
|
+ }
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
this.tasknumber()
|
|
this.tasknumber()
|