|
@@ -388,7 +388,10 @@
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
<el-form-item label="仓储" prop="storageId">
|
|
<el-form-item label="仓储" prop="storageId">
|
|
- <el-select v-model="orderForm.storageId" placeholder="请选择仓储" style="width: 100%;">
|
|
|
|
|
|
+ <el-select v-model="orderForm.storageId" placeholder="请选择仓储" @change="(e)=>{
|
|
|
|
+ storageName = storageList.find(item => item.storageId == e).storageName
|
|
|
|
+ getDetail()
|
|
|
|
+ }" style="width: 100%;">
|
|
<el-option :label="item.storageName" :value="item.storageId" v-for="(item, index) in storageList"
|
|
<el-option :label="item.storageName" :value="item.storageId" v-for="(item, index) in storageList"
|
|
:key="index"></el-option>
|
|
:key="index"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
@@ -405,7 +408,7 @@
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<el-card class="box-card">
|
|
<el-card class="box-card">
|
|
<el-tabs v-model="typeIndex">
|
|
<el-tabs v-model="typeIndex">
|
|
- <el-tab-pane label="发货数量" name="1"></el-tab-pane>
|
|
|
|
|
|
+ <el-tab-pane v-if="orderDetail.orderStatus != 'YFH' && orderDetail.orderStatus != 'OVER'" label="发货数量" name="1"></el-tab-pane>
|
|
<el-tab-pane v-if="joinCode" label="发货条码" name="2"></el-tab-pane>
|
|
<el-tab-pane v-if="joinCode" label="发货条码" name="2"></el-tab-pane>
|
|
</el-tabs>
|
|
</el-tabs>
|
|
<br/>
|
|
<br/>
|
|
@@ -427,11 +430,19 @@
|
|
{{scope.row.goodsMaterialUnit == 'C'?'整套':scope.row.goodsMaterialUnit == 'I'?"单个":''}}
|
|
{{scope.row.goodsMaterialUnit == 'C'?'整套':scope.row.goodsMaterialUnit == 'I'?"单个":''}}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="num" align="center" label="数量">
|
|
|
|
- <template slot-scope="scope">
|
|
|
|
- <el-input v-model="scope.row.num" placeholder="请输入" type="number"></el-input>
|
|
|
|
- </template>
|
|
|
|
- </el-table-column>
|
|
|
|
|
|
+ <el-table-column prop="num" align="center" label="订单数量">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <el-input v-model="scope.row.num" placeholder="请输入" type="number"></el-input>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column prop="sendStockNum" align="center" label="发货数量"></el-table-column>
|
|
|
|
+ <el-table-column v-if="joinCodeText != 'NO'" prop="" align="center" label="发货仓库">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ {{storageName}}
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column v-if="joinCodeText != 'NO'" prop="stockOnQty" align="center" label="发货仓库库存" width="100"></el-table-column>
|
|
|
|
+ <el-table-column v-if="joinCodeText != 'NO'" prop="allStockQty" align="center" label="库存总数量" width="100"></el-table-column>
|
|
<el-table-column prop="insideNum" align="center" label="内机数量"></el-table-column>
|
|
<el-table-column prop="insideNum" align="center" label="内机数量"></el-table-column>
|
|
<el-table-column prop="outNum" align="center" label="外机数量"></el-table-column>
|
|
<el-table-column prop="outNum" align="center" label="外机数量"></el-table-column>
|
|
<el-table-column prop="partNum" align="center" label="配件数量"></el-table-column>
|
|
<el-table-column prop="partNum" align="center" label="配件数量"></el-table-column>
|
|
@@ -772,12 +783,14 @@ export default {
|
|
isEdit1: 0,
|
|
isEdit1: 0,
|
|
isEdit2: 0,
|
|
isEdit2: 0,
|
|
joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
|
|
joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
|
|
|
|
+ joinCodeText: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
|
|
orderDetailId: '',
|
|
orderDetailId: '',
|
|
|
|
|
|
printList: [],
|
|
printList: [],
|
|
deliverList: [],
|
|
deliverList: [],
|
|
|
|
|
|
deliverSelection: [],
|
|
deliverSelection: [],
|
|
|
|
+ storageName: ''
|
|
}
|
|
}
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
@@ -791,16 +804,17 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
getDetail() {
|
|
getDetail() {
|
|
- getOrderDetail({ orderId: this.orderId }).then((res) => {
|
|
|
|
|
|
+ getOrderDetail({ orderId: this.orderId,storageId: this.orderForm.storageId }).then((res) => {
|
|
this.orderDetail = res.data
|
|
this.orderDetail = res.data
|
|
this.orderDetail.workerName = this.orderDetail.workerName ? this.orderDetail.workerName : '暂无'
|
|
this.orderDetail.workerName = this.orderDetail.workerName ? this.orderDetail.workerName : '暂无'
|
|
this.orderDetail.workerPhone = this.orderDetail.workerPhone ? this.orderDetail.workerPhone : ''
|
|
this.orderDetail.workerPhone = this.orderDetail.workerPhone ? this.orderDetail.workerPhone : ''
|
|
this.evaluateDetail = res.data.orderComment;
|
|
this.evaluateDetail = res.data.orderComment;
|
|
let arr = []
|
|
let arr = []
|
|
res.data.orderDetails.forEach(item=>{
|
|
res.data.orderDetails.forEach(item=>{
|
|
- if(item.goodsMaterialId){
|
|
|
|
- arr.push(item)
|
|
|
|
- }
|
|
|
|
|
|
+ arr.push(item)
|
|
|
|
+ // if(item.goodsMaterialId){
|
|
|
|
+ // arr.push(item)
|
|
|
|
+ // }
|
|
})
|
|
})
|
|
this.formData1.list = arr
|
|
this.formData1.list = arr
|
|
})
|
|
})
|