From 8662474529c048622a366ccac4798595463cb302 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期五, 25 十一月 2022 17:31:39 +0800
Subject: [PATCH] 新增有效期限
---
src/views/purchase/cityInAndOut.vue | 2 +-
src/views/specialCheck/components/areaEnterprises.vue | 1 -
src/views/login/index.vue | 4 ++--
src/views/specialCheck/components/sumSheet.vue | 4 ++--
src/views/login/components/login-form.vue | 8 +++++++-
src/views/specialCheck/components/feedbackDetails.vue | 8 ++++----
src/views/specialCheck/index.vue | 1 -
src/views/selfCheck/components/supervisionDetails.vue | 4 ++--
src/styles/variables.scss | 2 +-
src/views/selfCheck/index.vue | 16 ++++++++++++++--
src/components/ThemePicker/index.vue | 4 ++--
src/styles/index.scss | 2 +-
src/views/stock/enterpriseSale.vue | 2 +-
13 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
index f678471..d677032 100644
--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@@ -1,7 +1,7 @@
<template>
<el-color-picker
v-model="theme"
- :predefine="['#409EFF', '#11a983', '#13c2c2', '#6959CD', '#f5222d', '#eb2f96', '#DB7093', '#e6a23c', '#8B8989', '#212121']"
+ :predefine="['#034ea2', '#11a983', '#13c2c2', '#6959CD', '#f5222d', '#eb2f96', '#DB7093', '#e6a23c', '#8B8989', '#212121']"
class="theme-picker"
popper-class="theme-picker-dropdown"
/>
@@ -10,7 +10,7 @@
<script>
const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#409EFF' // default color
+const ORIGINAL_THEME = '#034ea2' // default color
export default {
data() {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 2b32161..949e2b6 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -124,7 +124,7 @@
word-spacing: .05rem;
a {
- color: #42b983;
+ color: #034EA2;
font-weight: 600;
}
}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index ccfd6a0..58f2b5f 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -1,5 +1,5 @@
// base color
-$blue:#324157;
+$blue:#034EA2;
$light-blue:#3A71A8;
$red:#C03639;
$pink: #E65D6E;
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index cff96d7..47259b0 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -167,7 +167,7 @@
}
.title {
- width: 60px;
+ width: 100%;
height: 122px;
font-size: 30px;
font-family: PingFangSC-Medium, PingFang SC;
@@ -176,6 +176,8 @@
line-height: 42px;
margin: auto;
padding-top: 40px;
+ text-align: center;
+ letter-spacing: 4px;
}
.loginForm_username{
width: 364px;
@@ -209,6 +211,8 @@
height: 44px;
background: #CC1420;
border-radius: 4px;
+ line-height: 44px;
+ padding: 0 20px;
}
.loginForm_register_button_login{
width: 32px;
@@ -222,6 +226,8 @@
.loginForm_register_button {
width: 364px;
height: 44px;
+ line-height: 44px;
+ padding: 0 20px;
border-radius: 4px;
border: 1px solid #120C3F;
}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 83b99bb..78b072d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -459,7 +459,7 @@
.money{
font-size: 22px;
font-weight: bolder;
- color: #409EFF;
+ color: #034ea2;
}
}
}
@@ -476,7 +476,7 @@
font-size: 22px;
font-weight: bolder;
display: block;
- color: #409EFF;
+ color: #034ea2;
margin-bottom: 6px;
}
div{
diff --git a/src/views/purchase/cityInAndOut.vue b/src/views/purchase/cityInAndOut.vue
index e779860..c55efdb 100644
--- a/src/views/purchase/cityInAndOut.vue
+++ b/src/views/purchase/cityInAndOut.vue
@@ -265,7 +265,7 @@
}
.click-color{
- color: #409EFF;
+ color: #034ea2;
cursor: pointer;
}
diff --git a/src/views/selfCheck/components/supervisionDetails.vue b/src/views/selfCheck/components/supervisionDetails.vue
index 7fca71a..f08b203 100644
--- a/src/views/selfCheck/components/supervisionDetails.vue
+++ b/src/views/selfCheck/components/supervisionDetails.vue
@@ -45,7 +45,7 @@
<td class="w-20 overText">
<span v-if="!item.rectifyStatus">
未整改
- <span v-if="unitType == -1" style="cursor: pointer;color: #409EFF" @click="toRectify(item)">去整改</span>
+ <span v-if="unitType == -1" style="cursor: pointer;color: #034ea2" @click="toRectify(item)">去整改</span>
</span>
<span v-else>
{{item.completeRectifyTime + '整改完成'}}
@@ -223,7 +223,7 @@
if(res.data.code === "200"){
t.$message({
type:'success',
- message:res.data.message
+ message: '提交成功'
})
}else{
t.$message({
diff --git a/src/views/selfCheck/index.vue b/src/views/selfCheck/index.vue
index 3908fbc..17fe36c 100644
--- a/src/views/selfCheck/index.vue
+++ b/src/views/selfCheck/index.vue
@@ -29,14 +29,14 @@
<el-table-column label="整改情况" prop="rectifyStatus" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<span v-if="scope.row.rectifyStatus==0">无需整改</span>
- <el-button v-else-if="scope.row.rectifyStatus==1" type="text" @click="toRepair(scope.row)">去整改</el-button>
+ <el-button v-else-if="scope.row.rectifyStatus==1 && unitType==-1" type="text" @click="toRepair(scope.row)">去整改</el-button>
<span v-else-if="scope.row.rectifyStatus==2">已整改</span>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column label="详情" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button v-if="scope.row.selfcheckStatus == 0" type="text" @click="toReport(scope.row)">自查填报</el-button>
+ <el-button v-if="scope.row.selfcheckStatus == 0 && unitType==-1" type="text" @click="toReport(scope.row)">自查填报</el-button>
<el-button v-else type="text" @click="toDetail(scope.row)">查看详情</el-button>
</template>
</el-table-column>
@@ -69,6 +69,7 @@
import repair from "./components/repair"
import checkDetails from "./components/checkDetails"
import { getUnDoneCheckTask } from '@/api/selfCheck'
+ import { getCheckUnitType } from "@/api/specialCheck"
export default {
name: "selfCheck",
@@ -85,6 +86,7 @@
pageTotal: 0,
currentPage: 1,
tableKey: 0,
+ unitType: null,
checkData: []
}
},
@@ -112,6 +114,16 @@
this.getUncheckList()
},
+ async getCheckUnitType(){
+ const t = this
+ let res = await getCheckUnitType()
+ if(res.data.code === "200"){
+ t.unitType = res.data.result.checkUnitType
+ }else{
+ t.unitType = -1
+ }
+ },
+
toReport(row){
const t = this
t.$refs.report.dialogVisible = true
diff --git a/src/views/specialCheck/components/areaEnterprises.vue b/src/views/specialCheck/components/areaEnterprises.vue
index 0cdaabc..2369c01 100644
--- a/src/views/specialCheck/components/areaEnterprises.vue
+++ b/src/views/specialCheck/components/areaEnterprises.vue
@@ -73,7 +73,6 @@
methods:{
toCheck(row){
const t = this
- console.log(row.checkUnitType,'type')
if(row.checkUnitType == 4){
t.$refs.report.id = row.id
t.$refs.report.enterpriseType = t.enterpriseType
diff --git a/src/views/specialCheck/components/feedbackDetails.vue b/src/views/specialCheck/components/feedbackDetails.vue
index 0960aca..a104645 100644
--- a/src/views/specialCheck/components/feedbackDetails.vue
+++ b/src/views/specialCheck/components/feedbackDetails.vue
@@ -123,7 +123,7 @@
<div v-if="provinceCheckStatus == 1" class="record-list">
<div class="record-item">
<table class="record-table">
- <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
+ <tr class="m-color b-font" style="background: #034ea2;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
<tr>
<td class="m-color w-50">被检查企业名称</td>
<td class="m-color w-50">所属省市县</td>
@@ -205,7 +205,7 @@
<div v-if="cityCheckStatus == 1" class="record-list">
<div class="record-item">
<table class="record-table">
- <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
+ <tr class="m-color b-font" style="background: #034ea2;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
<tr>
<td class="m-color w-50">被检查企业名称</td>
<td class="m-color w-50">所属省市县</td>
@@ -287,7 +287,7 @@
<div v-if="areaCheckStatus == 1" class="record-list">
<div class="record-item">
<table class="record-table">
- <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
+ <tr class="m-color b-font" style="background: #034ea2;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
<tr>
<td class="m-color w-50">被检查企业名称</td>
<td class="m-color w-50">所属省市县</td>
@@ -1034,7 +1034,7 @@
width: 75%;
}
&.dark-bg{
- background: #409EFF;
+ background: #034ea2;
color: #fff;
}
&.overText{
diff --git a/src/views/specialCheck/components/sumSheet.vue b/src/views/specialCheck/components/sumSheet.vue
index 043a63c..084a020 100644
--- a/src/views/specialCheck/components/sumSheet.vue
+++ b/src/views/specialCheck/components/sumSheet.vue
@@ -464,7 +464,7 @@
border-left: 1px solid #ccc;
}
&.dark-bg{
- background: #409EFF;
+ background: #034ea2;
color: #fff;
}
}
@@ -481,7 +481,7 @@
.point-item{
cursor: pointer;
text-decoration: underline;
- color: #409EFF;
+ color: #034ea2;
}
.warning{
color: red;
diff --git a/src/views/specialCheck/index.vue b/src/views/specialCheck/index.vue
index a108f2d..beeaf74 100644
--- a/src/views/specialCheck/index.vue
+++ b/src/views/specialCheck/index.vue
@@ -81,7 +81,6 @@
let res = await getCheckUnitType()
if(res.data.code === "200"){
t.unitType = res.data.result.checkUnitType
- console.log(t.unitType,'type666')
}else{
t.$message({
type:'warning',
diff --git a/src/views/stock/enterpriseSale.vue b/src/views/stock/enterpriseSale.vue
index 5449c61..35dbefe 100644
--- a/src/views/stock/enterpriseSale.vue
+++ b/src/views/stock/enterpriseSale.vue
@@ -492,6 +492,6 @@
display:inline-block;
}
.click-color{
- color: #409EFF;
+ color: #034ea2;
}
</style>
--
Gitblit v1.9.2