qb 9 months ago
parent
commit
c2ad73d263
  1. 10
      src/api/distribution/distrilbutionBillLading.js
  2. 8
      src/views/Pricesystem/Price/PriceDelivery.vue
  3. 2
      src/views/aftersales/DataSynchronization.vue
  4. 2
      src/views/distribution/checkInventoryTask/createTask.vue
  5. 2
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  6. 13
      src/views/distribution/inventory/distrilbutionBillLading.vue
  7. 56
      src/views/distribution/inventory/distrilbutionBillLadingView.vue
  8. 18
      src/views/distribution/reservation/reservationAddFrom.vue
  9. 7
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  10. 2
      src/views/factory/mt/packageInfo.vue
  11. 4
      src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

10
src/api/distribution/distrilbutionBillLading.js

@ -226,3 +226,13 @@ export const $_distrilbutionBillLading = row => {
data: row,
});
};
// 自提批量签收
export const $_batchSign = data => {
return request({
url: '/api/logpm-distribution/distrilbutionBillLading/batchSign',
method: 'post',
data,
});
};

8
src/views/Pricesystem/Price/PriceDelivery.vue

@ -347,7 +347,7 @@
/>
</el-form-item>
</template>
<el-form-item label="加算价格" v-if="request.dispatchMinCostType == 1" class="el_row">
<el-form-item label="加算价格" v-if="request.dispatchMinCostType != 1" class="el_row">
<el-input-number
v-model="form.additionalCost"
:precision="2"
@ -378,8 +378,8 @@
/>
</el-form-item>
</template>
<el-form-item label="遗留加算" v-if="request.dispatchMinCostType == 1" class="el_row">
<el-form-item label="遗留加算" v-if="request.dispatchMinCostType != 1" class="el_row">
<el-input-number
v-model="form.leaveBehindAdditionalCost"
:precision="2"
@ -493,7 +493,7 @@ const form = ref({
width: 'auto',
disabled: true,
},
{
{
label: '遗留件单价(元/件)',
prop: 'leaveBehindPrice',
type: 'number',

2
src/views/aftersales/DataSynchronization.vue

@ -1,5 +1,5 @@
<template>
<el-card class="box-card" v-loading="loading" element-loading-text="正在执行中...">
<el-card class="box-card" v-loading="loading" element-loading-text="数据正在同步执行中...">
<div class="content">
<div>
<h2 style="text-align: center">数据同步功能</h2>

2
src/views/distribution/checkInventoryTask/createTask.vue

@ -2648,7 +2648,7 @@ const DelayButton = () => {
/** 未盘点数据导出 */
const handleUncountedExport = () => {
ElMessageBox.confirm('是否导出未盘点数据?').then(async () => {
ElMessageBox.confirm(InventoryState.value ? '导出未盘点数据' : '导出已盘点数据').then(async () => {
try {
TcPdloading.value = true;
const res = await postExportContrastStockInfo({

2
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -3845,8 +3845,6 @@ if($useStore.getters && $useStore.getters.permission){
console.log(this.accessControl,'accessControl按钮权限');
}
// this.onLoad();
// //
// this.queryDictionary();

13
src/views/distribution/inventory/distrilbutionBillLading.vue

@ -465,7 +465,7 @@
class="addTable"
ref="multipleTable"
:columnList="columnList"
:tableData="dataOrder"
:tableData="dataOrder"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@ -2270,14 +2270,21 @@ export default {
},
//
callFordeliveryOrder() {
if(!this.selectionList.length){
this.$message.warning('请选择订单');
return
}
console.log(this.selectionList, 'this.selectionList');
let scID = this.selectionList[0].mallId; //DI
let mallIdState = this.selectionList.find(res => res.mallId != scID);
if (mallIdState) {
let dataListscID = null;
if(this.dataList.length){
dataListscID = this.dataList.find(res=>res.mallId != scID)
}
if (mallIdState || dataListscID) {
this.$message.warning('请选择同一商场');
return;
}
console.log('111 :>> ', 111);
let st = false;
let sts = false;

56
src/views/distribution/inventory/distrilbutionBillLadingView.vue

@ -95,6 +95,9 @@
<el-button type="warning" plain icon="el-icon-camera" @click="handleqr('')"
>批量查看二维码
</el-button>
<el-button type="warning" plain v-if="permission.Self_pickup_receipt" @click="Selfpickupreceipt"
><el-icon><EditPen /></el-icon>
</el-button>
<!-- 列表模块 -->
<tablecmt
ref="tableNodePackageRef"
@ -196,6 +199,7 @@ import {
getBillLadingDetail,
getOrderDetail,
$_checkBillLadingIsRelease,
$_batchSign,
} from '@/api/distribution/distrilbutionBillLading';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
import { ElMessage, ElMessageBox } from 'element-plus';
@ -213,6 +217,7 @@ import { downloadXls, hanleTextLineFeed, setNodeHeight } from '@/utils/util';
import { exportBlob } from '@/api/common';
import { dateNow } from '@/utils/date';
import print from '@/utils/print';
import error from '@/error';
export default {
data() {
return {
@ -1423,6 +1428,7 @@ export default {
},
computed: {
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
@ -1570,6 +1576,56 @@ export default {
searchChange() {
this.onLoad(this.page);
},
//
Selfpickupreceipt(){
if(!this.selectionList.length){
ElMessage({
message: '请勾选要签收的数据',
type: 'warning',
})
return
}
console.log(this.selectionList,'this.selectionList');
ElMessageBox.confirm(
'是否确认操作自提批量签收?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
this.loading=true
let data={
id:this.$route.query.id,
packageIds:this.selectionList.map(item=>item.id).join(',')
}
$_batchSign(data).then(res=>{
console.log(res,'自提签收成返回值');
if(res.data.code===200){
this.handlePackage(this.packpage)
ElMessage({
message:res.data.msg,
type: 'success',
})
}
}).catch(error=>{
console.log(error,'自提签收失败返回值');
}).finally(()=>{
this.loading=false
})
console.log(this.selectionList,'');
// handlePackage(this.packpage)
})
.catch(() => { })
},
//
async handleqr(val) {
console.log(val, 'val');

18
src/views/distribution/reservation/reservationAddFrom.vue

@ -2654,10 +2654,11 @@ export default {
if (this.reservationId) {
//
const checkInfoValues = this.form.stockArticleList.every(
item => !item.packageListInfo || !item.packageListInfo.length
item => !item.reservationNum
);
if (checkInfoValues) {
ElMessageBox.prompt(
await ElMessageBox.prompt(
'当前所有订单都没有选择包件是否确认"取消本次计划"?',
'请填写取消原因',
{
@ -2691,12 +2692,15 @@ export default {
});
console.log(data, '要提交的数据');
})
.catch(() => {});
.catch(() => {
console.log('关闭弹窗');
});
return
} else {
for (let i = 0; i < this.form.stockArticleList.length; i++) {
if (
!this.form.stockArticleList[i].packageListInfo ||
!this.form.stockArticleList[i].packageListInfo.length
!this.form.stockArticleList[i].reservationNum
) {
ElMessageBox.confirm(
`订单自编号:${this.form.stockArticleList[i].orderCode}没有选择包件是否移除!`,
@ -2711,7 +2715,9 @@ export default {
this.renderOrderData.splice(i, 1);
this.form.stockArticleList.splice(i, 1);
})
.catch(() => {});
.catch(() => {
});
return;
}
}

7
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -2986,6 +2986,13 @@ const handleBack = () => {
//
const SubmitCommercial = async () => {
if(!dataInfo.value.length){
ElMessage({
message: '订单列表为空,请手动移除本次计划!',
type: 'warning',
})
return
}
let code = null;
try {
//kind

2
src/views/factory/mt/packageInfo.vue

@ -49,7 +49,7 @@
<!-- 表单字段 -->
<el-date-picker
v-model="showPushData"
type="date"
type="datetime"
placeholder="选择推送时间"
:disabled-date="disabledDate"
:shortcuts="shortcuts"

4
src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@ -246,7 +246,7 @@ export default {
prop: 'receiptBatch',
type: 2,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: true,
sortable: true,
@ -307,7 +307,7 @@ export default {
prop: 'orderNumber',
type: 2,
values: '',
width: '130',
width: '220',
checkarr: [],
fixed: false,
sortable: true,

Loading…
Cancel
Save