From fa523e19c4e89c3a08aff41fe5acb57392a0f0aa Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 18 十二月 2023 14:57:43 +0800
Subject: [PATCH] 修改库存调整路由跳转，重订货规则数量设置默认值，样式调整
---
src/components/makepager/TableCommonView.vue | 8 +++
src/views/productManage/product/index.vue | 8 +++
src/views/reportForm/inboundOutboundDetail/index.vue | 6 +-
src/components/layout/components/appHeader/index.vue | 2
src/views/operate/orderPoint/index.vue | 23 +++++++++--
src/components/makepager/CommonFormTableView.vue | 1
src/views/reportForm/locationReport/index.vue | 15 ++++++-
src/views/operate/outEnterLibrary/index.vue | 9 ++--
src/router/index.js | 3 -
src/views/reportForm/outboundDetail/index.vue | 6 +-
10 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/src/components/layout/components/appHeader/index.vue b/src/components/layout/components/appHeader/index.vue
index 3369f4d..97c2c1d 100644
--- a/src/components/layout/components/appHeader/index.vue
+++ b/src/components/layout/components/appHeader/index.vue
@@ -47,7 +47,7 @@
prod: `//${window.location.hostname}:9080`,
test: `//192.168.20.119:9080`,
// 鎯宠烦鍒版湰鍦板惎鍔ㄧ殑鐧诲綍椤电殑璇濋渶瑕佹妸dev鏀规垚浣犳湰鍦伴」鐩矾寰�
- dev: `//192.168.20.102:8080`
+ dev: `//192.168.8.107:8080`
}
return loginPathMap[this.environmentType()]
},
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 06667cc..fae8e86 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -118,6 +118,7 @@
:controls="false"
size="mini"
style="width: 100%; margin-right: 5px"
+ :min="item.prop==='minInventory'?0:1"
@change="
(val) => {
commonInputChange(val, item.prop, scope.row)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 34f0287..56dc900 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -66,7 +66,7 @@
>{{ timeAgo(scope.row[item.prop]) }}</span
>
<div v-else-if="item.conversion">
- <span>{{ item.getStatus(scope.row[item.prop]) }}</span>
+ <p class="exceed_width">{{ item.getStatus(scope.row[item.prop]) }}</p>
</div>
<span
v-else-if="item.isClick && scope.row[item.prop]"
@@ -348,6 +348,12 @@
border-top-left-radius: 12px;
border-top-right-radius: 12px;
overflow: auto;
+ .exceed_width{
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
}
diff --git a/src/router/index.js b/src/router/index.js
index 0d7d048..9cbc146 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -151,8 +151,7 @@
console.log(result,"result")
next();
if (!isSkip) {
- console.log(to,"鐪嬬湅to")
- if(to.path==="/overview/overviewList"){
+ if(to.path==="/overview/overviewList"||to.path==="/overview/previewExcel"||to.path==="/operate/inventoryAdjustmentHistory"){
next();
}else{
next('/noData')
diff --git a/src/views/operate/orderPoint/index.vue b/src/views/operate/orderPoint/index.vue
index d9167c5..340eb0e 100644
--- a/src/views/operate/orderPoint/index.vue
+++ b/src/views/operate/orderPoint/index.vue
@@ -103,8 +103,8 @@
amount: 0,
operationId: 0,
minInventory: 0,
- maxInventory: 0,
- orderNumber: 0,
+ maxInventory: 1,
+ orderNumber: 1,
unit: "",
reorderId: 0,
searchTaskMap: [],
@@ -119,7 +119,16 @@
pageSize: 15,
page: 1
})
- } else {
+ }else if(this.$route.params.locationId){
+ this.searchTaskMap=[]
+ this.getData({
+ id: this.$route.params.locationId,
+ jointName:this.$route.params.locationName,
+ // type:"",
+ pageSize: 15,
+ page: 1
+ })
+ }else {
this.getData()
}
this.setTable()
@@ -190,7 +199,7 @@
},
// 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
- console.log(val, prop, row)
+ console.log(row)
if (prop === "minInventory") {
this.minInventory = val
if (parseFloat(this.minInventory) - parseFloat(this.prediction) > 0) {
@@ -249,7 +258,10 @@
this.showDiscard = false
let requestUrl = this.currentRowId === 0 ? addReorderRule : updateReorderRule
let params = this.saveParams()
- requestUrl(params)
+ if(params.productId===0){
+ this.$message.warning("璇峰～鍐欎骇鍝佷俊鎭�!")
+ }else{
+ requestUrl(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -262,6 +274,7 @@
console.log(err)
this.getData()
})
+ }
// }
}
},
diff --git a/src/views/operate/outEnterLibrary/index.vue b/src/views/operate/outEnterLibrary/index.vue
index 315abca..846578e 100644
--- a/src/views/operate/outEnterLibrary/index.vue
+++ b/src/views/operate/outEnterLibrary/index.vue
@@ -83,7 +83,6 @@
},
created() {
this.setTable()
- console.log(this.$route.params)
var paramsList = sessionStorage.getItem("paramsList")
let params = {}
if (paramsList) {
@@ -147,11 +146,11 @@
},
{
label: "涓氬姟绫诲瀷",
- prop: "baseOperationType",
+ prop: "operationTypeName",
isShowColumn: true,
default: true,
- conversion: true,
- getStatus: this.getBaseOperationTypeList
+ // conversion: true,
+ // getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
@@ -221,6 +220,7 @@
async getData() {
if (this.params.name === "鎶ヨ〃") {
await listByCondition({
+ // condition:"",
keyWord:this.params.keyWord,
produceId:this.params.produceId,
unit:this.params.unit,
@@ -270,7 +270,6 @@
this.getData()
},
tableRowClick(row,val) {
- console.log(row,"鐪嬬湅")
this.workType=row.baseOperationType
this.editConfig.title = val
getOperationInfo(row.operationId).then((res)=>{
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index c701e34..fb5c5fe 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -160,6 +160,12 @@
setTableColumn(showcol) {
let tableColumn = [
{
+ label: "浜у搧缂栫爜",
+ prop: "id",
+ isShowColumn: true,
+ default: true
+ },
+ {
label: "浜у搧鍚嶇О",
prop: "name",
isShowColumn: true,
@@ -167,7 +173,7 @@
},
{
label: "浜у搧瑙勬牸",
- prop: "spex",
+ prop: "specs",
isShowColumn: showcol.includes("浜у搧瑙勬牸"),
default: false
},
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index fa95d2b..fe60a74 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -130,11 +130,11 @@
},
{
label: "涓氬姟绫诲瀷",
- prop: "baseOperationType",
+ prop: "operationTypeName",
isShowColumn: true,
default: true,
- conversion: true,
- getStatus: this.getBaseOperationTypeList
+ // conversion: true,
+ // getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 4c2bc2a..2759b0b 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -28,7 +28,7 @@
<i class="el-icon-refresh-left"></i>
<span>鍘嗗彶</span>
</span>
- <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
+ <span @click="handleAddGoods(scope.row)" class="margin_left_5px">
<i class="el-icon-refresh"></i>
<span>琛ヨ揣</span>
</span>
@@ -163,6 +163,7 @@
},
{
label: "鍦ㄥ簱鏁伴噺",
+ width:100,
prop: "amount",
isShowColumn: true,
default: true,
@@ -257,7 +258,7 @@
handleHistoryClick(row) {
console.log(row)
this.$router.push({
- name: "inboundOutboundDetail",
+ name: "outEnterLibrary",
params: {
keyWord:row.productTypeName,
produceId:row.produceId,
@@ -268,7 +269,15 @@
})
},
// 琛ヨ揣
- handleAddGoods() {}
+ handleAddGoods(row) {
+ this.$router.push({
+ name: 'orderPoint',
+ params:{
+ locationId:row.locationId,
+ locationName:row.locationName
+ }
+ })
+ }
}
}
</script>
diff --git a/src/views/reportForm/outboundDetail/index.vue b/src/views/reportForm/outboundDetail/index.vue
index e7c63ca..02fef43 100644
--- a/src/views/reportForm/outboundDetail/index.vue
+++ b/src/views/reportForm/outboundDetail/index.vue
@@ -118,11 +118,11 @@
},
{
label: "涓氬姟绫诲瀷",
- prop: "baseOperationType",
+ prop: "operationTypeName",
isShowColumn: true,
default: true,
- conversion: true,
- getStatus: this.getBaseOperationTypeList
+ // conversion: true,
+ // getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
--
Gitblit v1.8.0