|
|
|
|
@ -356,6 +356,77 @@
|
|
|
|
|
</span> |
|
|
|
|
</template> |
|
|
|
|
</el-dialog> |
|
|
|
|
<!-- 物料选择模块 --> |
|
|
|
|
<el-dialog :title="titleMaterial" |
|
|
|
|
v-model="materialBox" |
|
|
|
|
width="40%" |
|
|
|
|
:before-close="beforeClose" |
|
|
|
|
append-to-body> |
|
|
|
|
<el-form :disabled="view" ref="form" :model="formMaterial" label-width="80px"> |
|
|
|
|
<el-form-item label="物料名称" prop="typeService"> |
|
|
|
|
<el-select |
|
|
|
|
v-model="formMaterial.name" |
|
|
|
|
filterable |
|
|
|
|
remote |
|
|
|
|
reserve-keyword |
|
|
|
|
placeholder="请输入物料名称" |
|
|
|
|
remote-show-suffix |
|
|
|
|
:remote-method="remoteMethodName" |
|
|
|
|
@change="getMethodName($event,'1')" |
|
|
|
|
:loading="loading" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in optionsName" |
|
|
|
|
:key="item.id" |
|
|
|
|
:label="item.name" |
|
|
|
|
:value="item.id" |
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="物料编码" prop="serviceNumber"> |
|
|
|
|
<el-select |
|
|
|
|
v-model="formMaterial.code" |
|
|
|
|
filterable |
|
|
|
|
remote |
|
|
|
|
reserve-keyword |
|
|
|
|
placeholder="请输入物料编码" |
|
|
|
|
remote-show-suffix |
|
|
|
|
:remote-method="remoteMethodCode" |
|
|
|
|
@change="getMethodName($event,'2')" |
|
|
|
|
:loading="loading" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in optionsCode" |
|
|
|
|
:key="item.value" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="物料单位" prop="orderCode"> |
|
|
|
|
<!-- <el-input v-model="formMaterial.unit" placeholder="请输入物料单位"/>--> |
|
|
|
|
<el-select v-model="formMaterial.unit" clearable placeholder="请选择单位"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in logpmUnit" |
|
|
|
|
:key="item.dictKey" |
|
|
|
|
:label="item.dictValue" |
|
|
|
|
:value="item.dictKey"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="SKU" prop="mallName"> |
|
|
|
|
<el-input v-model="formMaterial.sku" placeholder="请输入SKU"/> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
</el-form> |
|
|
|
|
<!-- 表单按钮 --> |
|
|
|
|
<template #footer> |
|
|
|
|
<span v-if="!view" class="dialog-footer"> |
|
|
|
|
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button> |
|
|
|
|
<el-button icon="el-icon-circle-close" @click="materialBox = false">取 消</el-button> |
|
|
|
|
</span> |
|
|
|
|
</template> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
</basic-container> |
|
|
|
|
<edittablehead |
|
|
|
|
@ -377,6 +448,7 @@ import { mapGetters } from "vuex";
|
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import { getListCallDelivery } from '@/api/distribution/distrilbutionCallDelivery'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { getListMaterial } from '@/api/basic/basicMaterial'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
data () { |
|
|
|
|
@ -805,8 +877,12 @@ export default {
|
|
|
|
|
height: 0, |
|
|
|
|
// 弹框标题 |
|
|
|
|
title: '', |
|
|
|
|
// 弹框标题 |
|
|
|
|
titleMaterial: '', |
|
|
|
|
// 是否展示弹框 |
|
|
|
|
box: false, |
|
|
|
|
// 是否展示弹框 |
|
|
|
|
materialBox: false, |
|
|
|
|
// 是否显示查询 |
|
|
|
|
search: true, |
|
|
|
|
// 加载中 |
|
|
|
|
@ -828,17 +904,22 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
// 表单数据 |
|
|
|
|
form: {}, |
|
|
|
|
formMaterial: {}, |
|
|
|
|
formCall: {},// 通知 |
|
|
|
|
formService: {}, // 服务 |
|
|
|
|
formCustomer: {}, // 客户 |
|
|
|
|
// 选择行 |
|
|
|
|
selectionList: [], |
|
|
|
|
materialData: [], |
|
|
|
|
// 表单配置 |
|
|
|
|
option: option, |
|
|
|
|
// 表单列表 |
|
|
|
|
data: [], |
|
|
|
|
optionsName: [], |
|
|
|
|
optionsCode: [], |
|
|
|
|
dataHistorical: [], |
|
|
|
|
distributionType: [], |
|
|
|
|
logpmUnit: [], |
|
|
|
|
deliveryOrderStatus: [], |
|
|
|
|
dialogTableVisible: false, |
|
|
|
|
dialogFormVisible: false, |
|
|
|
|
@ -951,9 +1032,49 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
/*getMethodName(row,num){ |
|
|
|
|
console.log("名称选择事件",row); |
|
|
|
|
switch (num) { |
|
|
|
|
case '1': |
|
|
|
|
let a = this.optionsName.find( i => i.id == row); |
|
|
|
|
this.formMaterial.code =a.productCode; |
|
|
|
|
this.formMaterial.unit =a.logpmUnit ; |
|
|
|
|
this.formMaterial.sku =a.sku ; |
|
|
|
|
break; |
|
|
|
|
case '2': |
|
|
|
|
let b = this.optionsCode.find( i => i.id == row); |
|
|
|
|
this.formMaterial.name =b.name; |
|
|
|
|
this.formMaterial.unit =b.logpmUnit ; |
|
|
|
|
this.formMaterial.sku =b.sku ; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
async remoteMethodName (query){ |
|
|
|
|
if (query) { |
|
|
|
|
this.loading = true; |
|
|
|
|
//查询物料数据 |
|
|
|
|
let asd = await getListMaterial(this.page.currentPage,this.page.pageSize,{ name: query }).then(); |
|
|
|
|
console.log("物料信息",asd.data.data); |
|
|
|
|
this.optionsName =asd.data.data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
} else { |
|
|
|
|
this.optionsName = []; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
async remoteMethodCode (query){ |
|
|
|
|
if (query) { |
|
|
|
|
this.loading = true |
|
|
|
|
let asd = await getListMaterial(this.page.currentPage,this.page.pageSize,{ productCode: query }).then(); |
|
|
|
|
console.log("物料编号信息",asd.data.data); |
|
|
|
|
this.optionsCode =asd.data.data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
} else { |
|
|
|
|
this.optionsCode = [] |
|
|
|
|
} |
|
|
|
|
},*/ |
|
|
|
|
//通知提货 |
|
|
|
|
handleCallDeliveryOwn(row){ |
|
|
|
|
console.log("row",row); |
|
|
|
|
// console.log("row",row); |
|
|
|
|
this.formCustomer.name = row.row.customerName; |
|
|
|
|
this.formCustomer.phone = row.row.customerTelephone; |
|
|
|
|
this.formCustomer.address = row.row.customerAddress; |
|
|
|
|
@ -1056,7 +1177,6 @@ export default {
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
this.$message.warning("请选择相同收货信息的订单！！！") |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
@ -1066,16 +1186,40 @@ export default {
|
|
|
|
|
return; |
|
|
|
|
}else { |
|
|
|
|
let st = false; |
|
|
|
|
this.selectionList.forEach( i =>{ |
|
|
|
|
let lost = false; |
|
|
|
|
for (const i of this.selectionList) { |
|
|
|
|
if(i.reservationStatusName == "已预约"){ |
|
|
|
|
st = true; |
|
|
|
|
this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！"); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
if(i.freezeStatus == "30"){ |
|
|
|
|
st = true; |
|
|
|
|
this.$message.warning(i.orderCode+" - 为冻结单，无法转为库存品！！！"); |
|
|
|
|
} |
|
|
|
|
if(!st){ |
|
|
|
|
//查询库存数据 |
|
|
|
|
// console.log("cxcxcxc",i); |
|
|
|
|
let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleId : i.id } ).then(); |
|
|
|
|
// console.log("包件物料不存在！！",aa.data.data.records); |
|
|
|
|
aa.data.data.records.forEach( l =>{ |
|
|
|
|
console.log(!l.materialId , !l.materialName , !l.materialCode , !l.materialUnit); |
|
|
|
|
if(!l.materialId || l.materialId == '-1' ){ |
|
|
|
|
lost = true; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if(st){ |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
this.getSock(); |
|
|
|
|
if(lost){ |
|
|
|
|
this.$message.warning("订单信息不完整，请完善包件信息！如没有请维护物料信息，在选择！！！") |
|
|
|
|
/* this.titleMaterial = "补充物料" |
|
|
|
|
this.materialBox = true;*/ |
|
|
|
|
}else{ |
|
|
|
|
this.getSock(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* if (this.selectionList.length > 1){ |
|
|
|
|
@ -1177,7 +1321,7 @@ export default {
|
|
|
|
|
let consigneePerson = ''; |
|
|
|
|
let consigneeMobile = ''; |
|
|
|
|
this.selectionList.some( i =>{ |
|
|
|
|
if(i.stateName === "已预约"){ |
|
|
|
|
if(i.reservationStatusName === "已预约"){ |
|
|
|
|
st = true; |
|
|
|
|
this.$message.warning(i.orderCode+"已预约，请勿重复预约！！！"); |
|
|
|
|
} |
|
|
|
|
@ -1279,6 +1423,9 @@ export default {
|
|
|
|
|
return item |
|
|
|
|
});*/ |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('logpm_unit').then(res => { //单位 |
|
|
|
|
this.logpmUnit = res.data.data; |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('order_status').then(res => { |
|
|
|
|
this.deliveryOrderStatus = res.data.data; |
|
|
|
|
this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{ |
|
|
|
|
|
0.0
2 years ago