检测到到您的打印设备尚未安装驱动或打印服务!请按照以下提示进行操作:
-
+
`;
// var strCLodopInstallB = "（若此前已安装过，可点这里直接再次启动）"; var strCLodopInstallB = "
注意事项:"; diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index 0fac26ef..a35c46e3 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -554,6 +554,17 @@ export default { sortable: true, head: false, }, + { + prop: 'phone', + label: '联系电话', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'typeServiceName', label: '配送类型', diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 669e5f21..11a7e5a9 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -328,6 +328,7 @@ export default { labelWidth: '150', width: '200px', align: 'center', + multiple:true, span: 11, // dicData: [], dicUrl: '/api/logpm-basicdata/vehicle/dictionary?vehicleNub={{key}}', diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue index 957ddb22..0ed71d89 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue @@ -85,11 +85,15 @@
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -866,6 +902,7 @@ import {
getReservationPackageList,
deliveryInventorySign,
printBatch,
+ $_deliveryZeroPackage,
} from '@/api/distribution/distributionDeliveryList';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
@@ -2306,6 +2343,11 @@ export default {
//状态列表
stateData: [],
// 表单配置
+ zeroPg:{
+ currentPage: 1,
+ pageSize: 30,
+ total: 40,
+ },
option: {
expand: false,
index: true,
@@ -3961,8 +4003,11 @@ export default {
console.log(res, '零担数据');
const data = res.data.data;
this.LessThantruckloadListData = data.records;
+ this.zeroPg.total = data.total;
+ })
+ .catch(() => {
+
})
- .catch(() => {})
.finally(() => {
this.loading = false; //关闭加载
});
@@ -4383,35 +4428,68 @@ export default {
message: '请勾选需要批量签收的数据',
type: 'warning',
});
- return
+ return;
}
- this.$confirm('是否进行批量签收？').then(()=>{
- this.loading=true;//开启加载
- if(res.data.code==200){
- this.truckload(this.page);
- }
-
- }).catch(()=>{
- })
+ const allSigned = this.LessThantruckloadListData.every(
+ item => item.signingStatusName == '待签收' || item.signingStatusName == '部分签收'
+ );
+ console.log(allSigned,'allSigned');
+ if (!allSigned) {
+ let temp = {};
+ console.log(true); // 如果都已签收，返回true
+ temp = this.LessThantruckloadListData.find(item => item.signingStatusName == '已签收');
+ ElMessage({
+ message: `${temp.orderCode}运单号已签收`,
+ type: 'warning',
+ });
+ return
+ }
+
+ this.$confirm('是否进行批量签收？')
+ .then(() => {
+ this.loading = true; //开启加载
+ let data = {
+ deliveryId: this.deliveryId,
+ reservationId: this.wid,
+ zeroPackageIds: this.selectionList.map(item => item.id).join(','),
+ };
+ $_deliveryZeroPackage(data).then(res => {
+ if (res.data.code == 200) {
+ ElMessage({
+ showClose: true,
+ message: res.data.msg,
+ type: 'success',
+ })
+ this.truckload(this.page);
+ this.selectionList = [];
+ }
+ }).catch(()=>{
+
+ }).finally(()=>{
+ this.loading = false; //关闭加载
+ });
+ })
+ .catch(() => {});
},
// 零担批量计划取消
LdBatchcancellation() {
+ return
if (!this.selectionList.length) {
ElMessage({
message: '请勾选需要计划取消的数据',
type: 'warning',
});
- return
+ return;
}
- this.$confirm('是否进行批量计划取消？').then(()=>{
- this.loading=true;//开启加载
- if(res.data.code == 200){
- this.truckload(this.page);
- }
- }).catch(()=>{
-
- })
+ this.$confirm('是否进行批量计划取消？')
+ .then(() => {
+ this.loading = true; //开启加载
+ if (res.data.code == 200) {
+ this.truckload(this.page);
+ }
+ })
+ .catch(() => {});
},
// 批量签收
Batchsigning() {
@@ -5065,6 +5143,7 @@ export default {
console.log('库存品包件>>>>>>>', res.data.data);
const data = res.data.data;
this.reservationInventoryPackageData = data.records;
+ this.wpage.total = data.total;
this.loading = false; //关闭加载
});
},
@@ -5132,10 +5211,30 @@ export default {
this.wpage.currentPage = currentPage;
this.getWrapdetails(this.wpage);
},
+ // 包件库存品
+ InventorycurrentChange(currentPage){
+ this.wpage.currentPage = currentPage;
+ this.getReservationInventoryPackageListInfo(this.wpage)
+ },
wsizeChange(pageSize) {
this.wpage.pageSize = pageSize;
this.getWrapdetails(this.wpage);
},
+ // 包件库存品
+ InventoryChange(pageSize){
+ this.wpage.pageSize = pageSize;
+ this.getReservationInventoryPackageListInfo(this.wpage)
+ },
+ // 零担
+ zeroChange(pageSize){
+ this.zeroPg.pageSize = pageSize;
+ this.truckload(this.zeroPg);
+ },
+ // 零担
+ zerocurrentChange(currentPage){
+ this.zeroPg.currentPag=currentPage;
+ this.truckload(this.zeroPg);
+ },
winputsc(index, row) {
this.wrapoption.query[row.prop] = index;
this.getWrapdetails(this.wpage);
diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue
index 3702c9eb..0009f560 100644
--- a/src/views/distribution/inventory/distributionStockListMarket.vue
+++ b/src/views/distribution/inventory/distributionStockListMarket.vue
@@ -143,12 +143,12 @@
v-model="formInline.sku"
placeholder="请输入sku"
clearable
- :disabled="Boolean(unpackFormDisable.sku)"
+ :disabled="FromDis"
/>
-
+
@@ -178,7 +196,7 @@
reserve-keyword
remote-show-suffix
placeholder="请选择货物单位"
- :disabled="Boolean(unpackFormDisable.cargoUnit)"
+ :disabled="FromDis"
>
@@ -201,7 +219,7 @@
v-model="formInline.cargoNumber"
placeholder="请输入产品编码"
clearable
- :disabled="Boolean(unpackFormDisable.cargoNumber)"
+ :disabled="goodsDis || FromDis"
/>
@@ -209,7 +227,7 @@
v-model="formInline.packageNum"
placeholder="请输入包装数量"
clearable
- :disabled="Boolean(unpackFormDisable.packageNum)"
+ :disabled="FromDis"
/>
@@ -314,7 +332,7 @@ import {
stockExport,
} from '@/api/distribution/distributionStockList';
import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
-import { getListMaterial } from '@/api/basic/basicMaterial';
+import { getListMaterial, $_getListMaterial } from '@/api/basic/basicMaterial';
import option from '@/option/distribution/distributionStockList';
import { mapGetters } from 'vuex';
import { exportBlob } from '@/api/common';
@@ -333,6 +351,8 @@ export default {
unpackFormDisable: {},
// 拆包名称下拉 选择
optionsName: [],
+ goodsDis: true,
+ FromDis: true,
columnList: [
{
prop: '',
@@ -820,24 +840,24 @@ export default {
/**
* 查询
* */
- async remoteMethodName(query) {
- console.log('query', query);
- if (query) {
- this.loading = true;
- //查询物料数据
- let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
- name: query,
- // pid: this.stockList.materialId,
- }).then();
- console.log('物料信息', asd.data.data);
- if (!!asd.data.data) {
- this.optionsName = asd.data.data.records;
- }
- this.loading = false;
- } else {
- this.optionsName = [];
- }
- },
+ // async remoteMethodName(query) {
+ // console.log('query', query);
+ // if (query) {
+ // this.loading = true;
+ // //查询物料数据
+ // let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
+ // name: query,
+ // pid: this.stockList.materialId,
+ // }).then();
+ // console.log('物料信息', asd.data.data);
+ // if (!!asd.data.data) {
+ // this.optionsName = asd.data.data.records;
+ // }
+ // this.loading = false;
+ // } else {
+ // this.optionsName = [];
+ // }
+ // },
/**
* 物料选择赋值
* */
@@ -1032,6 +1052,35 @@ export default {
// this.form.parcels = shi;
// }
// console.log("提交了");
+ if (this.FromDis) {
+ if (!this.formInline.materialIdName) {
+ this.$message.warning('请选择货物名称');
+ return;
+ }
+ }
+
+
+ if (!this.formInline.sku) {
+ this.$message.warning('请输入Sku');
+ return;
+ }
+
+ if (!this.formInline.cargoUnit) {
+ this.$message.warning('请选择货物单位');
+ return;
+ }
+ if (!this.formInline.cargoNorms) {
+ this.$message.warning('请输入规格');
+ return;
+ }
+ if (!this.formInline.packageNum) {
+ this.$message.warning('请输入包装数量');
+ return;
+ }
+ if (!this.formInline.unpackingQuantity) {
+ this.$message.warning('请输入拆箱数量');
+ return;
+ }
if (parseInt(this.formInline.unpackingQuantity) > parseInt(this.getQuery.quantityStock)) {
this.$message.warning('拆包数量大于在库数量!!!');
return;
@@ -1105,6 +1154,22 @@ export default {
});
},
async handleViewDismantle(row) {
+ let data = {
+ pid: row.row.materialId,
+ };
+ $_getListMaterial(data).then(res => {
+ console.log('物料信息', res);
+ if (res.data.data.length) {
+ this.optionsName = res.data.data;
+ console.log('this.optionsName', this.optionsName);
+ this.goodsDis = false;
+ this.FromDis = true;
+ } else {
+ this.goodsDis = true;
+ this.FromDis = false;
+ }
+ });
+
console.log('><<>L:', row.row);
this.dismantle = true;
this.view = true;
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 2f00ed1a..48b5192e 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -2906,6 +2906,7 @@ export default {
params.genre = 1;
params.typeService = 3;
params.reservation = '30';
+ params.isAll=0;
getListOne(page.currentPage, page.pageSize, Object.assign(params, this.queryOrder)).then(
res => {
const data = res.data.data;
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 97b705e9..d56e188e 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -292,6 +292,7 @@
>
-
-
-
- 搜 索
- 清 空
+
+
+
+
+ 搜 索
+ 清 空
+
+
@@ -91,11 +163,15 @@
import { columnList } from '@/option/reportforms/DeliveryCustomers.js';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { processRowProperty,setNodeHeight } from '@/utils/util';
- import {$_getcustomer,$_exportCustomer} from '@/api/reportforms/index.js';
+ import {$_getcustomer,$_exportCustomer,$_getMyWarehouseList} from '@/api/reportforms/index.js';
import { ElMessageBox } from 'element-plus';
import { downloadXls } from '@/utils/util';
import functions from '@/utils/functions.js';
import dayjs from 'dayjs';
+ const TopQuery=ref({});//顶部搜索
+ const warehouseList = ref([]); //仓库列表
+ const DeliveryTypeList =ref([])
+ const DeliverygenericList =ref([])
const details = reactive({
/** 是否开启搜索 */
search: false,
@@ -218,7 +294,14 @@
};
// 实例函数
-
+ const Toptiem = val => {
+ if (!val) {
+ delete TopQuery.value.ks;
+ delete TopQuery.value.end;
+ }
+ console.log(val, '顶部时间触发');
+ console.log(TopQuery.value, '顶部时间触发');
+};
/** 表格表头时间选择 */
const timesc = (index, row) => {
console.log(index, row);
@@ -247,8 +330,18 @@
};
// 网页顶部搜索按钮
const searchChange = () => {
- details.search = false; //关闭搜索
- };
+ // 日期处理
+ if (TopQuery.value.time) {
+ TopQuery.value.ks = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD'); //开始日期
+ TopQuery.value.end = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD'); //结束日期
+ }
+ // 仓库处理
+ if (TopQuery.value.warehouse) {
+ TopQuery.value.warehouseJoin = TopQuery.value.warehouse.join(',');
+ }
+ console.log(TopQuery.value, '顶部搜索触发');
+ // details.search = false; //关闭搜索
+};
// 每页多少条
const sizeChange = val => {
details.page.pageSize = val;
@@ -288,9 +381,31 @@
});
}
// 页面初始化方法
- const onLoad = () => {
- // updateDictionary(columnList[3].checkarr, 'pc_work_order'); //异常类型
- };
+// 页面初始化方法
+const onLoad = () => {
+ warehouseList.value = [];
+
+ columnList.find(res => res.label == '配送类型').checkarr = [];
+ columnList.find(res => res.label == '配送类型').checkarr = DeliveryTypeList.value;
+ columnList.find(res => res.label == '配送种类').checkarr = [];
+ columnList.find(res => res.label == '配送种类').checkarr = DeliverygenericList.value;
+ columnList.find(res => res.label == '仓库').checkarr = [];
+ columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
+
+ console.log(columnList, 'columnList');
+ // 获取仓库
+
+ $_getMyWarehouseList().then(res => {
+ console.log(res, '仓库列表');
+ if (res.data.data.length)
+ res.data.data.forEach(item => {
+ warehouseList.value.push({
+ value: item.name,
+ label: item.name,
+ });
+ });
+ });
+};
onLoad();
// 获取数据
const getrain=()=>{
@@ -360,5 +475,35 @@ const exportReport=()=>{
display: flex;
flex-direction: column;
}
+ :deep(.el-fr-d) {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ .el_top_left {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ .el-form-item {
+ align-items: flex-start;
+ }
+ .el-form-item__content {
+ align-items: flex-start;
+ height: 100%;
+ .el-date-editor {
+ height: 29px !important;
+ }
+ }
+ }
+}
+:deep(.el-btn) {
+ margin-right: 0;
+ display: flex;
+ width: 100%;
+ justify-content: flex-end;
+ .el-form-item__content {
+ justify-content: flex-end;
+ }
+}
\ No newline at end of file
diff --git a/src/views/reportforms/DeliveryTrainNumber.vue b/src/views/reportforms/DeliveryTrainNumber.vue
index 3c7e1a3c..fd405aec 100644
--- a/src/views/reportforms/DeliveryTrainNumber.vue
+++ b/src/views/reportforms/DeliveryTrainNumber.vue
@@ -5,8 +5,80 @@
-
+
+
+
搜 索
清 空
@@ -90,11 +162,36 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue
import { columnList } from '@/option/reportforms/DeliveryTrainNumber.js';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { processRowProperty, setNodeHeight } from '@/utils/util';
-import { $_getrain, $_exportTrain } from '@/api/reportforms/index.js';
+import { $_getrain, $_exportTrain, $_getMyWarehouseList } from '@/api/reportforms/index.js';
import { ElMessageBox } from 'element-plus';
import { downloadXls } from '@/utils/util';
import functions from '@/utils/functions.js';
+const warehouseList = ref([]); //仓库列表
+const DeliveryTypeList = ref([
+ {
+ label: '商配',
+ value: '商配',
+ },
+
+ {
+ label: '市配',
+ value: '市配',
+ },
+]); //配送类型
+// 配送种类
+const DeliverygenericList = ref([
+ {
+ label: '自主配送',
+ value: '自主配送',
+ },
+
+ {
+ label: '三方配送',
+ value: '三方配送',
+ },
+]); //配送类型
import dayjs from 'dayjs';
+const TopQuery = ref({}); //顶部搜索
const details = reactive({
/** 是否开启搜索 */
search: false,
@@ -236,6 +333,7 @@ const btnsc = val => {
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
+ getrain();
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@@ -244,7 +342,25 @@ const selectionChange = list => {
};
// 网页顶部搜索按钮
const searchChange = () => {
- details.search = false; //关闭搜索
+ // 日期处理
+ if (TopQuery.value.time) {
+ TopQuery.value.ks = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD'); //开始日期
+ TopQuery.value.end = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD'); //结束日期
+ }
+ // 仓库处理
+ if (TopQuery.value.warehouse) {
+ TopQuery.value.warehouseJoin = TopQuery.value.warehouse.join(',');
+ }
+ console.log(TopQuery.value, '顶部搜索触发');
+ // details.search = false; //关闭搜索
+};
+const Toptiem = val => {
+ if (!val) {
+ delete TopQuery.value.ks;
+ delete TopQuery.value.end;
+ }
+ console.log(val, '顶部时间触发');
+ console.log(TopQuery.value, '顶部时间触发');
};
// 每页多少条
const sizeChange = val => {
@@ -286,7 +402,28 @@ function updateDictionary(targetArray, dictionaryType) {
}
// 页面初始化方法
const onLoad = () => {
- // updateDictionary(columnList[3].checkarr, 'pc_work_order'); //异常类型
+ warehouseList.value = [];
+
+ columnList.find(res => res.label == '配送类型').checkarr = [];
+ columnList.find(res => res.label == '配送类型').checkarr = DeliveryTypeList.value;
+ columnList.find(res => res.label == '配送种类').checkarr = [];
+ columnList.find(res => res.label == '配送种类').checkarr = DeliverygenericList.value;
+ columnList.find(res => res.label == '仓库').checkarr = [];
+ columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
+
+ console.log(columnList, 'columnList');
+ // 获取仓库
+
+ $_getMyWarehouseList().then(res => {
+ console.log(res, '仓库列表');
+ if (res.data.data.length)
+ res.data.data.forEach(item => {
+ warehouseList.value.push({
+ value: item.name,
+ label: item.name,
+ });
+ });
+ });
};
onLoad();
// 获取数据
@@ -326,12 +463,10 @@ const exportReport = () => {
.then(res => {
downloadXls(res.data, `配送车次报表数据.xlsx`);
})
- .catch(() => {
-
- })
+ .catch(() => {})
.finally(() => {
details.loadingObj.list = false;
- })
+ });
})
.catch(() => {});
};
@@ -362,4 +497,34 @@ const exportReport = () => {
display: flex;
flex-direction: column;
}
+:deep(.el-fr-d) {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ .el_top_left {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ .el-form-item {
+ align-items: flex-start;
+ }
+ .el-form-item__content {
+ align-items: flex-start;
+ height: 100%;
+ .el-date-editor {
+ height: 29px !important;
+ }
+ }
+ }
+}
+:deep(.el-btn) {
+ margin-right: 0;
+ display: flex;
+ width: 100%;
+ justify-content: flex-end;
+ .el-form-item__content {
+ justify-content: flex-end;
+ }
+}
diff --git a/src/views/reportforms/Inventory.vue b/src/views/reportforms/Inventory.vue
new file mode 100644
index 00000000..bed2f8d6
--- /dev/null
+++ b/src/views/reportforms/Inventory.vue
@@ -0,0 +1,366 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜 索
+ 清 空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜 索
+ 清 空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜 索
+ 清 空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜 索
+ 清 空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+