Commit 790bbe36 by liangzhen

暂存下

1 parent 4f65a5c2
...@@ -11,10 +11,13 @@ ...@@ -11,10 +11,13 @@
"@wangeditor/editor-for-vue": "^1.0.2", "@wangeditor/editor-for-vue": "^1.0.2",
"axios": "^1.6.2", "axios": "^1.6.2",
"core-js": "^3.8.3", "core-js": "^3.8.3",
"docx-preview": "^0.3.2",
"echarts": "^5.5.0", "echarts": "^5.5.0",
"el-table-horizontal-scroll": "^1.2.5", "el-table-horizontal-scroll": "^1.2.5",
"element-ui": "^2.15.14", "element-ui": "^2.15.14",
"jquery": "^3.7.1", "jquery": "^3.7.1",
"mammoth": "^1.7.2",
"moment": "^2.30.1",
"scss": "^0.2.4", "scss": "^0.2.4",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-cli": "^2.9.6", "vue-cli": "^2.9.6",
......
...@@ -255,8 +255,12 @@ export function tjrectificationVerification(params) { ...@@ -255,8 +255,12 @@ export function tjrectificationVerification(params) {
//材料同步归档 //材料同步归档
//列表 //列表
export function materialSync(params) { export function tbgdrectificationVerification(params) {
return post(`${ARCH_EVALUATION}/materialSync/`, params) return post(`${ARCH_EVALUATION}/rectificationVerification/tbgd`, params)
}
//归档
export function gdrectificationVerification(params) {
return post(`${ARCH_EVALUATION}/rectificationVerification/gd`, params)
} }
//下载 //下载
......
...@@ -54,8 +54,8 @@ export function MaterialsListKY(type) { ...@@ -54,8 +54,8 @@ export function MaterialsListKY(type) {
break; break;
case 2: case 2:
return [ return [
{ batchtype: "计划", typeText: "公司下达计划信息", typeCode: "4" },
{ batchtype: "可研", typeText: "可研批复", typeCode: "2" }, { batchtype: "可研", typeText: "可研批复", typeCode: "2" },
{ batchtype: "计划", typeText: "公司下达计划信息", typeCode: "4" },
] ]
break break
case 3: case 3:
......
...@@ -131,6 +131,11 @@ export function trendsRules(type) { ...@@ -131,6 +131,11 @@ export function trendsRules(type) {
url: "/mainLayout/correctiveAssistanceVerification", url: "/mainLayout/correctiveAssistanceVerification",
children: [], children: [],
}, },
{
name: "同步归档",
url: "/mainLayout/attachSynchronousArchiving",
children: [],
},
], ],
}, },
], ],
...@@ -163,11 +168,11 @@ export function trendsRules(type) { ...@@ -163,11 +168,11 @@ export function trendsRules(type) {
// url: "/mainLayout/assistedRect", // url: "/mainLayout/assistedRect",
// children: [], // children: [],
// }, // },
// { {
// name: "专家同步归档", name: "同步归档",
// url: "/mainLayout/attachSynchronousArchiving", url: "/mainLayout/attachSynchronousArchiving",
// children: [], children: [],
// }, },
], ],
}, },
], ],
...@@ -327,11 +332,11 @@ export function trendsRules(type) { ...@@ -327,11 +332,11 @@ export function trendsRules(type) {
url: "/mainLayout/correctiveAssistanceVerification", url: "/mainLayout/correctiveAssistanceVerification",
children: [], children: [],
}, },
// { {
// name: "专家同步归档", name: "同步归档",
// url: "/mainLayout/attachSynchronousArchiving", url: "/mainLayout/attachSynchronousArchiving",
// children: [], children: [],
// }, },
], ],
}, },
{ {
......
...@@ -514,6 +514,8 @@ export default { ...@@ -514,6 +514,8 @@ export default {
this.$set(item, "reviewText", "需整改"); this.$set(item, "reviewText", "需整改");
} else if (item.reviewStatus == "2") { } else if (item.reviewStatus == "2") {
this.$set(item, "reviewText", "已整改"); this.$set(item, "reviewText", "已整改");
}else if (item.reviewStatus == "3") {
this.$set(item, "reviewText", "已归档");
} }
this.$set( this.$set(
item, item,
......
...@@ -389,6 +389,13 @@ export default { ...@@ -389,6 +389,13 @@ export default {
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
timeChange(time) {
if (time) {
//给后端的参数
this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1];
}
},
async submitForm() { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
...@@ -412,6 +419,8 @@ export default { ...@@ -412,6 +419,8 @@ export default {
this.$set(item, "reviewStatusText", "需整改"); this.$set(item, "reviewStatusText", "需整改");
} else if (item.reviewStatus == "2") { } else if (item.reviewStatus == "2") {
this.$set(item, "reviewStatusText", "已整改"); this.$set(item, "reviewStatusText", "已整改");
}else if (item.reviewStatus == "3") {
this.$set(item, "reviewStatusText", "已归档");
} }
this.$set( this.$set(
item, item,
......
...@@ -229,6 +229,13 @@ export default { ...@@ -229,6 +229,13 @@ export default {
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
timeChange(time) {
if (time) {
//给后端的参数
this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1];
}
},
async submitForm() { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
...@@ -261,6 +268,8 @@ export default { ...@@ -261,6 +268,8 @@ export default {
this.$set(item, "reviewStatusText", "需整改"); this.$set(item, "reviewStatusText", "需整改");
} else if (item.reviewStatus == "2") { } else if (item.reviewStatus == "2") {
this.$set(item, "reviewStatusText", "已整改"); this.$set(item, "reviewStatusText", "已整改");
}else if (item.reviewStatus == "3") {
this.$set(item, "reviewStatusText", "已归档");
} }
this.$set( this.$set(
item, item,
......
...@@ -727,6 +727,9 @@ export default { ...@@ -727,6 +727,9 @@ export default {
//给后端的参数 //给后端的参数
this.ruleForm.createStartTime = time[0]; this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1]; this.ruleForm.createEndTime = time[1];
}else{
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
...@@ -750,7 +753,7 @@ export default { ...@@ -750,7 +753,7 @@ export default {
this.$set(item, "postEvalStateText", "已撤回"); this.$set(item, "postEvalStateText", "已撤回");
} else if (item.postEvalState == "1") { } else if (item.postEvalState == "1") {
this.$set(item, "postEvalStateText", "已发起"); this.$set(item, "postEvalStateText", "已发起");
} else if (item.postEvalState == "3") { } else if (item.postEvalState == "3"||item.postEvalState == "4") {
this.$set(item, "postEvalStateText", "执行中"); this.$set(item, "postEvalStateText", "执行中");
} else if (item.postEvalState == "5") { } else if (item.postEvalState == "5") {
this.$set(item, "postEvalStateText", "已完成"); this.$set(item, "postEvalStateText", "已完成");
......
...@@ -404,7 +404,7 @@ export default { ...@@ -404,7 +404,7 @@ export default {
const binaryData = [] const binaryData = []
binaryData.push(resUrl) binaryData.push(resUrl)
let URL = window.URL.createObjectURL(new Blob(binaryData, { type: this.urlList[0].contentType})) let URL = window.URL.createObjectURL(new Blob(binaryData, { type: this.urlList[0].contentType}))
this.iframeUrl = "/pdf/web/viewer.html?file=" + URL this.iframeUrl = URL
} }
// setTimeout(() => { // setTimeout(() => {
// this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList)); // this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList));
......
...@@ -679,10 +679,14 @@ export default { ...@@ -679,10 +679,14 @@ export default {
}, },
methods: { methods: {
timeChange(time) { timeChange(time) {
console.log('tttttt',time)
if (time) { if (time) {
//给后端的参数 //给后端的参数
this.ruleForm.createStartTime = time[0]; this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1]; this.ruleForm.createEndTime = time[1];
}else{
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
......
...@@ -584,6 +584,8 @@ export default { ...@@ -584,6 +584,8 @@ export default {
this.$set(item, "reviewText", "需整改"); this.$set(item, "reviewText", "需整改");
} else if (item.reviewStatus == "2") { } else if (item.reviewStatus == "2") {
this.$set(item, "reviewText", "已整改"); this.$set(item, "reviewText", "已整改");
}else if (item.reviewStatus == "3") {
this.$set(item, "reviewText", "已归档");
} }
this.$set( this.$set(
item, item,
......
...@@ -393,6 +393,10 @@ export default { ...@@ -393,6 +393,10 @@ export default {
//给后端的参数 //给后端的参数
this.ruleForm.planStartTime = time[0]; this.ruleForm.planStartTime = time[0];
this.ruleForm.planEndTime = time[1]; this.ruleForm.planEndTime = time[1];
}else{
//给后端的参数
this.ruleForm.planStartTime ="";
this.ruleForm.planEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!