FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2021-12-06 15:43:44 +08:00
parent f5ab31bdcb e3f4405e2d
commit b3461a5f70
18 changed files with 449 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/empennage/index.vue
+2 -2
View File
@@ -13,7 +13,7 @@
style="height: 10px;width: 10px;margin-bottom: 3px" style="height: 10px;width: 10px;margin-bottom: 3px"
:src="item.icon" :src="item.icon"
v-if="index < 5"> v-if="index < 5">
<a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank"> <a v-if="index < 5" style="color: #0068B7;cursor: pointer" @click="openLinkUrl(item.url)" target="_blank">
<a v-if="item.name.length > 8"> {{ item.name.slice(0, 8) + '...' }}</a> <a v-if="item.name.length > 8"> {{ item.name.slice(0, 8) + '...' }}</a>
<a v-else>{{ item.name }}</a> <a v-else>{{ item.name }}</a>
</a> </a>
@@ -33,7 +33,7 @@
style="height: 10px;width: 10px;margin-bottom: 3px" style="height: 10px;width: 10px;margin-bottom: 3px"
:src="item.icon" :src="item.icon"
v-if="index < 5"> v-if="index < 5">
<a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank"> <a v-if="index < 5" style="color: #0068B7;cursor: pointer" @click="openLinkUrl(item.url)" target="_blank">
<a v-if="item.name.length > 8"> {{ item.name.slice(0, 8) + '...' }}</a> <a v-if="item.name.length > 8"> {{ item.name.slice(0, 8) + '...' }}</a>
<a v-else>{{ item.name }}</a> <a v-else>{{ item.name }}</a>
</a> </a>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+4 -2
View File
@@ -31,7 +31,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
@@ -47,6 +47,7 @@
</el-form-item> </el-form-item>
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled"> <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled
v-model="qbfsForm.draftTime" v-model="qbfsForm.draftTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@@ -64,7 +65,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态"> <el-select disabled v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option> <el-option label="完成" value="完成"></el-option>
@@ -88,6 +89,7 @@
</el-form-item> </el-form-item>
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled"> <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled
v-model="qbfsForm.releaseTime" v-model="qbfsForm.releaseTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+4 -2
View File
@@ -31,7 +31,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
@@ -47,6 +47,7 @@
</el-form-item> </el-form-item>
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled"> <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled
v-model="qbfsForm.draftTime" v-model="qbfsForm.draftTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@@ -72,7 +73,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态"> <el-select disabled v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option> <el-option label="完成" value="完成"></el-option>
@@ -96,6 +97,7 @@
</el-form-item> </el-form-item>
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled"> <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled
v-model="qbfsForm.releaseTime" v-model="qbfsForm.releaseTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+2 -2
View File
@@ -191,10 +191,10 @@ export default {
{required: true, message: '请输入企标名称', trigger: 'blur'}, {required: true, message: '请输入企标名称', trigger: 'blur'},
], ],
planStatus: [ planStatus: [
{required: true, message: '请选择计划状态', trigger: 'change'}, {required: true, message: '请选择计划状态', trigger: 'blur'},
], ],
reviseStatus: [ reviseStatus: [
{required: true, message: '请选择制修订状态', trigger: 'change'}, {required: true, message: '请选择制修订状态', trigger: 'blur'},
], ],
resPersonName: [ resPersonName: [
{required: true, message: '请输入评审责任人', trigger: 'blur'}, {required: true, message: '请输入评审责任人', trigger: 'blur'},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+4
View File
@@ -531,6 +531,9 @@ export default {
this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--' this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--'
this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--' this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
this.standShow = true this.standShow = true
}else{
if(this.qbfsForm.esName1 === this.selectList[0].esName ){
this.$message.warning('您选择的合并企标已经存在,请更改!')
}else{ }else{
this.qbfsForm.esId2 = this.selectList[0].id || '--' this.qbfsForm.esId2 = this.selectList[0].id || '--'
this.qbfsForm.esName2 = this.selectList[0].esName || '--' this.qbfsForm.esName2 = this.selectList[0].esName || '--'
@@ -538,6 +541,7 @@ export default {
this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--' this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
this.standShow2 = true this.standShow2 = true
} }
}
this.ListModel = false this.ListModel = false
} }
}, },
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+5 -3
View File
@@ -31,7 +31,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
@@ -47,6 +47,7 @@
</el-form-item> </el-form-item>
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled"> <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled
v-model="qbfsForm.draftTime" v-model="qbfsForm.draftTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@@ -63,7 +64,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态"> <el-select disabled v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option> <el-option label="完成" value="完成"></el-option>
@@ -87,6 +88,7 @@
</el-form-item> </el-form-item>
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled"> <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled
v-model="qbfsForm.releaseTime" v-model="qbfsForm.releaseTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@@ -257,7 +259,7 @@ export default {
renameEs: [ renameEs: [
{required: true, message: '请输入更名后企标名称', trigger:'blur'}, {required: true, message: '请输入更名后企标名称', trigger:'blur'},
], ],
cancelReason: [ renameReason: [
{required: true, message: '请输入更名原因', trigger:'blur'}, {required: true, message: '请输入更名原因', trigger:'blur'},
] ]
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+6 -6
View File
@@ -36,24 +36,24 @@
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.drafter" v-model="qbfsForm.drafterName"
placeholder="请输入起草人" placeholder="请输入起草人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.resPerson" v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人" placeholder="请输入评审责任人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.wgLeader" v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长" placeholder="请输入工作组组长"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+27 -2
View File
@@ -12,10 +12,11 @@
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="flex: auto; overflow: auto">
<process-title> <process-title v-if="showFlag">
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
<el-form <el-form
v-if="showFlag"
class="label-input-form prc-content-border" class="label-input-form prc-content-border"
label-width="150px" label-width="150px"
> >
@@ -54,6 +55,7 @@
</el-collapse> </el-collapse>
</div> </div>
</div> </div>
<loading :loading="formLoading">数据加载中...</loading>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
<el-timeline> <el-timeline>
@@ -273,7 +275,9 @@ export default {
commentText: "", commentText: "",
comName: "merge", comName: "merge",
qbfsForm: {}, qbfsForm: {},
formLoading: false,
approvalFlag: false, approvalFlag: false,
showFlag: true,
taskId: '', taskId: '',
bpnId: '', bpnId: '',
drawerTitle: "", drawerTitle: "",
@@ -316,8 +320,8 @@ export default {
if(this.taskId){ if(this.taskId){
this.approvalFlag = true this.approvalFlag = true
this.processTable() this.processTable()
}
this.getData(); this.getData();
}
}, },
methods: { methods: {
processTable() { processTable() {
@@ -344,6 +348,8 @@ export default {
}); });
}, },
getData() { getData() {
this.formLoading = true
this.showFlag = false
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
@@ -362,7 +368,25 @@ export default {
*/ */
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
switch (item.type){
case '1':
this.comName = "merge"
break
case '2':
this.comName = "delay"
break
case '3':
this.comName = "cancel"
break
case '4':
this.comName = "rename"
break
case '5':
this.comName = "establish"
break
}
this.qbfsForm = item; this.qbfsForm = item;
this.formLoading = false;
this.roleForm.dockUser = item.dockUser; this.roleForm.dockUser = item.dockUser;
this.roleForm.dockUserName = item.dockUserName; this.roleForm.dockUserName = item.dockUserName;
this.roleForm.countersigner = item.countersigner; this.roleForm.countersigner = item.countersigner;
@@ -446,6 +470,7 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
var json = Object.assign(qbzxdFrom, this.roleForm); var json = Object.assign(qbzxdFrom, this.roleForm);
console.log(json);
this.$http.get("lawss/activiti/startProcess", { type: "25" }, { this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+3 -3
View File
@@ -39,21 +39,21 @@
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.drafter" v-model="qbfsForm.drafterName"
placeholder="请输入起草人" placeholder="请输入起草人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.resPerson" v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人" placeholder="请输入评审责任人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.wgLeader" v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长" placeholder="请输入工作组组长"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+6 -6
View File
@@ -36,24 +36,24 @@
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.drafter" v-model="qbfsForm.drafterName"
placeholder="请输入起草人" placeholder="请输入起草人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.resPerson" v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人" placeholder="请输入评审责任人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.wgLeader" v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长" placeholder="请输入工作组组长"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+6 -6
View File
@@ -36,24 +36,24 @@
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.drafter" v-model="qbfsForm.drafterName"
placeholder="请输入起草人" placeholder="请输入起草人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.resPerson" v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人" placeholder="请输入评审责任人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.wgLeader" v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长" placeholder="请输入工作组组长"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+6 -6
View File
@@ -36,24 +36,24 @@
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.drafter" v-model="qbfsForm.drafterName"
placeholder="请输入起草人" placeholder="请输入起草人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.resPerson" v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人" placeholder="请输入评审责任人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.wgLeader" v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长" placeholder="请输入工作组组长"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+3 -2
View File
@@ -124,7 +124,8 @@ export default {
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
#accessStandardsAndRegulations { #accessStandardsAndRegulations {
height: 100%; //min-height: calc(100% - 20px);
height: inherit;
padding: 0 10px; padding: 0 10px;
background: #fff; background: #fff;
display: flex; display: flex;
@@ -147,7 +148,7 @@ export default {
flex-direction: column; flex-direction: column;
.el-tab-pane { .el-tab-pane {
height: 100%; height: 10px;
flex: auto; flex: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+11 -3
View File
@@ -67,6 +67,7 @@
</div> </div>
<div class="container"> <div class="container">
<loading :loading="tableLoading">数据获取中</loading> <loading :loading="tableLoading">数据获取中</loading>
<div class="table_info">
<el-table <el-table
:data="sarAccessListDatas" :data="sarAccessListDatas"
tooltip-effect="dark" tooltip-effect="dark"
@@ -156,6 +157,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
<pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination> @pageSizeChange="pageSizeChange"></pagination>
@@ -394,9 +396,11 @@ export default {
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
#listOfCountries { #listOfCountries {
height: 100%; //height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: calc(100% - 100px);
overflow-y: auto;
.container { .container {
display: flex; display: flex;
@@ -404,10 +408,14 @@ export default {
position: relative; position: relative;
flex: auto; flex: auto;
width: 100%; width: 100%;
height: calc(100% - 110px) !important; //height: calc(100% - 110px) !important;
height: calc(~'100% - 30px');
.table_info {
height: calc(70vh - 90px);
}
.pagination { .pagination {
position: static; position: inherit;
/deep/ .pagination-slot { /deep/ .pagination-slot {
padding: 0; padding: 0;
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+10 -2
View File
@@ -58,6 +58,7 @@
</div> </div>
<div class="container"> <div class="container">
<loading :loading="tableLoading">数据获取中</loading> <loading :loading="tableLoading">数据获取中</loading>
<div class="table_info">
<el-table <el-table
:data="sarAccessListDatas" :data="sarAccessListDatas"
tooltip-effect="dark" tooltip-effect="dark"
@@ -150,6 +151,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
<pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination> @pageSizeChange="pageSizeChange"></pagination>
@@ -374,9 +376,11 @@ export default {
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
#listOfCountries { #listOfCountries {
height: 100%; //height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: calc(100% - 100px);
overflow-y: auto;
.container { .container {
display: flex; display: flex;
@@ -385,8 +389,12 @@ export default {
flex: auto; flex: auto;
width: 100%; width: 100%;
//height: calc(~'100% - 105px - 56px') !important; //height: calc(~'100% - 105px - 56px') !important;
height: calc(~'100% - 30px');
.table_info {
height: calc(70vh - 90px);
}
.pagination { .pagination {
position: static; position: inherit;
/deep/ .pagination-slot { /deep/ .pagination-slot {
padding: 0; padding: 0;
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+10 -2
View File
@@ -68,6 +68,7 @@
</div> </div>
<div class="container"> <div class="container">
<loading :loading="tableLoading">数据获取中</loading> <loading :loading="tableLoading">数据获取中</loading>
<div class="table_info">
<el-table <el-table
:data="sarAccessListDatas" :data="sarAccessListDatas"
tooltip-effect="dark" tooltip-effect="dark"
@@ -150,6 +151,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
<pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination> @pageSizeChange="pageSizeChange"></pagination>
@@ -427,9 +429,11 @@ export default {
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
#listOfCountries { #listOfCountries {
height: 100%; //height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: calc(100% - 100px);
overflow-y: auto;
.container { .container {
display: flex; display: flex;
@@ -438,8 +442,12 @@ export default {
flex: auto; flex: auto;
width: 100%; width: 100%;
//height: calc(~'100% - 105px - 56px') !important; //height: calc(~'100% - 105px - 56px') !important;
height: calc(~'100% - 30px');
.table_info {
height: calc(70vh - 90px);
}
.pagination { .pagination {
position: static; position: inherit;
/deep/ .pagination-slot { /deep/ .pagination-slot {
padding: 0; padding: 0;
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+10 -3
View File
@@ -57,6 +57,7 @@
</div> </div>
<div class="container"> <div class="container">
<loading :loading="tableLoading">数据获取中</loading> <loading :loading="tableLoading">数据获取中</loading>
<div class="table_info">
<el-table <el-table
:data="sarAccessListDatas" :data="sarAccessListDatas"
tooltip-effect="dark" tooltip-effect="dark"
@@ -116,6 +117,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
<pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination> <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
</div> </div>
@@ -1370,9 +1372,11 @@ export default {
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
#listTracking { #listTracking {
height: 100%; //height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: calc(100% - 100px);
overflow-y: auto;
/deep/.el-form-item__label{ /deep/.el-form-item__label{
color: #333333; color: #333333;
} }
@@ -1382,9 +1386,12 @@ export default {
position: relative; position: relative;
flex: auto; flex: auto;
width: 100%; width: 100%;
height: calc(100% - 110px) !important; height: calc(~'100% - 30px');
.table_info {
height: calc(70vh - 90px);
}
.pagination { .pagination {
position: static; position: inherit;
/deep/ .pagination-slot { /deep/ .pagination-slot {
padding: 0; padding: 0;
} }
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+18 -4
View File
@@ -83,13 +83,14 @@
<el-tab-pane label="未维护" name="notMaintenance"></el-tab-pane> <el-tab-pane label="未维护" name="notMaintenance"></el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<div class="table_info">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="localProTableList" :data="localProTableList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
max-height="600" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}" fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
@@ -208,6 +209,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<pagination <pagination
:page="page" :page="page"
:pageSize="pageSize" :pageSize="pageSize"
@@ -1618,11 +1620,22 @@ export default {
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.local-products-or-project-library { .local-products-or-project-library {
//height: calc(100% - 69px);
//position: relative; //position: relative;
height: calc(100% - 100px); min-height: calc(100% - 100px);
overflow-y: auto;
.container { .container {
height: calc(~'100% - 55px'); display: flex;
flex-direction: column;
position: relative;
flex: auto;
width: 100%;
//height: calc(100% - 110px);
height: calc(~'100% - 30px');
.table_info {
height: calc(70vh - 90px);
}
} }
.el-drawer-form { .el-drawer-form {
@@ -1630,7 +1643,8 @@ export default {
} }
/deep/ .pagination { /deep/ .pagination {
position: absolute; position:inherit;
//position: unset;
} }
.row-col-box { .row-col-box {