diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 95db9709..86a29426 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -569,8 +569,10 @@
+
关闭
+
提交
+
+
+
+ 挂载目的仓
+
- 订单号: {{ details.editInfo.orderCode }}
+
+ 目的仓:
+
+
+
+
inputsc(value, row, index)"
- @selection="list => selectionChange(list, index)"
+ :tableData="details.problemData"
+ @inputTxt="(value, row) => inputsc(value, row)"
+ @selection="list => selectionChange(list)"
>
-
+
-
取消
+
取消
({
popUpShow: {
/** 修改计划数量 */
editPlanNumberVisited: false,
+ /** 未挂载目的仓的数据 */
+ problemDataVisited: true,
},
/** 列表Dom节点 */
listNode: '',
@@ -896,6 +910,11 @@ const details = reactive({
remveNodeList: [],
/** 拷贝的编辑信息, 提交时根据数据对比设置为新增、删除、编辑 */
nodeCloneInfoData: [],
+ /** 挂载在配载任务中, 但未挂载目的仓的数据 */
+ problemData: [],
+ problemForm: {},
+ /** 节点 */
+ nodeList: [],
});
const btnLoadingObj = reactive({
@@ -1709,6 +1728,25 @@ const handleSubmitEdit = async () => {
}
};
+/** 显示未挂载目的仓的数据 */
+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 = () => {
$store.commit('DEL_TAG_CURRENT');
@@ -2278,4 +2316,17 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
border: none;
color: #fff;
}
+
+.mr20 {
+ margin-right: 20px;
+}
+
+// 配置目的仓弹窗
+.problemDataVisited {
+ .title {
+ font-size: 18px;
+ font-weight: bold;
+ display: flex;
+ }
+}
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index d6e7c458..53b437d4 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -207,6 +207,7 @@
@@ -735,6 +736,7 @@ export default {
if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
this.title = '添加提货数据';
+ this.form = {};
this.chooseWaybillInfo = this.selectionList[0];
this.popUpShow.addDistrilbutionVisited = true;
},
@@ -967,19 +969,20 @@ export default {
if (item.waybillNo === value) _item = item;
}
- if (_item.totalCount - _item.stockCount === 0) {
+ if (_item.totalCount - _item.billladingNum <= 0) {
this.$message.warning('该运单已全部入库!!!');
this.form = {};
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.goodsName = _item.goodsName || '';
this.form.shipperName = _item.shipperName || '';
this.form.shipperMobile = _item.shipperMobile || '';
this.form.consigneeMobile = _item.consigneeMobile || '';
- this.form.num = 0;
+ this.form.num = this.form.maxNum;
},
},
activated() {
@@ -1137,4 +1140,8 @@ export default {
height: 100% !important;
width: 100% !important;
}
+
+:deep(.el-input-number .el-input__inner) {
+ text-align: left;
+}
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
index a6d3cda3..680b51b8 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
@@ -150,7 +150,7 @@
-
+
diff --git a/src/views/distribution/signfor/asurcharge.vue b/src/views/distribution/signfor/asurcharge.vue
index 397e97b1..ab826ce4 100644
--- a/src/views/distribution/signfor/asurcharge.vue
+++ b/src/views/distribution/signfor/asurcharge.vue
@@ -115,7 +115,7 @@
新增
-
批量删除
{
ConfirmationInformation.value = true; //数据确认
};
// 确认提交
-const ConfirmSubmission=()=>{
- let data={
- addvalueType:tabName.value,//类型
- deliveryId: $route.query.id,
- reservationId:$route.query.reservationId,
- num:0,//包件个数
- packageEntityList:details.TCselectionList,//选择的包件
+const ConfirmSubmission = () => {
+ let data = {
+ addvalueType: tabName.value, //类型
+ deliveryId: $route.query.id,
+ reservationId: $route.query.reservationId,
+ num: details.TCselectionList.length, //包件个数
+ packageEntityList: details.TCselectionList, //选择的包件
+ floolNum: TcZcInput.value.floolNum, //楼层
+ };
+ console.log(data, '准备提交的数据');
+ // 表格下面有数据走新增接口
+ $_saveSignAddValuePackage(data).then(res => {
+ console.log(res, '新增成功');
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ packdialog.value = false; //关闭弹窗
+ TcZcInput.value.floolNum = ''; //清空楼层
}
- console.log(data,'准备提交的数据');
-}
+ });
+};
+//删除
+const Batchdeletion = () => {
+ if (!details.selectionList.length) {
+ ElMessage({
+ message: '请勾选要删除的数据',
+ type: 'warning',
+ });
+ return
+ }
+ details.loadingObj.list = true;
+ let data={
+ addvalueType: tabName.value, //类型
+ deliveryId: $route.query.id,
+ reservationId: $route.query.reservationId,
+ packageEntityList: details.selectionList, //选择的包件
+ }
+ $_cancelSignAddValuePackage(data).then(res=>{
+ console.log(res,'删除成功');
+ if(res.data.code==200){
+ ElMessage({
+ message:res.data.msg,
+ type: 'success',
+ });
+ }
+ }).catch(err=>{
+ console.log(err,'删除失败');
+ }).finally(()=>{
+ details.loadingObj.list = false;
+ onLoad(tabName.value)
+ })
+};
//导出
// const exportExcel = () => {
// if (!Object.values(queryCarn.value).length && !Object.values(details.query).length) {
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index ec68d58a..0d3dba5e 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -672,9 +672,9 @@
/>
-
+