Browse Source

2025.01.20 绩效&送货计划 第二版

master
yuejiayang 12 months ago
parent
commit
c587a53af6
  1. 32
      src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue
  2. 137
      src/views/modules/deliverySchedule/supplierDeliverySchedule.vue

32
src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue

@ -28,13 +28,6 @@
<!-- <el-option label="部分发料" value="A"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="状态">
<el-select v-model="searchData.status" placeholder="请选择状态" clearable>
<el-option label="未发货" value="未发货"></el-option>
<el-option label="部分发货" value="部分发货"></el-option>
<el-option label="已发货" value="已发货"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'要求送货日期'">
<el-date-picker
style="width: 120px"
@ -52,6 +45,22 @@
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<!-- <el-form-item>-->
<!-- <span style="cursor: pointer" slot="label" @click="getBaseList(3)"><a herf="#">供应商编码</a></span>-->
<!-- <el-input v-model="searchData.supplierId" placeholder="输入或选择供应商编码"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="供应商名称">-->
<!-- <el-input v-model="searchData.supplierName"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="状态">
<el-select v-model="searchData.status" placeholder="请选择状态" clearable>
<el-option label="未发货" value="未发货"></el-option>
<el-option label="部分发货" value="部分发货"></el-option>
<el-option label="已发货" value="已发货"></el-option>
</el-select>
</el-form-item>
<el-form-item label="送货地点" prop="site">
<el-select v-model="searchData.delPoint" clearable placeholder="请选择" style="width: 120px">
<el-option label = "常熟" value = "常熟"></el-option>
@ -59,15 +68,6 @@
<el-option label = "徐州" value = "徐州"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(3)"><a herf="#">供应商编码</a></span>
<el-input v-model="searchData.supplierId" placeholder="输入或选择供应商编码"></el-input>
</el-form-item>
<el-form-item label="供应商名称">
<el-input v-model="searchData.supplierName"></el-input>
</el-form-item>
<el-form-item label="物料编码">
<el-input v-model="searchData.partNo"></el-input>
</el-form-item>

137
src/views/modules/deliverySchedule/supplierDeliverySchedule.vue

@ -74,6 +74,13 @@
<el-form-item label="此次送货数量">
<el-input v-model="searchData.deliveryQty"></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="searchData.status" placeholder="请选择状态" clearable>
<el-option label="已下达" value="已下达"></el-option>
<el-option label="部分入库" value="部分入库"></el-option>
<el-option label="部分接收" value="部分接收"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
<el-button type="primary" @click="autoReservationHandler()">自动预留</el-button>
@ -166,8 +173,8 @@
<el-form-item label="送货地点" prop="site" :rules="rules.delPoint">
<el-select v-model="modalData.DelPoint" placeholder="请选择" style="width: 120px">
<el-option label = "常熟" value = "常熟"></el-option>
<el-option label = "苏州" value = "苏州"></el-option>
<el-option label = "徐州" value = "徐州"></el-option>
<el-option label = "响水" value = "响水"></el-option>
<el-option label = "其他" value = "其他"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
@ -311,6 +318,60 @@ export default {
deliveryQty: '',
},
columnList: [
{
userId: this.$store.state.user.name,
functionId: 109001,
serialNumber: '109001TablePendingQty',
tableId: "109001Table",
tableName: "供应商送货计划表",
columnWidth: 120,
columnProp: 'pendingQty',
headerAlign: 'center',
align: "right",
columnLabel: '待发货数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 109001,
serialNumber: '109001TableDelNotifyQty',
tableId: "109001Table",
tableName: "供应商送货计划表",
columnWidth: 120,
columnProp: 'delNotifyQty',
headerAlign: 'center',
align: "right",
columnLabel: '已发货数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 109001,
serialNumber: '109001TableDeliveryQty',
tableId: "109001Table",
tableName: "供应商送货计划表",
columnWidth: 120,
columnProp: 'deliveryQty',
headerAlign: 'center',
align: "right",
columnLabel: '此次送货数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 109001,
@ -545,60 +606,6 @@ export default {
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 109001,
serialNumber: '109001TablePendingQty',
tableId: "109001Table",
tableName: "供应商送货计划表",
columnWidth: 120,
columnProp: 'pendingQty',
headerAlign: 'center',
align: "right",
columnLabel: '待发货数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 109001,
serialNumber: '109001TableDelNotifyQty',
tableId: "109001Table",
tableName: "供应商送货计划表",
columnWidth: 120,
columnProp: 'delNotifyQty',
headerAlign: 'center',
align: "right",
columnLabel: '已发货数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 109001,
serialNumber: '109001TableDeliveryQty',
tableId: "109001Table",
tableName: "供应商送货计划表",
columnWidth: 120,
columnProp: 'deliveryQty',
headerAlign: 'center',
align: "right",
columnLabel: '此次送货数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 109001,
@ -656,13 +663,13 @@ export default {
],
rules: {
wantedDelDate: [
{ required: true, message: '要求送货日期不能为空', trigger: 'blur' }
{ required: true, message: '要求送货日期不能为空', trigger: ['blur','change'] }
],
delPoint: [
{ required: true, message: '送货地点不能为空', trigger: 'blur' }
{ required: true, message: '送货地点不能为空', trigger: ['blur','change'] }
],
allotmentQty: [
{ required: true, message: '此次分配的送货数量不能为空', trigger: 'blur' }
{ required: true, message: ' ', trigger: ['blur','change'] }
],
},
pageIndex: 1,
@ -860,6 +867,18 @@ export default {
allotmentQty : this.autoReservationData.allotmentQty,
autoReservationDataList : this.dataList
}
if (inData.allotmentQty === '' || inData.allotmentQty == null){
this.$message.error('总订单数量不能为空')
return
}
if (inData.allotmentQty <= 0){
this.$message.error('总订单数量不能小于等于0')
return
}
if (inData.autoReservationDataList.length === 0){
this.$message.error('没有订单数据无法自动预留,请检查查询条件是否正确!')
return
}
autoReservationInitiateHandler(inData).then(({data}) => {
if (data.code === 0) {
this.getDataList()

Loading…
Cancel
Save