|
|
|
@ -75,14 +75,14 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-col> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-col :span="24"> |
|
|
|
<!-- <el-form-item label="订单单号" prop="orderNumber">--> |
|
|
|
<el-form-item label="订单自编号" prop="orderNumber" > |
|
|
|
<!-- <el-input v-model="form.orderNumber" placeholder="请输入订单单号"/>--> |
|
|
|
<el-input v-model="form.orderNumber" placeholder="请输入订单自编号" /> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
</el-form-item> |
|
|
|
<!-- <el-form-item label="运单号" prop="waybillNumber">--> |
|
|
|
<!-- <el-form-item label="运单号" prop="waybillNumber">--> |
|
|
|
<!-- <el-input v-model="form.waybillNumber" placeholder="请输入运单号"/>--> |
|
|
|
<!-- <el-input v-model="form.waybillNumber" placeholder="请输入运单号"/>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
|
|
|
|
|
|
<el-form-item label="所在仓库" prop="warehouseId"> |
|
|
|
<el-form-item label="所在仓库" prop="warehouseId" > |
|
|
|
<!-- <el-input placeholder="请输入所在仓库"/>--> |
|
|
|
<!-- <el-input placeholder="请输入所在仓库"/>--> |
|
|
|
<el-select |
|
|
|
<el-select |
|
|
|
v-model="form.warehouseId" |
|
|
|
v-model="form.warehouseId" |
|
|
|
@ -104,7 +104,7 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-col> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form-item label="服务类型" prop="serviceType"> |
|
|
|
<el-form-item label="服务类型" prop="serviceType" > |
|
|
|
<!-- <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>--> |
|
|
|
<!-- <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>--> |
|
|
|
<el-radio-group v-model="form.serviceType" class="ml-4" v-for="(item,index) in distributionType"> |
|
|
|
<el-radio-group v-model="form.serviceType" class="ml-4" v-for="(item,index) in distributionType"> |
|
|
|
<el-radio :label="item.dictKey" size="large" style="padding-right: 20px">{{item.dictValue}}</el-radio> |
|
|
|
<el-radio :label="item.dictKey" size="large" style="padding-right: 20px">{{item.dictValue}}</el-radio> |
|
|
|
@ -123,10 +123,10 @@ |
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> |
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
<div class="avue-crud__right"> |
|
|
|
<!-- <div class="avue-crud__right">--> |
|
|
|
<el-button icon="el-icon-refresh" @click="searchChange" circle :disabled="view"></el-button> |
|
|
|
<!-- <el-button icon="el-icon-refresh" @click="searchChange" circle :disabled="view"></el-button>--> |
|
|
|
<el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button> |
|
|
|
<!-- <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button>--> |
|
|
|
</div> |
|
|
|
<!-- </div>--> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</el-row> |
|
|
|
</el-row> |
|
|
|
<el-row> |
|
|
|
<el-row> |
|
|
|
@ -264,12 +264,30 @@ |
|
|
|
<el-form-item label="包装规格" > |
|
|
|
<el-form-item label="包装规格" > |
|
|
|
<el-input v-model="formDetail.packagingSpecifications" placeholder="请输入包装规格"/> |
|
|
|
<el-input v-model="formDetail.packagingSpecifications" placeholder="请输入包装规格"/> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="物资品牌" prop="actualReceipt"> |
|
|
|
|
|
|
|
<!-- <el-input v-model="formDetail.actualReceipt" placeholder="请选择物资品牌"/>--> |
|
|
|
|
|
|
|
<el-select |
|
|
|
|
|
|
|
v-model="formDetail.brandId" |
|
|
|
|
|
|
|
filterable |
|
|
|
|
|
|
|
remote |
|
|
|
|
|
|
|
reserve-keyword |
|
|
|
|
|
|
|
remote-show-suffix |
|
|
|
|
|
|
|
:remote-method="getBrandName" |
|
|
|
|
|
|
|
@change="getBanerqd($event)" |
|
|
|
|
|
|
|
placeholder="请输入物品编码" |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
<el-option |
|
|
|
|
|
|
|
v-for="item in brandList" |
|
|
|
|
|
|
|
:key="item.value" |
|
|
|
|
|
|
|
:label="item.label" |
|
|
|
|
|
|
|
:value="item.value" |
|
|
|
|
|
|
|
/> |
|
|
|
|
|
|
|
</el-select> |
|
|
|
|
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="入库数量" prop="createInventory"> |
|
|
|
<el-form-item label="入库数量" prop="createInventory"> |
|
|
|
<el-input v-model="formDetail.createInventory" placeholder="请输入创建入库数量"/> |
|
|
|
<el-input v-model="formDetail.createInventory" placeholder="请输入创建入库数量"/> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
<!-- <el-form-item label="实际入库数量" prop="actualReceipt">--> |
|
|
|
|
|
|
|
<!-- <el-input v-model="formDetail.actualReceipt" placeholder="请输入实际入库数量"/>--> |
|
|
|
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
|
|
<!-- <el-form-item label="入库单ID" prop="warehousingEntryId">--> |
|
|
|
<!-- <el-form-item label="入库单ID" prop="warehousingEntryId">--> |
|
|
|
<!-- <el-input v-model="formDetail.warehousingEntryId" placeholder="请输入入库单ID"/>--> |
|
|
|
<!-- <el-input v-model="formDetail.warehousingEntryId" placeholder="请输入入库单ID"/>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
@ -278,7 +296,7 @@ |
|
|
|
<template #footer> |
|
|
|
<template #footer> |
|
|
|
<span v-if="!view" class="dialog-footer"> |
|
|
|
<span v-if="!view" class="dialog-footer"> |
|
|
|
<el-button type="primary" icon="el-icon-circle-check" @click="handleDetail">确定</el-button> |
|
|
|
<el-button type="primary" icon="el-icon-circle-check" @click="handleDetail">确定</el-button> |
|
|
|
<!-- <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>--> |
|
|
|
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button> |
|
|
|
</span> |
|
|
|
</span> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</el-dialog> |
|
|
|
</el-dialog> |
|
|
|
@ -296,6 +314,7 @@ import { getListClient } from '@/api/basicdata/basicClient'; |
|
|
|
import { getDept } from '@/api/system/dept'; |
|
|
|
import { getDept } from '@/api/system/dept'; |
|
|
|
import { getListMaterial } from '@/api/basic/basicMaterial'; |
|
|
|
import { getListMaterial } from '@/api/basic/basicMaterial'; |
|
|
|
import { getListCopy } from '@/api/basicdata/basicdataWarehouse'; |
|
|
|
import { getListCopy } from '@/api/basicdata/basicdataWarehouse'; |
|
|
|
|
|
|
|
import { getListIdsName} from '@/api/basicdata/basicdataStoreBrand'; |
|
|
|
import dayjs from 'dayjs'; |
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -306,6 +325,7 @@ export default { |
|
|
|
height: 0, |
|
|
|
height: 0, |
|
|
|
distributionType: [], |
|
|
|
distributionType: [], |
|
|
|
distributionUnit: [], |
|
|
|
distributionUnit: [], |
|
|
|
|
|
|
|
distributionBrand: [], |
|
|
|
// 主键 |
|
|
|
// 主键 |
|
|
|
warehouseWarehousingEntryId: '', |
|
|
|
warehouseWarehousingEntryId: '', |
|
|
|
// 弹框标题 |
|
|
|
// 弹框标题 |
|
|
|
@ -345,6 +365,7 @@ export default { |
|
|
|
stuffName: [],//物品名称 |
|
|
|
stuffName: [],//物品名称 |
|
|
|
stuffCode: [],//物品编码 |
|
|
|
stuffCode: [],//物品编码 |
|
|
|
stuff: [],//物品集合 |
|
|
|
stuff: [],//物品集合 |
|
|
|
|
|
|
|
brandList: [],//品牌集合 |
|
|
|
shop: [],//门店 |
|
|
|
shop: [],//门店 |
|
|
|
options: [],//客户 |
|
|
|
options: [],//客户 |
|
|
|
rules: { |
|
|
|
rules: { |
|
|
|
@ -372,6 +393,10 @@ export default { |
|
|
|
productUnit: [ |
|
|
|
productUnit: [ |
|
|
|
{ required: true, message: '请选择物品单位', trigger: 'change' } |
|
|
|
{ required: true, message: '请选择物品单位', trigger: 'change' } |
|
|
|
], |
|
|
|
], |
|
|
|
|
|
|
|
brandId: [ |
|
|
|
|
|
|
|
{ required: true, message: '请选择品牌', trigger: 'change' } |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
receiptBatch: [ |
|
|
|
receiptBatch: [ |
|
|
|
{ required: true, message: '请填写入库批次', trigger: 'blur' } |
|
|
|
{ required: true, message: '请填写入库批次', trigger: 'blur' } |
|
|
|
@ -409,6 +434,7 @@ export default { |
|
|
|
'$route.query.id': { |
|
|
|
'$route.query.id': { |
|
|
|
handler(newVal, oldVal) { |
|
|
|
handler(newVal, oldVal) { |
|
|
|
console.log(newVal, oldVal); |
|
|
|
console.log(newVal, oldVal); |
|
|
|
|
|
|
|
console.log("$route.query.id",this.$route.query.type); |
|
|
|
this.getOwnDeliver(); |
|
|
|
this.getOwnDeliver(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
deep: true, |
|
|
|
deep: true, |
|
|
|
@ -427,6 +453,13 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
methods: { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//物品名称回显 |
|
|
|
|
|
|
|
async getBanerqd(row){ |
|
|
|
|
|
|
|
let a = this.brandList.find(i =>i.value== row); |
|
|
|
|
|
|
|
console.log("aA",a); |
|
|
|
|
|
|
|
this.formDetail.brandName = a.label; |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
//查询详情信息 |
|
|
|
//查询详情信息 |
|
|
|
async getOwnDeliver(){ |
|
|
|
async getOwnDeliver(){ |
|
|
|
let a = this.$route.query.id; |
|
|
|
let a = this.$route.query.id; |
|
|
|
@ -549,6 +582,29 @@ export default { |
|
|
|
this.stuffCode = [] |
|
|
|
this.stuffCode = [] |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
//查询品牌信息 |
|
|
|
|
|
|
|
async getBrandName(query){ |
|
|
|
|
|
|
|
if (query) { |
|
|
|
|
|
|
|
console.log("客户ID",this.form.clientId); |
|
|
|
|
|
|
|
if(!!this.form.clientId){ |
|
|
|
|
|
|
|
let si = !!this.form.storeId ? this.form.storeId : this.form.clientId; |
|
|
|
|
|
|
|
let cl = await getListIdsName(this.page.currentPage, this.page.pageSize,{ brandName: query,ids: si }); |
|
|
|
|
|
|
|
console.log(">>>>",cl.data.data); |
|
|
|
|
|
|
|
cl.data.data.forEach(i => { |
|
|
|
|
|
|
|
let st = { |
|
|
|
|
|
|
|
label: i.brandName, |
|
|
|
|
|
|
|
value: i.id |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.brandList.push(st); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
this.$message.warning("请先填写客户信息，在选择品牌！！") |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
this.brandList = [] |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
//门店查询 |
|
|
|
//门店查询 |
|
|
|
async getMen(row,type){ |
|
|
|
async getMen(row,type){ |
|
|
|
if(type == 1){ |
|
|
|
if(type == 1){ |
|
|
|
@ -740,6 +796,10 @@ export default { |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// console.log("修改！！！"); |
|
|
|
// console.log("修改！！！"); |
|
|
|
|
|
|
|
if(!this.form.orderNumber){ |
|
|
|
|
|
|
|
this.$message.warning("请完善订单自编号！！"); |
|
|
|
|
|
|
|
return ; |
|
|
|
|
|
|
|
} |
|
|
|
console.log("this.form",this.form); |
|
|
|
console.log("this.form",this.form); |
|
|
|
this.form.list = this.data; |
|
|
|
this.form.list = this.data; |
|
|
|
update(this.form).then(() => { |
|
|
|
update(this.form).then(() => { |
|
|
|
@ -877,15 +937,35 @@ export default { |
|
|
|
async getWareHoust(page, params = {}){ |
|
|
|
async getWareHoust(page, params = {}){ |
|
|
|
let a = await getListUser(); |
|
|
|
let a = await getListUser(); |
|
|
|
let b = await getDept(a.data.data.deptId); |
|
|
|
let b = await getDept(a.data.data.deptId); |
|
|
|
console.log("aaa",a); |
|
|
|
// console.log("aaa",a); |
|
|
|
console.log("bbb",b); |
|
|
|
// console.log("bbb",b); |
|
|
|
|
|
|
|
//查询全部仓库 |
|
|
|
|
|
|
|
let sl = {}; |
|
|
|
if(b.data.data.deptCategory == "4"){ |
|
|
|
if(b.data.data.deptCategory == "4"){ |
|
|
|
//部门 |
|
|
|
sl.department= b.data.data.id; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
let li = await getListCopy(page.currentPage, page.pageSize,sl); |
|
|
|
|
|
|
|
// console.log("li>>>>",li.data.data); |
|
|
|
|
|
|
|
this.store = []; |
|
|
|
|
|
|
|
li.data.data.records.forEach(i =>{ |
|
|
|
let st= { |
|
|
|
let st= { |
|
|
|
label: b.data.data.deptName, |
|
|
|
label: i.name, |
|
|
|
value: b.data.data.id |
|
|
|
value: i.id |
|
|
|
} |
|
|
|
} |
|
|
|
this.store.push(st); |
|
|
|
this.store.push(st); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* if(b.data.data.deptCategory == "4"){ |
|
|
|
|
|
|
|
//部门 |
|
|
|
|
|
|
|
let li = await getListCopy(page.currentPage, page.pageSize,{department: b.data.data.id}); |
|
|
|
|
|
|
|
console.log("li>>>>",li.data.data); |
|
|
|
|
|
|
|
li.data.data.some( i =>{ |
|
|
|
|
|
|
|
let st= { |
|
|
|
|
|
|
|
label: b.data.data.deptName, |
|
|
|
|
|
|
|
value: b.data.data.id |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.store.push(st); |
|
|
|
|
|
|
|
}) |
|
|
|
this.form.warehouseId = b.data.data.id; |
|
|
|
this.form.warehouseId = b.data.data.id; |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
//查询全部仓库 |
|
|
|
//查询全部仓库 |
|
|
|
@ -900,7 +980,7 @@ export default { |
|
|
|
} |
|
|
|
} |
|
|
|
this.store.push(st); |
|
|
|
this.store.push(st); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
}, |
|
|
|
}, |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
pref_mail@163.com
2 years ago