Skip to content

Administrator / project_progress

Go to a project
Commit 853353a3 by liangzhen
Options

和智杰交互

1 parent a65bd740
Inline Side-by-side
Showing with 60 additions and 19 deletions
src/styles/common.scss
...@@ -125,3 +125,11 @@ $color-primary: #0d867f; ...@@ -125,3 +125,11 @@ $color-primary: #0d867f;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.myTooltips {
width: 80% !important;
background: gainsboro !important ;
color: #333 !important;
text-align: center;
position: absolute;
right: 0;
}
\ No newline at end of file
src/utils/http.js
...@@ -20,20 +20,32 @@ function decryptStringBySM4_CBC(str) {//使用sm4-cbc算法给字符串解密 ...@@ -20,20 +20,32 @@ function decryptStringBySM4_CBC(str) {//使用sm4-cbc算法给字符串解密
const decryptString = sm4.decryptCustom_CBC(str, 'ZkR_SiNoSOFT=568', 'GJwsXX_BzW=gJWJW'); const decryptString = sm4.decryptCustom_CBC(str, 'ZkR_SiNoSOFT=568', 'GJwsXX_BzW=gJWJW');
return decryptString; return decryptString;
} }
let loadingInstance
//http 请求拦截器 //http 请求拦截器
axios.interceptors.request.use(config => { axios.interceptors.request.use(config => {
console.log(config.url.indexOf('oss/upload'),'2222222oss/uploadStr')
if(config.url.indexOf('oss/upload')!='-1'||config.url.indexOf('oss/uploadStr')!='-1'){
loadingInstance = Loading.service({
lock: true,
text: '文件上传中,请耐心等待...',
// background: 'rgba(0, 0, 0, 0.7)'
});
}
// else{
// loadingInstance = Loading.service({
// lock: true,
// text: '加载中...',
// background: 'rgba(0, 0, 0, 0.7)'
// });
// }
config.headers['X-USER'] =sessionStorage.getItem('author'); config.headers['X-USER'] =sessionStorage.getItem('author');
config.headers['X-USER-NAME']=sessionStorage.getItem('authorName') config.headers['X-USER-NAME']=sessionStorage.getItem('authorName')
console.log(config.url.indexOf('oss/downloadObject')!='-1','config.url')
if(config.url.indexOf('oss/downloadObject')!='-1'){ if(config.url.indexOf('oss/downloadObject')!='-1'){
config.headers["Content-Type"] ='application/x-www-form-urlencoded' config.headers["Content-Type"] ='application/x-www-form-urlencoded'
config.headers['responseType']='blob' config.headers['responseType']='blob'
} }
// else if(config.url.indexOf('oss/upload')!='-1'){
// config.headers["Content-Type"] ='application/form-data'
// }
// config.headers.token = JSON.parse(localStorage.getItem('token')).token; // config.headers.token = JSON.parse(localStorage.getItem('token')).token;
...@@ -51,6 +63,9 @@ axios.interceptors.request.use(config => { ...@@ -51,6 +63,9 @@ axios.interceptors.request.use(config => {
//响应拦截器即异常处理 //响应拦截器即异常处理
axios.interceptors.response.use(response => { axios.interceptors.response.use(response => {
if (loadingInstance) {
loadingInstance.close();
}
let code = response.data.code; let code = response.data.code;
// response.header('Access-Control-Allow-Origin', 'http://localhost:8080') // response.header('Access-Control-Allow-Origin', 'http://localhost:8080')
......
src/views/assessChecks/assistedViewing.vue
...@@ -381,7 +381,10 @@ export default { ...@@ -381,7 +381,10 @@ export default {
}; };
}, },
mounted() { mounted() {
this.ruleForm.batchName = this.$route.query.batchName;
this.ruleForm.projectId = this.$route.query.projCode;
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
timeChange(time) { timeChange(time) {
......
src/views/assessChecks/auxiliarySelection.vue
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
v-model="ruleFormdialogAdd.planReviewDate" v-model="ruleFormdialogAdd.planReviewDate"
type="datetime" type="datetime"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="{ :picker-options="{
disabledDate: (time) => disabledDate: (time) =>
time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)), time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)),
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
v-model="ruleFormdialogBJ.planReviewDate" v-model="ruleFormdialogBJ.planReviewDate"
type="datetime" type="datetime"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="{ :picker-options="{
disabledDate: (time) => disabledDate: (time) =>
time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)), time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)),
......
src/views/compliance/taskConfigure.vue
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input <el-input
v-model="ruleFormdialogAdd.auditName" v-model="ruleFormdialogAdd.auditName"
trim
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
...@@ -165,7 +166,7 @@ ...@@ -165,7 +166,7 @@
<el-date-picker <el-date-picker
v-model="ruleFormdialogAdd.auditTime" v-model="ruleFormdialogAdd.auditTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间" placeholder="选择日期时间"
:picker-options="{ :picker-options="{
disabledDate: (time) => disabledDate: (time) =>
...@@ -678,7 +679,7 @@ ...@@ -678,7 +679,7 @@
<el-date-picker <el-date-picker
v-model="ruleFormdialogAdd.auditTime" v-model="ruleFormdialogAdd.auditTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间" placeholder="选择日期时间"
disabled disabled
> >
...@@ -864,7 +865,7 @@ ...@@ -864,7 +865,7 @@
:rules="rulesBJ" :rules="rulesBJ"
> >
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input v-model="ruleFormdialogBJ.auditName" clearable></el-input> <el-input v-model="ruleFormdialogBJ.auditName" trim clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="稽核方式:" prop="auditType" class="fromItem"> <el-form-item label="稽核方式:" prop="auditType" class="fromItem">
<el-select <el-select
...@@ -885,7 +886,7 @@ ...@@ -885,7 +886,7 @@
<el-date-picker <el-date-picker
v-model="ruleFormdialogBJ.auditTime" v-model="ruleFormdialogBJ.auditTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间" placeholder="选择日期时间"
:picker-options="{ :picker-options="{
disabledDate: (time) => disabledDate: (time) =>
...@@ -1162,6 +1163,9 @@ export default { ...@@ -1162,6 +1163,9 @@ export default {
message: "请输入稽核名称", message: "请输入稽核名称",
trigger: "change", trigger: "change",
}, },
{
validator: this.validateNoWhitespace,trigger: 'blur'
}
], ],
audiType: [ audiType: [
{ {
...@@ -1180,11 +1184,14 @@ export default { ...@@ -1180,11 +1184,14 @@ export default {
}, },
rulesBJ: { rulesBJ: {
auditName: [ auditName: [
// {
// required: true,
// message: "请输入稽核名称",
// trigger: "change",
// },
{ {
required: true, validator: this.validateNoWhitespace,trigger: 'change'
message: "请输入稽核名称", }
trigger: "change",
},
], ],
audiType: [ audiType: [
{ {
...@@ -1261,6 +1268,13 @@ export default { ...@@ -1261,6 +1268,13 @@ export default {
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
validateNoWhitespace(rule, value, callback) {
if (value.trim() === '') {
callback(new Error('名称不能为空仅包含空格'));
} else {
callback();
}
},
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
......
src/views/projectCheck/problemRectify.vue
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
<el-table-column prop="ruleType" label="问题解决佐证材料" width="auto"> <el-table-column prop="ruleType" label="问题解决佐证材料" width="auto">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && scope.row.sszzFileId" v-if="scope.row.sszzFileId"
> >
{{ scope.row.sszzFileName}} {{ scope.row.sszzFileName}}
<el-button @click="handleClickXZ(scope.row.sszzFileId,scope.row.sszzFileName)">下载</el-button> <el-button @click="handleClickXZ(scope.row.sszzFileId,scope.row.sszzFileName)">下载</el-button>
...@@ -523,7 +523,7 @@ export default { ...@@ -523,7 +523,7 @@ export default {
this.checkedList = this.$refs.multipleTable.selection; this.checkedList = this.$refs.multipleTable.selection;
if (this.checkedList[0]) { if (this.checkedList[0]) {
this.ruleFormdialog = this.checkedList[0]; this.ruleFormdialog = this.checkedList[0];
if (this.checkedList[0].rectificationStatusText != "待整改") { if (this.checkedList[0].rectificationStatusText != "待整改"&&this.checkedList[0].rectificationStatusText != "被退回"&&this.checkedList[0].rectificationStatusText != "待提交") {
this.confirmdisabled = true; this.confirmdisabled = true;
} }
} }
......
src/views/projectCheck/verificationRectify.vue
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
</p> </p>
</div> </div>
</el-dialog> </el-dialog>
<!-- 下发弹窗 --> <!-- 复核弹窗 -->
<el-dialog <el-dialog
title="稽核问题整改核验" title="稽核问题整改核验"
...@@ -370,7 +370,7 @@ ...@@ -370,7 +370,7 @@
> >
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && scope.row.sszzFileId" v-if="scope.row.sszzFileId"
> >
{{ scope.row.sszzFileName}} {{ scope.row.sszzFileName}}
<el-button @click="handleClickXZ(scope.row.sszzFileId,scope.row.sszzFileName)">下载</el-button> <el-button @click="handleClickXZ(scope.row.sszzFileId,scope.row.sszzFileName)">下载</el-button>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!