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:
yuezhihang
2021-07-27 21:16:15 +08:00
parent d1b37660ff 7d0d552b5d
commit 61f227c037
38 changed files with 1403 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/images/shangqi/img/logo4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

src/assets/images/shangqi/img/none-file.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

src/assets/images/shangqi/img/tree-add.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 943 B

src/assets/images/shangqi/img/tree-show.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

src/assets/images/shangqi/img/tree-sub.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 632 B

src/assets/images/shangqi/img/tree.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

src/components/navMenu/index.vue
+1 -1
View File
@@ -434,7 +434,7 @@ export default {
}, },
computed: { computed: {
logo () { logo () {
return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo2.png') return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
}, },
...mapGetters(['getDynamicTotal', 'isCollapse']) ...mapGetters(['getDynamicTotal', 'isCollapse'])
}, },
src/pages/details/otherStandardDetails/index.vue
+28 -33
View File
@@ -65,14 +65,14 @@
</template> </template>
<template <template
v-for="(child, childIndex) in item.half" v-for="(child, childIndex) in item.half"
v-if="child.isShowImp === '0'" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
> >
<!-- 代替标准编号--> <!-- 代替标准编号-->
<div <div
:key="child.id" :key="child.id"
class="modular-item" class="modular-item"
:class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''" :class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''"
v-if="child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH'" v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' "
> >
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label> <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span <span
@@ -189,18 +189,18 @@
/> />
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
<el-button <!-- <el-button-->
@click="showItemsModel(child.attrField)" <!-- @click="showItemsModel(child.attrField)"-->
class="decomposition-btn" <!-- class="decomposition-btn"-->
icon="icon-separate" <!-- icon="icon-separate"-->
>标准分解单</el-button> <!-- >标准分解单</el-button>-->
</p> </p>
</div> </div>
</div> </div>
</template> </template>
<template <template
v-for="(child, childIndex) in item.one" v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))" v-if="child.isShowImp === '0' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
> >
<div <div
@@ -217,7 +217,7 @@
</p> </p>
</template> </template>
<template <template
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ'" v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
> >
<p class="modular-content-p-val" v-if="child.value"> <p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index"> <span v-for="(item, index) in child.value.split(',')" :key="index">
@@ -283,12 +283,12 @@
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
</p> </p>
<el-button <!-- <el-button-->
v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'" <!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
@click="showItemsModel(child.attrField)" <!-- @click="showItemsModel(child.attrField)"-->
class="decomposition-btn" <!-- class="decomposition-btn"-->
icon="icon-separate" <!-- icon="icon-separate"-->
>标准分解单</el-button> <!-- >标准分解单</el-button>-->
</div> </div>
</div> </div>
@@ -404,27 +404,23 @@
show-overflow-tooltip show-overflow-tooltip
prop="itemsNum" prop="itemsNum"
label="条款号" label="条款号"
width="150"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
width="150"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="itemsName" prop="itemsName"
label="条款内容" label="条款内容"
width="150"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="termsConditions" prop="termsConditions"
label="解读内容" label="解读内容"
width="250"
show-overflow-tooltip show-overflow-tooltip
:resizable="false" :resizable="false"
> >
@@ -433,28 +429,28 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip prop="XCXSSRQ"
prop="putTime" label="新车型实施日期(文本)"
label="实施日期" width="180">
width="150" </el-table-column>
> <el-table-column
prop="ZCCSSRQ"
label="在产车实施日期(文本)"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="putTime" prop="putTime"
label="适用车型" label="适用车型"
width="150"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="responsibleUnitShow" prop="responsibleUnitShow"
label="责任部门" label="责任部门">
width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zrgcs" prop="zrgcs"
label="责任工程师" label="责任工程师">
width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dutyEngineerShow" prop="dutyEngineerShow"
@@ -464,13 +460,11 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="svppsShow" prop="svppsShow"
label="符合性状态" label="符合性状态">
width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="applyArcticShow" prop="applyArcticShow"
label="合规性分析" label="合规性分析">
width="150">
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <el-table-column label="操作" align="center" width="50" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -2724,6 +2718,7 @@ export default {
} }
}) })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
console.log(this.dynamicFormField)
}) })
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false this.loading = false
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+17 -6
View File
@@ -1066,8 +1066,10 @@ export default {
middle.push(item.name); middle.push(item.name);
files.push(item.response.data.id); files.push(item.response.data.id);
}); });
this.fileListName = middle; this.listForm.fileName = middle.join(',');
this.fileIds = files; this.listForm.fileId = files.join(',');
// this.fileListName = middle;
// this.fileIds = files;
}, },
fileUpload() { fileUpload() {
this.fileMadel = true; this.fileMadel = true;
@@ -1081,12 +1083,17 @@ export default {
}); });
this.fileListName = middle; this.fileListName = middle;
this.fileIds.push(file.response.data.id); this.fileIds.push(file.response.data.id);
if(this.listForm.fileName === null ){ if(this.listForm.fileName === null || this.listForm.fileName === undefined){
this.listForm.fileName = this.fileListName.join(',') this.listForm.fileName = this.fileListName.join(',')
}else { } else {
this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(','); this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
} }
this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') if(this.listForm.fileId === null || this.listForm.fileId === undefined){
this.listForm.fileId = this.fileIds.join(',')
}else {
this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
}
console.log(this.listForm);
this.$message.success("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
@@ -1205,7 +1212,11 @@ export default {
exits.push(item.id) exits.push(item.id)
} }
}); });
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
this.listForm.inforlist = exits.join(',')
} else {
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
}
this.standardData = []; this.standardData = [];
this.standModel = false; this.standModel = false;
} }
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+5 -24
View File
@@ -78,13 +78,8 @@
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -374,14 +369,11 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.zrUserId = this.listForm.zrUserId; this.$message.warning('请填写会签意见')
this.listForm.jlUserId = this.listForm.jlUserId; }
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = ""; this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
this.listForm.signFlag = ""; this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -412,17 +404,6 @@ export default {
}, },
selectThree() { selectThree() {
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
}, },
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
-8
View File
@@ -527,14 +527,6 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
this.listForm.zrUserId = this.listForm.zrUserId;
this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+3 -7
View File
@@ -376,14 +376,10 @@
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId; if (this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.zrUserId = this.listForm.zrUserId; this.$message.warning('请填写审批意见')
this.listForm.jlUserId = this.listForm.jlUserId; }
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.signflag = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+23 -8
View File
@@ -554,11 +554,9 @@
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new> :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
v-model="form.gkdw" <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
placeholder="请输入归口管理部门" </el-select>
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple> <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
@@ -963,7 +961,13 @@
:visible.sync="modalShowFlag" :visible.sync="modalShowFlag"
:wrapperClosable="false" :wrapperClosable="false"
size="800px"> size="800px">
<el-input
style="width:70%;padding: 10px"
placeholder="请输入姓名"
v-model="filterText">
</el-input>
<el-tree <el-tree
:filter-node-method="filterNode"
v-if="modalShowFlag" v-if="modalShowFlag"
node-key="id" node-key="id"
style="height: 100%; overflow: auto;" style="height: 100%; overflow: auto;"
@@ -1158,6 +1162,7 @@
}, },
data () { data () {
return { return {
filterText:'',
textStatusMap: {}, // 文本状态id与name对应 textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false, standardDrawer: false,
loadSarStandard: false, loadSarStandard: false,
@@ -1391,6 +1396,7 @@
modelOptions: [], // 模块体系架构 modelOptions: [], // 模块体系架构
modelChildOptions: [], // 模块体系架构子集合 modelChildOptions: [], // 模块体系架构子集合
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
@@ -1405,6 +1411,9 @@
} }
}, },
watch:{ watch:{
filterText(val) {
this.$refs.tree.filter(val);
},
'form.standInData': { 'form.standInData': {
handler: function() { handler: function() {
this.verifySarStandard = false this.verifySarStandard = false
@@ -1458,6 +1467,11 @@
}, },
}, },
methods: { methods: {
// z责任人会签姓名搜索
filterNode(value, data) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
getTaskId () { getTaskId () {
queryTaskFirst({ queryTaskFirst({
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
@@ -1669,6 +1683,7 @@
} }
}, },
saveUserInfo () { saveUserInfo () {
this.filterText = ''
if (this.userType === 'zrUserId') { if (this.userType === 'zrUserId') {
this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",") this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",") this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
@@ -1680,6 +1695,7 @@
this.modalShowFlag = false this.modalShowFlag = false
}, },
cancelUserInfo () { cancelUserInfo () {
this.filterText = ''
this.modalShowFlag = false this.modalShowFlag = false
}, },
drawerCheck (data) { drawerCheck (data) {
@@ -2082,8 +2098,6 @@
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
// 流程保存之后，应该流转至草稿页面
this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
// this.bpnId = res.result // this.bpnId = res.result
}).catch(e => { }).catch(e => {
this.saveLoading = false this.saveLoading = false
@@ -2175,7 +2189,8 @@
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.qcdwOption = res.data.QCDW // 体系类别 this.qcdwOption = res.data.QCDW // 体系类别
this.setMap(this.standStateOptions) this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
this.modelFunc() this.modelFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+7 -8
View File
@@ -328,14 +328,11 @@
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled"> <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" disabled></el-input> <el-input v-model="form.dybxh" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
disabled <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
v-model="form.gkdw" </el-select>
placeholder="请输入归口管理部门" </el-form-item>
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled> <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
<el-option <el-option
@@ -821,6 +818,7 @@
standStateOptions: [], // 文本状态 standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系 standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
@@ -1070,6 +1068,7 @@
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.key++ this.key++
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+5 -6
View File
@@ -322,12 +322,9 @@
<el-input v-model="form.dybxh" disabled></el-input> <el-input v-model="form.dybxh" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
disabled <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
v-model="form.gkdw" </el-select>
placeholder="请输入归口管理部门"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled> <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
@@ -795,6 +792,7 @@ export default {
standStateOptions: [], // 文本状态 standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系 standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
@@ -1054,6 +1052,7 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.key++ this.key++
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+5 -5
View File
@@ -534,11 +534,9 @@
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new> :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
v-model="form.gkdw" <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
placeholder="请输入归口管理部门" </el-select>
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple> <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
@@ -1225,6 +1223,7 @@ export default {
modelOptions: [], // 模块体系架构 modelOptions: [], // 模块体系架构
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
gkglbmOptions: [], // 归口管理部门
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人 wssmrOptions: [], // 我司署名人
@@ -1750,6 +1749,7 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.treeStatus = true this.treeStatus = true
this.key++ this.key++
}) })
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+7 -8
View File
@@ -344,14 +344,11 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input <el-select disabled :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
disabled <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
v-model="form.gkdw" </el-select>
placeholder="请输入归口管理部门" </el-form-item>
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple> <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option <el-option
@@ -784,6 +781,7 @@
standSystemOptions: [], // 标准体系 standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
gkglbmOptions: [], // 归口管理部门
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
sycpxOptions: [], // 适用产品线 sycpxOptions: [], // 适用产品线
@@ -978,6 +976,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.qcdwOption = res.data.QCDW // 体系类别 this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
}) })
} }
} }
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+1 -1
View File
@@ -407,7 +407,7 @@ export default {
this.modalshowflag = true this.modalshowflag = true
}, },
drawerCheck (data) { drawerCheck (data) {
this.roleForm.dockUserName = data[0].id this.roleForm.dockUser = data[0].id
this.roleForm.dockUserName = data[0].name this.roleForm.dockUserName = data[0].name
this.modalshowflag = false this.modalshowflag = false
}, },
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2 -3
View File
@@ -193,7 +193,6 @@ export default {
}, },
created() { created() {
this.getData() this.getData()
this.getTree()
}, },
methods: { methods: {
getData() { getData() {
@@ -293,8 +292,8 @@ export default {
drawerCheck (data) { drawerCheck (data) {
this.roleForm = data[0] this.roleForm = data[0]
// 选择责任人时input框内值 // 选择责任人时input框内值
this.newDataList.dutyPeople = this.roleRow.name this.newDataList.dutyPeople = this.roleForm.name
this.newDataList.dutyPeopleId = this.roleRow.id this.newDataList.dutyPeopleId = this.roleForm.id
this.lastDataList = this.dataList this.lastDataList = this.dataList
this.modalshowflag = false this.modalshowflag = false
}, },
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+3 -11
View File
@@ -94,7 +94,7 @@
<el-table-column prop="dutyEngineer" label="负责人"/> <el-table-column prop="dutyEngineer" label="负责人"/>
<el-table-column label="佐证材料" show-overflow-tooltip> <el-table-column label="佐证材料" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="download" >{{scope.row.fileText}}</el-button> <el-button type="text" @click="download(scope.row)" >{{scope.row.fileText}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -187,9 +187,7 @@ export default {
}, },
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
console.log(item)
this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
console.log(this.dataList)
}) })
}, },
@@ -266,14 +264,8 @@ export default {
this.getData() this.getData()
}, },
download(row) { download(row) {
// window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath) let attId = row.fileTextId
var name = row.fileText; window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
var url = row.fileTextPath;
const a = document.createElement('a')
a.setAttribute('download', name)
a.setAttribute('target', '_blank')
a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
a.click()
}, },
// 分页事件 // 分页事件
pageChange (page) { pageChange (page) {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+129 -112
View File
@@ -28,16 +28,16 @@
</el-form-item> </el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input <el-input
disabled
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
@@ -93,13 +93,22 @@
<el-table-column <el-table-column
prop="distributePerson" prop="distributePerson"
label="分发责任人"> label="分发责任人">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
<!-- <el-input-->
<!-- v-model="dataList.distributePerson"-->
<!-- placeholder="请选择分发责任人"-->
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
<!-- readonly-->
<!-- v-if="dataList[scope.$index].distributePerson==null"-->
<!-- />-->
<!-- </template>-->
<template slot-scope="scope,text" v-if="showColumn"> <template slot-scope="scope,text" v-if="showColumn">
<div> <div>
<div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"> <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
{{listForm.dataList[scope.$index].distributePerson==null?"请选择分发负责人":listForm.dataList[scope.$index].distributePerson}} {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -113,7 +122,7 @@
:model="roleForm" :model="roleForm"
:rules="roleFormRules" :rules="roleFormRules"
class="label-input-form"> class="label-input-form">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规工程师</h4> <h4>标准法规工程师</h4>
@@ -241,17 +250,26 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="issueTime" prop="putTime"
label="发布日期"> label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrq" prop="zccssrqgj"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -370,20 +388,20 @@ export default {
// 查询相关参数 // 查询相关参数
searching: false, searching: false,
standardSearch: { standardSearch: {
standType:'', standType: "",
standName:'', standName: ""
}, },
standardTypeOptions: [ standardTypeOptions: [
{ {
value: 'INLAND', value: "INLAND",
label: '国内标准法规', label: "国内标准法规",
item:'INLAND', item: "INLAND"
}, },
{ {
value: 'FOREIGN', value: "FOREIGN",
label: '海外标准法规', label: "海外标准法规",
item:'FOREIGN', item: "FOREIGN"
}, }
], ],
nodeList: [], nodeList: [],
defaultProps: { defaultProps: {
@@ -394,14 +412,14 @@ export default {
startUserName: this.$store.getters.userInfo.userName, startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id, startUser: this.$store.getters.userInfo.id,
qualityEngineer: "", qualityEngineer: "",
certifiedEngineer:"", certifiedEngineer: "",
qualityEngineerName: "", qualityEngineerName: "",
certifiedEngineerName:"", certifiedEngineerName: "",
distributePerson: "", distributePerson: "",
dockUser:'', dockUser: "",
ministerUser:"", ministerUser: "",
dockUserName:'', dockUserName: "",
ministerUserName:"", ministerUserName: ""
}, },
formRules: { formRules: {
standName: [ standName: [
@@ -415,7 +433,7 @@ export default {
], ],
certifiedEngineer: [ certifiedEngineer: [
{ required: true, message: "请选择认证工程师", trigger: "change" } { required: true, message: "请选择认证工程师", trigger: "change" }
], ]
}, },
roleFormRules: { roleFormRules: {
dockUserName: [ dockUserName: [
@@ -423,7 +441,7 @@ export default {
], ],
ministerUserName: [ ministerUserName: [
{ required: true, message: "请选择标准法规部领导", trigger: "change" } { required: true, message: "请选择标准法规部领导", trigger: "change" }
], ]
}, },
ListModel: false, //选择拆分标准抽屉状态 ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据 treeData: [], // 人员数据
@@ -459,29 +477,29 @@ export default {
dataList: [{ dataList: [{
projectLine: "", //产品线 projectLine: "", //产品线
uname: "",//产品线责任人 uname: "",//产品线责任人
projectManager:"",// 产品线责任人id projectManager: "",// 产品线责任人id
distributePerson: "", //分发责任人 distributePerson: "", //分发责任人
distributePersonId: "", //分发责任人id distributePersonId: "", //分发责任人id
id: "", id: "",
sarStandProjectLibraries: [{ sarStandProjectLibraries: [{
projectManager: '', projectManager: "",
projectLevel: '', projectLevel: "",
projectNumber: '', projectNumber: "",
projectEndDate: '', projectEndDate: "",
currentNode: '', currentNode: "",
projectGroup: '', projectGroup: "",
productLine: '', productLine: "",
projectClassification: '', projectClassification: "",
projectStatus: '', projectStatus: "",
projectStartDate: '', projectStartDate: "",
id: '', id: "",
projectName: '', projectName: "",
projectPlatfor: '' projectPlatfor: ""
}] }]
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
showColumn:true showColumn: true
}; };
}, },
methods: { methods: {
@@ -491,25 +509,26 @@ export default {
this.roleForm.dockUserName = data[0].name; this.roleForm.dockUserName = data[0].name;
} else if (this.type === "ministerUser") { } else if (this.type === "ministerUser") {
this.roleForm.ministerUser = data[0].id; this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = data[0].name; this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "qualityEngineer") { } else if (this.type === "qualityEngineer") {
this.roleForm.qualityEngineer = data[0].id; this.roleForm.qualityEngineer = data[0].id;
this.roleForm.qualityEngineerName = data[0].name; this.roleForm.qualityEngineerName = data[0].name;
this.listForm.qualityEngineer = data[0].id; this.listForm.qualityEngineer = data[0].id;
this.listForm.qualityEngineerName = data[0].name; this.listForm.qualityEngineerName = data[0].name;
} else if (this.type === "certifiedEngineer") { } else if (this.type === "certifiedEngineer") {
this.roleForm.certifiedEngineer = data[0].id; this.roleForm.certifiedEngineer = data[0].id;
this.roleForm.certifiedEngineerName = data[0].name; this.roleForm.certifiedEngineerName = data[0].name;
this.listForm.certifiedEngineer = data[0].id; this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name; this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") { } else if (this.type === "distributePerson") {
this.listForm.distributePerson = data[0].name; // this.dataList.distributePerson = data[0].id;
this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id // this.dataList.distributePersonName = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
this.showColumn = false; this.showColumn = false;
this.$nextTick(() => { this.$nextTick(() => {
this.showColumn = true this.showColumn = true;
}) });
} }
this.modalshowflag = false; this.modalshowflag = false;
}, },
@@ -521,7 +540,7 @@ export default {
this.active = name; this.active = name;
}, },
typeChange(type) { typeChange(type) {
this.standardSearch.standType = type this.standardSearch.standType = type;
}, },
choiceShow() { choiceShow() {
this.ListModel = true; this.ListModel = true;
@@ -542,32 +561,32 @@ export default {
//点击添加事件 //点击添加事件
addList() { addList() {
this.standModel = true; this.standModel = true;
this.$refs.projectTable.clearSelection() this.$refs.projectTable.clearSelection();
}, },
// 点击批量删除事件 // 点击批量删除事件
deleteList() { deleteList() {
if(this.selectList.length < 1){ if (this.selectList.length < 1) {
this.$message.warning('请选择一条数据进行删除') this.$message.warning("请选择一条数据进行删除");
}else { } else {
this.$confirm('您确认删除这些数据？', '提示', { this.$confirm("您确认删除这些数据？", "提示", {
confirmButtonText: "确认", confirmButtonText: "确认",
confirmButtonClass: "common-button-primary", confirmButtonClass: "common-button-primary",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}). then(() => { }).then(() => {
this.selectList.map(item => { this.selectList.map(item => {
let index; let index;
index = this.dataList.findIndex(items => { index = this.dataList.findIndex(items => {
return items.productLine = item return items.productLine = item;
})
if (index > -1) {
this.dataList.splice(index, 1);
}
}); });
this.selectList = []; if (index > -1) {
}).catch(() => { this.dataList.splice(index, 1);
}) }
} });
this.selectList = [];
}).catch(() => {
});
}
}, },
//取消添加事件 //取消添加事件
cancelStand() { cancelStand() {
@@ -576,21 +595,21 @@ export default {
//确认添加事件 //确认添加事件
okStand() { okStand() {
let proData = []; let proData = [];
if(this.dataList.length >= 1){ if (this.dataList.length >= 1) {
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(proData.length === 0){ if (proData.length === 0) {
proData.push(item.productLine) proData.push(item.productLine);
}else if(!proData.includes(item.productLine)){ } else if (!proData.includes(item.productLine)) {
proData.push(item.productLine) proData.push(item.productLine);
}
})
this.standList.forEach(items => {
if(!proData.includes(items.productLine)){
this.dataList.push(items)
} }
}) });
this.standList.forEach(items => {
if (!proData.includes(items.productLine)) {
this.dataList.push(items);
}
});
this.standModel = false; this.standModel = false;
}else{ } else {
if (this.standList.length >= 1) { if (this.standList.length >= 1) {
this.dataList = this.standList; this.dataList = this.standList;
this.roleForm.directorUser = this.dataList[0].uname; this.roleForm.directorUser = this.dataList[0].uname;
@@ -607,7 +626,7 @@ export default {
let _formData = new FormData(); let _formData = new FormData();
_formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.uName); _formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", '5'); _formData.append("prcType", "5");
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
prcForm: this.prcForm, prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList, sarAccessInfoList: this.sarAccessInfoList,
@@ -625,19 +644,17 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if (this.dataList.length < 1) {
this.$message.warning("请添加产品线信息");
}
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){ if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.$message.warning('请选择分发责任人') this.$message.warning("请选择分发责任人");
} else { } else {
var json = Object.assign(this.listForm, this.roleForm) var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId; this.$refs["listForm"].validate((valid) => {
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj
json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj
this.$refs['listForm'].validate((valid) => {
if (valid) { if (valid) {
this.$refs['roleForm'].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, { this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this _this: this
@@ -666,7 +683,7 @@ export default {
} }
}); });
} }
}) });
}, },
//选择拆分标准取消事件 //选择拆分标准取消事件
@@ -723,8 +740,8 @@ export default {
selectThree(data) { selectThree(data) {
this.standList = data; this.standList = data;
}, },
choiceZRR(scope,type, title, id) { choiceZRR(scope, type, title, id) {
if(scope!=null){ if (scope != null) {
this.dsadadadsada = scope.$index; this.dsadadadsada = scope.$index;
} }
this.nodeList = []; this.nodeList = [];
@@ -740,19 +757,19 @@ export default {
}, },
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
this.getStandData() this.getStandData();
}, },
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent; this.pageSize = this.$store.getters.userInfo.configContent;
this.getStandData() this.getStandData();
}, },
pageChangeNo(page) { pageChangeNo(page) {
this.pageNO = page; this.pageNO = page;
this.getProductData() this.getProductData();
}, },
pageSizeChangeNo(pageSize) { pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent; this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.getProductData() this.getProductData();
}, },
//获取产品线数据 //获取产品线数据
getProductData() { getProductData() {
@@ -769,27 +786,27 @@ export default {
}); });
}, },
//获取标准数据 //获取标准数据
getStandData(){ getStandData() {
this.$http.post('SarStandItems/sar-stand-items/findStand',{ this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page, page: this.page,
size: this.pageSize, size: this.pageSize,
...this.standardSearch, ...this.standardSearch
},{ }, {
_this: this, _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.records; this.sarAccessListDatas = res.records;
this.total = res.total this.total = res.total;
}, e => { }, e => {
}) });
}, },
clearSearch() { clearSearch() {
this.standardSearch = { this.standardSearch = {
standName: "", standName: "",
standType:"", standType: ""
}; };
this.getStandData(); this.getStandData();
}, }
}, },
computed: {}, computed: {},
mounted() { mounted() {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input <el-input
v-model="listForm.standNumber" v-model="listForm.standNumber"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.standName" v-model="listForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+1 -10
View File
@@ -117,16 +117,6 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column
prop="applicationScope"
label="适用领域"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
}}</span>
</template>
</el-table-column>-->
<el-table-column <el-table-column
prop="updateTime" prop="updateTime"
label="更新时间" label="更新时间"
@@ -269,6 +259,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records this.sarAccessListDatas = res.data.records
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total this.sarAccessListTotal = res.data.total
}, e => { }, e => {
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+2
View File
@@ -266,6 +266,7 @@ export default {
//分页查询 //分页查询
searchSarAccess() { searchSarAccess() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
current: 1,
page: 1, page: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
...this.sarSarAccessEOSearch, ...this.sarSarAccessEOSearch,
@@ -274,6 +275,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records; this.sarAccessListDatas = res.data.records;
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total; this.sarAccessListTotal = res.data.total;
}, e => { }, e => {
}); });
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+2 -1
View File
@@ -267,7 +267,7 @@ export default {
//分页查询 //分页查询
searchSarAccess() { searchSarAccess() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page, page: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
...this.sarSarAccessEOSearch, ...this.sarSarAccessEOSearch,
sortKey: 2 sortKey: 2
@@ -275,6 +275,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records; this.sarAccessListDatas = res.data.records;
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total this.sarAccessListTotal = res.data.total
}, e => { }, e => {
}); });
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+117 -50
View File
@@ -1168,19 +1168,19 @@ export default {
this.selectedAccInfoSearchList.map(item => { this.selectedAccInfoSearchList.map(item => {
let addList; let addList;
addList = this.sarAccessInfoList.findIndex(items => { addList = this.sarAccessInfoList.findIndex(items => {
return items.id == item.id return items.id == item.id
}) })
if(addList > -1){ if(addList > -1){
this.$message.warning('请勿添加重复数据') this.$message.warning('请勿添加重复数据')
this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
} else{ } else{
this.sarAccessInfoList.push(item) this.sarAccessInfoList.push(item)
this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
} }
}) })
} else { } else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
@@ -1329,12 +1329,16 @@ export default {
_this: this, _this: this,
loading: 'loadData' loading: 'loadData'
}, res => { }, res => {
if (res.ok) { if (this.sarAccessInfoList.length !== 0) {
this.$message.success('新增成功') if (res.ok) {
this.isNext = true this.$message.success('新增成功')
this.$router.push({ this.isNext = true
name: 'AccessStandardsAndRegulations' this.$router.push({
}) name: 'AccessStandardsAndRegulations'
})
}
} else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
} }
}, e => { }, e => {
}) })
@@ -1363,6 +1367,7 @@ export default {
selectLawsStands () { selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = ''
} else { } else {
this.sarAccessInfoSearch.standType = 'FOREIGN' this.sarAccessInfoSearch.standType = 'FOREIGN'
} }
@@ -1374,16 +1379,29 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
@@ -1403,16 +1421,29 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
@@ -1426,16 +1457,29 @@ export default {
sarAccessInfoSearchSelect (val) { sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val this.selectedAccInfoSearchList = val
this.selectedAccInfoSearchList.forEach(item => { this.selectedAccInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.selectedAccInfoSearchList.forEach(item => { this.selectedAccInfoSearchList.forEach(item => {
// 责任部门转换 // 责任部门转换
@@ -1834,7 +1878,7 @@ export default {
}, },
// 点击查看 // 点击查看
handlePreview (data) { handlePreview (data) {
let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails' let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: routerName, name: routerName,
params: { params: {
@@ -1947,6 +1991,29 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
}, e => { }, e => {
}) })
@@ -2020,8 +2087,8 @@ export default {
this.sarAccessEO.remark = accessRow.remark || '' this.sarAccessEO.remark = accessRow.remark || ''
this.sarAccessEO.relateFile = accessRow.relateFile this.sarAccessEO.relateFile = accessRow.relateFile
this.sarAccessInfoSearch.validFlag = 0 this.sarAccessInfoSearch.validFlag = 0
this.getFileInfo()
this.getData() this.getData()
this.getFileInfo()
this.selectLawsStands() this.selectLawsStands()
}) })
} else { } else {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+257 -45
View File
@@ -346,7 +346,7 @@
width="210px" width="210px"
label="卡车VPPS中文名称"> label="卡车VPPS中文名称">
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="操作"> <el-table-column width="240" align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -360,6 +360,12 @@
size="small" @click="moveDown(scope.$index, scope.row)" size="small" @click="moveDown(scope.$index, scope.row)"
v-if="!disabledFlag" v-if="!disabledFlag"
>下移</el-button> >下移</el-button>
<el-button
size="small"
@click="editTghisRow(scope.row)"
class="common-button-default"
type="warning"
>编辑</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -396,6 +402,90 @@
</div> </div>
</el-upload> </el-upload>
</el-dialog> </el-dialog>
<!--编辑-->
<el-drawer
title="编辑清单条目"
:visible.sync="drawerEdit"
:wrapperClosable="false"
size="800px"
>
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号">
<el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
</el-form-item>
<el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"/>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName">
<el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
</el-form-item>
<el-form-item label="适用车型" prop="typeApplicable">
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
</el-form-item>
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-date-picker
v-model.trim="editRowData.putTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任部门" prop="zrbm">
<el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
</el-form-item>
<el-form-item label="适用产品线" prop="sycpx">
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
</el-form-item>
</el-form>
<div class="demo-drawer-footer">
<el-button
type="primary"
class="common-button-primary"
size="mini"
icon="el-icon-check"
@click="saveInfo"
>提交</el-button
>
<el-button
size="mini"
icon="el-icon-close"
class="common-button-default"
@click="cancelInfo"
>取消</el-button
>
</div>
</el-drawer>
</div> </div>
</template> </template>
<script> <script>
@@ -451,6 +541,26 @@ export default {
zrbmMap: {}, zrbmMap: {},
sycpxMap: {}, sycpxMap: {},
selectSearch : [], selectSearch : [],
// 编辑抽屉状态
drawerEdit: false,
// 编辑框数据
editRowData: {
id: '',
standName: '',
standSortShow:'',
standEnName: '',
typeApplicable: '',
nylx: '',
putTime: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
sycpx: '',
cycvppsbm: '',
cycvppscn: '',
kccvppsbm: '',
kccvppscn: ''
},
// 新增、编辑 基础信息字段 // 新增、编辑 基础信息字段
sarAccessEO: { sarAccessEO: {
id: '', id: '',
@@ -1022,17 +1132,18 @@ export default {
// 追加字段 // 追加字段
this.selectedAccInfoSearchList.map(item => { this.selectedAccInfoSearchList.map(item => {
let addList; let addList;
addList = this.sarAccessInfoList.findIndex(items => { addList = this.sarAccessInfoList.findIndex(items => {
return items.id == item.id return items.id == item.id
}) })
if(addList > -1){ if(addList > -1){
this.$message.warning('请勿添加重复数据') this.$message.warning('请勿添加重复数据')
this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
} else{ } else{
this.sarAccessInfoList.push(item) this.sarAccessInfoList.push(item)
this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
} }
@@ -1069,6 +1180,22 @@ export default {
this.$set(this.sarAccessInfoList, index, i) this.$set(this.sarAccessInfoList, index, i)
} }
}, },
// 编辑按钮
editTghisRow(row) {
this.rowList = row
this.editRowData = this.rowList
this.editRowData.standNumber = this.rowList.standNumber
this.drawerEdit = true
},
// 抽屉取消按钮
cancelInfo() {
this.drawerEdit = false
},
// 抽屉提交按钮
saveInfo() {
this.rowList = this.editRowData
this.drawerEdit = false
},
// 点击清单条目导入按钮事件 // 点击清单条目导入按钮事件
importmodalFlags () { importmodalFlags () {
this.importmodalFlag = true this.importmodalFlag = true
@@ -1126,12 +1253,30 @@ export default {
this.$refs['sarAccessForm'].validate((valid) => { this.$refs['sarAccessForm'].validate((valid) => {
if (valid) { if (valid) {
let rowlist = [] let rowlist = []
let rowlist1 = []
let rowlist2 = []
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) { for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id) rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime)
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
} }
rowlist = rowlist.join(',') rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.inforlist = JSON.stringify(rowlist)
sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
// sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件 // 判断是否有附件
@@ -1150,12 +1295,16 @@ export default {
_this: this, _this: this,
loading: 'loadData' loading: 'loadData'
}, res => { }, res => {
if (res.ok) { if (this.sarAccessInfoList.length !== 0) {
this.$message.success('新增成功') if (res.ok) {
this.isNext = true this.$message.success('新增成功')
this.$router.push({ this.isNext = true
name: 'AccessStandardsAndRegulations' this.$router.push({
}) name: 'AccessStandardsAndRegulations'
})
}
}else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
} }
}, e => { }, e => {
}) })
@@ -1184,6 +1333,7 @@ export default {
selectLawsStands () { selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = ''
} else { } else {
this.sarAccessInfoSearch.standType = 'FOREIGN' this.sarAccessInfoSearch.standType = 'FOREIGN'
} }
@@ -1195,16 +1345,29 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
@@ -1225,16 +1388,29 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
@@ -1248,16 +1424,29 @@ export default {
sarAccessInfoSearchSelect (val) { sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val this.selectedAccInfoSearchList = val
this.selectedAccInfoSearchList.forEach(item => { this.selectedAccInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.selectedAccInfoSearchList.forEach(item => { this.selectedAccInfoSearchList.forEach(item => {
// 责任部门转换 // 责任部门转换
@@ -1656,13 +1845,13 @@ export default {
}) })
}, },
// 点击查看 // 点击查看
handlePreview (item) { handlePreview (data) {
let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails' let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: routerName, name: routerName,
params: { params: {
id: item.resId, id: data.id,
pageType: item.sarType pageType: this.sarAccessInfoSearch.dataSource
} }
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
@@ -1771,6 +1960,29 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
}, e => { }, e => {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+255 -55
View File
@@ -346,7 +346,7 @@
width="210px" width="210px"
label="卡车VPPS中文名称"> label="卡车VPPS中文名称">
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="操作"> <el-table-column width="240" align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -360,6 +360,12 @@
size="small" @click="moveDown(scope.$index, scope.row)" size="small" @click="moveDown(scope.$index, scope.row)"
v-if="!disabledFlag" v-if="!disabledFlag"
>下移</el-button> >下移</el-button>
<el-button
size="small"
@click="editTghisRow(scope.row)"
class="common-button-default"
type="warning"
>编辑</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -396,6 +402,89 @@
</div> </div>
</el-upload> </el-upload>
</el-dialog> </el-dialog>
<el-drawer
title="编辑清单条目"
:visible.sync="drawerEdit"
:wrapperClosable="false"
size="800px"
>
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号">
<el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
</el-form-item>
<el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"/>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName">
<el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
</el-form-item>
<el-form-item label="适用车型" prop="typeApplicable">
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
</el-form-item>
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-date-picker
v-model.trim="editRowData.putTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任部门" prop="zrbm">
<el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
</el-form-item>
<el-form-item label="适用产品线" prop="sycpx">
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
</el-form-item>
</el-form>
<div class="demo-drawer-footer">
<el-button
type="primary"
class="common-button-primary"
size="mini"
icon="el-icon-check"
@click="saveInfo"
>提交</el-button
>
<el-button
size="mini"
icon="el-icon-close"
class="common-button-default"
@click="cancelInfo"
>取消</el-button
>
</div>
</el-drawer>
</div> </div>
</template> </template>
<script> <script>
@@ -466,6 +555,26 @@ export default {
}, },
fileInfoList: [], // 上传的附件 fileInfoList: [], // 上传的附件
uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
// 编辑抽屉状态
drawerEdit: false,
// 编辑框数据
editRowData: {
id: '',
standName: '',
standSortShow:'',
standEnName: '',
typeApplicable: '',
nylx: '',
putTime: '',
zccssrqgj: '',
xcxssrqgj: '',
zrbm: '',
sycpx: '',
cycvppsbm: '',
cycvppscn: '',
kccvppsbm: '',
kccvppscn: ''
},
// 新增、编辑 基础信息验证条件 // 新增、编辑 基础信息验证条件
sarAccessEORules: { sarAccessEORules: {
type: [ type: [
@@ -1024,16 +1133,16 @@ export default {
this.selectedAccInfoSearchList.map(item => { this.selectedAccInfoSearchList.map(item => {
let addList; let addList;
addList = this.sarAccessInfoList.findIndex(items => { addList = this.sarAccessInfoList.findIndex(items => {
return items.id == item.id return items.id == item.id
}) })
if(addList > -1){ if(addList > -1){
this.$message.warning('请勿添加重复数据') this.$message.warning('请勿添加重复数据')
this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
} else{ } else{
this.sarAccessInfoList.push(item) this.sarAccessInfoList.push(item)
this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
} }
@@ -1070,6 +1179,22 @@ export default {
this.$set(this.sarAccessInfoList, index, i) this.$set(this.sarAccessInfoList, index, i)
} }
}, },
// 编辑按钮
editTghisRow(row) {
this.rowList = row
this.editRowData = this.rowList
this.editRowData.standNumber = this.rowList.standNumber
this.drawerEdit = true
},
// 抽屉取消按钮
cancelInfo() {
this.drawerEdit = false
},
// 抽屉提交按钮
saveInfo() {
this.rowList = this.editRowData
this.drawerEdit = false
},
// 点击清单条目导入按钮事件 // 点击清单条目导入按钮事件
importmodalFlags () { importmodalFlags () {
this.importmodalFlag = true this.importmodalFlag = true
@@ -1127,12 +1252,30 @@ export default {
this.$refs['sarAccessForm'].validate((valid) => { this.$refs['sarAccessForm'].validate((valid) => {
if (valid) { if (valid) {
let rowlist = [] let rowlist = []
let rowlist1 = []
let rowlist2 = []
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) { for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id) rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime)
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
} }
rowlist = rowlist.join(',') rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.inforlist = JSON.stringify(rowlist)
sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
// sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件 // 判断是否有附件
@@ -1151,12 +1294,16 @@ export default {
_this: this, _this: this,
loading: 'loadData' loading: 'loadData'
}, res => { }, res => {
if (res.ok) { if (this.sarAccessInfoList.length !== 0) {
this.$message.success('新增成功') if (res.ok) {
this.isNext = true this.$message.success('新增成功')
this.$router.push({ this.isNext = true
name: 'AccessStandardsAndRegulations' this.$router.push({
}) name: 'AccessStandardsAndRegulations'
})
}
}else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
} }
}, e => { }, e => {
}) })
@@ -1185,6 +1332,7 @@ export default {
selectLawsStands () { selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.sarAccessInfoSearch.standType = ''
} else { } else {
this.sarAccessInfoSearch.standType = 'FOREIGN' this.sarAccessInfoSearch.standType = 'FOREIGN'
} }
@@ -1196,16 +1344,29 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
@@ -1226,16 +1387,29 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
@@ -1249,16 +1423,29 @@ export default {
sarAccessInfoSearchSelect (val) { sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val this.selectedAccInfoSearchList = val
this.selectedAccInfoSearchList.forEach(item => { this.selectedAccInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
this.selectedAccInfoSearchList.forEach(item => { this.selectedAccInfoSearchList.forEach(item => {
// 责任部门转换 // 责任部门转换
@@ -1659,13 +1846,13 @@ export default {
}) })
}, },
// 点击查看 // 点击查看
handlePreview (item) { handlePreview (data) {
let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails' let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: routerName, name: routerName,
params: { params: {
id: item.resId, id: data.id,
pageType: item.sarType pageType: this.sarAccessInfoSearch.dataSource
} }
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
@@ -1776,16 +1963,29 @@ export default {
} }
}) })
this.sarAccessInfoSearchList.forEach(item => { this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'zccssrqgj', '')
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
}) })
}, e => { }, e => {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+102 -6
View File
@@ -10,7 +10,9 @@
<el-tree <el-tree
ref="tree" ref="tree"
node-key="id" node-key="id"
class="filter-tree" class="tree-line"
icon-class="icon-tree"
:indent="0"
:props="props" :props="props"
:data="treeList" :data="treeList"
highlight-current highlight-current
@@ -19,7 +21,7 @@
default-expand-all default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)"> <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span> {{ node.label}} </span> <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
<span> <span>
<el-button <el-button
type="text" type="text"
@@ -439,7 +441,7 @@
></custom-date-pick-group> ></custom-date-pick-group>
</template> </template>
<template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'"> <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
<template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH'"> <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'CBBH' || field.attrField === 'BFDTBZ'">
<custom-input-for-standards <custom-input-for-standards
:key="field.attrField" :key="field.attrField"
:config="field" :config="field"
@@ -502,6 +504,14 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</template> </template>
<template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
<custom-input
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="true"
></custom-input>
</template>
<template v-else> <template v-else>
<custom-input <custom-input
:key="field.attrField" :key="field.attrField"
@@ -2689,7 +2699,6 @@ export default {
this.$set(data, 'showDel', false) this.$set(data, 'showDel', false)
}, },
treeClick (treeNode) { treeClick (treeNode) {
console.log(treeNode)
this.selectSarMenu = treeNode this.selectSarMenu = treeNode
this.standCommonlySearch.menuId = treeNode.id this.standCommonlySearch.menuId = treeNode.id
this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
@@ -3362,8 +3371,8 @@ export default {
this.isSubmit = false this.isSubmit = false
if (res.ok) { if (res.ok) {
this.personCollect.collectType = 'INLAND_STAND' this.personCollect.collectType = 'INLAND_STAND'
this.personCollect.id = this.id this.personCollect.id = this.collectId
this.personCollect.collectResId = this.collectId this.personCollect.collectResId = this.id
this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')' this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')'
this.personCollect.userId = this.$store.getters.userInfo.userId this.personCollect.userId = this.$store.getters.userInfo.userId
this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {
@@ -4724,6 +4733,93 @@ export default {
} }
} }
</script> </script>
<style lang="less" scoped>
/deep/ .icon-tree {
margin:0 5px 0 10px;
position:relative;
background:url('~@/assets/images/shangqi/img/tree-add.png');
background-size:100% 100%;
}
/deep/ .expanded{
background:url('~@/assets/images/shangqi/img/tree-sub.png');
background-size:100% 100%;
}
/deep/ .is-leaf{
background-image:none;
background-size:100% 100%;
}
/deep/ .is-leaf-none{
position: relative;
display: inline-block;
width: 15px;
height: 15px;
background:url('~@/assets/images/shangqi/img/none-file.png');
background-size:100% 100%;
}
/deep/ .is-show{
position: relative;
display: inline-block;
width: 15px;
height: 15px;
background:url('~@/assets/images/shangqi/img/tree.png');
background-size:100% 100%;
}
/deep/.tree-line{
.el-tree-node {
position: relative;
padding-left: 0px; // 缩进量
}
.el-tree-node__children {
padding-left: 16px; // 缩进量
}
// 竖线
.el-tree-node::before {
content: "";
height: 100%;
width: 1px;
position: absolute;
left: -3px;
top: -26px;
border-width: 1px;
border-left: 1px dashed #858990e0;
}
// 当前层最后一个节点的竖线高度固定
.el-tree-node:last-child::before {
height: 38px; // 可以自己调节到合适数值
}
// 横线
.el-tree-node::after {
content: "";
width: 11px;
height: 20px;
position: absolute;
left: -3px;
top: 12px;
border-width: 1px;
border-top: 1px dashed #858990e0;
}
// 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
& > .el-tree-node::after {
border-top: none;
}
& > .el-tree-node::before {
border-left: none;
}
// 展开关闭的icon
.el-tree-node__expand-icon{
font-size: 16px;
// 叶子节点（无子节点）
&.is-leaf{
color: transparent;
// display: none; // 也可以去掉
}
}
}
</style>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+330 -14
View File
@@ -10,7 +10,9 @@
<el-tree <el-tree
ref="tree" ref="tree"
node-key="id" node-key="id"
class="filter-tree" class="tree-line"
icon-class="icon-tree"
:indent="0"
:props="props" :props="props"
:data="treeList" :data="treeList"
highlight-current highlight-current
@@ -19,7 +21,7 @@
default-expand-all default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)"> <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span> {{ node.label}} </span> <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
<span> <span>
<el-button <el-button
type="text" type="text"
@@ -261,9 +263,73 @@
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button> <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
</span> </span>
</el-dialog> </el-dialog>
<table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)" <!-- <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
@reset="clearAllSearch('sarStandardsSearch')"> <!-- @reset="clearAllSearch('sarStandardsSearch')">-->
<div slot="content"> <!-- <div slot="content">-->
<!-- <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">-->
<!-- &lt;!&ndash; 标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardNo')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 标准名称&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 标准类别&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">-->
<!-- <search-select-->
<!-- v-model="sarStandardsSearch.standSort"-->
<!-- :placeholder="$t('m.standardCategoryTips')"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
<!-- :options="standSortOptions"-->
<!-- clearable/>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 文本状态&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 代替标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 适用车型&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 适用产品线（新增字段）&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 关联模块（新增字段）&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.associatedModule')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- </table-tools-bar>-->
<!-- 高级筛选-->
<el-drawer
title="高级搜索"
size="700px"
:wrapperClosable="false"
:visible.sync="isAdvancedSearch">
<div class="demo-drawer-content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap"> <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
<!-- 标准号--> <!-- 标准号-->
<el-form-item :label="$t('m.standardNo')" class="serch-form-item"> <el-form-item :label="$t('m.standardNo')" class="serch-form-item">
@@ -275,14 +341,19 @@
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500" <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item> </el-form-item>
<!-- 标准英文名称-->
<el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准类别--> <!-- 标准类别-->
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item"> <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
<search-select <search-select
v-model="sarStandardsSearch.standSort" v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')" :placeholder="$t('m.standardCategoryTips')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="standSortOptions" :options="standSortOptions"
clearable/> clearable/>
</el-form-item> </el-form-item>
<!-- 文本状态--> <!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item"> <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
@@ -296,20 +367,161 @@
<el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100" <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item> </el-form-item>
<!-- 标准年份-->
<el-form-item :label="$t('m.standardYear')" class="serch-form-item">
<el-date-picker
v-model="sarStandardsSearch.standYear"
type="date"
placeholder="根据标准年份查找">
</el-date-picker>
</el-form-item>
<!-- 标准发布日期-->
<el-form-item label="标准发布日期" class="serch-form-item">
<el-date-picker
v-model="sarStandardsSearch.issueTime"
type="date"
placeholder="根据标准发布日期查找">
</el-date-picker>
</el-form-item>
<!-- 标准性质-->
<el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 是否纳入标准清单-->
<el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
<el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
<el-option value="yes" label="是"></el-option>
<el-option value="no" label="否"></el-option>
</el-select>
</el-form-item>
<!-- 实施日期-->
<el-form-item label="实施日期">
<el-date-picker
v-model="sarStandardsSearch.putTime"
type="date"
placeholder="根据实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 新车型实施日期-->
<el-form-item title="新车型实施日期" label="新车型实施日期">
<el-date-picker
v-model="sarStandardsSearch.XCXTime"
type="date"
placeholder="根据新车型实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 在产车实施日期-->
<el-form-item title="在产车实施日期" label="在产车实施日期">
<el-date-picker
v-model="sarStandardsSearch.ZCCTime"
type="date"
placeholder="根据在产车实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 归口管理部门-->
<el-form-item label="归口管理部门">
<el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 起草单位-->
<el-form-item label="起草单位">
<el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 我司参与深度-->
<el-form-item label="我司参与深度">
<el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 能源类型-->
<el-form-item label="能源类型">
<el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 适用车型--> <!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item"> <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option> <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 适用产品线（新增字段）--> <!-- 适用产品线（新增字段）-->
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item"> <el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option> <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 适用认证-->
<el-form-item label="适用认证">
<el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 责任部门-->
<el-form-item label="责任部门">
<el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 责任工程师-->
<el-form-item label="责任工程师">
<el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 关联模块-VPPS编码-->
<el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
<el-input v-model="sarStandardsSearch.svpps" clearable
placeholder="根据关联模块-VPPS编码查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 代替标准号-->
<el-form-item label="代替标准号">
<el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块-中文名称-->
<el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
<el-input v-model="sarStandardsSearch.standNumber" clearable
placeholder="根据关联模块-中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 采标编号-->
<el-form-item label="采标编号" prop="nameShow">
<el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 采标程度-->
<el-form-item label="采标程度" prop="standNumber">
<el-input v-model="sarStandardsSearch.standNumber" clearable
placeholder="根据采标程度查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 引用标准-->
<el-form-item label="引用标准">
<el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 被引用标准-->
<el-form-item label="被引用标准">
<el-input v-model="sarStandardsSearch.citedStand" clearable
placeholder="根据被引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块（新增字段）--> <!-- 关联模块（新增字段）-->
<el-form-item :label="$t('m.associatedModule')" class="serch-form-item"> <el-form-item :label="$t('m.associatedModule')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@@ -320,7 +532,18 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</table-tools-bar> <div class="demo-drawer-footer">
<el-button
class="common-button-primary"
icon="el-icon-check"
type="primary"
@click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
<el-button
class="common-button-default"
icon="el-icon-close"
@click="clearAllSearch('sarStandardsSearch')">取消</el-button>
</div>
</el-drawer>
<!-- 新增海外标准 --> <!-- 新增海外标准 -->
<el-drawer <el-drawer
:title="modalshowtitle" :title="modalshowtitle"
@@ -4092,6 +4315,93 @@ export default {
} }
</script> </script>
<style lang="less" scoped>
/deep/ .icon-tree {
margin:0 5px 0 10px;
position:relative;
background:url('~@/assets/images/shangqi/img/tree-add.png');
background-size:100% 100%;
}
/deep/ .expanded{
background:url('~@/assets/images/shangqi/img/tree-sub.png');
background-size:100% 100%;
}
/deep/ .is-leaf{
background-image:none;
background-size:100% 100%;
}
/deep/ .is-leaf-none{
position: relative;
display: inline-block;
width: 15px;
height: 15px;
background:url('~@/assets/images/shangqi/img/none-file.png');
background-size:100% 100%;
}
/deep/ .is-show{
position: relative;
display: inline-block;
width: 15px;
height: 15px;
background:url('~@/assets/images/shangqi/img/tree.png');
background-size:100% 100%;
}
/deep/.tree-line{
.el-tree-node {
position: relative;
padding-left: 0px; // 缩进量
}
.el-tree-node__children {
padding-left: 16px; // 缩进量
}
// 竖线
.el-tree-node::before {
content: "";
height: 100%;
width: 1px;
position: absolute;
left: -3px;
top: -26px;
border-width: 1px;
border-left: 1px dashed #858990e0;
}
// 当前层最后一个节点的竖线高度固定
.el-tree-node:last-child::before {
height: 38px; // 可以自己调节到合适数值
}
// 横线
.el-tree-node::after {
content: "";
width: 11px;
height: 20px;
position: absolute;
left: -3px;
top: 12px;
border-width: 1px;
border-top: 1px dashed #858990e0;
}
// 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
& > .el-tree-node::after {
border-top: none;
}
& > .el-tree-node::before {
border-left: none;
}
// 展开关闭的icon
.el-tree-node__expand-icon{
font-size: 16px;
// 叶子节点（无子节点）
&.is-leaf{
color: transparent;
// display: none; // 也可以去掉
}
}
}
</style>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
@@ -4273,6 +4583,9 @@ export default {
text-align: center; text-align: center;
margin-top: 6px; margin-top: 6px;
background: #F9F9F9; background: #F9F9F9;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis
} }
/deep/.el-input__inner { /deep/.el-input__inner {
height: 30px; height: 30px;
@@ -4280,6 +4593,9 @@ export default {
border-radius: 0 !important; border-radius: 0 !important;
} }
} }
.el-date-editor.el-input, .el-date-editor.el-input__inner{
width: 190px
}
.classDisplay{ .classDisplay{
display: none; display: none;
} }
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+1
View File
@@ -345,6 +345,7 @@ export default {
this.querySarProStateZero() this.querySarProStateZero()
}, // 查看项目符合性 }, // 查看项目符合性
querySarProStateZero () { querySarProStateZero () {
this.sarProStateTotalPage = 1
var form = this.sarProStateEO var form = this.sarProStateEO
// form.standId = this.standId // form.standId = this.standId
form.current = this.sarProStateTotalPage form.current = this.sarProStateTotalPage
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+44 -26
View File
@@ -25,33 +25,39 @@
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="historySearch.responseUnitShow" v-show="false" /> <el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
<el-popover <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
placement="bottom" {{ opt.label}}</el-option>
popper-class="user-dept-popper" </el-select>
trigger="click"
:value="false"
>
<el-input
slot="reference"
v-model="historySearch.responseUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
id="searchResp"
/>
<div class="api">
<laws-tree
:zNodes="zNodesSItem"
treeDivId="zNodesSItemSearch"
deptSelect
showRMenu
@treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
class="ztree" style="width: 200px;height: 400px;overflow: auto">
</laws-tree>
</div>
</el-popover>
</el-form-item> </el-form-item>
<!-- <el-form-item label="责任部门" class="search-item">-->
<!-- <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
<!-- <el-popover-->
<!-- placement="bottom"-->
<!-- popper-class="user-dept-popper"-->
<!-- trigger="click"-->
<!-- :value="false"-->
<!-- >-->
<!-- <el-input-->
<!-- slot="reference"-->
<!-- v-model="historySearch.responseUnitShow"-->
<!-- placeholder="根据责任部门查找"-->
<!-- readonly-->
<!-- clearable-->
<!-- id="searchResp"-->
<!-- />-->
<!-- <div class="api">-->
<!-- <laws-tree-->
<!-- :zNodes="zNodesSItem"-->
<!-- treeDivId="zNodesSItemSearch"-->
<!-- deptSelect-->
<!-- showRMenu-->
<!-- @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
<!-- class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
<!-- </laws-tree>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </el-form-item>-->
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -374,6 +380,7 @@ export default {
total: 0, total: 0,
// 当前页数 // 当前页数
pageNo: 1, pageNo: 1,
zrbmOptions:[],
// 单页数量 // 单页数量
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
// 历史数据查看 // 历史数据查看
@@ -652,6 +659,17 @@ export default {
} }
}, },
mounted () { mounted () {
// 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.allSelectOptions = res.data || {}
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => {
})
this.getTableBtn() this.getTableBtn()
this.getOrgTreeSource() this.getOrgTreeSource()
} }
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+44 -26
View File
@@ -17,33 +17,39 @@
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" /> <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
<el-popover <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
placement="bottom" {{ opt.label}}</el-option>
popper-class="user-dept-popper" </el-select>
trigger="click"
:value="false"
>
<el-input
slot="reference"
v-model="nonConformitySearch.responsibleUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
id="searchResp"
/>
<div class="api">
<laws-tree
:zNodes="zNodesSItem"
treeDivId="zNodesSItemSearch"
deptSelect
showRMenu
@treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
class="ztree" style="width: 200px;height: 400px;overflow: auto">
</laws-tree>
</div>
</el-popover>
</el-form-item> </el-form-item>
<!-- <el-form-item label="责任部门" class="search-item">-->
<!-- <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />-->
<!-- <el-popover-->
<!-- placement="bottom"-->
<!-- popper-class="user-dept-popper"-->
<!-- trigger="click"-->
<!-- :value="false"-->
<!-- >-->
<!-- <el-input-->
<!-- slot="reference"-->
<!-- v-model="nonConformitySearch.responsibleUnitShow"-->
<!-- placeholder="根据责任部门查找"-->
<!-- readonly-->
<!-- clearable-->
<!-- id="searchResp"-->
<!-- />-->
<!-- <div class="api">-->
<!-- <laws-tree-->
<!-- :zNodes="zNodesSItem"-->
<!-- treeDivId="zNodesSItemSearch"-->
<!-- deptSelect-->
<!-- showRMenu-->
<!-- @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
<!-- class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
<!-- </laws-tree>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </el-form-item>-->
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -427,6 +433,7 @@ export default {
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
}, },
zrbmOptions: [], // 责任部门下拉框
// 责任部门 // 责任部门
zNodesSItem: [], zNodesSItem: [],
myLoading: { myLoading: {
@@ -654,6 +661,17 @@ export default {
}, },
}, },
mounted () { mounted () {
// 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.allSelectOptions = res.data || {}
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => {
})
this.getTableByPage() this.getTableByPage()
// 加载所有的部门 // 加载所有的部门
this.getOrgTreeSource() this.getOrgTreeSource()