Skip to content

F
founder_vue
Commit 71a84859 by huangdang
Options

fix: 成果测试修改

parent e4bbe86d
Showing with 265 additions and 69 deletions
src/components/form.vue
......@@ -2212,31 +2212,31 @@ $-header-fontSize: 18px;
.caijiIcon {
margin-right: 5px;
}
/deep/.el-input__inner,
/deep/.el-textarea__inner {
::v-deep.el-input__inner,
::v-deep.el-textarea__inner {
background: #fdfdfd !important;
height: auto;
}
/deep/.el-textarea {
::v-deep.el-textarea {
vertical-align: top;
width: calc(100% - 30px);
}
/deep/.el-input__inner {
::v-deep.el-input__inner {
height: 32px;
}
/deep/.el-checkbox-button,
/deep/.el-checkbox-button__inner {
::v-deep.el-checkbox-button,
::v-deep.el-checkbox-button__inner {
min-width: 74px;
height: 24px;
border-radius: 2px !important;
padding: 6px 4px !important;
margin-top: -10px !important;
}
/deep/.el-upload-list__item.is-success
/deep/.el-upload-list__item-status-label {
::v-deep.el-upload-list__item.is-success
::v-deep.el-upload-list__item-status-label {
line-height: 36px;
}
/deep/.el-date-editor--daterange {
::v-deep.el-date-editor--daterange {
.el-range-separator {
line-height: 20px;
}
......@@ -2270,7 +2270,7 @@ $-header-fontSize: 18px;
// 表单元素的真实容器
.zdyLine {
/deep/.el-form-item {
::v-deep.el-form-item {
margin-bottom: 15px !important;
}
......@@ -2278,13 +2278,13 @@ $-header-fontSize: 18px;
position: relative;
}
/deep/ .el-button--primary {
::v-deep .el-button--primary {
background: #3670ff;
box-shadow: 0px 4px 6px rgba(26, 129, 225, 0.12);
}
/deep/ .el-form-item__content,
/deep/ .el-form-item__label {
::v-deep .el-form-item__content,
::v-deep .el-form-item__label {
line-height: 32px;
color: #666666;
}
......@@ -2316,7 +2316,7 @@ $-header-fontSize: 18px;
.item3 {
display: inline-block;
width: 25%;
/deep/ .el-input .el-input--suffix,
::v-deep .el-input .el-input--suffix,
.el-date-editor {
width: 100%;
}
......@@ -2328,7 +2328,7 @@ $-header-fontSize: 18px;
.zdycol2 {
display: inline-block;
width: 33.33%;
/deep/ .el-input .el-input--suffix,
::v-deep .el-input .el-input--suffix,
.el-date-editor {
width: 100%;
}
......@@ -2362,7 +2362,7 @@ $-header-fontSize: 18px;
width: 40%;
margin-right: 20%;
display: inline-block;
/deep/ .el-date-editor {
::v-deep .el-date-editor {
width: 100% !important;
}
}
......@@ -2384,7 +2384,7 @@ $-header-fontSize: 18px;
width: auto;
margin-left: 160px;
display: inline-block;
/deep/.el-checkbox-button {
::v-deep.el-checkbox-button {
.el-checkbox-button__inner {
padding-left: 0px !important;
}
......@@ -2407,7 +2407,7 @@ $-header-fontSize: 18px;
.item16 {
width: 66%;
display: inline-block;
/deep/ .el-input {
::v-deep .el-input {
width: calc(91% + 2px) !important;
}
}
......@@ -2455,11 +2455,11 @@ $-header-fontSize: 18px;
}
.upload-demo {
/deep/.el-icon-close {
::v-deep.el-icon-close {
top: 12px;
right: 4px;
}
/deep/.el-button {
::v-deep.el-button {
border-radius: 2px;
}
}
......@@ -2540,12 +2540,12 @@ $-header-fontSize: 18px;
color: #8c97a0;
cursor: pointer;
}
/deep/ .el-input__inner {
::v-deep .el-input__inner {
background: #ffffff !important;
height: 29px;
}
/deep/ .el-form-item:nth-child(1),
/deep/ .el-form-item:nth-child(2) {
::v-deep .el-form-item:nth-child(1),
::v-deep .el-form-item:nth-child(2) {
margin-top: 0px;
}
}
......@@ -2589,7 +2589,7 @@ $-header-fontSize: 18px;
height: 40px;
}
}
/deep/.treeDialog {
::v-deep.treeDialog {
width: 680px;
background: #ffffff;
box-shadow: 0px 8px 8px rgba(0, 0, 0, 0.1);
......@@ -2654,11 +2654,11 @@ $-header-fontSize: 18px;
}
}
}
#formCommonPage .el-input.is-disabled /deep/ .el-input__inner {
#formCommonPage .el-input.is-disabled ::v-deep .el-input__inner {
color: #606266 !important;
background-color: #f1f3f4 !important;
}
#formCommonPage /deep/ .zdyInputW .el-select .is-disabled .el-input__inner {
#formCommonPage ::v-deep .zdyInputW .el-select .is-disabled .el-input__inner {
color: #606266 !important;
background-color: #f1f3f4 !important;
}
......@@ -2682,7 +2682,7 @@ $-header-fontSize: 18px;
background-color: rgba(0, 0, 0, 0.6);
}
/* /deep/ .avatar-uploader /deep/ .el-upload {
/* ::v-deep .avatar-uploader ::v-deep .el-upload {
border: 1px dashed #d9d9d9;
background: #fff !important;
border-radius: 6px;
......@@ -2690,10 +2690,10 @@ $-header-fontSize: 18px;
position: relative;
overflow: hidden;
}
/deep/ .avatar-uploader /deep/ .el-upload:hover {
::v-deep .avatar-uploader ::v-deep .el-upload:hover {
border-color: #409eff;
}
/deep/ .avatar-uploader-icon {
::v-deep .avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 60px;
......@@ -2701,7 +2701,7 @@ $-header-fontSize: 18px;
line-height: 60px;
text-align: center;
} */
/* /deep/ .avatar {
/* ::v-deep .avatar {
width: 60px;
height: 60px;
display: block;
......@@ -2727,22 +2727,22 @@ $-header-fontSize: 18px;
top: 0px;
left: 0px;
} */
.redColor /deep/ .el-form-item__label {
.redColor ::v-deep .el-form-item__label {
color: red;
}
/deep/ .zdyCodeDialog {
::v-deep .zdyCodeDialog {
opacity: 0;
}
/deep/ .uoloadSty /deep/ .el-upload--picture-card,
/deep/ .avatar-uploader-icon {
::v-deep .uoloadSty ::v-deep .el-upload--picture-card,
::v-deep .avatar-uploader-icon {
width: 150px;
height: 185px;
line-height: 185px;
}
.disUoloadSty /deep/ .el-upload--picture-card {
.disUoloadSty ::v-deep .el-upload--picture-card {
display: none; /* 上传按钮隐藏 */
}
/deep/ .is-required .el-form-item__label {
::v-deep .is-required .el-form-item__label {
color: red;
}
</style>
src/views/rzcx/addCgcs.vue
......@@ -15,7 +15,11 @@
<el-row :gutter="20">
<el-col :span="8"
><div class="grid-content bg-purple">
<el-form-item label="标题">
<el-form-item
label="标题"
prop="bt"
:rules="{ required: true, message: '请输入标题', trigger: 'blur' }"
>
<el-input v-model="form.bt"></el-input>
</el-form-item></div
></el-col>
......@@ -27,13 +31,21 @@
></el-col> -->
<el-col :span="8"
><div class="grid-content bg-purple">
<el-form-item label="测试人员">
<el-form-item
label="测试人员"
prop="csry"
:rules="{ required: true, message: '请输入测试人员', trigger: 'blur' }"
>
<el-input v-model="form.csry"></el-input>
</el-form-item></div
></el-col>
<el-col :span="8"
><div class="grid-content bg-purple">
<el-form-item label="测试结果">
<el-form-item
label="测试结果"
prop="csjg"
:rules="{ required: true, message: '请输入测试结果', trigger: 'blur' }"
>
<el-input v-model="form.csjg"></el-input>
</el-form-item></div
></el-col>
......@@ -49,7 +61,11 @@
<el-row :gutter="20">
<el-col :span="24"
><div class="grid-content bg-purple">
<el-form-item label="测试内容">
<el-form-item
label="测试内容"
prop="csnr"
:rules="{ required: true, message: '请输入测试内容', trigger: 'blur' }"
>
<el-input
v-model="form.csnr"
type="textarea"
......@@ -100,28 +116,47 @@ export default {
},
methods: {
save() {
// this.form.zzdw = JSON.parse(sessionStorage.getItem("userInfo")).unitcode;
this.form.glxxzjbh = this.$route.query.xxzjbh;
this.doQueryRequest(this.form, "/ypzc/saveYpzccgcs").then((res) => {
if (res.code == 200) {
this.$message.success("保存成功");
this.$router.push({
path: "/rzcxIndex/jszcyyglCgcs",
query: {
xxzjbh: this.$route.query.xxzjbh,
},
this.$refs.form.validate((valid) => {
if (valid) {
this.form.glxxzjbh = this.$route.query.xxzjbh;
this.doQueryRequest(this.form, "/ypzc/saveYpzccgcs").then((res) => {
if (res.code == 200) {
this.$message.success("保存成功");
this.$router.push({
path: "/rzcxIndex/jszcyyglCgcs",
query: {
xxzjbh: this.$route.query.xxzjbh,
},
});
}
});
} else {
console.log('error submit!!');
return false;
}
});
},
update() {
this.doQueryRequest(this.form, "/ypzc/updateYpzccgcs").then((res) => {
if (res.code == 200) {
this.$message.success("修改成功！");
this.$refs.form.validate((valid) => {
if (valid) {
this.doQueryRequest(this.form, "/ypzc/updateYpzccgcs").then((res) => {
if (res.code == 200) {
this.$message.success("修改成功！");
this.$router.push({
path: "/rzcxIndex/jszcyyglCgcs",
query: {
xxzjbh: this.$route.query.bh,
},
});
} else {
this.$message.error("修改失败！");
}
});
} else {
this.$message.error("修改成功！");
console.log('error')
}
});
})
},
getDetail() {
this.doQueryRequest(
......@@ -163,6 +198,7 @@ export default {
opacity: 1;
border-radius: 8px;
margin: 20px auto;
padding-right: 20px;
.subTitle {
display: flex;
align-items: center;
......
src/views/rzcx/cgcsDetail.vue
<template>
<div>
123
<div class="formContent" v-loading="loading">
<div class="subTitle">
<span class="subTitle_shuxian"></span>
<div class="subTitle_title">成果测试详情</div>
</div>
<div class="infos">
<div :class="'infoWrap'+item.index" v-for="item in infoList" :key="item.id">
<span class="name">{{ item.name }}:</span>
<span class="infoContent">{{ item.content }}</span>
</div>
</div>
</div>
</template>
<script>
import url from "@/api/base";
import request from "@/utils/axiosHttp.js";
import qs from "qs";
export default {
}
data() {
return {
loading: false,
infoList: [
{
name: "标题",
id: "bt",
content: "",
index:1
},
{
name: "测试人员",
id: "csry",
content: "",
index:1
},
{
name: "测试结果",
id: "csjg",
content: "",
index:1
},
{
name: "评估结果",
id: "pgjg",
content: "",
index:1
},
{
name: "组织单位",
id: "zzdwmc",
content: "",
index:1
},
{
name: "测试内容",
id: "csnr",
content: "",
index:2
},
],
};
},
methods: {
getShuju() {
this.doQueryRequest(
{ xxzjbh: this.$route.query.id },
"/ypzc/getYpcgcsxq"
).then(res => {
console.log(res)
if (res.code == 200) {
this.infoList.forEach((item) => {
if (item.id) {
this.$set(item, "content", res.data.cgcs[item.id]);
}
});
console.log(this.infoList);
this.loading = false;
}
});
},
doQueryRequest(form, cxUrl) {
/*post方法*/
return request({
url: url.rzURL + cxUrl,
data: qs.stringify(form),
method: "post",
headers: {
"content-type": "application/x-www-form-urlencoded",
},
});
},
},
created() {
if (this.$route.query.id) {
this.getShuju();
this.loading = true;
}
},
};
</script>
<style lang="scss" scoped>
<style scoped lang="scss">
.formContent {
width: 1180px;
background: #ffffff;
border: 1px solid #e4e4e4;
opacity: 1;
border-radius: 8px;
margin: 20px auto;
.subTitle {
display: flex;
align-items: center;
margin: 15px 20px;
.subTitle_shuxian {
width: 4px;
height: 16px;
background: #ff8d1e;
opacity: 1;
margin-right: 12px;
}
.subTitle_title {
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #1a1a1a;
opacity: 1;
}
}
.btnWrap {
text-align: right;
margin: 10px 20px;
}
.infos{
display: flex;
flex-wrap: wrap;
margin: 20px;
}
.infoWrap1{
width: 50%;
}
.infoWrap2{
width: 100%;
}
.name {
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #272626;
}
.infoContent {
font-size: 16px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #000000;
margin-left: 10px;
}
}
</style>
\ No newline at end of file
src/views/rzcx/jszcyyglCgcs.vue
......@@ -10,6 +10,7 @@
:isPost="true"
:pageType='pageType'
@add="add($route.query)"
@godetail="godetail"
>
<template v-slot:tool="row">
<el-button
......@@ -72,6 +73,7 @@ export default {
{
label: "标题",
prop: "bt",
toInfo: true,
},
{
/*table默认得表头*/
......@@ -123,7 +125,8 @@ export default {
this.$router.push({
path: '/addCgcs',
query: {
id: e.xxzjbh
id: e.xxzjbh,
bh: this.$route.query.xxzjbh
}
})
},
......@@ -139,7 +142,15 @@ export default {
}).catch(() => {
});
},
godetail(e) {
console.log(e)
this.$router.push({
path: '/cgcsDetail',
query: {
id: e.xxzjbh
}
})
},
doQueryRequest(form, cxUrl) {
/*post方法*/
......
src/views/rzcx/ydjwZdbbgl.vue
......@@ -156,14 +156,14 @@ export default {
<style scoped lang='scss'>
.fbxbb {
padding: 20px 5px;
/deep/.el-form-item__content {
::v-deep.el-form-item__content {
display: flex !important;
width: 63%;
}
/deep/.el-form-item__label {
::v-deep.el-form-item__label {
width: 20%;
}
/deep/.el-form-item__error {
::v-deep.el-form-item__error {
left: 0px;
top: 38px;
}
......
src/views/rzcx/ydsbgl.vue
......@@ -424,7 +424,7 @@ header {
border-radius: 8px 8px 8px 8px;
margin-bottom: 16px;
/deep/ .el-form {
::v-deep .el-form {
padding: 0 32px;
.el-form-item__content {
......@@ -437,7 +437,7 @@ header {
background: #ffffff;
border-radius: 8px 8px 8px 8px;
/deep/ .tableCon {
::v-deep .tableCon {
padding: 0 20px;
}
}
......@@ -445,12 +445,12 @@ header {
position: initial !important;
}
.dialogBd {
/deep/.el-dialog {
::v-deep.el-dialog {
max-height: 620px;
overflow: hidden;
border-radius: 8px;
}
/deep/.el-dialog__body {
::v-deep.el-dialog__body {
height: 240px;
overflow-y: auto;
padding: 10px 20px 0 20px !important;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment