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

修改表格部分样式

dev-xx
qb 1 year ago
parent
38372a4b88
commit
51decf611d
6 changed files with 256 additions and 225 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/api/distribution/abnormalList.js
  2. 130
      src/option/distribution/abnormalList.js
  3. 28
      src/views/distribution/artery/abnormalList.vue
  4. 4
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  5. 65
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  6. 242
      src/views/distribution/reservation/reservationAddFrom.vue

12
src/api/distribution/abnormalList.js
Unescape View File

@ -0,0 +1,12 @@
import request from '@/axios';
/**
* 初始化获取配载信息
*/
export const postAbnormalList = (data = {}) => {
return request({
url: '/api/logpm-trunkline/carsLoad/abnormalList',
method: 'post',
data,
});
};

130
src/option/distribution/abnormalList.js
Unescape View File

@ -26,29 +26,18 @@ export const columnList = [
sortable: true, sortable: true,
head: false, head: false,
}, },
{ // {
prop: 'orderPackageCode', // prop: 'driverName',
label: '异常状态', // label: '车类型',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '130',
checkarr: [], // checkarr: [],
fixed: true, // fixed: false,
sortable: true, // sortable: true,
head: false, // },
}, {
{ prop: 'unloadNodeName',
prop: 'driverName',
label: '车类型',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'carNumber',
label: '上报仓库', label: '上报仓库',
type: 2, type: 2,
values: '', values: '',
@ -98,45 +87,78 @@ export const columnList = [
sortable: true, sortable: true,
}, },
{ {
prop: '', prop: 'orderPackageCode',
label: '上报人', label: '有无数据',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'trayCode',
label: '状态',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: true,
sortable: true, sortable: true,
head: false,
}, },
{ {
prop: 'firstPickName', prop: 'orderPackageCode',
label: '处理人', label: '装车异常',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: true,
sortable: true, sortable: true,
head: false,
}, },
{ {
prop: 'secondPickName', prop: 'orderPackageCode',
label: '处理时间', label: '卸车异常',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
fixed: false, fixed: true,
sortable: 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', prop: 'remark',
label: '备注', label: '备注',
@ -147,16 +169,16 @@ export const columnList = [
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'materialName', // prop: 'materialName',
label: '上报时间', // label: '上报时间',
type: 2, // type: 2,
values: '', // values: '',
width: '150', // width: '150',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ {
prop: '', prop: '',
label: '操作', label: '操作',

28
src/views/distribution/artery/abnormalList.vue
Unescape View File

@ -97,15 +97,9 @@
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '运单号'"> <template v-if="slotProps.scope.column.label === '操作'">
<el-text @click="handleGoWaybillDetails(slotProps.scope)"> <el-text @click="handleUploadReceipt(slotProps.scope)"> 详情 </el-text>
{{ slotProps.scope.row.waybillNo }} <el-text @click="handleViewOrderDetails(slotProps.scope)"> 处理 </el-text>
</el-text>
</template>
<template v-else-if="slotProps.scope.column.label === '操作'">
<el-text @click="handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
<el-text @click="handleViewOrderDetails(slotProps.scope)"> 查看订单 </el-text>
</template> </template>
</template> </template>
</tablecmt> </tablecmt>
@ -151,6 +145,7 @@ import { columnList } from '@/option/distribution/abnormalList';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import { postAbnormalList } from '@/api/distribution/abnormalList';
// 获取路由实例 // 获取路由实例
const $router = useRouter(); const $router = useRouter();
@ -265,15 +260,12 @@ const onLoad = async (page?: any, params = {}) => {
let _page = details.page; let _page = details.page;
if (page) _page = page; if (page) _page = page;
// 获取暂存单列表 // 获取暂存单列表
// const res = await postWarehouseWaybillPageWaybillList(details.page, { const res = await postAbnormalList({ ...details.page, ...details.query, ...params });
// ...details.query, console.log('res :>> ', res);
// ...params, const { code, data } = res.data;
// }); if (code !== 200) return;
// console.log('res :>> ', res); details.data = data.records;
// const { code, data } = res.data; details.page.total = data.total;
// if (code !== 200) return;
// details.data = data.records;
// details.page.total = data.total;
} catch (error) { } catch (error) {
} finally { } finally {
details.loadingObj.list = false; details.loadingObj.list = false;

4
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -1442,7 +1442,7 @@ export default {
label: '订单自编号', label: '订单自编号',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '240',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -1674,7 +1674,7 @@ export default {
label: '订单自编号', label: '订单自编号',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '240',
checkarr: [], checkarr: [],
fixed: true, fixed: true,
sortable: true, sortable: true,

65
src/views/distribution/inventory/distributionStockArticleDetails.vue
Unescape View File

@ -113,7 +113,7 @@
<tablecmt <tablecmt
:columnList="columnList" :columnList="columnList"
:tableData="dataPare" :tableData="dataPare"
:loading="loading" :loading="loadingObj.tableLoading"
@inputTxt="inputsc" @inputTxt="inputsc"
@timeCheck="timesc" @timeCheck="timesc"
@btnCheck="btnsc" @btnCheck="btnsc"
@ -639,6 +639,7 @@ export default {
/** loading */ /** loading */
loadingObj: { loadingObj: {
pageLoading: false, pageLoading: false,
tableLoading: false,
}, },
}; };
}, },
@ -1388,39 +1389,43 @@ export default {
}, },
async onLoadOwn(page, params = {}) { async onLoadOwn(page, params = {}) {
try { try {
this.loadingObj.pageLoading = true; this.loadingObj.tableLoading = true;
// this.loading = true;
this.dataMaterial = false;
params = {
stockArticleIds: this.$route.query.id,
};
const res = await getListOwn(
page.currentPage,
page.pageSize,
Object.assign(params, this.queryPage)
);
console.log('包件明细》》》》》', res.data.data);
const { code, data } = res.data;
if (code !== 200) return;
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();
} catch (error) { } catch (error) {
console.log('error :>> ', error); console.log('error :>> ', error);
} finally { } 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();
}
);
}, },
}, },
}; };

242
src/views/distribution/reservation/reservationAddFrom.vue
Unescape View File

@ -231,11 +231,7 @@
width="90%" width="90%"
:model="addvalue" :model="addvalue"
> >
<el-button <el-button type="primary" @click="Batchmodifycustomers">批量修改客户 </el-button>
type="primary"
@click="Batchmodifycustomers"
>批量修改客户
</el-button>
<tablecmt <tablecmt
ref="orderTableNode" ref="orderTableNode"
:columnList="stockArtcolumnList" :columnList="stockArtcolumnList"
@ -323,26 +319,26 @@
</el-col> --> </el-col> -->
<el-col :xl="5" :lg="4" :md="4" :sm="12"> <el-col :xl="5" :lg="4" :md="4" :sm="12">
<div class="el_sumS"> <div class="el_sumS">
<span>操作数量：</span> <span>操作数量：</span>
<el-input-number <el-input-number
v-if="this.isrReservationEntry" v-if="this.isrReservationEntry"
v-model="item.reservationNum" v-model="item.reservationNum"
min="0" min="0"
:max="maxSum" :max="maxSum"
placeholder="请输入预约数量" placeholder="请输入预约数量"
></el-input-number> ></el-input-number>
<el-input-number <el-input-number
v-else v-else
v-model="item.number" v-model="item.number"
min="0" min="0"
:max="maxSum" :max="maxSum"
placeholder="请输入预约数量" placeholder="请输入预约数量"
></el-input-number> ></el-input-number>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-input-number v-model="item.reservationNum" min="0" :max="item.quantity - item.deliveryQuantity -item.outboundQuantity " placeholder="请输入预约数量"></el-input-number>--> <!-- <el-input-number v-model="item.reservationNum" min="0" :max="item.quantity - item.deliveryQuantity -item.outboundQuantity " placeholder="请输入预约数量"></el-input-number>-->
</div> </div>
</template> </template>
@ -461,7 +457,10 @@
<el-input v-model="clientData.customerName" placeholder="请输入用户名称"></el-input> <el-input v-model="clientData.customerName" placeholder="请输入用户名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="用户电话:"> <el-form-item label="用户电话:">
<el-input v-model="clientData.customerTelephone" placeholder="请输入用户电话"></el-input> <el-input
v-model="clientData.customerTelephone"
placeholder="请输入用户电话"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="用户地址:"> <el-form-item label="用户地址:">
<el-input v-model="clientData.customerAddress" placeholder="请输入用户地址"></el-input> <el-input v-model="clientData.customerAddress" placeholder="请输入用户地址"></el-input>
@ -1332,17 +1331,6 @@ export default {
checkarr: [], checkarr: [],
fixed: true, fixed: true,
}, },
{
prop: 'incomingBatch',
label: '入库批次',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
// { // {
// prop: 'serviceTypeName', // prop: 'serviceTypeName',
// label: '服务类型', // label: '服务类型',
@ -1359,12 +1347,32 @@ export default {
label: '订单自编号', label: '订单自编号',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '240',
checkarr: [], checkarr: [],
fixed: true, fixed: true,
sortable: true, sortable: true,
head: false, 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', prop: 'serviceNumber',
label: '服务号', label: '服务号',
@ -1372,19 +1380,20 @@ export default {
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],
fixed: true, fixed: false,
sortable: true, sortable: true,
head: false, head: false,
}, },
{ {
prop: 'descriptionGoods', prop: 'incomingBatch',
label: '物料名称', label: '入库批次',
type: 2, type: 2,
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
head: false,
}, },
// { // {
// prop: 'warehouse', // prop: 'warehouse',
@ -1406,16 +1415,6 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{
prop: 'cargoNumber',
label: '物料编码',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{ {
prop: 'marketName', prop: 'marketName',
label: '商场/客户', label: '商场/客户',
@ -1423,7 +1422,7 @@ export default {
values: '', values: '',
width: '130', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: true,
sortable: true, sortable: true,
}, },
{ {
@ -2019,15 +2018,15 @@ export default {
return ids.join(','); return ids.join(',');
}, },
// 最大数量 // 最大数量
maxSum(){ maxSum() {
let max=0 let max = 0;
this.zeroOrderData.forEach(item=>{ this.zeroOrderData.forEach(item => {
console.log(item); console.log(item);
max+=item.deliveryQuantity;//冻结数量 max += item.deliveryQuantity; //冻结数量
}) });
let maxs = this.obj.handQuantity -max let maxs = this.obj.handQuantity - max;
return maxs return maxs;
} },
}, },
methods: { methods: {
@ -2170,29 +2169,29 @@ export default {
} }
}, },
// 批量修改客户 // 批量修改客户
Batchmodifycustomers(){ Batchmodifycustomers() {
if(!this.orderList.length){ if (!this.orderList.length) {
ElMessage({ ElMessage({
message: '请勾选要批量修改的数据', message: '请勾选要批量修改的数据',
type: 'warning', type: 'warning',
}) });
return; 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({ ElMessage({
message: '请勾选商场名称一样的单子', message: '请勾选商场名称一样的单子',
type: 'warning', type: 'warning',
}) });
return return;
} }
// this.orderList // this.orderList
this.clientData={} this.clientData = {};
this.clientData.mallName= this.orderList[0].mallName this.clientData.mallName = this.orderList[0].mallName;
this.dialogVisible=true this.dialogVisible = true;
}, },
handleCheckedCitiesChange(value) { handleCheckedCitiesChange(value) {
if (value) { if (value) {
@ -2307,51 +2306,52 @@ export default {
this.isrReservationEntry = false; this.isrReservationEntry = false;
}, },
submitClient() { submitClient() {
if(this.orderList.length){ if (this.orderList.length) {
let data={ let data = {
entityList:[] 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=>{ this.onLoadOrder(this.page);
item.customerName = this.clientData.customerName;//用户名称 this.orderList = [];
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',
}) })
.catch(() => {
this.onLoadOrder(this.page); this.loading = false;
this.orderList=[] })
} .finally(() => {});
}).catch(()=>{ } else {
this.loading=false this.loading = true;
}).finally(()=>{ this.dialogVisible = false; //关闭修改弹出
console.log('this.client===============>', this.clientData);
}) updateClient(this.clientData)
}else{ .then(res => {
this.loading=true console.log('res>>>>>>>>>>>', res.data.data);
this.dialogVisible = false;//关闭修改弹出 this.orderList = [];
console.log('this.client===============>', this.clientData); this.onLoadOrder(this.page);
updateClient(this.clientData).then(res => { this.dialogVisible = false;
console.log('res>>>>>>>>>>>', res.data.data); })
this.orderList=[] .catch(() => {
this.onLoadOrder(this.page); this.loading = false;
this.dialogVisible = false; })
}).catch(()=>{ .finally(() => {});
this.loading=false
}).finally(()=>{
});
} }
}, },
// 选择包件信息 // 选择包件信息
@ -3424,12 +3424,12 @@ input[type='number'] {
.footer-container { .footer-container {
height: 60px; height: 60px;
} }
.el_sumS{ .el_sumS {
span{ span {
width: 100px; width: 100px;
} }
display: flex; display: flex;
height: 20px; height: 20px;
width: 200px; width: 200px;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save