diff --git a/src/assets/css/process.scss b/src/assets/css/process.scss
index 25c0d5d..3b95180 100644
--- a/src/assets/css/process.scss
+++ b/src/assets/css/process.scss
@@ -43,7 +43,20 @@
.el-form-item .el-input__inner {
height: 40px;
line-height: 40px;
- font-size: 15px;
+ font-size: 14px;
+ }
+ .el-date-editor.el-input{
+ width: 100%;
+ .el-input__inner{
+ padding-left: 15px !important;
+ }
+ }
+ .el-cascader {
+ width: 100%;
+ .el-input__inner{
+ height: 40px !important;
+ line-height: 40px !important;
+ }
}
.el-select{
width: 100%;
@@ -57,6 +70,18 @@
line-height: 40px;
}
}
+ .is-diable{
+ .ti-input{
+ background-color: #F5F7FA;
+ border-color: #E4E7ED;
+ color: #C0C4CC;
+ cursor: not-allowed;
+ .ti-new-tag-input{
+ cursor: not-allowed;
+ }
+ }
+
+ }
}
.blurcolor{
color: #1890FF ;
diff --git a/src/router/modules/reportProcess.js b/src/router/modules/reportProcess.js
new file mode 100644
index 0000000..d152f20
--- /dev/null
+++ b/src/router/modules/reportProcess.js
@@ -0,0 +1,29 @@
+const routes = [
+ // 报告管理
+ {
+ path: '/reportprocess',
+ name: 'Layout',
+ component: () => import('../../views/Layout.vue'),
+ children: [
+ // 报告列表
+ {
+ path: 'launch',
+ name: 'urlIndex',
+ component: () => import('../../views/reportProcess/launch'),
+ meta: {
+ crumb: ['上传报告']
+ }
+ },
+ {
+ path: 'examine',
+ name: 'urlIndex',
+ component: () => import('../../views/reportProcess/examine'),
+ meta: {
+ crumb: ['报告审批']
+ }
+ }
+ ]
+ }
+]
+
+export default routes
diff --git a/src/views/Login.vue b/src/views/Login.vue
index a09383a..ab565b0 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -115,6 +115,9 @@ export default {
this.getMarket().then((resx)=>{
this.$store.commit('setMarketpre', resx)
this.$router.push({ path: '/report/list', query: { id: 'AEHJB8YNJ3' } })
+ }).catch((resx)=>{
+ this.$store.commit('setMarketpre', resx)
+ this.$router.push({ path: '/report/list', query: { id: 'AEHJB8YNJ3' } })
})
}).catch(_ => {
@@ -132,8 +135,15 @@ export default {
getMarket () {
return new Promise((resolve,reject)=>{
this.$api.setting.getOneSetting("水印前缀").then(res=>{
- resolve(res.data.configValue)
+ if(res.data){
+ resolve(res.data.configValue)
+
+ }else{
+ resolve('')
+ }
})
+ }).catch(()=>{
+ reject('')
})
}
}
diff --git a/src/views/baseMes/index.vue b/src/views/baseMes/index.vue
index db815d0..3ef2ac6 100644
--- a/src/views/baseMes/index.vue
+++ b/src/views/baseMes/index.vue
@@ -35,9 +35,14 @@ export default {
//获取水印前缀
loadMark(){
this.$api.setting.getAllSetting().then(res=>{
- if(res.data){
+ if(res.data.length>0){
this.formData=res.data
console.log(res.data.data,"res.data.data")
+ }else{
+ this.formData=[{
+ configKey:'水印前缀',
+ configValue:''
+ }]
}
})
},
diff --git a/src/views/reportProcess/components/AuditOperation.vue b/src/views/reportProcess/components/AuditOperation.vue
new file mode 100644
index 0000000..cc1e466
--- /dev/null
+++ b/src/views/reportProcess/components/AuditOperation.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同意
+ 不同意
+
+
+
+
+
+
+
+ 审批意见:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue
new file mode 100644
index 0000000..88ff3da
--- /dev/null
+++ b/src/views/reportProcess/components/reportForm.vue
@@ -0,0 +1,281 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ data.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择文件
+
+
+
+
+
+
+
+ 选择文件
+
+
+
+
+
+
+
+
diff --git a/src/views/reportProcess/examine.vue b/src/views/reportProcess/examine.vue
new file mode 100644
index 0000000..a0240b5
--- /dev/null
+++ b/src/views/reportProcess/examine.vue
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ 指派信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+