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:
zhaokaiyao@91isoft.com
2021-08-10 23:22:50 +08:00
parent 8e29a8ac1d 357092682c
commit 25beb283f7
36 changed files with 901 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+2 -2
View File
@@ -135,11 +135,11 @@ export default {
// // // title: '本地产品/项目库',
// // // path: '/localProductsOrProjectLibrary'
// // // },
{
/*{
title: '企业标准库',
path: '/enterpriseStandardDatabase',
menuId: '01ed8f752748227777b3572d56ee9ab5'
},
},*/
// {
// title: '企标制修订计划',
// path: '/enterBSysRevPlanManaLib',
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+24 -7
View File
@@ -135,6 +135,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -155,7 +156,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default {
name: "bzdyStep2",
@@ -229,7 +230,21 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
@@ -261,11 +276,13 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.form.model = data.model
this.form.modelName = data.modelName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+26 -9
View File
@@ -147,6 +147,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -180,7 +181,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default {
name: "bzdyStep3",
@@ -273,7 +274,21 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
@@ -305,13 +320,15 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.form.model = data.model
this.form.modelName = data.modelName
this.form.fileName = data.fileName || ''
this.form.fileId = data.fileId || ''
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
this.form.fileName = data.form.fileName || data.fileName || ''
this.form.fileId = data.form.fileId || data.fileId || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+8 -7
View File
@@ -252,13 +252,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.form.file = data.fileId
this.form.fileName = data.fileName
this.form.model = data.model
this.form.modelName = data.modelName
console.log(data);
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+22 -7
View File
@@ -174,6 +174,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -297,7 +298,21 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
@@ -327,12 +342,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileId = data.hzfileId
this.form.hzfileName = data.hzfileName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+9
View File
@@ -358,6 +358,15 @@
@checkedRole="saveUserInfo"
:nodeList="nodeList"
></Role-tree>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+9 -1
View File
@@ -218,6 +218,15 @@
:nodeList="nodeList2"
></Role-tree>
<loading :loading="loading">加载中...</loading>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -321,7 +330,6 @@
this.active = name
},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+9
View File
@@ -360,6 +360,15 @@
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading>
</div>
</template>
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+9
View File
@@ -265,6 +265,15 @@
submitBTNText="同意"
>
</ProcessFooter>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+9
View File
@@ -264,6 +264,15 @@
submitBTNText="同意"
>
</ProcessFooter>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading>
</div>
</template>
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+9
View File
@@ -263,6 +263,15 @@
submitBTNText="同意"
>
</ProcessFooter>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
<loading :loading="loading">加载中...</loading>
</div>
</template>
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+7 -11
View File
@@ -678,7 +678,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -718,22 +717,19 @@ export default {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "4");
_formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
// saveTaskForPub(_formData).then(res => {
// this.saveLoading = false;
// this.$message.success("保存成功");
// this.bpnId = res.result;
// }).catch(e => {
// this.saveLoading = false;
// });
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
//提交事件
handleSubmit() {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1
View File
@@ -2346,6 +2346,7 @@
this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.setMap(this.standStateOptions)
})
this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+3
View File
@@ -282,6 +282,7 @@ export default {
endTime: '', // 结束日期
cname: '', // 名称
standType: '',
standId: '',
},
formRules: {
cid: [
@@ -299,6 +300,7 @@ export default {
standSort: '',
standNumber: '',
standType: '',
standId: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
@@ -456,6 +458,7 @@ export default {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
}
this.form.standType = bringData[0].standType
this.form.standId = bringData[0].id
this.form.cname = bringData[0].standName;
this.listModel = false;
} else if (this.selectedList.length > 1) {
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+26 -14
View File
@@ -345,21 +345,33 @@ export default {
addList() {
dicTypeData().then(res => {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
})
standUnqualified(this.queryUnqualidiedData).then(res => {
this.unqualidiedData = res.data.records
this.unqualidiedData.forEach(item => {
this.$set(item,'engineer','')
this.$set(item,'engineerId','')
this.$set(item,'dutyPeopleInfo','')
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
standUnqualified(this.queryUnqualidiedData).then(res => {
this.unqualidiedData = res.data.records
this.unqualidiedData.forEach(item => {
// 责任部门转换
if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
let k = (item.responsibleUnit || "").split(',')
for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
}
item.responsibleUnit = k.join(',')
}
}
}
this.$set(item,'engineer','')
this.$set(item,'engineerId','')
this.$set(item,'dutyPeopleInfo','')
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
})
this.total = res.data.total
})
this.total = res.data.total
})
this.standModel = true;
},
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+6 -8
View File
@@ -382,15 +382,13 @@ export default {
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
this.fileListData.fileText = fileList
this.fileTextList = fileList
/* this.newDataList.forEach((item, index) => {
if (file.name === item.name || file.id === item.id) {
this.newDataList.splice(index, 1)
console.log(this.dataList)
this.fileData = fileList
this.fileTextList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id ) {
console.log()
this.fileTextList.splice(index,1)
}
})*/
})
},
handleONRemove() {},
/************ ********* *****************/
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+2 -2
View File
@@ -360,8 +360,8 @@ export default {
this.backLoading = true
if (this.commentText) {
var json = {
responUserInfo: {
info: this.dataList
responUserList: {
standardInfoList: this.dataList
},
actionFlag: 1,
commentText: this.commentText
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+2
View File
@@ -409,6 +409,7 @@ export default {
// 查询相关参数
searching: false,
commentText:'',
fileType: 'FBGBJBD',
standardSearch: {
standType: "",
standName: ""
@@ -847,6 +848,7 @@ export default {
this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page,
size: this.pageSize,
fileType: this.fileType,
...this.standardSearch
}, {
_this: this
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+2
View File
@@ -396,6 +396,7 @@ export default {
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
fileType: 'FBGBJBD',
standardSearch: {
standType: "",
standName: ""
@@ -822,6 +823,7 @@ export default {
this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page,
size: this.pageSize,
fileType: this.fileType,
...this.standardSearch
}, {
_this: this
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+58 -30
View File
@@ -222,7 +222,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpgStep3",
@@ -348,7 +348,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg)
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -362,36 +362,48 @@ export default {
*/
getFormFieldList(item) {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
implementer: item.pepdtos[i].breakdownList[j].implementer || null,
distributePerson: item.pepdtos[i].distributePerson,
distributePersonId: item.pepdtos[i].distributePersonId,
uname: item.pepdtos[i].uname,
projectManager: item.pepdtos[i].projectManager,
certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
xCXSSRQ: item.pepdtos[i].xCXSSRQ,
zCCSSRQ: item.pepdtos[i].zCCSSRQ
});
if(item.form === undefined){
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
console.log(item.pepdtos[i].xCXSSRQ === null);
if(item.pepdtos[i].xCXSSRQ === null){
item.pepdtos[i].xCXSSRQ = ''
}
if(item.pepdtos[i].zCCSSRQ === null){
item.pepdtos[i].zCCSSRQ = ''
}
this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
implementer: item.pepdtos[i].breakdownList[j].implementer || null,
distributePerson: item.pepdtos[i].distributePerson,
distributePersonId: item.pepdtos[i].distributePersonId,
uname: item.pepdtos[i].uname,
projectManager: item.pepdtos[i].projectManager,
certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
xCXSSRQ : item.pepdtos[i].XCXSSRQ,
zCCSSRQ : item.pepdtos[i].ZCCSSRQ,
});
}
}
} else {
this.listForm = item.form
this.listForm.breakdownList = item.form.breakdownList
}
console.log(this.listForm.breakdownList);
},
checkedRole (data) {
if (this.type === 1) {
@@ -441,6 +453,22 @@ export default {
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "5");
_formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
//提交事件
handleSubmit() {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+63 -25
View File
@@ -347,7 +347,8 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import Moment from 'moment';
import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpgStep4",
@@ -434,12 +435,24 @@ export default {
handleTabs(name) {
this.active = name;
},
//将时间戳转换为日期格式
getLocalTime(item) {
return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
},
// 时间戳（毫秒）转化为标准时间格式
getFullTime(item) {
const stamp = new Date(item);
const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss');
return item = time
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -454,36 +467,61 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.fenFlag === undefined ) {
item.step3DTOS.forEach(item => {
item.implementerId = this.$store.getters.userInfo.userId
item.implementer = this.$store.getters.userInfo.userName
})
this.dataList = item.step3DTOS;
if (item.form === undefined) {
if (item.fenFlag === undefined) {
item.step3DTOS.forEach(item => {
item.implementerId = this.$store.getters.userInfo.userId;
item.implementer = this.$store.getters.userInfo.userName;
});
this.dataList = item.step3DTOS;
} else {
this.dataList = item.dataList;
this.dataList.forEach(item => {
item.implementerId = this.$store.getters.userInfo.userId;
item.implementer = this.$store.getters.userInfo.userName;
});
}
// this.getLocalTime()
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.standName = item.step3DTOS[0].standName;
this.listForm.standNumber = item.step3DTOS[0].standNumber;
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
this.listForm.itemsName = item.step3DTOS[0].itemsName;
this.listForm.itemNum = item.step3DTOS[0].itemNum;
this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
} else {
this.dataList = item.dataList;
this.dataList.forEach(item => {
item.implementerId = this.$store.getters.userInfo.userId
item.implementer = this.$store.getters.userInfo.userName
})
this.listForm = item.form;
this.dataList = item.form.dataList;
}
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.standName = item.step3DTOS[0].standName;
this.listForm.standNumber = item.step3DTOS[0].standNumber;
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
this.listForm.itemsName = item.step3DTOS[0].itemsName;
this.listForm.itemNum = item.step3DTOS[0].itemNum;
this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
});
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
this.listForm.dataList = this.dataList;
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "5");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
//提交事件
handleSubmit() {
@@ -493,7 +531,7 @@ export default {
this.listForm.signFlag = "";
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.isSubmit = true;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -505,7 +543,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
this.isSubmit = false;
}, e => {
});
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+16 -8
View File
@@ -68,8 +68,10 @@
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -484,6 +486,7 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
_this: this
}, res => {
console.log(res.data.records);
this.listForm.dataList = res.data.records;
this.dataList = res.data.records;
this.listForm.dataList.forEach(item => {
@@ -517,7 +520,12 @@ export default {
{
_this: this
}, res => {
this.listForm.breakdownList = res.data;
if (!res.data.length) {
this.dataList = []
this.$message.warning("请选择带有分解单的标准");
} else {
this.listForm.breakdownList = res.data;
}
});
},
//标准的多选框改变
@@ -595,15 +603,15 @@ export default {
});
},
// 点击查看
handlePreview (item) {
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
name: "OtherStandardDetails",
params: {
id: item.standId,
pageType: 'INLAND_STAND'
pageType: "INLAND_STAND"
}
})
window.open(routeUrl.href, '_blank')
});
window.open(routeUrl.href, "_blank");
},
choiceZRR(type, title, id) {
this.nodeList = [];
src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+30 -9
View File
@@ -219,7 +219,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpg2Step3",
@@ -339,18 +339,39 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
if (item.form === undefined) {
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
} else {
this.listForm = item.form
this.dataList = item.form.dataList
}
});
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "6");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
//提交事件
handleSubmit() {
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+30 -9
View File
@@ -225,7 +225,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpg2Step4",
@@ -333,6 +333,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -345,18 +346,38 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
if(item.form === undefined){
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
this.listForm.breakdownList = item.breakdownList;
} else {
this.listForm = item.form
this.dataList = item.form.dataList
}
});
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "6");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
//提交事件
handleSubmit() {
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+53 -32
View File
@@ -208,7 +208,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpg2Step5",
@@ -328,43 +328,64 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
// this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
let children = [];
item.breakdownList.forEach(
item => {
let aa = {
key: item.standId,
id: item.id,
standId: item.itemsNum,
itemsNum: item.itemsNum,
itemsName: item.itemsName,
workPeople: "请选择责任人"
};
children.push(aa);
}
);
this.dataList.forEach(key => {
key["children"] = [];
children.forEach(breakDown => {
if (key.standId === breakDown.key) {
key["children"].push(breakDown);
if(item.form === undefined){
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
// this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
let children = [];
item.breakdownList.forEach(
item => {
let aa = {
key: item.standId,
id: item.id,
standId: item.itemsNum,
itemsNum: item.itemsNum,
itemsName: item.itemsName,
workPeople: "请选择责任人"
};
children.push(aa);
}
);
this.dataList.forEach(key => {
key["children"] = [];
children.forEach(breakDown => {
if (key.standId === breakDown.key) {
key["children"].push(breakDown);
}
});
if (key["children"].length === 0) {
delete key["children"];
}
});
if (key["children"].length === 0) {
delete key["children"];
}
});
this.listForm.children = children;
this.listForm.children = children;
} else {
this.listForm = item.form
this.dataList = item.form.dataList
}
});
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "6");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
//提交事件
handleSubmit() {
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+28 -7
View File
@@ -338,7 +338,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpg2Step6",
@@ -470,16 +470,37 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList;
if(item.form === undefined){
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList;
} else {
this.listForm = item.form
this.dataList = item.form.dataList
}
});
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "6");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
//提交事件
handleSubmit() {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -641,7 +641,7 @@
</el-form-item>
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
prop="standState" label-width="150px" class="add-form-item">
<template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
<template slot="label">文本状态</template>
<el-select v-model="sarStandardsInfoEO.textStatus"
placeholder="请选择文本状态"
clearable>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+230 -209
View File
@@ -15,10 +15,14 @@
clearable></el-input>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'314ad07cd81834dfdd3c58476cdcde68'">查询</el-button>
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws"
v-btn-permission="'314ad07cd81834dfdd3c58476cdcde68'">查询
</el-button>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" @click="resetSelect" size="mini" v-btn-permission="'eb402ab8306d437c7d33e9e4b4e4341a'">清空</el-button>
<el-button class="common-button-default" @click="resetSelect" size="mini"
v-btn-permission="'eb402ab8306d437c7d33e9e4b4e4341a'">清空
</el-button>
</el-form-item>
</el-form>
</div>
@@ -27,24 +31,24 @@
</div>
<div class="content">
<el-table
stripe
ref="selections"
tooltip-effect="dark"
border
:height="tableHeight"
:data="sarProjectListDatas"
class="table"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
stripe
ref="selections"
tooltip-effect="dark"
border
:height="tableHeight"
:data="sarProjectListDatas"
class="table"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standType"
label="标准/政策类型"
width="120"
prop="standType"
label="标准/政策类型"
width="120"
>
<template slot-scope="scope">
<div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
@@ -55,9 +59,9 @@
</template>
</el-table-column>
<el-table-column
prop="standNumber"
label="标准/政策号"
width="180"
prop="standNumber"
label="标准/政策号"
width="180"
>
<template slot-scope="scope">
<a class="table-jump"
@@ -65,8 +69,8 @@
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准/政策名称"
prop="standName"
label="标准/政策名称"
>
<template slot-scope="scope">
<a class="table-jump"
@@ -74,15 +78,15 @@
</template>
</el-table-column>
<el-table-column
prop="interpretationTime"
label="评估时间"
prop="interpretationTime"
label="评估时间"
>
</el-table-column>
<el-table-column
fixed="right"
label=""
width="50"
align="center">
fixed="right"
label=""
width="50"
align="center">
<template slot-scope="scope">
<i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>
</template>
@@ -93,12 +97,12 @@
</div>
<!-- 查看符合标准性弹窗-->
<el-drawer
title="标准涉及项目符合性"
:visible.sync="showSarProStateModal"
:wrapperClosable="false"
size="1100px"
:before-close="clearSearchPro"
class="not-footer-drawer"
title="标准涉及项目符合性"
:visible.sync="showSarProStateModal"
:wrapperClosable="false"
size="1100px"
:before-close="clearSearchPro"
class="not-footer-drawer"
>
<div class="demo-drawer-content">
<div class="el-drawer-form">
@@ -107,10 +111,10 @@
<el-form :inline="true" :model="sarProStateEO" class="label-input-form">
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.productName"
placeholder="根据项目名称查找"
:maxlength="100"
clearable></el-input>
v-model="sarProStateEO.productName"
placeholder="根据项目名称查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
@@ -121,18 +125,20 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
@click="querySarProStateZero">查询</el-button>
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
@click="querySarProStateZero">查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="mini"
v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'"
@click="clearSearchProState">清空</el-button>
class="common-button-default"
size="mini"
v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'"
@click="clearSearchProState">清空
</el-button>
</el-form-item>
</el-form>
</div>
@@ -140,141 +146,153 @@
</div>
</div>
<el-table
ref="multipleTable"
:data="sarProStateListDatas"
tooltip-effect="dark"
style="width: 100%;"
border
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
ref="multipleTable"
:data="sarProStateListDatas"
tooltip-effect="dark"
style="width: 100%;"
border
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productLineId"
label="产品线">
prop="productLineId"
label="产品线">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productId"
label="项目编号">
prop="productId"
label="项目编号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productName"
label="项目名称">
prop="productName"
label="项目名称">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standNumber"
label="标准编号">
prop="standNumber"
label="标准编号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standName"
label="标准名称">
prop="standName"
label="标准名称">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standardItem"
label="条款号">
prop="standardItem"
label="条款号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standardInfo"
label="条款名称">
prop="standardInfo"
label="条款名称">
</el-table-column>
<el-table-column
align="center"
prop="productType"
label="在研产品">
prop="productType"
label="在研产品">
<el-table-column
width="150px"
align="center"
prop="researchImplementationTime"
label="实施时间">
prop="researchImplementationTime"
label="实施时间">
<template slot-scope="scope">
<span>{{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCompliance"
label="合规">
prop="researchCompliance"
label="合规">
</el-table-column>
<el-table-column
width="150px"
align="center"
label="不合规">
label="不合规">
<el-table-column
width="150px"
align="center"
prop="researchNonCompliance"
label="不合规项目">
prop="researchNonCompliance"
label="不合规项目">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCountermeasures"
label="应对措施">
prop="researchCountermeasures"
label="应对措施">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCompletionTime"
label="完成时间">
prop="researchCompletionTime"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.researchCompletionTime ? $moment(scope.row.researchCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
prop="center"
label="在产产品">
prop="center"
label="在产产品">
<el-table-column
width="150px"
align="center"
prop="productionImplementationTime"
label="实施时间">
prop="productionImplementationTime"
label="实施时间">
<template slot-scope="scope">
<span>{{ scope.row.productionImplementationTime ? $moment(scope.row.productionImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productionCompliance"
label="合规(具体情况)">
prop="productionCompliance"
label="合规(具体情况)">
</el-table-column>
<el-table-column
width="150px"
align="center"
label="不合规">
label="不合规">
<el-table-column
width="150px"
align="center"
prop="productionCountermeasures"
label="应对措施">
prop="productionCountermeasures"
label="应对措施">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productionCompletionTime"
label="完成时间">
prop="productionCompletionTime"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.productionCompletionTime ? $moment(scope.row.productionCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
<pagination
:page="sarProStateTotalPage"
:total="sarProStateTotal"
@pageChange="pageProStateChange"
@pageSizeChange="pageProStateSizeChange"></pagination>
:page="sarProStateTotalPage"
:total="sarProStateTotal"
@pageChange="pageProStateChange"
@pageSizeChange="pageProStateSizeChange"></pagination>
</div>
</div>
</el-drawer>
@@ -283,12 +301,12 @@
<script>
export default {
name: 'standInvolveProjectDetail',
data () {
name: "standInvolveProjectDetail",
data() {
return {
sarProject: {
standName: '', // 标准政策名称
standNumber: '', // 标准/政策号
standName: "", // 标准政策名称
standNumber: "", // 标准/政策号
standApplicationType: 1
}, // 条件查询
showSarProStateModal: false, // 查看drawer开关
@@ -302,125 +320,126 @@ export default {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: {
productName: '',
standId: ''
productName: "",
standId: ""
},
sarProStateTotal: 0,
sarProStateTotalPage: 1,
sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null, // 符合性项目列表高度
standId: '' // 符合性项目Id
}
standId: "" // 符合性项目Id
};
},
methods: {
searchStandAndLaws () {
this.page = 1
this.queryStandAndLaws()
}, // 查询
pageChange (page) {
this.page = page
this.queryStandAndLaws()
},
pageSizeChange (pageSize) {
this.pageSize = pageSize
this.$store.getters.userInfo.configContent = pageSize
this.queryStandAndLaws()
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
queryStandAndLaws () {
this.sarProject.current = this.page
this.sarProject.size = this.pageSize
this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, {
_this: this,
loading: 'loading',
}, res => {
this.sarProjectListDatas = res.data.records
this.total = res.data.total
}, e=> {})
}, // 分页查询
resetSelect () {
this.sarProject.country = ''
this.sarProject.standCode=''
this.sarProject.standName = ''
this.sarProject.standNumber=''
this.queryStandAndLaws()
}, // 外层清空条件查询
handleProjectCompliance (row) {
this.standId = row.standId
this.querySarProStateZero()
}, // 查看项目符合性
querySarProStateZero () {
this.sarProStateTotalPage = 1
var form = this.sarProStateEO
// form.standId = this.standId
form.current = this.sarProStateTotalPage
form.size = this.sarProStatePageSize
this.$http.get('sarStandardComplianceAssessResult/product', form, {
_this: this,
loading: 'loading'
}, res => {
if (res.ok) {
res.data.records.forEach((item)=>{
for(let key in item){
if(item[key] == null){
item[key]='无'
}
}
})
this.sarProStateListDatas = res.data.records
this.sarProStateTotal = res.data.total
}
})
this.showSarProStateModal = true
}, // 查询项目数据
clearSearchProState () {
this.sarProStateEO.productName = ''
this.sarProStateEO.standId = ''
this.sarProStateTotalPage = 1
this.querySarProStateZero()
}, // 清空条件查询
clearSearchPro () {
this.sarProStateEO.productName = ''
this.sarProStateEO.standId = ''
this.showSarProStateModal = false
this.standId = ''
}, // 关闭查看事件
pageProStateChange (page) {
this.sarProStateTotalPage = page
this.querySarProStateZero()
},
pageProStateSizeChange (pageSize) {
this.sarProStatePageSize = pageSize
this.$store.getters.userInfo.configContent = pageSize
this.querySarProStateZero()
},
},
mounted () {
this.queryStandAndLaws()
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight=$('.regulatory-repository').height() -120
window.onresize = () => {
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight=$('.regulatory-repository').height() - 120
searchStandAndLaws() {
this.page = 1;
this.queryStandAndLaws();
}, // 查询
pageChange(page) {
this.page = page;
this.queryStandAndLaws();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.$store.getters.userInfo.configContent = pageSize;
this.queryStandAndLaws();
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.standId,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
queryStandAndLaws() {
this.sarProject.current = this.page;
this.sarProject.size = this.pageSize;
this.$http.get("sarStandardComplianceAssessResult/standard", this.sarProject, {
_this: this,
loading: "loading"
}, res => {
this.sarProjectListDatas = res.data.records;
this.total = res.data.total;
}, e => {
});
}, // 分页查询
resetSelect() {
this.sarProject.country = "";
this.sarProject.standCode = "";
this.sarProject.standName = "";
this.sarProject.standNumber = "";
this.queryStandAndLaws();
}, // 外层清空条件查询
handleProjectCompliance(row) {
this.standId = row.standId;
this.querySarProStateZero();
}, // 查看项目符合性
querySarProStateZero() {
this.sarProStateTotalPage = 1;
var form = this.sarProStateEO;
// form.standId = this.standId
form.current = this.sarProStateTotalPage;
form.size = this.sarProStatePageSize;
this.$http.get("sarStandardComplianceAssessResult/product", form, {
_this: this
}, res => {
if (res.ok) {
// res.data.records.forEach((item)=>{
// for(let key in item){
// if(item[key] == null){
// item[key]='无'
// }
// }
// })
this.sarProStateListDatas = res.data.records;
this.sarProStateTotal = res.data.total;
}
});
this.showSarProStateModal = true;
}, // 查询项目数据
clearSearchProState() {
this.sarProStateEO.productName = "";
this.sarProStateEO.standId = "";
this.sarProStateTotalPage = 1;
this.querySarProStateZero();
}, // 清空条件查询
clearSearchPro() {
this.sarProStateEO.productName = "";
this.sarProStateEO.standId = "";
this.showSarProStateModal = false;
this.standId = "";
}, // 关闭查看事件
pageProStateChange(page) {
this.sarProStateTotalPage = page;
this.querySarProStateZero();
},
pageProStateSizeChange(pageSize) {
this.sarProStatePageSize = pageSize;
this.$store.getters.userInfo.configContent = pageSize;
this.querySarProStateZero();
}
},
mounted() {
this.queryStandAndLaws();
this.tableHeight = $(".regulatory-repository").height() - 159;
this.sarProStateTableHeight = $(".regulatory-repository").height() - 120;
window.onresize = () => {
this.tableHeight = $(".regulatory-repository").height() - 159;
this.sarProStateTableHeight = $(".regulatory-repository").height() - 120;
};
}
}
};
</script>
<style lang="less" scoped>
.stand-involve-project-detail{
.stand-involve-project-detail {
height: 100%;
.laws-details-header {
background: #fff;
// height: 30px;
@@ -431,6 +450,7 @@ export default {
display: inline-block;
margin-right: 10px;
}
.title {
display: inline-block;
font-weight: bold;
@@ -440,6 +460,7 @@ export default {
text-align: center;
}
}
.contaiiner {
background: #fff;
padding: 5px 10px;
@@ -447,8 +468,8 @@ export default {
}
</style>
<style lang="less">
.stand-involve-project-detail{
.search-area .search-item .el-input--suffix .el-input__inner{
.stand-involve-project-detail {
.search-area .search-item .el-input--suffix .el-input__inner {
padding-right: 15px;
}
}
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+17 -6
View File
@@ -458,8 +458,22 @@ export default {
_this: this
}, res => {
this.myLoading.loadData = false
this.nonList = res.data.records
this.total = res.data.total
this.nonList = res.data.records
this.nonList.forEach(item => {
// 责任部门转换
if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
let k = (item.responsibleUnit || "").split(",");
for (let i in this.zrbmOptions) {
for (let m = 0; m < k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label;
}
item.responsibleUnit = k.join(",");
}
}
}
});
}, e => {
this.myLoading.loadData = false
})
@@ -665,18 +679,15 @@ export default {
},
},
mounted () {
// 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.allSelectOptions = res.data || {}
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.getGzzOption()
this.setMap(this.standStateOptions)
this.getTableByPage()
}, e => {
})
this.getTableByPage()
// 加载所有的部门
this.getOrgTreeSource()
}
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+28 -24
View File
@@ -11,19 +11,27 @@
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p">
<label class="transition-box-label">标准号：</label>
<span class="transition-box-span" @click="handlePreview($route.query.item)">{{ $route.query.item.cid }}</span>
<span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cid }}
</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">标准名称：</label>
<span class="transition-box-span">{{ $route.query.item.cname || '-' }}</span>
<span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cname || '-' }}
</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">上传时间：</label>
<span class="transition-box-span">{{ $route.query.item.endTime || '-' }}</span>
<span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">征求意见周期：</label>
<span class="transition-box-span" v-if="$route.query.item.startTime && $route.query.item.endTime">{{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}</span>
<span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
<span class="transition-box-span" v-else>-</span>
</p>
</div>
@@ -120,6 +128,7 @@
name: 'consultationDetails',
data () {
return {
itemData: this.$route.query.item,
id: '', // 选中id
type: '', // 选中状态
spinShow: false,
@@ -152,6 +161,17 @@
}
},
methods: {
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
exportAll () {
window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
},
@@ -166,21 +186,6 @@
}
})
},
//点击查看
handlePreview(data) {
console.log(data);
return
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: data.id,
pageType: data.standType
}
});
window.open(routeUrl.href, "_blank");
},
// 获取详情信息列表
getList() {
this.spinShow = true
@@ -188,7 +193,6 @@
_this: this
}, res => {
this.standinfoList = res.data.records
console.log(this.standinfoList);
this.total = res.data.total
this.spinShow = false
}, e => {
@@ -272,10 +276,10 @@
cid: this.$route.query.item.cid,
content: this.opinionContent.content,
partCode: this.opinionContent.partCode,
userId: this.$store.getters.userInfo.userId,
userName: this.$store.getters.userInfo.account,
deptName: this.$store.getters.userInfo.orgName,
deptId: this.$store.getters.userInfo.orgId
userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.userName || '',
deptName: this.$store.getters.userInfo.orgName || '',
deptId: this.$store.getters.userInfo.orgId || ''
}
if (this.type === 'edit') {
form.id = this.id
src/pages/searchCenter/pages/advancedSearch.vue
+103 -52
View File
@@ -13,7 +13,7 @@
</h5>
</div>
<div v-if="!kindtext" style="position: absolute;right: 110px;display: flex">
<el-input v-model="standForm.selectValue" :placeholder="$t('m.standSelect')" @keyup.enter.native="btnSearch"
<el-input v-model.trim="standForm.selectValue" :placeholder="$t('m.standSelect')" @keyup.enter.native="btnSearch"
clearable>
</el-input>
<el-button type="primary" @click="btnSearch" style="width: 98px;background:#3391CE
@@ -53,7 +53,7 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="标准类别" prop="standSort">
<el-select :popper-append-to-body="false" v-model="standForm.standSort" placeholder="请选择标准类别">
<el-select :popper-append-to-body="false" v-model="standForm.standSort" placeholder="请选择标准类别" clearable>
<el-option
v-for="item in standSortOptions"
placeholder="请选择"
@@ -75,11 +75,11 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="标准年份" prop="standYear">
<el-date-picker
v-model="standForm.standYear"
type="date"
placeholder="根据标准年份查找">
</el-date-picker>
<el-input
v-model.number="standForm.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -104,7 +104,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="标准性质" prop="standNumber">
<el-select :popper-append-to-body="false" v-model="standForm.standNature" placeholder="请选择标准性质">
<el-select :popper-append-to-body="false" v-model="standForm.standNature" placeholder="请选择标准性质" clearable>
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
@@ -119,7 +119,7 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="文本状态" prop="textStatus">
<el-select :popper-append-to-body="false" v-model="standForm.textStatus" placeholder="请选择文本状态">
<el-select :popper-append-to-body="false" v-model="standForm.textStatus" placeholder="请选择文本状态" clearable>
<el-option
v-for="item in standStateOptions"
placeholder="请选择"
@@ -144,7 +144,7 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="是否纳入标准清单" prop="bringIntoList">
<el-select v-model="standForm.isRelateAccess" class="advanced-one" placeholder="请选择是否纳入标准清单">
<el-select v-model="standForm.isRelateAccess" class="advanced-one" placeholder="请选择是否纳入标准清单" clearable>
<el-option value="1" label="是"></el-option>
<el-option value="2" label="否"></el-option>
</el-select>
@@ -186,14 +186,14 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="归口管理部门" prop="gkdw">
<el-select :popper-append-to-body="false" v-model="standForm.gkdw" placeholder="请选择归口管理部门">
<el-select :popper-append-to-body="false" v-model="standForm.gkdw" placeholder="请选择归口管理部门" clearable>
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草单位" prop="qcdw">
<el-select :popper-append-to-body="false" v-model="standForm.qcdw" placeholder="请选择起草单位" multiple>
<el-select :popper-append-to-body="false" v-model="standForm.qcdw" placeholder="请选择起草单位" multiple clearable>
<el-option
v-for="item in qcdwOption"
placeholder="请选择"
@@ -208,7 +208,7 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="我司参与深度" prop="cysd">
<el-select :popper-append-to-body="false" v-model="standForm.cysd" placeholder="请选择我司参与深度">
<el-select :popper-append-to-body="false" v-model="standForm.cysd" placeholder="请选择我司参与深度" clearable>
<el-option
v-for="item in cysdOptions"
placeholder="请选择"
@@ -221,7 +221,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用车型" prop="cllx">
<el-select :popper-append-to-body="false" v-model="standForm.cllx" placeholder="请选择适用车型" multiple>
<el-select :popper-append-to-body="false" v-model="standForm.cllx" placeholder="请选择适用车型" multiple clearable>
<el-option
v-for="item in applyArcticOptions"
placeholder="请选择"
@@ -236,7 +236,7 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="能源类型" prop="nylx">
<el-select :popper-append-to-body="false" v-model="standForm.nylx" placeholder="请选择能源类型" multiple>
<el-select :popper-append-to-body="false" v-model="standForm.nylx" placeholder="请选择能源类型" multiple clearable>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -249,7 +249,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx">
<el-select :popper-append-to-body="false" v-model="standForm.sycpx" placeholder="请选择适用产品线" multiple>
<el-select :popper-append-to-body="false" v-model="standForm.sycpx" placeholder="请选择适用产品线" multiple clearable>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -264,7 +264,7 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="适用认证" prop="syrz">
<el-select :popper-append-to-body="false" v-model="standForm.syrz" placeholder="请选择适用认证" multiple>
<el-select :popper-append-to-body="false" v-model="standForm.syrz" placeholder="请选择适用认证" multiple clearable>
<el-option
v-for="item in applyAuthOptions"
placeholder="请选择"
@@ -277,7 +277,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm">
<el-select :popper-append-to-body="false" v-model="standForm.zrbm" placeholder="请选择责任部门" multiple>
<el-select :popper-append-to-body="false" v-model="standForm.zrbm" placeholder="请选择责任部门" multiple clearable>
<el-option
v-for="item in zrbmOptions"
placeholder="请选择"
@@ -292,7 +292,7 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="责任工程师" prop="zrgcs">
<el-select :popper-append-to-body="false" v-model="standForm.zrgcs" placeholder="请选择责任工程师" multiple>
<el-select :popper-append-to-body="false" v-model="standForm.zrgcs" placeholder="请选择责任工程师" multiple clearable>
<el-option
v-for="item in zrgcsOptions"
placeholder="请选择"
@@ -324,8 +324,8 @@
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="代替标准号" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据代替标准号查找"
<el-form-item label="代替标准号" prop="dtbjh">
<el-input v-model="standForm.dtbjh" clearable placeholder="根据代替标准号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
@@ -380,7 +380,7 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="采标程度" prop="standNumber">
<el-select :popper-append-to-body="false" v-model="standForm.cbcd" placeholder="请选择采标程度">
<el-select :popper-append-to-body="false" v-model="standForm.cbcd" placeholder="请选择采标程度" clearable>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
@@ -899,8 +899,8 @@
v-if="selectIndex !== 'items'"
width="130">
<template slot-scope="scope">
<div v-if="scope.row.issue_time !== null && scope.row.issue_time !== undefined">
{{ $dateFormat(new Date(scope.row.issue_time), "yyyy-MM-dd") }}
<div v-if="scope.row.issue_time !== null && scope.row.issueTime !== undefined">
{{ $dateFormat(new Date(scope.row.issueTime), "yyyy-MM-dd") }}
</div>
<div v-else></div>
</template>
@@ -910,8 +910,8 @@
:label="$t('m.putTime')"
width="130">
<template slot-scope="scope">
<div v-if="scope.row.put_time !== null && scope.row.put_time !== undefined">
{{ $dateFormat(new Date(scope.row.put_time), "yyyy-MM-dd") }}
<div v-if="scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== ''">
{{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
</div>
<div v-else></div>
</template>
@@ -919,7 +919,7 @@
<el-table-column
align="center"
width="180"
:label="selectIndex === 'INLAND_STAND' ? '标准状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '企业标准状态')">
:label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '企业标准状态')">
<template slot-scope="scope">
<div>
{{ scope.row.standstateshow }}
@@ -937,8 +937,17 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>
<el-dropdown-item v-if="scope.row.collectBtn"
:command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
@@ -948,8 +957,16 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
<el-dropdown-item v-btn-permission="'FB3R3TVALD'" :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
<el-dropdown-item v-if="scope.row.collectBtn"
:command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item><!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
@@ -960,9 +977,18 @@
<el-button size="mini" @click="itemsDetails(scope.row)">查看</el-button>
</div>
<div v-else>
<el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>
<el-dropdown-item v-if="scope.row.collectBtn"
:command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item>
<el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
<el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>
<!-- <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>-->
</div>
</template>
</el-table-column>
@@ -1306,9 +1332,7 @@ export default {
const inlandList = data['INLAND_STAND'] || []
const foreignList = data['FOREIGN_STAND'] || []
const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB');
console.log(foreignFilterList)
this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList);
console.log(this.formFieldListStandData,'-----------------------------------1')
}
}, e => {})
},
@@ -1720,6 +1744,13 @@ export default {
this.total = res.data.count;
this.resultData = res.data.list;
this.resultData.map((item) => {
if (item.collectId != null && item.collectId !== '') {
item.collectBtn = false
item.cancelCollectBtn = true
} else {
item.collectBtn = true
item.cancelCollectBtn = false
}
if (item.applyArcticShow) {
item.applyArcticShow.toString();
item.applyArcticShow = item.applyArcticShow.slice(0, item.applyArcticShow.length - 1);
@@ -1936,13 +1967,13 @@ export default {
}
let pagetype = "";
if (item.type === "stand") {
if (item.stand_type === "INLAND") {
if (item.standType === "INLAND") {
pagetype = "INLAND_STAND";
} else {
pagetype = "FOREIGN_STAND";
}
} else if (item.type === "laws") {
if (item.laws_type === "INLAND") {
if (item.lawsType === "INLAND") {
pagetype = "INLAND_LAWS";
} else {
pagetype = "FOREIGN_LAWS";
@@ -1959,6 +1990,7 @@ export default {
}
}
personCollect.collectType = pagetype;
personCollect.userId = this.$store.getters.userInfo.userId
this.$http.postData("person/personCollect", personCollect, {
_this: this
}, res => {
@@ -1970,21 +2002,20 @@ export default {
},
// 取消收藏
cancelCollectStandard(item) {
// this.judgeBussRole(item)
// if (this.bussRoleFlag === false) {
// this.$message.error('当前角色无权限操作此数据')
// } else {
// }
this.$http.put("person/personCollect/updateByUserId", {
id: item.collectId
}, {
_this: this
}, res => {
item.collectBtn = !item.collectBtn;
item.cancelCollectBtn = !item.cancelCollectBtn;
item.collectId = "";
}, e => {
});
item.isSubmit = true
this.$http.put('person/personCollect/updateByUserId', {
id: item.collectId
}, {
_this: this
}, res => {
item.isSubmit = false
item.collectBtn = !item.collectBtn
item.cancelCollectBtn = !item.cancelCollectBtn
item.collectId = ''
this.$message.success(res.message)
}, e => {
item.isSubmit = false
})
},
// 取消
treeCancel() {
@@ -2278,6 +2309,26 @@ export default {
}
},
watch: {
"standForm.zccssrq"(newVal) {
if (newVal == null) {
this.standForm.zccssrq = "";
}
},
"standForm.xcxssrq"(newVal) {
if (newVal == null) {
this.standForm.xcxssrq = "";
}
},
"standForm.ssrq"(newVal) {
if (newVal == null) {
this.standForm.ssrq = "";
}
},
"standForm.issueTime"(newVal) {
if (newVal == null) {
this.standForm.issueTime = "";
}
},
// 资源大类监听, 改变后过滤条件
selectIndex(val) {
let type = "";
src/pages/searchCenter/pages/standardSearch.vue
+35 -11
View File
@@ -11,7 +11,7 @@
<el-input
placeholder="请输入查询条件"
clearable
v-model="keywords"
v-model.trim="keywords"
@keyup.enter.native="searchSarByInputKeyByCondition">
</el-input>
</div>
@@ -156,8 +156,17 @@
<!-- </el-button>-->
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('see',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
<el-dropdown-item v-if="scope.row.collectBtn"
:command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -170,8 +179,17 @@
<!-- </el-button>-->
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('see',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
<el-dropdown-item v-if="scope.row.collectBtn"
:command="beforeHandleCommand('d',scope.row)"
>
收藏
</el-dropdown-item>
<el-dropdown-item v-else
:command="beforeHandleCommand('a',scope.row)"
>
取消收藏
</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -215,7 +233,7 @@
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
<div style="margin-right: 15px;">发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<div style="margin-right: 15px;">发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<!-- <div>{{$t('m.putTime')}}: {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '&#45;&#45;' }} </div>-->
</div>
</div>
@@ -1003,7 +1021,6 @@
})
}
this.searchOriginOptions = this.searchOptions
console.log(this.searchOriginOptions)
this.saveAllSortOptions = res.data.STANDCLASSIFY
this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW
this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组
@@ -1241,6 +1258,15 @@
if (res.ok) {
this.total = res.data.count
this.resultData = res.data.list
this.resultData.map((item) => {
if (item.collectId != null && item.collectId !== '') {
item.collectBtn = false
item.cancelCollectBtn = true
} else {
item.collectBtn = true
item.cancelCollectBtn = false
}
});
this.selectGroupdata(res.data)
} else {
this.total = 0
@@ -1877,7 +1903,6 @@
let pagetype = ''
pagetype = item.typeShow
if (item.typeShow === 'INLAND_STAND') {
console.log('guonei权限')
routername = 'OtherStandardDetails'
// if (this.$hasPermission('CFEZ3VP7EA95CTRBH3JB')) {
// routername = 'OtherStandardDetails'
@@ -2051,6 +2076,7 @@
}
}
personCollect.collectType = pagetype
personCollect.userId = this.$store.getters.userInfo.userId
this.$http.postData('person/personCollect', personCollect, {
_this: this
}, res => {
@@ -2120,7 +2146,6 @@
type: 'warning'
})
} else {
console.log(this.selectNowObjResult);
let pagetype = ''
if (this.selectNowObjResult.type === 'stand') {
if (this.selectNowObjResult.standType === 'INLAND') {
@@ -2241,7 +2266,6 @@
if (item.type === 'stand') {
// if (this.$hasPermission('HK36LHK9444NPN8X634W')){
routername = 'OtherStandardDetails'
console.log('guoneiQUANXIAN')
if (item.standType === 'INLAND') {
pagetype = 'INLAND_STAND'
} else {
@@ -2531,7 +2555,7 @@
//display: -webkit-box;
//-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
max-height: 60px;
max-height: 78px;
}
.AllTime {
margin-top: 15px;