Browse Source

修复部分bug

dev-xx
qb 6 months ago
parent
commit
1d829f4ec2
  1. 57
      src/views/distribution/artery/AddVehicleStowage.vue
  2. 11
      src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue

57
src/views/distribution/artery/AddVehicleStowage.vue

@ -593,15 +593,20 @@
<el-dialog <el-dialog
title="配置目的仓" title="配置目的仓"
v-model="details.popUpShow.editPlanNumberVisited" v-model="details.popUpShow.problemDataVisited"
width="40%" width="80%"
append-to-body append-to-body
class="packageDetailColumnListVisited" class="problemDataVisited"
> >
<div class="edit_title">订单号: {{ details.editInfo.orderCode }}</div> <div class="title">
<span class="mr20">目的仓: </span>
<el-select></el-select>
</div>
<!-- <el-form-item label="目的仓:"></el-form-item> -->
<tablecmt <tablecmt
class="columnList" class="columnList mt20"
ref="newColumnListNode" ref="newColumnListNode"
:columnList="details.newColumnList" :columnList="details.newColumnList"
:tableData="details.problemData" :tableData="details.problemData"
@ -609,16 +614,16 @@
@selection="list => selectionChange(list)" @selection="list => selectionChange(list)"
> >
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '计划数'"> <!-- <template v-if="slotProps.scope.column.label === '计划数'">
<el-text size="small" text @click="handleEditplanNum(slotProps.scope, item)">{{ <el-text size="small" text @click="handleEditplanNum(slotProps.scope, item)">{{
slotProps.scope.row.planNum slotProps.scope.row.planNum
}}</el-text> }}</el-text>
</template> </template> -->
</template> </template>
</tablecmt> </tablecmt>
<div class="flex-c-c"> <div class="flex-c-c">
<el-button @click="details.popUpShow.editPlanNumberVisited = false">取消</el-button> <el-button @click="details.popUpShow.problemDataVisited = false">取消</el-button>
<el-button <el-button
type="primary" type="primary"
:loading="btnLoadingObj.editPlanNumBtn" :loading="btnLoadingObj.editPlanNumBtn"
@ -820,6 +825,8 @@ const details = reactive<any>({
popUpShow: { popUpShow: {
/** 修改计划数量 */ /** 修改计划数量 */
editPlanNumberVisited: false, editPlanNumberVisited: false,
/** 未挂载目的仓的数据 */
problemDataVisited: true,
}, },
/** 列表Dom节点 */ /** 列表Dom节点 */
listNode: '', listNode: '',
@ -905,6 +912,9 @@ const details = reactive<any>({
nodeCloneInfoData: [], nodeCloneInfoData: [],
/** 挂载在配载任务中, 但未挂载目的仓的数据 */ /** 挂载在配载任务中, 但未挂载目的仓的数据 */
problemData: [], problemData: [],
problemForm: {},
/** 节点 */
nodeList: [],
}); });
const btnLoadingObj = reactive({ const btnLoadingObj = reactive({
@ -1719,7 +1729,23 @@ const handleSubmitEdit = async () => {
}; };
/** 显示未挂载目的仓的数据 */ /** 显示未挂载目的仓的数据 */
const handleShowProblemData = () => {}; const handleShowProblemData = () => {
console.log('details.nodeInfoData :>> ', details.nodeInfoData);
console.log('details.active :>> ', details.active);
details.nodeList = [];
for (let i = 0; i < details.nodeInfoData.length; i++) {
const item = details.nodeInfoData[i];
if (i <= details.active || !item.nodeId) continue;
details.nodeList.push({
nodeName: item.nodeName,
nodeId: item.nodeId,
});
}
details.popUpShow;
};
/** 关闭页面 */ /** 关闭页面 */
const back = () => { const back = () => {
@ -2290,4 +2316,17 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
border: none; border: none;
color: #fff; color: #fff;
} }
.mr20 {
margin-right: 20px;
}
//
.problemDataVisited {
.title {
font-size: 18px;
font-weight: bold;
display: flex;
}
}
</style> </style>

11
src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue

@ -207,6 +207,7 @@
</el-form-item> </el-form-item>
<el-form-item label="开单日期" prop="createTime"> <el-form-item label="开单日期" prop="createTime">
<el-date-picker <el-date-picker
disabled
class="w100 h100" class="w100 h100"
v-model="form.createTime" v-model="form.createTime"
type="date" type="date"
@ -222,7 +223,7 @@
v-model="form.num" v-model="form.num"
class="w100" class="w100"
:min="0" :min="0"
:max="form.maxNum || form.maxNum === 0 || Infinity" :max="form.maxNum || 0"
:value-on-clear="0" :value-on-clear="0"
controls-position="right" controls-position="right"
/> />
@ -735,6 +736,7 @@ export default {
if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据'); if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作'); if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
this.title = '添加提货数据'; this.title = '添加提货数据';
this.form = {};
this.chooseWaybillInfo = this.selectionList[0]; this.chooseWaybillInfo = this.selectionList[0];
this.popUpShow.addDistrilbutionVisited = true; this.popUpShow.addDistrilbutionVisited = true;
}, },
@ -973,7 +975,8 @@ export default {
return; return;
} }
this.form.maxNum = _item.totalCount - _item.stockCount; this.form.maxNum = _item.totalCount - _item.billladingNum;
this.form.createTime = _item.createTime;
this.form.destination = _item.destinationWarehouseName || ''; this.form.destination = _item.destinationWarehouseName || '';
this.form.goodsName = _item.goodsName || ''; this.form.goodsName = _item.goodsName || '';
this.form.shipperName = _item.shipperName || ''; this.form.shipperName = _item.shipperName || '';
@ -1137,4 +1140,8 @@ export default {
height: 100% !important; height: 100% !important;
width: 100% !important; width: 100% !important;
} }
:deep(.el-input-number .el-input__inner) {
text-align: left;
}
</style> </style>

Loading…
Cancel
Save