diff --git a/src/api/LsystemsInventory/LsystemsInventory.js b/src/api/LsystemsInventory/LsystemsInventory.js
new file mode 100644
index 00000000..4e47ccc3
--- /dev/null
+++ b/src/api/LsystemsInventory/LsystemsInventory.js
@@ -0,0 +1,18 @@
+import request from '@/axios';
+// 同步老系统盘点数据列表接口
+export const $_SyncInventoryList = data => {
+ return request({
+ url: '/logpm-patch/syncInventory/list',
+ method: 'POST',
+ data,
+ });
+};
+
+// 新增同步老系统盘点数据
+export const $_SyncInventorySubmit = data => {
+ return request({
+ url: '/logpm-patch/syncInventory/submit',
+ method: 'POST',
+ data,
+ });
+};
diff --git a/src/views/basic/pda/basicPdaTTTTT.vue b/src/views/basic/pda/basicPdaTTTT.vue
similarity index 77%
rename from src/views/basic/pda/basicPdaTTTTT.vue
rename to src/views/basic/pda/basicPdaTTTT.vue
index c6362a07..f65b0f48 100644
--- a/src/views/basic/pda/basicPdaTTTTT.vue
+++ b/src/views/basic/pda/basicPdaTTTT.vue
@@ -38,12 +38,16 @@
@@ -89,14 +93,44 @@
width="280"
align="center "
>
-
-
+ 删除
- 编辑
- 查看
+ -->
+
+
+ 删除
+ 编辑
+ 查看
@@ -110,13 +144,12 @@
v-model:current-page="currentPage"
v-model:page-size="pageSize"
:page-sizes="pageList"
- :small="small"
:disabled="disabled"
:background="background"
layout="total, sizes, prev, pager, next, jumper"
- :total="2"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
+ :total="total"
+ @size-change="PageSizeChange"
+ @current-change="SizeChange"
/>
@@ -264,16 +297,20 @@
菜单功能列表
+
-
-
-
-
-
-
- {{ scope.row[column.prop] }}
-
-
-
-
-
-
-
-
+
+
+
+ {{ scope.row[column.prop] }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+ Config
+ Role
+ Task
+
+
+
@@ -332,7 +376,7 @@ import { ref, reactive, onMounted, computed } from 'vue';
import { getList, getDetail, $_AddInfo, update, remove, $_TableList } from '@/api/basic/basicPda'; //API
import { ElMessage, type UploadProps } from 'element-plus';
import { getToken } from '@/utils/auth';
-
+// 菜单功能标题
const MenuTop = ref([
{
prop: 'label',
@@ -352,22 +396,43 @@ const MenuTop = ref([
label: '排序',
},
]);
-const checkList = ref<(string | number)[]>([]); //隐藏
-const flexList = ref<(string | number)[]>([]); //冻结
-const CheckBox = (scope, type: number) => {
- console.log(scope, 'scope');
- if (type === 1) {
- scope.head = !scope.head;
- }
- if (type === 2) {
- scope.fixed = !scope.fixed;
- }
-};
-
+// 按钮配置
+const ElButtonS = ref([
+ // 1.link 切换按钮样式(文本模式-false ,按钮模式-tre)
+ // 2.class 按钮样式名(用于切换按钮样式)
+ // 3.space 是否开启按钮文子直接间距(true开启 ,false关闭)
+ // 4.size 按钮尺寸默认小尺寸('large'| 'default'| 'small')
+ // 5.icon 按钮图标
+ // 6.table 按钮名称
+ {
+ link: false,
+ class: 'el-btn-danger',
+ space: true,
+ size: 'small',
+ icon: 'el-icon-delete',
+ table: '删除',
+ },
+ {
+ link: false,
+ class: 'el-btn-success',
+ space: true,
+ size: 'small',
+ icon: 'Edit',
+ table: '编辑',
+ },
+ {
+ link: false,
+ class: 'el-btn-view',
+ space: true,
+ size: 'small',
+ icon: 'el-icon-view',
+ table: '查看',
+ },
+]);
const currentPage = ref(1); // 默认页码
const pageSize = ref(30); // 默认每一页几条
+const total = ref(0); //页码总页数
const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
-const small = ref(false);
const background = ref(true); // 是否开启背景颜色
const disabled = ref(false); // 是否禁止使用页码功能
const data = ref([]); // 表格数据
@@ -376,15 +441,13 @@ const AddLalog = ref(false); //提交弹窗
const img = ref(false); //图片是否上传成功
const ImgText = ref(''); //图片上传成功文件名
const AddForm = ref({}); //表单所有信息
-const value1 = ref(''); //日期
-const optionsvalue = ref(''); //下拉框值
-const optionsvalue2 = ref(''); //状态值
const uploadRef = ref(); //图片上传
const tableRef = ref(null); // 用于引用 table 实例
const menu = ref(true); //功能菜单列表
const menuHeight = ref(); //右侧菜单栏高度,用于固定表头
-const MeunList = ref((name = {}));
-const MeunName = ref([]); //菜单名
+const checkList = ref<(string | number)[]>([]); //隐藏
+const flexList = ref<(string | number)[]>([]); //冻结
+const loading = ref(false); //刷新功能
const options = [
//下拉选择框
{
@@ -611,8 +674,6 @@ function onLoad() {
$_TableList({ current: currentPage.value, size: pageSize.value }).then(res => {
//表格信息
console.log(res, 'res');
- const keys = Object.keys(res.data.data.records[0]);
- MeunName.value = keys.map(key => ({ key }));
data.value = res.data.data.records;
const setIn = setTimeout(() => {
toggleSelection(); //表格自动选中函数
@@ -691,6 +752,53 @@ const submit = () => {
console.log(res);
});
};
+// 每页多少条触发
+const PageSizeChange = val => {
+ console.log('每一页', val, '条');
+};
+// 页码翻页触发
+const SizeChange = val => {
+ console.log('当前是第', val, '页');
+};
+// 表格全选功能触发
+const selectAll = val => {
+ console.log(val);
+};
+// 表格单个选中触发事件
+const selectChange = (selection, row) => {
+ // 1.selection 选中的数组
+ // 2.row 选中的当前行
+ console.log(selection);
+};
+// 删除触发事件
+const DeleteEvent = val => {
+ // 接收点击删除当前行数据
+ console.log('触发了删除事件', val);
+};
+// 编辑触发事件
+const EditEvent = val => {
+ // 接收点击编辑当前行数据
+ console.log('触发了编辑事件', val);
+};
+// 查看事件
+const ViewEvent = val => {
+ //接收点击查看当前行数据;
+ console.log('触发了查看事件', val);
+};
+// 菜单功能选择触发
+const CheckBox = (scope, type: number) => {
+ console.log(scope, 'scope');
+ if (type === 1) {
+ scope.head = !scope.head;
+ }
+ if (type === 2) {
+ scope.fixed = !scope.fixed;
+ }
+};
+// 刷新触发事件
+const refresh = () => {
+ loading.value = !loading.value;
+};
diff --git a/src/views/distribution/LsystemsInventory/LsystemsInventory.vue b/src/views/distribution/LsystemsInventory/LsystemsInventory.vue
new file mode 100644
index 00000000..21dc0542
--- /dev/null
+++ b/src/views/distribution/LsystemsInventory/LsystemsInventory.vue
@@ -0,0 +1,941 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ props.row[item.prop] === 0
+ ? '未开始'
+ : props.row[item.prop] === 1
+ ? '同步中'
+ : props.row[item.prop] === 2
+ ? '同步完成'
+ : props.row[item.prop] === 2
+ ? '同步异常'
+ : '/'
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 编辑
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认提交
+
+
+
+
+
+ It's a draggable Dialog
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 7bfd4a5d..1a61539f 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -439,6 +439,7 @@ export default {
fixed: false,
sortable: true,
},
+
{
prop: 'vehicleName',
label: '配送车辆',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index a3daf98d..62b805ef 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -26,6 +26,9 @@
装车班组:{{ deliverydata.loadingTeamName }}
+
+
+ 司机电话:{{ deliverydata.driverPhone }}
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index b14e96cd..89a8cf69 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -1105,7 +1105,7 @@ export default {
// 返回false,说明全都相等
if (!notEqualFlag) {
this.$router.push({
- path: '/distribution/inventory/distributionStockArticleFrom',
+ path: '/distribution/reservation/reservationSubmitFrom',
query: {
id: this.ids,
name: '转预约单',
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index ecc34f5b..a1072fd2 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -943,16 +943,17 @@ export default {
},
//签收
handleSign(row, num) {
- if (this.selectionList.length == 0) {
- this.$message.warning('至少选择一条数据!!');
- return;
- }
- let a = this.selectionList.find(i => i.conditions > 6);
- if (!!a) {
- this.$message.warning('有已签收的数据,请勿重复签收!!');
- return;
+ if(num === 2){
+ if (this.selectionList.length == 0) {
+ this.$message.warning('至少选择一条数据!!');
+ return;
+ }
+ let a = this.selectionList.find(i => i.conditions > 20);
+ if (!!a) {
+ this.$message.warning('有已签收的数据,请勿重复签收!!');
+ return;
+ }
}
-
this.$confirm('确定签收吗?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 6a1f5d71..4b89e330 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -318,7 +318,7 @@ export default {
head: false,
},
{
- prop: 'deliveryNumber',
+ prop: 'quantity',
label: '备货数',
type: 2,
values: '',
@@ -329,7 +329,7 @@ export default {
head: false,
},
{
- prop: 'readyStock',
+ prop: 'preparedQuantity',
label: '已备数量',
type: 2,
values: '',
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 2c27db0e..8ef46d18 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -1906,6 +1906,7 @@
let page = this.page;
let params = {};
this.query.serviceType = '2';
+ console.log('this.marketName :>> ', this.marketName);
params.marketName = this.marketName
console.log('params :>> ', params);
getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
@@ -1917,15 +1918,9 @@
});
this.page.total = inventoryList.total;
console.log('res :>> ', res);
- // this.inventoryInfo = inventoryList.records.filter(value=>{
- // if(this.marketName === '')return value
- // return value.marketName === this.marketName
- // });
+
this.inventoryInfo = inventoryList.records
- this.inventoryInfo = inventoryList.records.filter(value => {
- if (this.marketName === '') return value;
- return value.marketName === this.marketName;
- });
+
//存在库存品,需要将库存品进行回显勾选
if (this.inventoryData) {
this.inventoryInfo.forEach((item, index) => {
@@ -2657,7 +2652,7 @@
* 增加订单提交
*/
onSubmitOrder() {
- console.log('-------------》', this.orderList);
+ console.log('orderList-------------》', this.orderList);
if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!')
const list = this.orderList;
let _name = list[0].customerName;
@@ -2682,56 +2677,16 @@
// 设置商场名称
if (this.marketName === '') this.marketName = _marketName
- this.marketName = list[0].marketName;
+ // this.marketName = list[0].marketName;
this.form.consignee = _name;
this.form.deliveryAddress = _address;
this.form.deliveryPhone = _phone;
+
//这里需要对选择的订单进行筛选
- const info = [];
- this.stockArticleInfo.forEach((item, index) => {
- this.orderList.forEach(order => {
- // const newDate1 = this.orderData.map(item => { // map遍历本地数据
- // if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据,则返回这条本地数据
- // return item;
- // });
- // } info.push(order);
- //清理原来订单列表的订单数据
- info.push(order);
- this.stockArticleInfo.splice(index, 1);
- });
- });
-
-
- if (this.orderData.length >= 1) {
- let newDate1 = this.orderData.map(item => {
- // map遍历本地数据
- if (this.orderList.find(o => o.id !== item.id)) {
- // 如果在接口数据中包含本地数据,则返回这条本地数据
- return item;
- }
- });
- console.log('newDate1-------------->', newDate1.length);
- if (newDate1.length >= 1) {
- console.log('newDate1-------------->', newDate1);
- newDate1.forEach(a => {
- this.orderData.push(a);
- });
- }
- console.log('this.orderData------------->', this.orderData);
- } else {
-
- this.orderData = this.orderList;
- }
-
-
- this.orderData.forEach(a => {
- a.reservationNum = a.handQuantity;
-
- });
-
+ const _ids = this.orderData.map(val => val.id)
+ this.orderData = [...this.orderData, ...this.orderList.filter(item => !_ids.includes(item.id))]
- // this.orderData.push(info);
this.orderShow = false;
},
selectionClear() {
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 2ea0b40e..df6fa3ce 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -701,6 +701,7 @@
import dayjs from 'dayjs';
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
import { ElMessageBox } from 'element-plus'
+import { ElMessage } from 'element-plus'
export default {
data() {
return {
@@ -1416,6 +1417,20 @@ import { ElMessageBox } from 'element-plus'
* 订单提交
*/
onSubmitBusiness() {
+ if( !this.driverForm.masterDriverName ){
+ ElMessage({
+ message: '没有选择配送司信息',
+ type: 'warning',
+ })
+ return
+ }
+ if(!this.driverForm.masterVehicleNub){
+ ElMessage({
+ message: '没有选择配车辆信息',
+ type: 'warning',
+ })
+ return
+ }
this.BtnDisabled=true
setTimeout(() => {
// 启用按钮
@@ -1552,7 +1567,7 @@ import { ElMessageBox } from 'element-plus'
item.packageListInfo = item.parcelListVOS;
}
});
- console.log('data>>>>>>>>>>>', data);
+ console.log('data>>>>>>>>>>>TTTTTT', data);
updateDeliveryList(data).then(res => {
this.$router.push({
path: '/distribution/deliverylist/distributionDeliveryListdis'
@@ -1677,7 +1692,7 @@ import { ElMessageBox } from 'element-plus'
}
});
- console.log('data>>>>>>>>>>>', data);
+ console.log('data>>>>>>>>>>>ssssssss', data);
// 新增
deliveryBusinessTask(data).then(res => {
this.$router.push({
diff --git a/vite.config.js b/vite.config.js
index fe3ab980..c74cba5a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -15,11 +15,14 @@ export default ({ mode, command }) => {
// target: 'http://192.168.10.126:8889',
// hy
// target: 'http://192.168.10.48:8888',
+ // lmy
// target: 'http://192.168.10.123:8889',
// target: 'http://192.168.10.101:8888',
// target: 'http://192.168.10.75:8777',
- // target: 'http://192.168.10.29:13000',
+ // tjj
+ // target: 'http://192.168.10.29:13000',
target: 'http://test.api.huitongys.com',
+ // target: 'http://h5uapi.huitongys.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),
},