|
|
|
|
@ -112,6 +112,7 @@
|
|
|
|
|
<template #="{row}"> |
|
|
|
|
<el-button type="primary" text icon="el-icon-view" @click="handleTrajectory(row)">查看轨迹</el-button> |
|
|
|
|
<el-button type="primary" text icon="el-icon-view" @click="handleQRCode(row)">查看二维码</el-button> |
|
|
|
|
<el-button type="primary" text icon="el-icon-view" v-if="row.materialId == '' || row.materialId == '-1'" @click="handleMaterial(row)">补充物料信息</el-button> |
|
|
|
|
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>--> |
|
|
|
|
<!-- <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>--> |
|
|
|
|
</template> |
|
|
|
|
@ -133,6 +134,77 @@
|
|
|
|
|
</el-pagination> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
<!-- 物料选择模块 --> |
|
|
|
|
<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.materialId" |
|
|
|
|
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.materialCode" |
|
|
|
|
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.id" |
|
|
|
|
:label="item.productCode" |
|
|
|
|
:value="item.id" |
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="物料单位" prop="orderCode"> |
|
|
|
|
<!-- <el-input v-model="formMaterial.unit" placeholder="请输入物料单位"/>--> |
|
|
|
|
<el-select v-model="formMaterial.materialUnit" 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="handleSubmitMethod">提 交</el-button> |
|
|
|
|
<el-button icon="el-icon-circle-close" @click="materialBox = false">取 消</el-button> |
|
|
|
|
</span> |
|
|
|
|
</template> |
|
|
|
|
</el-dialog> |
|
|
|
|
<el-dialog v-model="dialogFormCustomer" title="修改客户信息"> |
|
|
|
|
<el-form :model="formCustomer"> |
|
|
|
|
<el-form-item label="姓名" :label-width="formLabelWidth"> |
|
|
|
|
@ -193,13 +265,14 @@ import {
|
|
|
|
|
addStock, |
|
|
|
|
getQueryQRCode |
|
|
|
|
} from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getListOwn } from "@/api/distribution/distributionParcelList"; |
|
|
|
|
import { getListOwn, updateParcelList } from '@/api/distribution/distributionParcelList'; |
|
|
|
|
import { addCallDelivery } from "@/api/distribution/distrilbutionCallDelivery"; |
|
|
|
|
import { addClient } from "@/api/distribution/distributionClientMessage"; |
|
|
|
|
import { addService } from "@/api/distribution/distributionServiceLog"; |
|
|
|
|
import option from "@/option/distribution/distributionStockArticle"; |
|
|
|
|
import { mapGetters } from "vuex"; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import { getListMaterial } from '@/api/basic/basicMaterial'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
data () { |
|
|
|
|
@ -217,6 +290,13 @@ export default {
|
|
|
|
|
view: false, |
|
|
|
|
// 查询信息 |
|
|
|
|
query: {}, |
|
|
|
|
// 弹框标题 |
|
|
|
|
titleMaterial: '', |
|
|
|
|
optionsName: [], |
|
|
|
|
optionsCode: [], |
|
|
|
|
logpmUnit:[], |
|
|
|
|
// 是否展示弹框 |
|
|
|
|
materialBox: false, |
|
|
|
|
// 分页信息 |
|
|
|
|
page: { |
|
|
|
|
currentPage: 1, |
|
|
|
|
@ -225,6 +305,7 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
// 表单数据 |
|
|
|
|
form: {}, |
|
|
|
|
formMaterial: {}, |
|
|
|
|
formCall: {},// 通知 |
|
|
|
|
formService: {}, // 服务 |
|
|
|
|
formCustomer: {}, // 客户 |
|
|
|
|
@ -283,6 +364,76 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
|
|
|
|
|
//提交物品数据 |
|
|
|
|
handleSubmitMethod(){ |
|
|
|
|
// console.log(">>>",this.formMaterial); |
|
|
|
|
|
|
|
|
|
const regex = /^\d+$/; |
|
|
|
|
let asm = { |
|
|
|
|
id: this.formMaterial.id, |
|
|
|
|
// materialId: this.formMaterial.materialId, |
|
|
|
|
} |
|
|
|
|
if (regex.test(this.formMaterial.materialId)) { |
|
|
|
|
// console.log("全是数字"); |
|
|
|
|
asm.materialId = this.formMaterial.materialId |
|
|
|
|
} else { |
|
|
|
|
// console.log("包含非数字字符"); |
|
|
|
|
asm.materialId = this.formMaterial.materialCode; |
|
|
|
|
} |
|
|
|
|
// console.log(">>>",asm); |
|
|
|
|
updateParcelList(asm).then(() => { |
|
|
|
|
this.materialBox = false; |
|
|
|
|
this.onLoadOwn(this.page); |
|
|
|
|
this.$message({ |
|
|
|
|
type: "success", |
|
|
|
|
message: "操作成功!" |
|
|
|
|
}); |
|
|
|
|
this.formMaterial = {}; |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
getMethodName(row,num){ |
|
|
|
|
// console.log("名称选择事件",row); |
|
|
|
|
switch (num) { |
|
|
|
|
case '1': |
|
|
|
|
let a = this.optionsName.find( i => i.id == row); |
|
|
|
|
this.formMaterial.materialCode = a.productCode; |
|
|
|
|
this.formMaterial.materialUnit = a.logpmUnit; |
|
|
|
|
this.formMaterial.sku = a.sku; |
|
|
|
|
break; |
|
|
|
|
case '2': |
|
|
|
|
let b = this.optionsCode.find( i => i.id == row); |
|
|
|
|
this.formMaterial.materialId = b.name; |
|
|
|
|
this.formMaterial.materialUnit = 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 = [] |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
handleMoke(){ |
|
|
|
|
if (this.selectionList.length === 0) { |
|
|
|
|
this.$message.warning("请选择至少一条数据"); |
|
|
|
|
@ -418,6 +569,9 @@ export default {
|
|
|
|
|
getDictionaryBiz('distribution_type').then(res => { |
|
|
|
|
this.distributionType = res.data.data; |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('logpm_unit').then(res => { //单位 |
|
|
|
|
this.logpmUnit = res.data.data; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
searchHide () { |
|
|
|
|
@ -531,6 +685,12 @@ export default {
|
|
|
|
|
this.form = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
handleMaterial(row){ |
|
|
|
|
console.log("row>>>",row); |
|
|
|
|
this.titleMaterial = "补充物料" |
|
|
|
|
this.materialBox = true; |
|
|
|
|
this.formMaterial.id = row.id; |
|
|
|
|
}, |
|
|
|
|
handleQRCode (row) { |
|
|
|
|
// this.title = '查看' |
|
|
|
|
// this.view = true; |
|
|
|
|
|
