From 6b2aa7f0bb3f43e040ae2e659009e3bee3f3db1c Mon Sep 17 00:00:00 2001 From: zuozhengqing <a13193816592@163.com> Date: 星期四, 19 十月 2023 11:14:58 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq --- src/assets/style/reset-element.scss | 8 ++-- src/views/reportForm/inventoryReport/index.vue | 30 +++++++------- src/views/reportForm/locationReport/index.vue | 26 ++++++------ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/assets/style/reset-element.scss b/src/assets/style/reset-element.scss index f9e6aa3..61d1fe2 100644 --- a/src/assets/style/reset-element.scss +++ b/src/assets/style/reset-element.scss @@ -65,8 +65,8 @@ .el-button--primary { color: #fff; - background-color: $color-primary !important; - border-color: $color-primary !important; + background-color: $color-primary; + border-color: $color-primary; } .el-pagination.is-background .el-pager li:not(.disabled).active { @@ -81,6 +81,6 @@ } .el-button--primary { color: #fff; - background-color: #2a78fb !important; - border-color: #2a78fb !important; + background-color: #2a78fb; + border-color: #2a78fb; } \ No newline at end of file diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue index 91e54a1..3f7c699 100644 --- a/src/views/reportForm/inventoryReport/index.vue +++ b/src/views/reportForm/inventoryReport/index.vue @@ -46,20 +46,20 @@ <template slot="tableButton"> <el-table-column label="鎿嶄綔" width="220" align="center"> <template slot-scope="scope"> - <span @click="handleHistoryClick(scope.row)"> + <span @click="handleHistoryClick(scope.row)" class="yes-cursor"> <i class="el-icon-refresh-left"></i> <span>鍘嗗彶</span> </span> - <span @click="handleAddGoods(scope)" class="margin_left_5px"> + <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor"> <i class="el-icon-refresh"></i> <span>琛ヨ揣</span> </span> <template> - <span @click="handleLocation(scope)" class="margin_left_5px"> + <span @click="handleLocation(scope)" class="margin_left_5px yes-cursor"> <i class="el-icon-menu"></i> <span>浣嶇疆</span> </span> - <span @click="handleForecast(scope)" class="margin_left_5px"> + <span @click="handleForecast(scope)" class="margin_left_5px no-cursor"> <i class="el-icon-s-data"></i> <span>棰勬祴</span> </span> @@ -146,7 +146,7 @@ pageSizes: [15, 30], oldRadioBtn: "", metaTitle: this.$route.meta.title, - searchStr:"" + searchStr: "" } }, created() { @@ -275,11 +275,11 @@ this.tableList.tableColumn = this.setTableColumn(val) }, getList(val) { - this.searchStr=val + this.searchStr = val this.getInventoryData({ page: 1, pageSize: this.pagerOptions.pageSize, - keyWord:val, + keyWord: val }) }, // 琛岀偣鍑� @@ -351,18 +351,18 @@ //鎺ュ彛璇锋眰----------------------------------------------------------------------------------------------- // 鑾峰彇搴撳瓨鎶ヨ〃鏁版嵁 - async getInventoryData(params){ + async getInventoryData(params) { await getInventoryData(params).then((res) => { - if (res.code === 200) { - const list = res.data - this.tableList.tableInfomation = list || [] - this.pagerOptions.totalCount = res.total - } - }) + if (res.code === 200) { + const list = res.data + this.tableList.tableInfomation = list || [] + this.pagerOptions.totalCount = res.total + } + }) }, getData() { let params = { - keyWord:this.searchStr, + keyWord: this.searchStr, categoryIds: this.categoryListId, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize, diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue index 76af58e..78866f9 100644 --- a/src/views/reportForm/locationReport/index.vue +++ b/src/views/reportForm/locationReport/index.vue @@ -2,15 +2,15 @@ <template> <div class="rightContent"> <div class="top"> - <SearchCommonView - :add-title="'鏂板缓'" - :showAdd="false" - :placeholder="'璇疯緭鍏ヤ綅缃悕绉般�佷骇鍝佸悕绉版垨浜у搧绫诲埆'" - :amount-view="false" - @addCommonClick="addBtnClick" - @searchClick="getList" - :isDisabled="true" - /> + <SearchCommonView + :add-title="'鏂板缓'" + :showAdd="false" + :placeholder="'璇疯緭鍏ヤ綅缃悕绉般�佷骇鍝佸悕绉版垨浜у搧绫诲埆'" + :amount-view="false" + @addCommonClick="addBtnClick" + @searchClick="getList" + :isDisabled="true" + /> </div> <div class="list-view"> <div class="table"> @@ -24,11 +24,11 @@ <template slot="tableButton"> <el-table-column label="鎿嶄綔" width="210" align="center"> <template slot-scope="scope"> - <span @click="handleHistoryClick(scope.row)"> + <span @click="handleHistoryClick(scope.row)" class="yes-cursor"> <i class="el-icon-refresh-left"></i> <span>鍘嗗彶</span> </span> - <span @click="handleAddGoods(scope)" class="margin_left_5px"> + <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor"> <i class="el-icon-refresh"></i> <span>琛ヨ揣</span> </span> @@ -197,7 +197,7 @@ this.tableList.tableColumn = this.setTableColumn(val) }, // 璇锋眰鏁版嵁 - async getLocationData(params){ + async getLocationData(params) { await getLocationData(params).then((res) => { if (res.code === 200) { const list = res.data @@ -226,7 +226,7 @@ this.getLocationData({ page: 1, pageSize: this.pagerOptions.pageSize, - keyWord:val + keyWord: val }) }, // 琛岀偣鍑� -- Gitblit v1.8.0