From 7d99f6d5a6c7b7ba21cc234e1135d369a78dc8f5 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 20 十二月 2022 16:44:44 +0800
Subject: [PATCH] 修改
---
src/views/layout/components/Navbar.vue | 2 +-
src/views/specialCheck/components/wholesaleForm.vue | 6 +++++-
src/views/selfCheck/components/selfReport.vue | 7 ++++---
src/views/specialCheck/index.vue | 2 ++
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 870bb71..0395241 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -137,7 +137,7 @@
const res = response.data;
if (res.code == 200) {
const result = res.result;
- _this.appCode = result.fileurl
+ _this.appCode = process.env.IMG_API + result.fileurl
}
}).catch(error => {
})
diff --git a/src/views/selfCheck/components/selfReport.vue b/src/views/selfCheck/components/selfReport.vue
index 6300b94..ccdb390 100644
--- a/src/views/selfCheck/components/selfReport.vue
+++ b/src/views/selfCheck/components/selfReport.vue
@@ -15,7 +15,7 @@
<span v-if="licenceValidStatus == 0">在有效期（有效期至：{{licenceValidDeadline}}）</span>
<span v-else>已过期</span>
</div>
- <div><span>库存：</span><span>{{stockNum}}</span></div>
+ <div><span>库存：</span><span>{{checkForm.stockNum}}</span></div>
<div><span>库容：</span>
<span>
<el-input placeholder="请输入库容量" type="number" v-model="checkForm.storageCapacity"></el-input>
@@ -89,8 +89,8 @@
enterpriseName: '',
licenceValidStatus: 0,
licenceValidDeadline: '',
- stockNum: 0,
checkForm:{
+ stockNum: null,
storageCapacity: null,
hiddendangerStatus: null,
submitHiddendangers: [
@@ -148,7 +148,7 @@
t.enterpriseName = res.data.result.enterpriseName
t.licenceValidStatus = res.data.result.licenceValidStatus
t.licenceValidDeadline = res.data.result.licenceValidDeadline
- t.stockNum = res.data.result.stockNum
+ t.checkForm.stockNum = res.data.result.stockNum
}else{
t.$message({
type:'warning',
@@ -204,6 +204,7 @@
},
reset(){
this.checkForm = {
+ stockNum: null,
storageCapacity: null,
hiddendangerStatus: null,
submitHiddendangers: [
diff --git a/src/views/specialCheck/components/wholesaleForm.vue b/src/views/specialCheck/components/wholesaleForm.vue
index 4273cfc..f7430f9 100644
--- a/src/views/specialCheck/components/wholesaleForm.vue
+++ b/src/views/specialCheck/components/wholesaleForm.vue
@@ -59,7 +59,11 @@
<el-table-column type="index" label="序号" align="center" width="80"/>
<el-table-column label="单位名称" prop="enterpriseName" align="center" width="180"></el-table-column>
<el-table-column label="联系电话" prop="enterpriseOfficephone" align="center"></el-table-column>
- <el-table-column label="库存数量/箱" prop="stockNum" align="center"></el-table-column>
+ <el-table-column label="填报时库存数量/箱" prop="stockNum" align="center">
+ <template slot-scope="scope">
+ <span>{{ scope.row.stockNum == null ? '--' : scope.row.stockNum }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="是否查出隐患" prop="hiddendangerStatus" align="center">
<template slot-scope="scope">
<span>{{ scope.row.hiddendangerStatus == 1 ? '是' : '否' }}</span>
diff --git a/src/views/specialCheck/index.vue b/src/views/specialCheck/index.vue
index 8080813..6f64d86 100644
--- a/src/views/specialCheck/index.vue
+++ b/src/views/specialCheck/index.vue
@@ -106,6 +106,8 @@
menuSelect(key, keyPath) {
const t = this
+ t.$refs.wholesale.currentPage = 1
+ t.$refs.wholesale.pageSize = 10
if(key.split('-')[1] == '1' || key.split('-')[1] == '2'){
t.$refs.wholesale.taskId = Number(keyPath[0].split('-')[0])
t.$refs.wholesale.taskName = keyPath[0].split('-')[1]
--
Gitblit v1.9.2