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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!163
This commit is contained in:
王夏晖
2021-09-26 15:48:24 +08:00
parent 6931ea5e89 3357d049c8
commit 0877a6bcc4
31 changed files with 241 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/attributeCustom/components/stand.vue
+10 -10
View File
@@ -104,7 +104,7 @@
label-width="150px" label-width="150px"
> >
<input v-model="attributeEO.id" v-show="false"> <input v-model="attributeEO.id" v-show="false">
<el-form-item label="所属模块" class="add-form-item"> <el-form-item label="所属模块" prop="sarType" class="add-form-item">
<el-select <el-select
v-model="attributeEO.sarType" v-model="attributeEO.sarType"
placeholder="请选择" placeholder="请选择"
@@ -118,13 +118,13 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="属性字段" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}"> <el-form-item label="属性字段" prop="attrField" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
<el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/> <el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="属性名称" class="add-form-item"> <el-form-item label="属性名称" prop="attrName" class="add-form-item">
<el-input v-model.trim="attributeEO.attrName" placeholder="请输入属性名称" clearable/> <el-input v-model.trim="attributeEO.attrName" placeholder="请输入属性名称" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="属性类型" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}"> <el-form-item label="属性类型" prop="attrType" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
<el-select v-model="attributeEO.attrType" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable> <el-select v-model="attributeEO.attrType" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
<el-option <el-option
v-for="item in attrTypeOptions" v-for="item in attrTypeOptions"
@@ -134,7 +134,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="选项值" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'"> <el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
<el-select v-model="attributeEO.selVal" placeholder="请选择" filterable> <el-select v-model="attributeEO.selVal" placeholder="请选择" filterable>
<el-option <el-option
v-for="item in relateDicIdOptions" v-for="item in relateDicIdOptions"
@@ -149,18 +149,18 @@
<!-- <Option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>--> <!-- <Option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>-->
<!-- </Select>--> <!-- </Select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="字段长度" class="add-form-item"> <el-form-item label="字段长度" prop="attrLen" class="add-form-item">
<el-input v-model.number="attributeEO.attrLen" :disabled="addOrEdit === 'edit'" placeholder="只允许输入正整数" number :maxlength="4"/> <el-input v-model.number="attributeEO.attrLen" :disabled="addOrEdit === 'edit'" placeholder="只允许输入正整数" number :maxlength="4"/>
</el-form-item> </el-form-item>
<el-form-item label="展示顺序" class="add-form-item"> <el-form-item label="展示顺序" prop="orderNum" class="add-form-item">
<el-input v-model.number="attributeEO.orderNum" placeholder="只允许输入正整数" number :maxlength="3"/> <el-input v-model.number="attributeEO.orderNum" placeholder="只允许输入正整数" number :maxlength="3"/>
</el-form-item> </el-form-item>
<el-form-item label="是否必填" class="add-form-item"> <el-form-item label="是否必填" prop="isMust" class="add-form-item">
<el-select v-model="attributeEO.isMust"> <el-select v-model="attributeEO.isMust">
<el-option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value" :label="opt.label">{{ opt.label }}</el-option> <el-option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value" :label="opt.label">{{ opt.label }}</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否展示" class="add-form-item"> <el-form-item label="是否展示" prop="isShowImp" class="add-form-item">
<el-select v-model="attributeEO.isShowImp"> <el-select v-model="attributeEO.isShowImp">
<el-option <el-option
v-for="opt in isMustOptions" v-for="opt in isMustOptions"
@@ -170,7 +170,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="展示区域" class="add-form-item" v-if="attributeEO.isShowImp === '0'"> <el-form-item label="展示区域" prop="showRegionId" class="add-form-item" v-if="attributeEO.isShowImp === '0'">
<el-select v-model="attributeEO.showRegionId"> <el-select v-model="attributeEO.showRegionId">
<el-option <el-option
v-for="opt in showRegionOptions" v-for="opt in showRegionOptions"
src/pages/config/pages/mechanismManage/index.vue
+1
View File
@@ -200,6 +200,7 @@ export default {
uname: "", uname: "",
email: "" email: ""
} }
this.page = 1
this.getData() this.getData()
}, },
resetFormPost () { resetFormPost () {
src/pages/config/pages/roleManage/index.vue
+3 -2
View File
@@ -38,7 +38,7 @@
class="common-button-primary add-button" class="common-button-primary add-button"
@click="roleAddData" @click="roleAddData"
v-btn-permission="'bb2571b08179edb36880aae169cb2e54'" v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
size="mini">配置数据权限 size="mini">配置法规库权限
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@@ -195,7 +195,8 @@
placeholder="请输入角色名称" placeholder="请输入角色名称"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上级角色" prop="parentId" label-width="100px" class="add-form-item"> <!-- 当前的需求是不允许更改父级节点-->
<el-form-item v-show="this.type === 1" label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
<el-input v-model="addForm.parentId" style="display: none;" <el-input v-model="addForm.parentId" style="display: none;"
clearable></el-input> clearable></el-input>
<el-input v-model="addForm.parent" <el-input v-model="addForm.parent"
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+4 -4
View File
@@ -163,7 +163,7 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="technicalRequir" prop="technicalRequir"
width="150" width="200"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
</el-table-column> </el-table-column>
@@ -196,13 +196,13 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="150" width="200"
label="合规性分析" label="合规性分析"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="250" width="150"
label="新车型实施日期" label="新车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -211,7 +211,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="onlineData"
width="250" width="150"
label="在产车型实施日期" label="在产车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+5 -5
View File
@@ -167,7 +167,7 @@
<el-table-column <el-table-column
v-if="!form.itemsNum1" v-if="!form.itemsNum1"
prop="technicalRequir" prop="technicalRequir"
width="150" width="200"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -211,7 +211,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceState" prop="complianceState"
width="150" width="200"
label="合规性分析" label="合规性分析"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -222,7 +222,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="250" width="150"
label="新车型实施日期" label="新车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -235,7 +235,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="onlineData"
width="250" width="150"
label="在产车型实施日期" label="在产车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -364,7 +364,7 @@
:wrapperClosable="false" :wrapperClosable="false"
size="800px"> size="800px">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150"> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150">
<el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input <el-input
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+4 -4
View File
@@ -162,7 +162,7 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="technicalRequir" prop="technicalRequir"
width="150" width="200"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
</el-table-column> </el-table-column>
@@ -195,13 +195,13 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="150" width="200"
label="合规性分析" label="合规性分析"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="250" width="150"
label="新车型实施日期" label="新车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -210,7 +210,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="onlineData"
width="250" width="150"
label="在产车型实施日期" label="在产车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+4 -4
View File
@@ -162,7 +162,7 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="technicalRequir" prop="technicalRequir"
width="150" width="200"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
</el-table-column> </el-table-column>
@@ -195,13 +195,13 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="150" width="200"
label="合规性分析" label="合规性分析"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="250" width="150"
label="新车型实施日期" label="新车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -210,7 +210,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="onlineData"
width="250" width="150"
label="在产车型实施日期" label="在产车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+4 -4
View File
@@ -163,7 +163,7 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="technicalRequir" prop="technicalRequir"
width="150" width="200"
label="核心技术要求" label="核心技术要求"
align="center"> align="center">
</el-table-column> </el-table-column>
@@ -196,13 +196,13 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="complianceState" prop="complianceState"
width="150" width="200"
label="合规性分析" label="合规性分析"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newData" prop="newData"
width="250" width="150"
label="新车型实施日期" label="新车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -211,7 +211,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="onlineData"
width="250" width="150"
label="在产车型实施日期" label="在产车型实施日期"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+22 -2
View File
@@ -1238,6 +1238,26 @@
TreeSelectNew TreeSelectNew
}, },
data () { data () {
const validateQcdw = (rule, value, callback) => {
if(this.form.standInData === '0'){
if (value === null || value.length === 0) {
callback(new Error('请选择起草单位！'))
} else {
callback()
}
}
callback()
};
const validateCysd = (rule, value, callback) => {
if(this.form.standInData === '0'){
if (value === '') {
callback(new Error('请选择我司参与深度！'))
} else {
callback()
}
}
callback()
}
return { return {
fileList: [], fileList: [],
caFileList: [], caFileList: [],
@@ -1477,10 +1497,10 @@
{ required: true, message: '请选择标准发布日期', trigger: 'change' } { required: true, message: '请选择标准发布日期', trigger: 'change' }
], ],
qcdw: [ qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' } { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
], ],
cysd: [ cysd: [
{ required: true, message: '请选择我司参与深度', trigger: 'change' } { required: true, message: '请选择我司参与深度', validator: validateCysd, trigger: 'change' }
], ],
}, },
zrUserIds: [], // 选择多个会签责任人 zrUserIds: [], // 选择多个会签责任人
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+8 -2
View File
@@ -91,12 +91,15 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
label="章节名称"> align="center"
label="章节名称"
width="200px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
@@ -120,14 +123,17 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="department" prop="department"
align="center"
label="提出部门"> label="提出部门">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="responUserName" prop="responUserName"
align="center"
label="提出人"> label="提出人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="state" prop="state"
align="center"
label="处理意见"> label="处理意见">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div> <div>{{ stateText(scope.row.state) }}</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+2 -2
View File
@@ -97,7 +97,7 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input>
</template> </template>
@@ -106,7 +106,7 @@
prop="chapterName" prop="chapterName"
align="center" align="center"
label="章节名称" label="章节名称"
width="170px"> width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template> </template>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+3 -2
View File
@@ -79,12 +79,13 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
label="章节名称"> label="章节名称"
width="200px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+2 -1
View File
@@ -79,11 +79,12 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center" align="center"
label="章条编号" label="章条编号"
sortable sortable
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+2 -1
View File
@@ -91,11 +91,12 @@
sortable sortable
align="center" align="center"
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+4 -4
View File
@@ -197,7 +197,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -209,7 +209,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -245,7 +245,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+4 -4
View File
@@ -204,7 +204,7 @@
<el-table-column <el-table-column
prop="researchNonCompliance" prop="researchNonCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
@@ -230,7 +230,7 @@
<el-table-column <el-table-column
prop="researchCompletionTime" prop="researchCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
@@ -265,7 +265,7 @@
<el-table-column <el-table-column
prop="productionNonCompliance" prop="productionNonCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
@@ -291,7 +291,7 @@
<el-table-column <el-table-column
prop="productionCompletionTime" prop="productionCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+4 -4
View File
@@ -197,7 +197,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -209,7 +209,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -245,7 +245,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+4 -4
View File
@@ -197,7 +197,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -209,7 +209,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -245,7 +245,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+4 -4
View File
@@ -197,7 +197,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -209,7 +209,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -245,7 +245,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+4 -4
View File
@@ -127,7 +127,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -139,7 +139,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -163,7 +163,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -175,7 +175,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -142,7 +142,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -179,7 +179,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -142,7 +142,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -179,7 +179,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -142,7 +142,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -179,7 +179,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+42 -13
View File
@@ -49,11 +49,12 @@
</div> </div>
</div> </div>
<el-table <el-table
:data="dataList" :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc" style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId" row-key="standId"
height="70%" height="70%"
border border
highlight-current-row
@selection-change="selectStandChange" @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold'}" fontWeight: 'bold'}"
@@ -72,7 +73,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a> {{ scope.row.standNumber }}</a>
@@ -144,7 +146,7 @@
<el-table-column <el-table-column
prop="researchNonCompliance" prop="researchNonCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
@@ -170,7 +172,7 @@
<el-table-column <el-table-column
prop="researchCompletionTime" prop="researchCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
@@ -205,7 +207,7 @@
<el-table-column <el-table-column
prop="productionNonCompliance" prop="productionNonCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
@@ -231,7 +233,7 @@
<el-table-column <el-table-column
prop="productionCompletionTime" prop="productionCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
@@ -255,6 +257,14 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
</el-table> </el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
@current-change="handleCurrentChange"
>
</el-pagination>
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
@@ -422,8 +432,11 @@
</el-form> </el-form>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">确定</el-button> <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消</el-button> 确定
</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
</el-button>
</div> </div>
</el-drawer> </el-drawer>
</div> </div>
@@ -444,6 +457,9 @@ export default {
}, },
data() { data() {
return { return {
total: 0,
currentPage: 1,
pageSize: 20,
nodeList: [], nodeList: [],
isTransfer: false, isTransfer: false,
// 调整处理人抽屉状态 // 调整处理人抽屉状态
@@ -696,7 +712,6 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
console.log(res.mesg);
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
} }
@@ -713,15 +728,27 @@ export default {
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList; // this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList; this.dataList = this.listForm.dataList[0].children
console.log(this.dataList); this.dataList.map(item => {
this.$set(item, 'standName', this.listForm.dataList[0].standName)
this.$set(item, 'standEnName', this.listForm.dataList[0].standEnName)
this.$set(item, 'standYear', this.listForm.dataList[0].standYear)
this.$set(item, 'standSort', this.listForm.dataList[0].standSort)
this.$set(item, 'standNumber', this.listForm.dataList[0].standNumber)
})
this.total = this.listForm.dataList[0].children.length;
} else { } else {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList[0].children
this.total = item.form.dataList[0].children.length;
} }
}); });
}, },
// 分页
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true; this.saveLoading = true;
@@ -874,9 +901,11 @@ export default {
.demo-drawer-content { .demo-drawer-content {
margin-top: 10px; margin-top: 10px;
} }
/deep/ .el-table th > .cell { /deep/ .el-table th > .cell {
font-size: 12px; font-size: 12px;
} }
/deep/ .el-table thead.is-group th { /deep/ .el-table thead.is-group th {
padding: 0px; padding: 0px;
} }
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -142,7 +142,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -179,7 +179,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -142,7 +142,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -166,7 +166,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -178,7 +178,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+4 -4
View File
@@ -130,7 +130,7 @@
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -142,7 +142,7 @@
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="170"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -179,7 +179,7 @@
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : "" <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -1
View File
@@ -3192,7 +3192,10 @@ export default {
} }
} }
this.getDomesticStandardTable(this.tableFlag) // this.getDomesticStandardTable(this.tableFlag)
//搜索后排序,应该以被搜索后的数据排序
this.getDomesticStandardTable(this.standCommonlySearch)
}, },
// 修改成表格样式后，选择项勾选改变 // 修改成表格样式后，选择项勾选改变
standSelectChange(data) { standSelectChange(data) {