From 51decf611df6677bb97bf8fb852a1fb085ee2b9d Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 21 Mar 2024 22:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/distribution/abnormalList.js | 12 +
src/option/distribution/abnormalList.js | 130 ++++++----
.../distribution/artery/abnormalList.vue | 28 +-
.../distributionDeliveryListedt.vue | 4 +-
.../distributionStockArticleDetails.vue | 65 ++---
.../reservation/reservationAddFrom.vue | 242 +++++++++---------
6 files changed, 256 insertions(+), 225 deletions(-)
create mode 100644 src/api/distribution/abnormalList.js
diff --git a/src/api/distribution/abnormalList.js b/src/api/distribution/abnormalList.js
new file mode 100644
index 00000000..43cdfb18
--- /dev/null
+++ b/src/api/distribution/abnormalList.js
@@ -0,0 +1,12 @@
+import request from '@/axios';
+
+/**
+ * 初始化获取配载信息
+ */
+export const postAbnormalList = (data = {}) => {
+ return request({
+ url: '/api/logpm-trunkline/carsLoad/abnormalList',
+ method: 'post',
+ data,
+ });
+};
diff --git a/src/option/distribution/abnormalList.js b/src/option/distribution/abnormalList.js
index 260a6c75..18b7191d 100644
--- a/src/option/distribution/abnormalList.js
+++ b/src/option/distribution/abnormalList.js
@@ -26,29 +26,18 @@ export const columnList = [
sortable: true,
head: false,
},
- {
- prop: 'orderPackageCode',
- label: '异常状态',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: true,
- sortable: true,
- head: false,
- },
- {
- prop: 'driverName',
- label: '车类型',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
- {
- prop: 'carNumber',
+ // {
+ // prop: 'driverName',
+ // label: '车类型',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
+ prop: 'unloadNodeName',
label: '上报仓库',
type: 2,
values: '',
@@ -98,45 +87,78 @@ export const columnList = [
sortable: true,
},
{
- prop: '',
- label: '上报人',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
- {
- prop: 'trayCode',
- label: '状态',
+ prop: 'orderPackageCode',
+ label: '有无数据',
type: 2,
values: '',
- width: '130',
+ width: '150',
checkarr: [],
- fixed: false,
+ fixed: true,
sortable: true,
+ head: false,
},
{
- prop: 'firstPickName',
- label: '处理人',
+ prop: 'orderPackageCode',
+ label: '装车异常',
type: 2,
values: '',
- width: '130',
+ width: '150',
checkarr: [],
- fixed: false,
+ fixed: true,
sortable: true,
+ head: false,
},
{
- prop: 'secondPickName',
- label: '处理时间',
+ prop: 'orderPackageCode',
+ label: '卸车异常',
type: 2,
values: '',
width: '150',
checkarr: [],
- fixed: false,
+ fixed: true,
sortable: true,
+ head: false,
},
+ // {
+ // prop: '',
+ // label: '上报人',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // prop: 'scanSta',
+ // label: '状态',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // prop: 'firstPickName',
+ // label: '处理人',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // prop: 'secondPickName',
+ // label: '处理时间',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
prop: 'remark',
label: '备注',
@@ -147,16 +169,16 @@ export const columnList = [
fixed: false,
sortable: true,
},
- {
- prop: 'materialName',
- label: '上报时间',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
+ // {
+ // prop: 'materialName',
+ // label: '上报时间',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
prop: '',
label: '操作',
diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue
index 922b4e82..c5183680 100644
--- a/src/views/distribution/artery/abnormalList.vue
+++ b/src/views/distribution/artery/abnormalList.vue
@@ -97,15 +97,9 @@
@selection="selectionChange"
>
-
-
- {{ slotProps.scope.row.waybillNo }}
-
-
-
-
- 上传回单
- 查看订单
+
+ 详情
+ 处理
@@ -151,6 +145,7 @@ import { columnList } from '@/option/distribution/abnormalList';
import { useRouter } from 'vue-router';
import { ElMessage } from 'element-plus';
import { getToken } from '@/utils/auth';
+import { postAbnormalList } from '@/api/distribution/abnormalList';
// 获取路由实例
const $router = useRouter();
@@ -265,15 +260,12 @@ const onLoad = async (page?: any, params = {}) => {
let _page = details.page;
if (page) _page = page;
// 获取暂存单列表
- // const res = await postWarehouseWaybillPageWaybillList(details.page, {
- // ...details.query,
- // ...params,
- // });
- // console.log('res :>> ', res);
- // const { code, data } = res.data;
- // if (code !== 200) return;
- // details.data = data.records;
- // details.page.total = data.total;
+ const res = await postAbnormalList({ ...details.page, ...details.query, ...params });
+ console.log('res :>> ', res);
+ const { code, data } = res.data;
+ if (code !== 200) return;
+ details.data = data.records;
+ details.page.total = data.total;
} catch (error) {
} finally {
details.loadingObj.list = false;
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index ec832630..dbf70424 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -1442,7 +1442,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
- width: '150',
+ width: '240',
checkarr: [],
fixed: false,
sortable: true,
@@ -1674,7 +1674,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
- width: '150',
+ width: '240',
checkarr: [],
fixed: true,
sortable: true,
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index be792750..b2a0bba7 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -113,7 +113,7 @@
{
+ if (i.conditions == '1') {
+ i.conditions = '定制品';
+ } else {
+ i.conditions = '库存品';
+ }
+ if (!i.materialId) {
+ //有
+ this.dataMaterial = true;
+ }
+ });
+ // this.loading = false;
+ this.selectionClear();
} catch (error) {
console.log('error :>> ', error);
} finally {
- this.loadingObj.pageLoading = false;
+ this.loadingObj.tableLoading = false;
}
-
- // this.loading = true;
- this.dataMaterial = false;
- params = {
- stockArticleIds: this.$route.query.id,
- };
- getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then(
- res => {
- console.log('包件明细》》》》》', res.data.data);
- const data = res.data.data;
- this.page.total = data.total;
- this.dataPare = data.records;
- this.dataPare.some(i => {
- if (i.conditions == '1') {
- i.conditions = '定制品';
- } else {
- i.conditions = '库存品';
- }
- if (!i.materialId) {
- //有
- this.dataMaterial = true;
- }
- });
- this.loading = false;
- this.selectionClear();
- }
- );
},
},
};
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 15420971..3b2a41ca 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -231,11 +231,7 @@
width="90%"
:model="addvalue"
>
- 批量修改客户
-
+ 批量修改客户
-->
-
- 操作数量：
-
-
-
-
+
+ 操作数量：
+
+
+
+
-
+
@@ -461,7 +457,10 @@
-
+
@@ -1332,17 +1331,6 @@ export default {
checkarr: [],
fixed: true,
},
- {
- prop: 'incomingBatch',
- label: '入库批次',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: true,
- sortable: true,
- head: false,
- },
// {
// prop: 'serviceTypeName',
// label: '服务类型',
@@ -1359,12 +1347,32 @@ export default {
label: '订单自编号',
type: 2,
values: '',
- width: '130',
+ width: '240',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
+ {
+ prop: 'descriptionGoods',
+ label: '物料名称',
+ type: 2,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: true,
+ sortable: true,
+ },
+ {
+ prop: 'cargoNumber',
+ label: '物料编码',
+ type: 2,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: true,
+ sortable: true,
+ },
{
prop: 'serviceNumber',
label: '服务号',
@@ -1372,19 +1380,20 @@ export default {
values: '',
width: '130',
checkarr: [],
- fixed: true,
+ fixed: false,
sortable: true,
head: false,
},
{
- prop: 'descriptionGoods',
- label: '物料名称',
+ prop: 'incomingBatch',
+ label: '入库批次',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
+ head: false,
},
// {
// prop: 'warehouse',
@@ -1406,16 +1415,6 @@ export default {
fixed: false,
sortable: true,
},
- {
- prop: 'cargoNumber',
- label: '物料编码',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
{
prop: 'marketName',
label: '商场/客户',
@@ -1423,7 +1422,7 @@ export default {
values: '',
width: '130',
checkarr: [],
- fixed: false,
+ fixed: true,
sortable: true,
},
{
@@ -2019,15 +2018,15 @@ export default {
return ids.join(',');
},
// 最大数量
- maxSum(){
- let max=0
- this.zeroOrderData.forEach(item=>{
+ maxSum() {
+ let max = 0;
+ this.zeroOrderData.forEach(item => {
console.log(item);
- max+=item.deliveryQuantity;//冻结数量
- })
- let maxs = this.obj.handQuantity -max
- return maxs
- }
+ max += item.deliveryQuantity; //冻结数量
+ });
+ let maxs = this.obj.handQuantity - max;
+ return maxs;
+ },
},
methods: {
@@ -2170,29 +2169,29 @@ export default {
}
},
// 批量修改客户
- Batchmodifycustomers(){
- if(!this.orderList.length){
+ Batchmodifycustomers() {
+ if (!this.orderList.length) {
ElMessage({
- message: '请勾选要批量修改的数据',
- type: 'warning',
- })
- return;
+ message: '请勾选要批量修改的数据',
+ type: 'warning',
+ });
+ return;
}
-
- let State= this.orderList.every(item=>item.mallName==this.orderList[0].mallName)
- if(!State){
+ let State = this.orderList.every(item => item.mallName == this.orderList[0].mallName);
+
+ if (!State) {
ElMessage({
- message: '请勾选商场名称一样的单子',
- type: 'warning',
- })
- return
+ message: '请勾选商场名称一样的单子',
+ type: 'warning',
+ });
+ return;
}
// this.orderList
- this.clientData={}
- this.clientData.mallName= this.orderList[0].mallName
- this.dialogVisible=true
+ this.clientData = {};
+ this.clientData.mallName = this.orderList[0].mallName;
+ this.dialogVisible = true;
},
handleCheckedCitiesChange(value) {
if (value) {
@@ -2307,51 +2306,52 @@ export default {
this.isrReservationEntry = false;
},
submitClient() {
- if(this.orderList.length){
- let data={
- entityList:[]
- }
+ if (this.orderList.length) {
+ let data = {
+ entityList: [],
+ };
+
+ this.orderList.forEach(item => {
+ item.customerName = this.clientData.customerName; //用户名称
+ item.customerTelephone = this.clientData.customerTelephone; //用户电话
+ item.customerAddress = this.clientData.customerAddress; //用户地址
+ data['entityList'].push(item);
+ });
+ this.loading = true;
+ this.dialogVisible = false; //关闭修改谈弹窗
+ $_updateBatchClient(data)
+ .then(res => {
+ console.log(res, '修改成功');
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
- this.orderList.forEach(item=>{
- item.customerName = this.clientData.customerName;//用户名称
- item.customerTelephone=this.clientData.customerTelephone;//用户电话
- item.customerAddress=this.clientData.customerAddress;//用户地址
- data['entityList'].push(item)
- })
- this.loading=true
- this.dialogVisible = false;//关闭修改谈弹窗
- $_updateBatchClient(data).then(res=>{
- console.log(res,'修改成功');
- if(res.data.code == 200){
- ElMessage({
- message: res.data.msg,
- type: 'success',
+ this.onLoadOrder(this.page);
+ this.orderList = [];
+ }
})
-
- this.onLoadOrder(this.page);
- this.orderList=[]
- }
- }).catch(()=>{
- this.loading=false
- }).finally(()=>{
-
- })
- }else{
- this.loading=true
- this.dialogVisible = false;//关闭修改弹出
- console.log('this.client===============>', this.clientData);
- updateClient(this.clientData).then(res => {
- console.log('res>>>>>>>>>>>', res.data.data);
- this.orderList=[]
- this.onLoadOrder(this.page);
- this.dialogVisible = false;
- }).catch(()=>{
- this.loading=false
- }).finally(()=>{
-
- });
+ .catch(() => {
+ this.loading = false;
+ })
+ .finally(() => {});
+ } else {
+ this.loading = true;
+ this.dialogVisible = false; //关闭修改弹出
+ console.log('this.client===============>', this.clientData);
+ updateClient(this.clientData)
+ .then(res => {
+ console.log('res>>>>>>>>>>>', res.data.data);
+ this.orderList = [];
+ this.onLoadOrder(this.page);
+ this.dialogVisible = false;
+ })
+ .catch(() => {
+ this.loading = false;
+ })
+ .finally(() => {});
}
-
},
// 选择包件信息
@@ -3424,12 +3424,12 @@ input[type='number'] {
.footer-container {
height: 60px;
}
-.el_sumS{
- span{
+.el_sumS {
+ span {
width: 100px;
}
display: flex;
- height: 20px;
- width: 200px;
+ height: 20px;
+ width: 200px;
}