|
@@ -308,10 +308,7 @@
|
|
|
</div>
|
|
|
<div class="from">
|
|
|
<span class="text">进厂门岗:</span>
|
|
|
- <el-select
|
|
|
- v-model="enFactoryGatepost"
|
|
|
- placeholder="请选择"
|
|
|
- >
|
|
|
+ <el-select v-model="enFactoryGatepost" placeholder="请选择">
|
|
|
<el-option
|
|
|
v-for="item in gatePostList"
|
|
|
:key="item.gatepostId"
|
|
@@ -319,7 +316,7 @@
|
|
|
:value="item.gatepostId"
|
|
|
>
|
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select>
|
|
|
</div>
|
|
|
<div class="button_box">
|
|
|
<el-button
|
|
@@ -361,10 +358,7 @@
|
|
|
</div>
|
|
|
<div class="from">
|
|
|
<span class="text">出厂门岗:</span>
|
|
|
- <el-select
|
|
|
- v-model="enFactoryGatepost"
|
|
|
- placeholder="请选择"
|
|
|
- >
|
|
|
+ <el-select v-model="enFactoryGatepost" placeholder="请选择">
|
|
|
<el-option
|
|
|
v-for="item in gatePostList"
|
|
|
:key="item.gatepostId"
|
|
@@ -460,6 +454,58 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
+ <el-tab-pane label="物流单向删皮/删毛接口(仅限钢材)" name="zero">
|
|
|
+ <div class="admin2">
|
|
|
+ <div class="carrier from">
|
|
|
+ <el-form
|
|
|
+ :inline="true"
|
|
|
+ class="demo-form-inline"
|
|
|
+ label-width="80px"
|
|
|
+ >
|
|
|
+ <el-form-item label="车牌号:">
|
|
|
+ <el-autocomplete
|
|
|
+ class="inline-input"
|
|
|
+ v-model="capacityName"
|
|
|
+ :fetch-suggestions="querySearchCapacity"
|
|
|
+ placeholder="车牌号"
|
|
|
+ :trigger-on-focus="false"
|
|
|
+ @select="handleSelectCapacity"
|
|
|
+ >
|
|
|
+ <template slot-scope="{ item }">
|
|
|
+ <div class="name">{{ item.capacityNumber }}</div>
|
|
|
+ </template>
|
|
|
+ </el-autocomplete>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+ <div class="material from">
|
|
|
+ <span class="text">物资:</span>
|
|
|
+ <el-select v-model="materialId" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in materialList"
|
|
|
+ :key="item.materialId"
|
|
|
+ :label="item.materialName"
|
|
|
+ :value="item.materialId"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ <div class="block">
|
|
|
+ <span class="text">毛重时间:</span>
|
|
|
+ <el-date-picker
|
|
|
+ v-model="value1"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择日期时间"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="button_box">
|
|
|
+ <el-button type="primary" @click="linkageDeleteTransportOrder"
|
|
|
+ >确认</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ </el-tab-pane>
|
|
|
</el-tabs>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -509,6 +555,34 @@ export default {
|
|
|
this.information()
|
|
|
},
|
|
|
methods: {
|
|
|
+ linkageDeleteTransportOrder() {
|
|
|
+ let good = ''
|
|
|
+ let goodspa = ''
|
|
|
+ let goodList = []
|
|
|
+ let mapList = []
|
|
|
+ if (this.materialId != null) {
|
|
|
+ goodList = this.materialList.filter(e => {
|
|
|
+ if (e.materialId == this.materialId) {
|
|
|
+ return e
|
|
|
+ }
|
|
|
+ })
|
|
|
+ good = goodList[0].good
|
|
|
+ goodspa = goodList[0].goodspa
|
|
|
+ }
|
|
|
+ let map = {
|
|
|
+ orderNumber: this.orderNumber,
|
|
|
+ good: good,
|
|
|
+ goodspa: goodspa,
|
|
|
+ resultCrossWeightTime: toDateString(this.value1)
|
|
|
+ }
|
|
|
+ mapList.push(map)
|
|
|
+ this.axios
|
|
|
+ .post('/api/v1/join/linkageDeleteTransportOrder', mapList)
|
|
|
+ .then(res => {
|
|
|
+ console.log(res)
|
|
|
+ })
|
|
|
+ console.log(toDateString(this.value1))
|
|
|
+ },
|
|
|
updateOrderStatus() {
|
|
|
if (
|
|
|
this.orderNumber != null &&
|
|
@@ -540,28 +614,28 @@ export default {
|
|
|
orderNumber: this.orderNumber + ' ',
|
|
|
gatepostId: this.enFactoryGatepost
|
|
|
}
|
|
|
- this.axios.post('/api/v1/tms/enFactoryResultByPDA',map).then(res=>{
|
|
|
- console.log(res);
|
|
|
- if(res.data.status=='succeed'){
|
|
|
- this.$message.success("进厂成功!");
|
|
|
- }else{
|
|
|
- this.$message.error("操作失败:"+res.data.data);
|
|
|
+ this.axios.post('/api/v1/tms/enFactoryResultByPDA', map).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ if (res.data.status == 'succeed') {
|
|
|
+ this.$message.success('进厂成功!')
|
|
|
+ } else {
|
|
|
+ this.$message.error('操作失败:' + res.data.data)
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
- leaveFactoryResultByPDA(){
|
|
|
- let map = {
|
|
|
+ leaveFactoryResultByPDA() {
|
|
|
+ let map = {
|
|
|
orderNumber: this.orderNumber + ' ',
|
|
|
- gatepostId: this.enFactoryGatepost
|
|
|
+ gatepostId: this.enFactoryGatepost
|
|
|
}
|
|
|
- this.axios.post('/api/v1/tms/addLeaveFactoryResult',map).then(res=>{
|
|
|
- console.log(res);
|
|
|
- if(res.data.status=='succeed'){
|
|
|
- this.$message.success("出厂成功!");
|
|
|
- }else{
|
|
|
- this.$message.error("操作失败:"+res.data.data);
|
|
|
+ this.axios.post('/api/v1/tms/addLeaveFactoryResult', map).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ if (res.data.status == 'succeed') {
|
|
|
+ this.$message.success('出厂成功!')
|
|
|
+ } else {
|
|
|
+ this.$message.error('操作失败:' + res.data.data)
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
allowEnfactoryClick() {},
|
|
|
queueClick() {
|