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

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

Browse Source
This commit is contained in:
zhutianqi
2021-07-27 15:49:51 +08:00
parent 2eca268fd0 23c6e90950
commit 8b960b384e
21 changed files with 2326 additions and 2238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForStandards.vue
+1 -1
View File
@@ -361,7 +361,7 @@ export default {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
total: 0, total: 0,
standType: 'INLAND', standType: 'ALL',
quoteIdList: '', quoteIdList: '',
validFlag: '0' validFlag: '0'
} }
src/components/CustomFormComponents/InputForStandardsForForeign.vue
+1 -1
View File
@@ -329,7 +329,7 @@ export default {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
total: 0, total: 0,
standType: 'FOREIGN', standType: 'ALL',
quoteIdList: '', quoteIdList: '',
validFlag: '0' validFlag: '0'
} }
src/components/treeSelect/treeSelectNew.vue
+7
View File
@@ -6,6 +6,7 @@
:size="width" :size="width"
:append-to-body=true :append-to-body=true
:before-close="cancelUserInfo" :before-close="cancelUserInfo"
:show-checkbox="showCheckBox"
> >
<el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps" <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
:load="loadNode" :load="loadNode"
@@ -111,6 +112,12 @@
return ''; return '';
} }
}, },
showCheckBox:{
type: Boolean,
default () {
return true;
}
},
// 配置是否展开 // 配置是否展开
modalShowFlag: { modalShowFlag: {
type: Boolean, type: Boolean,
src/pages/config/pages/linkManage/index.vue
+72 -42
View File
@@ -48,8 +48,10 @@
width="220px"> width="220px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="url"
label="链接"> label="链接">
<template slot-scope="scope" >
<span @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">{{ scope.row.url }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
@@ -149,6 +151,10 @@
} }
}, },
methods: { methods: {
//链接点击跳转,链接形式为http://xxxxxx
linkto(link_href){
window.open(link_href)
},
//头部新增按钮 //头部新增按钮
addLink () { addLink () {
this.type = 1 this.type = 1
@@ -157,33 +163,46 @@
}, },
//表格中操作列删除操作弹窗 //表格中操作列删除操作弹窗
deleteLink (row) { deleteLink (row) {
this.$confirm('此操作将删除该链接, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http.delete('sarUrl/tsUrl/delete', { this.$http.delete('sarUrl/tsUrl/delete', {
id: row.id id: row.id
}, { }, {
_this: this, _this: this,
loading: 'Loading' loading: 'Loading'
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.$message.success('删除成功') this.$message.success('删除成功')
let arr = [] let arr = []
for (let a = 0; a < this.linkList.length; a++) { for (let a = 0; a < this.linkList.length; a++) {
if (this.linkList[a].id === row.id) { if (this.linkList[a].id === row.id) {
this.linkList.splice(a, 1) this.linkList.splice(a, 1)
} }
}
this.linkList.forEach((item, index) => {
let json = {}
json.id = item.id
json.orderBy = index + 1
arr.push(json)
})
this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
this.getLink()
})
}else {
this.$message.warning(res.message)
} }
this.linkList.forEach((item, index) => {
let json = {}
json.id = item.id
json.orderBy = index + 1
arr.push(json)
})
this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
this.getLink()
})
}else {
this.$message.warning(res.message)
}
}) })
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
}, },
//头部删除按钮 //头部删除按钮
deleteAllLink() { deleteAllLink() {
@@ -196,28 +215,39 @@
this.$message.warning('请选择要删除的链接') this.$message.warning('请选择要删除的链接')
} else { } else {
this.modalRole = true this.modalRole = true
this.$confirm('此操作将删除链接, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http.delete('sarUrl/tsUrl/deleteBatch', { this.$http.delete('sarUrl/tsUrl/deleteBatch', {
ids: this.ids ids: this.ids
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
this.$message.success('删除成功') this.$message.success('删除成功')
let arr = this.linkList.filter(items => { let arr = this.linkList.filter(items => {
if (!this.ids.includes(items.id)) return items; if (!this.ids.includes(items.id)) return items;
}) })
let newArr = [] let newArr = []
arr.forEach((item, index) => { arr.forEach((item, index) => {
let json = {} let json = {}
json.id = item.id json.id = item.id
json.orderBy = index + 1 json.orderBy = index + 1
newArr.push(json) newArr.push(json)
}) })
this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
this.getLink() this.getLink()
}) })
}else { }else {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
}) })
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
} }
}, },
//弹窗关闭操作 //弹窗关闭操作
src/pages/details/otherStandardDetails/index.vue
+5 -3
View File
@@ -1267,6 +1267,9 @@ export default {
}, },
watch: {}, watch: {},
methods: { methods: {
FormatDate(date){
return moment(date).format('YYYY-MM-DD');
},
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
data.forEach(item => { data.forEach(item => {
@@ -2703,8 +2706,8 @@ export default {
location.half = half location.half = half
location.showAll = false location.showAll = false
}) })
this.$http.get('sarSarAccessInfo/sar-sar-access-info/selectProTimeInfoByStandId', { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
standId: this.$route.params.id id: this.$route.params.id
}, { }, {
_this: this _this: this
}, res => { }, res => {
@@ -2721,7 +2724,6 @@ 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-1.vue
+1415 -1440
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+30 -40
View File
@@ -49,26 +49,25 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="listForm.fileName"> <div>
<p>{{listForm.fileName}} <p>
{{ listForm.fileName }}
<el-upload
:action="uploadFileListPath"
show-file-list
:file-list="fileInfoList"
name="file"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
<el-button class="common-button-default" size="mini">
点击上传
</el-button>
</el-upload>
</p> </p>
</div> </div>
<div v-else>
<el-upload
:action="uploadFileListPath"
show-file-list
:file-list="fileInfoList"
name="file"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
<el-button class="common-button-default" size="mini">
点击上传
</el-button>
</el-upload>
</div>
</el-form-item> </el-form-item>
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled"> <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
<el-radio-group v-model="signFlag" @change="selectSign"> <el-radio-group v-model="signFlag" @change="selectSign">
@@ -741,17 +740,13 @@ export default {
}, },
roleForm: { roleForm: {
startUserName: this.$store.getters.userInfo.userName, startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id, startUser: this.$store.getters.userInfo.userId,
dockUser: "", dockUser: "",
responUserList: "",
ministerUser: "", ministerUser: "",
directorUser: "", directorUser: "",
presidentUser: "",
dockUserName: "", dockUserName: "",
responUserListName: "",
ministerUserName: "", ministerUserName: "",
directorUserName: "", directorUserName: "",
presidentUserName: ""
}, },
formRules: { formRules: {
listType: [ listType: [
@@ -806,7 +801,7 @@ export default {
modelName: "", modelName: "",
standId: "", //选择的清单的id standId: "", //选择的清单的id
signFlag: "1", //是否会签 1为会签 2为不会签 signFlag: "1", //是否会签 1为会签 2为不会签
inforlist: "", //用来存放标准列表的标准id inforlist: " ", //用来存放标准列表的标准id
dataList: [{ dataList: [{
code: "", //标准号 code: "", //标准号
standName: "", //标准名称 standName: "", //标准名称
@@ -850,9 +845,6 @@ export default {
} else if (this.type === "directorUser") { } else if (this.type === "directorUser") {
this.roleForm.directorUser = data[0].id; this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = data[0].name; this.roleForm.directorUserName = data[0].name;
} else if (this.type === "presidentUser") {
this.roleForm.presidentUser = data[0].id;
this.roleForm.presidentUserName = data[0].name;
} }
this.modalshowflag = false; this.modalshowflag = false;
}, },
@@ -1032,19 +1024,8 @@ export default {
if (this.dataList.length < 1) { if (this.dataList.length < 1) {
this.$message.warning("标准不能为空"); this.$message.warning("标准不能为空");
} else { } else {
let json = this.listForm; var json = Object.assign(this.listForm, this.roleForm)
this.listForm.fileId = this.fileIds.join(","); console.log(json);
this.listForm.fileName = this.fileListName.join(",");
this.listForm.model = this.listForm.fileId;
this.listForm.modelName = this.listForm.fileName;
json.zrUserId = this.roleForm.dockUser; //会签人
json.jlUserId = this.roleForm.directorUser; //业务经理
json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
json.approvalOpinion = "";
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standName = this.listForm.listName;
json.standId = this.listForm.standId;
this.$refs["qdfbForm"].validate((valid) => { this.$refs["qdfbForm"].validate((valid) => {
if (valid) { if (valid) {
this.$refs["Form"].validate((valid) => { this.$refs["Form"].validate((valid) => {
@@ -1100,6 +1081,12 @@ 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 ){
this.listForm.fileName = this.fileListName.join(',')
}else {
this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
}
this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
this.$message.success("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
@@ -1202,6 +1189,7 @@ export default {
if (this.standList.length < 1) { if (this.standList.length < 1) {
this.$message.warning("请选择需要添加进清单的数据"); this.$message.warning("请选择需要添加进清单的数据");
} else { } else {
let exits = []
this.standList.map(item => { this.standList.map(item => {
let newStand = false; let newStand = false;
for (let itemKey of this.dataList) { for (let itemKey of this.dataList) {
@@ -1214,8 +1202,10 @@ export default {
this.$message.warning("请勿重复添加数据"); this.$message.warning("请勿重复添加数据");
} else { } else {
this.dataList.push(item); this.dataList.push(item);
exits.push(item.id)
} }
}); });
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
+18 -2
View File
@@ -78,8 +78,13 @@
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p> <a v-if="scope.row.standYear" class="table-jump"
<p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p> @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
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
@@ -407,6 +412,17 @@ 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/bzrk/step1.vue
+23 -6
View File
@@ -511,9 +511,11 @@
width = "800" width = "800"
:key="key1" :key="key1"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-Strictly="false"
:modalShowFlag="modalShowFlag2" :modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url" :url="url"
:urlChild="urlChild" :urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
@@ -525,9 +527,11 @@
width = "800" width = "800"
:key="key2" :key="key2"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-Strictly="false"
:modalShowFlag="modalShowFlag3" :modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url" :url="url"
:urlChild="urlChild" :urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
@@ -539,10 +543,12 @@
width = "800" width = "800"
:key="key3" :key="key3"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-Strictly="false"
:modalShowFlag="modalShowFlag4" :modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
:show-checkBox="showCheckBox"
:urlChild="urlChild" :urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new> :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
@@ -727,6 +733,13 @@
placeholder="请输入采标编号" placeholder="请输入采标编号"
clearable clearable
></el-input> ></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('cbbh'),config.attrName = '采标编号'"
>{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
@@ -1235,6 +1248,7 @@
url:'', url:'',
urlChild:'', urlChild:'',
drawerTitle: '', //drawer标题 drawerTitle: '', //drawer标题
showCheckBox: true, // 树形控件是否展示多选框
nodeKey: 'id', nodeKey: 'id',
defaultCheckedKeys: [], defaultCheckedKeys: [],
nodeKeyCode: 'code', nodeKeyCode: 'code',
@@ -1834,12 +1848,15 @@
this.replaceLawsNumModel = false this.replaceLawsNumModel = false
}) })
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'dtbjh'){ if(this.replaceLawType === 'dtbjh'){
this.form.dtbjh = textArr.join(',') this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){ }else if(this.replaceLawType === 'yybj'){
this.form.yybj = textArr.join(',') this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else { }else {
this.form.byybj = textArr.join(',') this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
} }
// this.$emit('input', textArr.join(',')) // this.$emit('input', textArr.join(','))
this.$refs.selections.clearSelection() this.$refs.selections.clearSelection()
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+129 -86
View File
@@ -201,84 +201,84 @@
<template slot="title">文本信息</template> <template slot="title">文本信息</template>
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="form.xgdName"> <div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
{{ form.xgdName }} {{ form.xgdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled"> <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgbjbdName"> <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
{{ form.fbgbjbdName }} {{ form.fbgbjbdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName"> <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
{{ form.zbjbdName }} {{ form.zbjbdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName"> <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }} {{ form.bpgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName"> <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.ssgName }} {{ form.ssgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwjName"> <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
{{ form.kwjName }} {{ form.kwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjgName"> <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }} {{ form.zqyjgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled"> <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.caName"> <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.caName }} {{ form.caName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<div v-if="form.jdwjName"> <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwjName }} {{ form.jdwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
<template slot="title">适用范围</template> <template slot="title">适用范围</template>
@@ -467,14 +467,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName"> <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
{{ form.glwjName }} {{ form.glwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -685,6 +685,16 @@
name: "bzrkStep2", name: "bzrkStep2",
data () { data () {
return { return {
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
ssgFileId: '',
zqyjgFileId: '',
jdwjFileId: '',
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId:'',
rules: { rules: {
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }], commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }] approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
@@ -844,6 +854,29 @@
}, },
}, },
methods: { methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
}
},
getRule(){ getRule(){
if (this.formTongGuo.approvalOpinion !== '1') { if (this.formTongGuo.approvalOpinion !== '1') {
this.$refs.formTongGuo.clearValidate('commentText') this.$refs.formTongGuo.clearValidate('commentText')
@@ -910,6 +943,16 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
this.ssgFileId = processForm.ssg
this.zqyjgFileId = processForm.zqyjg
this.jdwjFileId = processForm.jdwj
this.kwjFileId = processForm.kwj
this.glwjFileId = processForm.glwj
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
} }
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+53 -10
View File
@@ -197,7 +197,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="form.xgdName"> <div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
{{ form.xgdName }} {{ form.xgdName }}
</div> </div>
<div v-else> <div v-else>
@@ -205,7 +205,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled"> <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgbjbdName"> <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
{{ form.fbgbjbdName }} {{ form.fbgbjbdName }}
</div> </div>
<div v-else> <div v-else>
@@ -213,7 +213,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName"> <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
{{ form.zbjbdName }} {{ form.zbjbdName }}
</div> </div>
<div v-else> <div v-else>
@@ -221,7 +221,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName"> <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }} {{ form.bpgName }}
</div> </div>
<div v-else> <div v-else>
@@ -229,7 +229,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName"> <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.ssgName }} {{ form.ssgName }}
</div> </div>
<div v-else> <div v-else>
@@ -239,7 +239,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwjName"> <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
{{ form.kwjName }} {{ form.kwjName }}
</div> </div>
<div v-else> <div v-else>
@@ -247,7 +247,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjgName"> <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }} {{ form.zqyjgName }}
</div> </div>
<div v-else> <div v-else>
@@ -255,7 +255,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled"> <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.caName"> <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.caName }} {{ form.caName }}
</div> </div>
<div v-else> <div v-else>
@@ -263,7 +263,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<div v-if="form.jdwjName"> <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwjName }} {{ form.jdwjName }}
</div> </div>
<div v-else> <div v-else>
@@ -461,7 +461,7 @@
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName"> <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
{{ form.glwjName }} {{ form.glwjName }}
</div> </div>
<div v-else> <div v-else>
@@ -666,6 +666,16 @@ export default {
name: "bzrkStep3", name: "bzrkStep3",
data () { data () {
return { return {
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
ssgFileId: '',
zqyjgFileId: '',
jdwjFileId: '',
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId:'',
activeName:'1', activeName:'1',
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
processType: 1, processType: 1,
@@ -818,6 +828,29 @@ export default {
}, },
}, },
methods: { methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
}
},
popoverHide (checkedIds, checkedData) { popoverHide (checkedIds, checkedData) {
if(checkedData) { if(checkedData) {
this.form.standSystem = checkedData.id this.form.standSystem = checkedData.id
@@ -879,6 +912,16 @@ export default {
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
this.ssgFileId = processForm.ssg
this.zqyjgFileId = processForm.zqyjg
this.jdwjFileId = processForm.jdwj
this.kwjFileId = processForm.kwj
this.glwjFileId = processForm.glwj
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
} }
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+17 -6
View File
@@ -709,7 +709,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="position:absolute;top: 10px;right: 0;" style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('dtbjh'),config.attrName = '代替标准号'" @click="selectLaws('yybj'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
@@ -718,6 +718,13 @@
placeholder="请输入采标编号" placeholder="请输入采标编号"
clearable clearable
></el-input> ></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('cbbh'),config.attrName = '采标编号'"
>{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled"> <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -730,7 +737,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="position:absolute;top: 10px;right: 0;" style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('dtbjh'),config.attrName = '代替标准号'" @click="selectLaws('byybj'),config.attrName = '被引用标准'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
@@ -1398,12 +1405,15 @@ export default {
this.replaceLawsNumModel = false this.replaceLawsNumModel = false
}) })
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'dtbjh'){ if(this.replaceLawType === 'dtbjh'){
this.form.dtbjh = textArr.join(',') this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){ }else if(this.replaceLawType === 'yybj'){
this.form.yybj = textArr.join(',') this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else { }else if(this.replaceLawType === 'cbbh'){
this.form.byybj = textArr.join(',') this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
} else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
} }
// this.$emit('input', textArr.join(',')) // this.$emit('input', textArr.join(','))
this.$refs.selections.clearSelection() this.$refs.selections.clearSelection()
@@ -1605,6 +1615,7 @@ export default {
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.commentText = processForm.commentText
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
} }
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+205 -141
View File
@@ -42,13 +42,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled"> <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-date-picker <el-input
disabled v-model.number="form.standYear"
v-model="form.standYear" placeholder="请输入标准标准年份"
type="year" disabled
placeholder="请选择标准年份" ></el-input>
value-format="yyyy">
</el-date-picker>
</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
@@ -119,10 +117,16 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<tree-select <el-input
:data="standSystemOptions" disabled
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" v-model="form.standSystem"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select> placeholder="请选择标准体系"
clearable
></el-input>
<!-- <tree-select-->
<!-- :data="standSystemOptions"-->
<!-- :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"-->
<!-- :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>-->
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -198,84 +202,84 @@
<template slot="title">文本信息</template> <template slot="title">文本信息</template>
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="form.xgd"> <div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
{{ form.xgd }} {{ form.xgdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled"> <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgbjbd"> <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
{{ form.fbgbjbd }} {{ form.fbgbjbdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbd"> <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
{{ form.zbjbd }} {{ form.zbjbdName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpg"> <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpg }} {{ form.bpgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssg"> <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.ssg }} {{ form.ssgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwj"> <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
{{ form.kwj }} {{ form.kwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjg"> <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjg }} {{ form.zqyjgName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled"> <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.ca"> <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.ca }} {{ form.caName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<div v-if="form.jdwj"> <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwj }} {{ form.jdwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
<template slot="title">适用范围</template> <template slot="title">适用范围</template>
@@ -317,22 +321,28 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple disabled> <el-input
<el-option label="乘用车VPPS编码1" value="1"></el-option> disabled
<el-option label="乘用车VPPS编码2" value="2"></el-option> v-model.number="form.cycvppsbm"
</el-select> placeholder="请选择关联模块--乘用车VPPS编码"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple disabled> <el-input
<el-option label="卡车VPPS编码1" value="1"></el-option> disabled
<el-option label="卡车VPPS编码2" value="2"></el-option> v-model.number="form.kccvppsbm"
</el-select> placeholder="关联模块--卡车VPPS编码"
clearable
></el-input>
</el-form-item> </el-form-item>
<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-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled> <el-input
<el-option label="模块结构单元变型号1" value="1"></el-option> disabled
<el-option label="模块结构单元变型号2" value="2"></el-option> v-model.number="form.dybxh"
</el-select> placeholder="请选择模块结构单元变型号"
clearable
></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-input
@@ -342,14 +352,17 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="fbjg" 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-input <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
disabled <el-option
v-model="form.fbjg" v-for="item in qcdwOption"
placeholder="请选择起草单位" placeholder="请选择"
clearable :key="item.value"
></el-input> :value="item.value"
</el-form-item> :label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
<el-option <el-option
@@ -457,22 +470,23 @@
<el-option label="采标程度2" value="2"></el-option> <el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled"> <!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
disabled <!-- disabled-->
v-model="form.xglc" <!-- v-model="form.xglc"-->
placeholder="请输入相关流程" <!-- placeholder="请输入相关流程"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwj"> <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
{{ form.glwj }} {{ form.glwjName }}
</div> </div>
<div v-else> <div v-else>
- - - -
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -491,22 +505,22 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
disabled <!-- disabled-->
v-model="form.byybj" <!-- v-model="form.byybj"-->
placeholder="请输入被引用标准" <!-- placeholder="请输入被引用标准"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled"> <!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
disabled <!-- disabled-->
v-model="form.chjl" <!-- v-model="form.chjl"-->
placeholder="请输入参会记录" <!-- placeholder="请输入参会记录"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -670,6 +684,16 @@
name: "bzrkStep5", name: "bzrkStep5",
data () { data () {
return { return {
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
ssgFileId: '',
zqyjgFileId: '',
jdwjFileId: '',
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId:'',
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
processType: 1, processType: 1,
detailData: [], detailData: [],
@@ -766,6 +790,7 @@
zrbmOptions: [], // 责任部门 zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师 zrgcsOptions: [], // 责任工程师
txlbOptions: [], // 体系类别 txlbOptions: [], // 体系类别
qcdwOption: [], // 起草单位
data: [], // 标准列表数据 data: [], // 标准列表数据
ListForm: {}, // 新增数据 ListForm: {}, // 新增数据
user1: '', user1: '',
@@ -790,6 +815,29 @@
}, },
}, },
methods: { methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
}
},
popoverHide (checkedIds, checkedData) { popoverHide (checkedIds, checkedData) {
console.log(checkedIds); console.log(checkedIds);
console.log(checkedData); console.log(checkedData);
@@ -816,6 +864,21 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
this.ssgFileId = processForm.ssg
this.zqyjgFileId = processForm.zqyjg
this.jdwjFileId = processForm.jdwj
this.kwjFileId = processForm.kwj
this.glwjFileId = processForm.glwj
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.form.standYear = processForm.standYear
this.form.standSystem = processForm.standSystem
this.form.kccvppsbm = processForm.kccvppsbm
this.form.cycvppsbm = processForm.cycvppsbm
this.form.dybxh = processForm.dybxh
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
} }
}).catch(e => { }).catch(e => {
@@ -914,6 +977,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.qcdwOption = res.data.QCDW // 体系类别
}) })
} }
} }
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+1 -7
View File
@@ -84,7 +84,7 @@
<el-table-column label="责任人" prop="workPeople" align="center"> <el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="{'fileClass': !scope.row.workPeople}"> <div :class="{'fileClass': !scope.row.workPeople}">
{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div> {{ scope.row.workPeople ? scope.row.workPeople: '' }}</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -304,8 +304,6 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.dataList.forEach(item => {
if (item.workPeople !== undefined) {
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -321,10 +319,6 @@ export default {
} }
}, e => { }, e => {
}); });
} else {
this.$message.warning("请选择分发负责人");
}
});
}, },
//批量分发按钮 //批量分发按钮
batchOperation(id) { batchOperation(id) {
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+66
View File
@@ -600,6 +600,72 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
} else if(row.taskInfo === '分发负责人审批') {
this.$router.push({
name: 'xmpg2Step7',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '架构经理审批') {
this.$router.push({
name: 'xmpg2Step8',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '工程经理审批') {
this.$router.push({
name: 'xmpg2Step9',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '标准法规部经理审批') {
this.$router.push({
name: 'xmpg2Step10',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '汇总审批') {
this.$router.push({
name: 'xmpg2Step11',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '标准法规部部长审批') {
this.$router.push({
name: 'xmpg2Step12',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} }
break break
//未符合项整改流程 //未符合项整改流程
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+80 -155
View File
@@ -80,55 +80,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item"> <el-form-item label="标准名称" class="search-item">
<el-input <el-input
v-model="sarAccessInfoSearch.standName" v-model="sarAccessInfoSearch.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100" :maxlength="100"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="国家/地区" class="search-item" v-show="isListType">
<el-select
v-model="sarAccessInfoSearch.countryArea"
placeholder="请选择"
filterable
>
<el-option
v-for="item in drawerCountryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</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"
@@ -158,46 +116,23 @@
</div> </div>
</div> </div>
<div class="showSelectBox" v-if="!showSelectBox"> <div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline> <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType"> <el-form-item label="标准号" class="labelBox">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-input <el-input
v-model="sarAccessInfoSearch.standName" v-model="sarAccessInfo.standNumber"
placeholder="请输入" placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small" size="small"
value-format="yyyy-MM-DD" clearable/>
placeholder="选择更新日期"> </el-form-item>
</el-date-picker> <el-form-item label="标准名称" class="labelBox">
<el-input
v-model="sarAccessInfo.standName"
placeholder="请输入"
size="small"
clearable/>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -243,13 +178,12 @@
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a> <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称" label="标准名称"
width="260px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -287,52 +221,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="country"
label="国家/地区"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.country !== null && scope.row.country.indexOf(',') > 0">
<span>{{ scope.row.country }}</span>
</span>
<span v-else>{{ countryAreaMap[scope.row.country] }}</span>
</template>
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange" <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination> @pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading> <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -354,6 +242,7 @@
v-btn-permission="''" v-btn-permission="''"
><i class="iconfont">&#xe61b;</i>删除</el-button> ><i class="iconfont">&#xe61b;</i>删除</el-button>
</div> </div>
<!-- 清单条目的列表页 -->
<el-table <el-table
ref="entryTable" ref="entryTable"
:data="sarAccessInfoList" :data="sarAccessInfoList"
@@ -541,21 +430,19 @@
> >
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px"> <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号"> <el-form-item label="标准号">
<el-input v-model.trim="editRowData.standNumber" :disabled="true"> <el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
<!-- <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName"> <el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"></el-input> <el-input v-model.trim="editRowData.standName" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="英文名称" prop="standEnName"> <el-form-item label="英文名称" prop="standEnName">
<el-input v-model.trim="editRowData.standEnName" :disabled="true"></el-input> <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" prop="typeApplicable"> <el-form-item label="适用车型" prop="typeApplicable">
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"></el-input> <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="能源类型" prop="nylx"> <el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"></el-input> <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="标准实施日期" prop="putTime"> <el-form-item label="标准实施日期" prop="putTime">
<el-date-picker <el-date-picker
@@ -582,22 +469,22 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" prop="zrbm"> <el-form-item label="责任部门" prop="zrbm">
<el-input v-model.trim="editRowData.zrbm" :disabled="true"></el-input> <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="适用产品线" prop="sycpx"> <el-form-item label="适用产品线" prop="sycpx">
<el-input v-model.trim="editRowData.sycpx" :disabled="true"></el-input> <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm"> <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"></el-input> <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn"> <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"></el-input> <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="卡车VPPS编码" prop="kccvppsbm"> <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"></el-input> <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn"> <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"></el-input> <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
@@ -746,19 +633,23 @@ export default {
{value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'},
//{value: 'FOREIGN_LAWS', label: '国内外政策'}, //{value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '}, // {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '} // {value: 'TEMP', label: '标准法规清单 '}
], ],
// 新增、编辑 数据搜索字段 // 新增、编辑 数据搜索字段
sarAccessInfoSearch: { sarAccessInfoSearch: {
id: '', id: '',
countryArea: '', // 国家
issueTime: '',
standName: '', standName: '',
textStatus: '', askType: '', // 监管类型
// applicationScope: '', //适用区域 dataSource: 'INLAND_STAND', // 数据来源
keywords: '', // 关键字 page: 1,
detailedListName: '', //清单名称 pageSize: this.$store.getters.userInfo.configContent,
applyArctic: '', // 能源种类 validFlag: 0,
advanceSearchVOStr: ''
},
sarAccessInfo: {
id: '',
standNumber: '',
standName: '',
askType: '', // 监管类型 askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源 dataSource: 'INLAND_STAND', // 数据来源
page: 1, page: 1,
@@ -1104,15 +995,11 @@ export default {
}, },
// 点击清空查询条件 按钮事件 // 点击清空查询条件 按钮事件
clearSearchLaws () { clearSearchLaws () {
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.sarAccessInfoSearch.standName = '' this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.putTime = '' this.sarAccessInfo.standName = ''
this.sarAccessInfoSearch.textStatus = '' this.sarAccessInfo.standNumber = ''
this.isListType = false this.isListType = false
this.selectLawsStands() this.selectLawsStands()
}, },
@@ -1474,6 +1361,11 @@ export default {
}, },
// 查询数据搜索 table 数据 // 查询数据搜索 table 数据
selectLawsStands () { selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => { this.sarAccessInfoSearchList.forEach(item => {
@@ -1482,8 +1374,35 @@ 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)
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
}, e => {
})
},
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => { this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
@@ -2169,6 +2088,12 @@ export default {
text-align: right; text-align: right;
} }
} }
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select { .un-select {
user-select: none; user-select: none;
} }
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+13 -6
View File
@@ -191,13 +191,13 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="standNumber"
fixed="left" fixed="left"
width="180px" width="180px"
align="center" align="center"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a> <span class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -491,6 +491,13 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.standinfoList = res.data; this.standinfoList = res.data;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.total = res.data.total; this.total = res.data.total;
}, e => { }, e => {
@@ -628,7 +635,7 @@ export default {
name: "OtherStandardDetails", name: "OtherStandardDetails",
params: { params: {
id: data.id, id: data.id,
pageType: data.sarType pageType: data.standType
} }
}); });
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, "_blank");
@@ -660,10 +667,10 @@ export default {
// //
changeState(row) { changeState(row) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: "ComplianceDetails", name: "OtherStandardDetails",
query: { query: {
sarId: row.resId, id: data.id,
sarType: row.sarState pageType: this.standType
} }
}); });
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, "_blank");
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+79 -139
View File
@@ -65,40 +65,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item"> <el-form-item label="标准名称" class="search-item">
<el-input <el-input
v-model="sarAccessInfoSearch.standName" v-model="sarAccessInfoSearch.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100" :maxlength="100"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</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"
@@ -115,7 +88,11 @@
@click="clearSearchLaws">清空</el-button> @click="clearSearchLaws">清空</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"> <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i> <i class="iconfont">&#xe7a5;</i>
高级查询 高级查询
</el-button> </el-button>
@@ -124,54 +101,23 @@
</div> </div>
</div> </div>
<div class="showSelectBox" v-if="!showSelectBox"> <div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline> <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType"> <el-form-item label="标准号" class="labelBox">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目类别" v-show="isListType">
<el-input <el-input
size="small" v-model="sarAccessInfo.standNumber"
v-model="sarAccessInfoSearch.standSystem"
placeholder="请输入" placeholder="请输入"
:maxlength="100" size="small"
></el-input> clearable/>
</el-form-item> </el-form-item>
<el-form-item label="更新人" v-show="isListType"> <el-form-item label="标准名称" class="labelBox">
<el-input <el-input
v-model="sarAccessInfoSearch.standName" v-model="sarAccessInfo.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small" size="small"
value-format="yyyy-MM-DD" clearable/>
placeholder="选择更新日期"> </el-form-item>
</el-date-picker> <el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -223,7 +169,6 @@
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称" label="标准名称"
width="260px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -261,46 +206,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="detailedList"
label="清单类别"
align="center">
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange" <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination> @pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading> <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -405,16 +310,6 @@
width="210px" width="210px"
align="center" align="center"
label="责任部门"> label="责任部门">
<template slot-scope="scope">
<span
v-for="(item, index) in zrbmOptions"
:key="index"
:value="item.value"
v-if="scope.row.value == item.value"
>
{{ item.label }}
</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -525,7 +420,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand"; import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig"; import {interfaceUrl} from "@/sysConfig";
import {dicTypeData} from "@/api/unqualProcess"; import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess";
export default { export default {
name: 'OtherAddEit', name: 'OtherAddEit',
components: { components: {
@@ -607,18 +502,14 @@ export default {
dataSourceOptions: [ dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'}, {value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'},
{value: 'FOREIGN_LAWS', label: '国内外政策'}, // {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '}, // {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '} // {value: 'TEMP', label: '标准法规清单 '}
], ],
// 新增、编辑 数据搜索字段 // 新增、编辑 数据搜索字段
sarAccessInfoSearch: { sarAccessInfoSearch: {
id: '', id: '',
countryArea: '', // 国家 standName: '',
// applicationScope: '', //适用区域
keywords: '', // 关键字
detailedListName: '', //清单名称
applyArctic: '', // 能源种类
askType: '', // 监管类型 askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源 dataSource: 'INLAND_STAND', // 数据来源
page: 1, page: 1,
@@ -626,6 +517,17 @@ export default {
validFlag: 0, validFlag: 0,
advanceSearchVOStr: '' advanceSearchVOStr: ''
}, },
sarAccessInfo: {
id: '',
standName: '',
standNumber: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
moreSearchBtn: true, // 多属性搜索按钮 状态 moreSearchBtn: true, // 多属性搜索按钮 状态
showTableFlag: true, // 显示添加列表 状态 showTableFlag: true, // 显示添加列表 状态
sarAccessInfoSearchList: [], // 数据搜索 table列表数据 sarAccessInfoSearchList: [], // 数据搜索 table列表数据
@@ -855,6 +757,9 @@ export default {
methods: { methods: {
// 高级检索 // 高级检索
selectMoreBtn () { selectMoreBtn () {
this.showSelectBox = !this.showSelectBox
this.showTableFlag = false
this.selectLawsStands()
}, },
// 法规维护人树 // 法规维护人树
getDept () { getDept () {
@@ -945,11 +850,10 @@ export default {
// 点击清空查询条件 按钮事件 // 点击清空查询条件 按钮事件
clearSearchLaws () { clearSearchLaws () {
this.sarAccessInfoSearch.standName = '' this.sarAccessInfoSearch.standName = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.sarAccessInfoSearch.advanceSearchVOStr = '' this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.isListType = false this.isListType = false
this.selectLawsStands() this.selectLawsStands()
@@ -1278,9 +1182,42 @@ export default {
}, },
// 查询数据搜索 table 数据 // 查询数据搜索 table 数据
selectLawsStands () { selectLawsStands () {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
_this: this this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
}, res =>{ } else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
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
}, e => {
})
},
// 高级检索查询按钮
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => { this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) { if (item.standYear === null) {
@@ -1288,8 +1225,6 @@ export default {
} else { } else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
@@ -1303,7 +1238,6 @@ export default {
}) })
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
}) })
}, },
// 数据搜索table判断checked状态 // 数据搜索table判断checked状态
@@ -1987,6 +1921,12 @@ export default {
text-align: right; text-align: right;
} }
} }
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select { .un-select {
user-select: none; user-select: none;
} }
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+81 -126
View File
@@ -65,40 +65,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item"> <el-form-item label="标准名称" class="search-item">
<el-input <el-input
v-model="sarAccessInfoSearch.standName" v-model="sarAccessInfoSearch.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100" :maxlength="100"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</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"
@@ -128,54 +101,23 @@
</div> </div>
</div> </div>
<div class="showSelectBox" v-if="!showSelectBox"> <div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline> <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType"> <el-form-item label="标准号" class="labelBox">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目名称" v-show="isListType">
<el-input <el-input
size="small" v-model="sarAccessInfo.standNumber"
v-model="sarAccessInfoSearch.standSystem"
placeholder="请输入" placeholder="请输入"
:maxlength="100" size="small"
></el-input> clearable/>
</el-form-item> </el-form-item>
<el-form-item label="更新人" v-show="isListType"> <el-form-item label="标准名称" class="labelBox">
<el-input <el-input
v-model="sarAccessInfoSearch.standName" v-model="sarAccessInfo.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small" size="small"
value-format="yyyy-MM-DD" clearable/>
placeholder="选择更新日期"> </el-form-item>
</el-date-picker> <el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -227,7 +169,6 @@
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称" label="标准名称"
width="260px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -265,46 +206,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
align="center">
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange" <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination> @pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading> <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -519,7 +420,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand"; import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig"; import {interfaceUrl} from "@/sysConfig";
import {dicTypeData} from "@/api/unqualProcess"; import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess"
export default { export default {
name: 'OtherAddEit', name: 'OtherAddEit',
components: { components: {
@@ -601,18 +502,25 @@ export default {
dataSourceOptions: [ dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'}, {value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'},
{value: 'FOREIGN_LAWS', label: '国内外政策'}, // {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '}, // {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '} // {value: 'TEMP', label: '标准法规清单 '}
], ],
// 新增、编辑 数据搜索字段 // 新增、编辑 数据搜索字段
sarAccessInfoSearch: { sarAccessInfoSearch: {
id: '', id: '',
countryArea: '', // 国家 standName: '',
// applicationScope: '', //适用区域 askType: '', // 监管类型
keywords: '', // 关键字 dataSource: 'INLAND_STAND', // 数据来源
detailedListName: '', //清单名称 page: 1,
applyArctic: '', // 能源种类 pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
sarAccessInfo: {
id: '',
standName: '',
standNumber: '',
askType: '', // 监管类型 askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源 dataSource: 'INLAND_STAND', // 数据来源
page: 1, page: 1,
@@ -943,11 +851,10 @@ export default {
// 点击清空查询条件 按钮事件 // 点击清空查询条件 按钮事件
clearSearchLaws () { clearSearchLaws () {
this.sarAccessInfoSearch.standName = '' this.sarAccessInfoSearch.standName = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.sarAccessInfoSearch.advanceSearchVOStr = '' this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.isListType = false this.isListType = false
this.selectLawsStands() this.selectLawsStands()
@@ -1276,9 +1183,12 @@ export default {
}, },
// 查询数据搜索 table 数据 // 查询数据搜索 table 数据
selectLawsStands () { selectLawsStands () {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
_this: this this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
}, res =>{ } else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => { this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) { if (item.standYear === null) {
@@ -1286,10 +1196,49 @@ 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)
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
}, e => {
})
},
/** 高级查询查询按钮*/
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
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 => {
}) })
}, },
// 数据搜索table判断checked状态 // 数据搜索table判断checked状态
@@ -1987,6 +1936,12 @@ export default {
text-align: right; text-align: right;
} }
} }
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select { .un-select {
user-select: none; user-select: none;
} }
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+13 -11
View File
@@ -188,22 +188,21 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="XCXSSRQ"
sortable="custom" sortable="custom"
width="150px" width="150px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span> <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrq" prop="ZCCSSRQ"
sortable="custom" sortable="custom"
width="150px" width="150px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatText(scope.row.ZCCSSRQ) }}</span> <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -2516,7 +2515,6 @@ export default {
console.log(item, 'itemitemitemitem') console.log(item, 'itemitemitemitem')
const formFieldList = this.formFieldList const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
if(this.sarStandardsInfoEO.standSystem){ if(this.sarStandardsInfoEO.standSystem){
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
} }
@@ -2679,10 +2677,11 @@ export default {
}, },
// 树节点鼠标移入移出 // 树节点鼠标移入移出
mouseenter(data){ mouseenter(data){
console.log(data) if(data.menuName !== '我的收藏'){
this.$set(data, 'show', true) this.$set(data, 'show', true)
if(data.parentId !== null){ if(data.parentId !== null){
this.$set(data, 'showDel', true) this.$set(data, 'showDel', true)
}
} }
}, },
mouseleave(data){ mouseleave(data){
@@ -2690,6 +2689,7 @@ 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传回后台做标准的条件查询
@@ -3431,8 +3431,9 @@ export default {
formData.nowOrder = this.nowOrder formData.nowOrder = this.nowOrder
formData.nowOrderBy = this.nowOrderBy formData.nowOrderBy = this.nowOrderBy
// formData.orderBy = this.orderBy // formData.orderBy = this.orderBy
console.log(this.selectSarMenu.id)
// 处理我的收藏和个性化标签传参 // 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'wdsc') { if (this.selectSarMenu.menuName === '我的收藏') {
formData.menuId = undefined formData.menuId = undefined
formData.labelMenuId = undefined formData.labelMenuId = undefined
formData.collectMenuId = 'wdsc' formData.collectMenuId = 'wdsc'
@@ -3472,6 +3473,7 @@ export default {
} }
} }
this.stahndinfoList = res.data.list this.stahndinfoList = res.data.list
console.log(this.stahndinfoList)
this.total = res.data.count this.total = res.data.count
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
this.pageChange(1) this.pageChange(1)
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+17 -16
View File
@@ -184,21 +184,21 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="XCXSSRQ" prop="XCXSSRQ"
sortable="custom" sortable="custom"
width="150px" width="150px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span> <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ZCCSSRQ" prop="ZCCSSRQ"
sortable="custom" sortable="custom"
width="150px" width="150px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatText(scope.row.ZCCSSRQ) }}</span> <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -2187,7 +2187,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http.delete("sarResource/ts-resource", { this.$http.delete("sarResource/ts-resource", {
menuId: data.id resourceId: data.id
}, res => { }, res => {
}, e => { }, e => {
if(e.ok){ if(e.ok){
@@ -2217,10 +2217,11 @@ export default {
}, },
// 树节点鼠标移入移出 // 树节点鼠标移入移出
mouseenter(data){ mouseenter(data){
console.log(data) if(data.menuName !== '我的收藏'){
this.$set(data, 'show', true) this.$set(data, 'show', true)
if(data.parentId !== null){ if(data.parentId !== null){
this.$set(data, 'showDel', true) this.$set(data, 'showDel', true)
}
} }
}, },
mouseleave(data){ mouseleave(data){
@@ -2878,7 +2879,7 @@ export default {
formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
formData.nowOrder = this.nowOrder formData.nowOrder = this.nowOrder
// 处理我的收藏和个性化标签传参 // 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'wdsc') { if (this.selectSarMenu.menuName === '我的收藏') {
formData.menuId = undefined formData.menuId = undefined
formData.labelMenuId = undefined formData.labelMenuId = undefined
formData.collectMenuId = 'wdsc' formData.collectMenuId = 'wdsc'