java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复预约

dev-xx
qb 6 months ago
parent
daabaec567
commit
309f3a3620
1 changed files with 80 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 128
      src/views/distribution/reservation/reservation.vue

128
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -41,7 +41,7 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" @click="handleAdd" v-if="permissionList.reservation_add"
<el-button type="primary" @click="handleAdd" v-if="permissionList.reservation_add"
>添加预约
</el-button>
<el-button
@ -51,7 +51,12 @@
v-if="permissionList.reservation_enter_batch"
>批量确认
</el-button>
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain v-if="permissionList.reservation_export"
<el-button
type="danger"
icon="el-icon-download"
@click="handleExportInfo(1)"
plain
v-if="permissionList.reservation_export"
>导出
</el-button>
</div>
@ -106,7 +111,7 @@
>取消预约
</el-text>
<el-text
v-if="(this.queryA.reservationStatus === '1') && permissionList.Confirm_appointment"
v-if="this.queryA.reservationStatus === '1' && permissionList.Confirm_appointment"
size="small"
@click="confirmReservation(slotProps.scope)"
>确认预约
@ -137,12 +142,28 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" @click="handleAdd"
>添加预约
<el-button type="primary" @click="handleAdd">添加预约 </el-button>
<el-button
type="danger"
@click="handleStockUp()"
v-if="permissionList.reservation_Stock_batch"
plain
>批量转备货
</el-button>
<el-button
type="danger"
@click="handleDeliverys"
v-if="permissionList.reservation_delivery_batch"
plain
>批量转配送
</el-button>
<el-button
type="danger"
@click="batchPrintData"
v-if="permissionList.reservation_print_batch"
plain
>批量打印
</el-button>
<el-button type="danger" @click="handleStockUp()" v-if="permissionList.reservation_Stock_batch" plain>批量转备货 </el-button>
<el-button type="danger" @click="handleDeliverys" v-if="permissionList.reservation_delivery_batch" plain>批量转配送 </el-button>
<el-button type="danger" @click="batchPrintData" v-if="permissionList.reservation_print_batch" plain>批量打印 </el-button>
<el-button
type="danger"
icon="el-icon-download"
@ -155,11 +176,14 @@
type="primary"
icon="Plus"
@click="handleAddPickerClipData"
v-if="(orderStatus === 'all') && (permissionList.reservation_jionPickerclip)"
v-if="orderStatus === 'all' && permissionList.reservation_jionPickerclip"
>加入挑单夹
</el-button>
<el-button
v-if="!(orderStatus === 'all' && permissionList.reservation_jionPickerclip) && permissionList.remove_pickerclip"
v-if="
!(orderStatus === 'all' && permissionList.reservation_jionPickerclip) &&
permissionList.remove_pickerclip
"
type="primary"
icon="Delete"
@click="handleRemovePickerClipData"
@ -176,7 +200,7 @@
</el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
class="tableNode"
ref="confirmList"
:columnList="columnList"
:tableData="data"
@ -203,7 +227,7 @@
link
icon="el-icon-view"
@click="editsolt(slotProps.scope)"
v-if="permissionList.reservation_update"
v-if="permissionList.reservation_update"
>编辑
</el-text>
<el-text
@ -216,7 +240,9 @@
>取消预约
</el-text>
<el-text
v-if="(this.queryB.reservationStatus === '1') && permissionList.Confirm_appointment"
v-if="
this.queryB.reservationStatus === '1' && permissionList.Confirm_appointment
"
size="small"
@click="confirmReservation(slotProps.scope)"
>确认预约
@ -275,7 +301,7 @@
:columnList="columnList"
v-model="columnList"
></edittablehead>
<el-dialog v-model="dialogFormCustomer" title="指派叉车">
<el-dialog v-model="dialogFormCustomer" title="指派叉车">
<el-form :model="info">
<el-form-item label="备货时间:">
<el-date-picker v-model="info.stockupDate" type="date" placeholder="选择日期">
@ -915,23 +941,28 @@ export default {
return ids.join(',');
},
permissionList() {
console.log(this.permission,'permission');
console.log(this.permission, 'permission');
return {
reservation_add: this.validData(this.permission.reservation_add, false),//添加预约
reservation_export: this.validData(this.permission.reservation_export, false),//导出
reservation_enter_batch: this.validData(this.permission.reservation_enter_batch, false),//批量确认
reservation_Stock_batch: this.validData(this.permission.reservation_Stock_batch, false),//批量转备货
reservation_delivery_batch: this.validData(this.permission.reservation_delivery_batch, false),//批量转配送
reservation_print_batch: this.validData(this.permission.reservation_print_batch, false),//批量打印
reservation_cancel: this.validData(this.permission.reservation_cancel, false),//取消预约
reservation_update: this.validData(this.permission.reservation_update, false),//编辑
reservation_view: this.validData(this.permission.reservation_view, false),//查看
reservation_print: this.validData(this.permission.reservation_print, false),//打印
reservation_jionPickerclip: this.validData(this.permission.reservation_jionPickerclip, false),//加入挑单夹
Confirm_appointment: this.validData(this.permission.Confirm_appointment, false),//确认预约
remove_pickerclip: this.validData(this.permission.remove_pickerclip, false),//移除调单夹
reservation_add: this.validData(this.permission.reservation_add, false), //添加预约
reservation_export: this.validData(this.permission.reservation_export, false), //导出
reservation_enter_batch: this.validData(this.permission.reservation_enter_batch, false), //批量确认
reservation_Stock_batch: this.validData(this.permission.reservation_Stock_batch, false), //批量转备货
reservation_delivery_batch: this.validData(
this.permission.reservation_delivery_batch,
false
), //批量转配送
reservation_print_batch: this.validData(this.permission.reservation_print_batch, false), //批量打印
reservation_cancel: this.validData(this.permission.reservation_cancel, false), //取消预约
reservation_update: this.validData(this.permission.reservation_update, false), //编辑
reservation_view: this.validData(this.permission.reservation_view, false), //查看
reservation_print: this.validData(this.permission.reservation_print, false), //打印
reservation_jionPickerclip: this.validData(
this.permission.reservation_jionPickerclip,
false
), //加入挑单夹
Confirm_appointment: this.validData(this.permission.Confirm_appointment, false), //确认预约
remove_pickerclip: this.validData(this.permission.remove_pickerclip, false), //移除调单夹
};
},
},
@ -973,6 +1004,7 @@ export default {
},
cancelReservation(scope) {
const { row } = scope;
this.cancel = {};
this.dialogCancelReservation = true;
this.cancelReservationRow = row;
console.log(row);
@ -1003,22 +1035,22 @@ export default {
console.log(index, row);
},
updateQuery(query, index, row) {
const mappings = {
'periodOfTimeName': 'periodOfTime',
'stockupStatusName': 'stockupStatus',
'serveTypeName': 'serveType',
'isInstallName': 'isInstall'
};
const prop = mappings[row.prop] || row.prop;
query[prop] = index;
this.onLoad(this.page);
},
selectscA(index, row) {
this.updateQuery(this.queryA, index, row);
},
selectscB(index, row) {
this.updateQuery(this.queryB, index, row);
},
const mappings = {
periodOfTimeName: 'periodOfTime',
stockupStatusName: 'stockupStatus',
serveTypeName: 'serveType',
isInstallName: 'isInstall',
};
const prop = mappings[row.prop] || row.prop;
query[prop] = index;
this.onLoad(this.page);
},
selectscA(index, row) {
this.updateQuery(this.queryA, index, row);
},
selectscB(index, row) {
this.updateQuery(this.queryB, index, row);
},
timescA(index, row) {
console.log(index, row);
console.log(index, row);
@ -1485,7 +1517,7 @@ export default {
if (this.activename === 'nocheck') {
console.log('123123 :>> ', 123123);
query = this.queryA;
query.reservationStatus = this.queryA.reservationStatus || '1';
query.reservationStatus = this.queryA.reservationStatus || '10';
} else query.excludeId = this.pickerClipData.map(val => val.id).join(',');
// if (this.queryA.reservationStatus)
const res = await getList(page.currentPage, page.pageSize, Object.assign(params, query));
@ -1728,7 +1760,7 @@ export default {
.overflow {
overflow: hidden;
}
.avue-crud{
.avue-crud {
height: 100%;
}
</style>

Write Preview
Loading…
Cancel
Save