From 218fd27d44cf8de2d58cbc0455c26febd88f4096 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 22 Dec 2023 10:18:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/website.js | 2 +-
.../delivery/distributionStockArticle.vue | 13 +-------
.../distributionStockArticleDiscuss.vue | 27 ++--------------
.../distributionStockArticleMarket.vue | 11 -------
.../delivery/distributionStockArticleSelf.vue | 31 +++----------------
vite.config.js | 2 +-
6 files changed, 11 insertions(+), 75 deletions(-)
diff --git a/src/config/website.js b/src/config/website.js
index 5ce28c18..3b87363c 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -5,7 +5,7 @@ export default {
title: '货无忧物流信息平台',
logo: 'S',
key: 'TWMS', //配置主键,目前用于存储
- indexTitle: '货无优 Admin',
+ indexTitle: '货无忧 Admin',
clientId: 'saber', // 客户端id
clientSecret: 'saber_secret', // 客户端密钥
tenantMode: true, // 是否开启租户模式
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index b152eead..f8b4d34c 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -101,7 +101,7 @@
v-if="handler"
>修改服务类型
- 导 出
@@ -626,17 +626,6 @@ export default {
isshowSummary: true,
sortable: true,
},
- {
- prop: 'availableQuantity',
- label: '可用数量',
- type: 2,
- values: '',
- width: '140',
- checkarr: [],
- fixed: false,
- isshowSummary: true,
- sortable: true,
- },
{
prop: 'notReceived',
label: '未入库数量',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 85ba35c8..727a3fe6 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -80,23 +80,13 @@
>
- 修改客户信息
- 修改服务类型
- 导 出
+ 导 出
@@ -684,17 +674,6 @@ export default {
isshowSummary: true,
sortable: true,
},
- {
- prop: 'availableQuantity',
- label: '可用数量',
- type: 2,
- values: '',
- width: '140',
- checkarr: [],
- fixed: false,
- isshowSummary: true,
- sortable: true,
- },
{
prop: 'notReceived',
label: '未入库数量',
diff --git a/vite.config.js b/vite.config.js
index 497d3d30..6353e045 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default ({ mode, command }) => {
// 新zyc
// target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.122:8777',
- target: 'http://192.168.10.25:13000',
+ // target: 'http://192.168.10.25:13000',
// target: 'http://192.168.10.57:13000',
// target: 'http://192.168.6.122:8777',
// target: 'http://192.168.6.116:8777',
From a9abf9c64338b6698bdc641e90d9833be67861d9 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 22 Dec 2023 10:50:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../aftersales/aftersalesWorkOrderAdd.vue | 20 +++----
.../signfor/distributionSignforedt.vue | 60 +++++++++++--------
vite.config.js | 4 +-
3 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index ffb64d99..4d9c83d9 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -1002,16 +1002,16 @@ const ConfirmForm = () => {
delete DataSubmit.processor; //移除多余字段
console.log(DataSubmit, '处理好的数据');
// 提交表单信息stringify
- // $_submit(DataSubmit).then(res => {
- // if (res.data.code == 200) {
- // ElMessage({
- // message: res.data.msg,
- // type: 'success',
- // });
- // Indexform.value = {}; //重置表单
- // $router.push('/aftersales/aftersalesWorkOrder'); //添加成功跳转到列表
- // }
- // });
+ $_submit(DataSubmit).then(res => {
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ Indexform.value = {}; //重置表单
+ $router.push('/aftersales/aftersalesWorkOrder'); //添加成功跳转到列表
+ }
+ });
};
// 选择司机带出车次号日期
const changeDeliveryDriver=(val)=>{
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index d888c98e..b372fcf0 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -386,8 +386,8 @@
height="500"
style="width: 100%"
ref="tableRef"
- @select-all="selectAll"
- @select="selectChange"
+ @select-all="qsselectAll"
+ @select="qsselectChange"
>
- 勾选数量：{{TcTemp.length}}
+ 勾选数量：{{sptemp.length}}
@@ -465,7 +465,7 @@
新增
@@ -580,6 +580,7 @@
+ 勾选数量:{{ZCTableData.length}}
@@ -671,7 +672,7 @@
-
+ 勾选数量:{{TcTemp.length}}