From afa3a67885bac35e4c2949a4f44a375d4459d050 Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Sat, 7 Oct 2023 18:34:54 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=B4=B7=E4=BD=8D=E5=8F=AF=E8=A7=86?= =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goodsShelf/basicdataGoodsShelfView.vue | 277 +++++++++++------- 1 file changed, 165 insertions(+), 112 deletions(-) diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index a3a2f8d1..2f783d37 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -33,19 +33,19 @@
导出
-
+
总货位: {{ countnumber.cargoNub }}
-
+
占用货位: {{ countnumber.employNub }}
-
+
未用货位: {{ countnumber.unusedNub }}
-
+
禁用货位: {{ countnumber.disableNub }}
@@ -66,37 +66,39 @@
-
-
- 总货位: - {{ boxdetails.cargoNub }} -
-
- 占用货位: - {{ boxdetails.employNub }} -
-
- 未用货位: - {{ boxdetails.unusedNub }} -
-
- 禁用货位: - {{ boxdetails.disableNub }} -
-
- 货物总数: - {{ boxdetails.goodsNub }} -
+
+
+ 总货位: + {{ boxdetails.cargoNub }} +
+
+ 占用货位: + {{ boxdetails.employNub }}
+
+ 未用货位: + {{ boxdetails.unusedNub }} +
+
+ 禁用货位: + {{ boxdetails.disableNub }} +
+
+ 货物总数: + {{ boxdetails.goodsNub }} +
+
- +
+
禁用货位
- -
+ +
确定 取消
@@ -944,7 +943,7 @@ const showupt = value => { }, { prop: 'customerAddress', - label: '顾客电话', + label: '顾客地址', type: 1, values: '', width: '260', @@ -1045,7 +1044,7 @@ const showupt = value => { }, { prop: 'customerAddress', - label: '顾客电话', + label: '顾客地址', type: 1, values: '', width: '150', @@ -1267,6 +1266,17 @@ const showupt = value => { sortable: true, head: false, }, + { + prop: 'enterNum', + label: '可上架数量', + type: 10, + values: '', + width: '200', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, { prop: '', label: '操作', @@ -1349,7 +1359,18 @@ const showupt = value => { { prop: 'customerAddress', - label: '顾客电话', + label: '顾客地址', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'residueNumber', + label: '可上架数量', type: 1, values: '', width: '150', @@ -1904,17 +1925,6 @@ const showdown = async value => { sortable: true, head: false, }, - { - prop: 'num', - label: '货位剩余数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, { prop: 'orderCode', label: '订单号', @@ -2025,8 +2035,8 @@ const showdown = async value => { searchbutdown(); }; const addhuoj = async scope => { - details.addhuojData = scope - details.isshowConfirmedListing = true + details.addhuojData = scope; + details.isshowConfirmedListing = true; console.log(scope.row); }; // 确定上架 @@ -2034,7 +2044,7 @@ const confirmedListing = async () => { let data = { allocationId: details.checkite.id, }; - const scope = details.addhuojData + const scope = details.addhuojData; let url = ''; switch (details.isshowupt) { case 1: @@ -2073,7 +2083,7 @@ const confirmedListing = async () => { } let response = await posturl(url, data); // 关闭弹窗 - details.isshowConfirmedListing = false + details.isshowConfirmedListing = false; if (response.data.code == 200) { console.log(response.data); proxy.$message({ @@ -2089,7 +2099,7 @@ const confirmedListing = async () => { message: response.data.msg, }); } -} +}; async function allup() { // console.log(scope.row); let data = { @@ -2298,7 +2308,7 @@ const { border: none; background-color: #fff; box-sizing: border-box; - align-items: flex-start; + align-items: flex-end; .headtop { display: flex; align-items: center; @@ -2307,14 +2317,15 @@ const { // height: 90px; width: 150px; box-sizing: border-box; - border-right: 1.5px solid var(--boxcolor); + margin-right: 2px; + // border-right: 1.5px solid var(--boxcolor); &:nth-last-child(1) { border-right: 0; } &:nth-last-child(1) { .itemmibox { - border-bottom: 1.5px solid var(--boxcolor); + // border-bottom: 1.5px solid var(--boxcolor); } } .titls { @@ -2340,6 +2351,7 @@ const { box-sizing: border-box; color: rgba(237, 25, 25); + margin-bottom: 2px; &:nth-last-child(1) { // border-right: 0; } @@ -2356,7 +2368,7 @@ const { height: 100%; display: flex; align-items: center; - justify-content: center; + justify-content: flex-start; flex-direction: column; // font-size: 14px; } @@ -2494,13 +2506,13 @@ const { .contentbj { background-color: #fff; - border: 1px solid var(--bordercolor); + // border: 1px solid var(--bordercolor); } .itemwbox:last-child { - .itemmibox { - border-right: 1px solid var(--boxcolor); - } + // .itemmibox { + // border-right: 1px solid var(--boxcolor); + // } } .itemwbox { overflow: hidden; @@ -2514,4 +2526,13 @@ const { align-items: flex-start; width: 120px; } +.itemmibox { + border: 0 !important; +} + +.mabx .contentbx .itemwbox .rotate { + border: 1px solid #ff0000 !important; + background-color: #bd3a52 !important; + color: #fff; +} diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index 05275d61..e8a577c3 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -127,7 +127,7 @@
- diff --git a/src/views/distribution/zero/distributionReservationZeroPackage.vue b/src/views/distribution/zero/distributionReservationZeroPackage.vue new file mode 100644 index 00000000..d379337e --- /dev/null +++ b/src/views/distribution/zero/distributionReservationZeroPackage.vue @@ -0,0 +1,294 @@ + + + From 3a4fd3a1030b03b84936edad5e6944c684bc333c Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Sun, 8 Oct 2023 17:50:43 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=8B=E6=9E=B6?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E5=8F=8A=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tablecmt/tablecmt.vue | 56 +++++++++++++++---- .../goodsShelf/basicdataGoodsShelfView.vue | 43 +++++++++++--- src/views/system/topmenu.vue | 2 +- 3 files changed, 79 insertions(+), 22 deletions(-) diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 95b4a372..d9f1f7c5 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -91,8 +91,12 @@ v-if="Number(column.type) < 6 && Number(column.type) > 0" >{{ scope.row[column.prop] }} - - + +
-
+
{{ isshowupt == 1 ? '服务号' @@ -359,6 +360,8 @@ " width="80%" center + w + class="loadtc" >
@@ -504,6 +507,7 @@ import { exportBlob } from '@/api/common'; import { downloadXls } from '@/utils/util'; import { dateNow } from '@/utils/date'; const { proxy } = getCurrentInstance(); +let loadtc = ref(false); let details = reactive({ columnList: [], tablistarr: [], @@ -623,6 +627,7 @@ function sizeChange(pageSize) { searchbuts(); } async function searchbuts() { + loadtc = true; //弹窗样式修改 let url = ''; let data = null; // console.log(details.arrlist[details.checkindex].id); @@ -864,7 +869,7 @@ const showupt = value => { }, { prop: 'customerAddress', - label: '顾客电话', + label: '顾客地址', type: 1, values: '', width: '260', @@ -1868,6 +1873,18 @@ const showdown = async value => { sortable: true, head: false, }, + { + prop: 'num', + label: '可下架数量', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { prop: '', label: '操作', @@ -2254,7 +2271,7 @@ const { countnumber, } = toRefs(details); - diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue index e5256394..0dbede34 100644 --- a/src/views/system/topmenu.vue +++ b/src/views/system/topmenu.vue @@ -357,7 +357,7 @@ export default { }; - diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js index 61bc7cf8..b06b14be 100644 --- a/src/option/basicdata/basicdataGoodsAllocation.js +++ b/src/option/basicdata/basicdataGoodsAllocation.js @@ -2,7 +2,7 @@ export default { height: 'auto', calcHeight: 30, tip: false, - searchShow: true, + searchShow: false, //搜索展开 searchMenuSpan: 6, border: true, index: true, diff --git a/src/styles/login.scss b/src/styles/login.scss index 610d7a6a..74070084 100644 --- a/src/styles/login.scss +++ b/src/styles/login.scss @@ -185,3 +185,13 @@ text-align: center; cursor: pointer !important; } +.el-input__suffix { + // width: 5px !important; +} +.inputLog span.el-input__suffix-inner { + width: 5px !important; +} +.el-form-item__error { + left: 2%; + color: #ff0000; +} diff --git a/src/views/addvalue/distributionAddvalue.vue b/src/views/addvalue/distributionAddvalue.vue index eb871586..eb4bf08f 100644 --- a/src/views/addvalue/distributionAddvalue.vue +++ b/src/views/addvalue/distributionAddvalue.vue @@ -1,7 +1,7 @@