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:
super_liu
2021-07-28 10:28:54 +08:00
parent 567cb4905e 61f227c037
commit 34c23d0337
23 changed files with 1392 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+14 -3
View File
@@ -1066,8 +1066,10 @@ export default {
middle.push(item.name);
files.push(item.response.data.id);
});
this.fileListName = middle;
this.fileIds = files;
this.listForm.fileName = middle.join(',');
this.listForm.fileId = files.join(',');
// this.fileListName = middle;
// this.fileIds = files;
},
fileUpload() {
this.fileMadel = true;
@@ -1081,12 +1083,17 @@ export default {
});
this.fileListName = middle;
this.fileIds.push(file.response.data.id);
if(this.listForm.fileName === null ){
if(this.listForm.fileName === null || this.listForm.fileName === undefined){
this.listForm.fileName = this.fileListName.join(',')
} else {
this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
}
if(this.listForm.fileId === null || this.listForm.fileId === undefined){
this.listForm.fileId = this.fileIds.join(',')
}else {
this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
}
console.log(this.listForm);
this.$message.success("上传成功");
} else {
this.$message.error(res.message);
@@ -1205,7 +1212,11 @@ export default {
exits.push(item.id)
}
});
if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
this.listForm.inforlist = exits.join(',')
} else {
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
}
this.standardData = [];
this.standModel = false;
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+5 -24
View File
@@ -78,13 +78,8 @@
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@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>
<p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
<p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
</template>
</el-table-column>
<el-table-column
@@ -374,14 +369,11 @@ export default {
},
//提交事件
handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
this.listForm.zrUserId = this.listForm.zrUserId;
this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写会签意见')
}
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -412,17 +404,6 @@ export default {
},
selectThree() {
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
pageChange(page) {
this.page = page;
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
-8
View File
@@ -527,14 +527,6 @@ export default {
},
//提交事件
handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
this.listForm.zrUserId = this.listForm.zrUserId;
this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+3 -7
View File
@@ -376,14 +376,10 @@
},
//提交事件
handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
this.listForm.zrUserId = this.listForm.zrUserId;
this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
if (this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}
this.listForm.commentText = this.commentText;
this.listForm.signflag = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+1 -1
View File
@@ -407,7 +407,7 @@ export default {
this.modalshowflag = true
},
drawerCheck (data) {
this.roleForm.dockUserName = data[0].id
this.roleForm.dockUser = data[0].id
this.roleForm.dockUserName = data[0].name
this.modalshowflag = false
},
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2 -3
View File
@@ -193,7 +193,6 @@ export default {
},
created() {
this.getData()
this.getTree()
},
methods: {
getData() {
@@ -293,8 +292,8 @@ export default {
drawerCheck (data) {
this.roleForm = data[0]
// 选择责任人时input框内值
this.newDataList.dutyPeople = this.roleRow.name
this.newDataList.dutyPeopleId = this.roleRow.id
this.newDataList.dutyPeople = this.roleForm.name
this.newDataList.dutyPeopleId = this.roleForm.id
this.lastDataList = this.dataList
this.modalshowflag = false
},
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+3 -11
View File
@@ -94,7 +94,7 @@
<el-table-column prop="dutyEngineer" label="负责人"/>
<el-table-column label="佐证材料" show-overflow-tooltip>
<template slot-scope="scope">
<el-button type="text" @click="download" >{{scope.row.fileText}}</el-button>
<el-button type="text" @click="download(scope.row)" >{{scope.row.fileText}}</el-button>
</template>
</el-table-column>
</el-table>
@@ -187,9 +187,7 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
console.log(item)
this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
console.log(this.dataList)
})
},
@@ -266,14 +264,8 @@ export default {
this.getData()
},
download(row) {
// window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
var name = row.fileText;
var url = row.fileTextPath;
const a = document.createElement('a')
a.setAttribute('download', name)
a.setAttribute('target', '_blank')
a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
a.click()
let attId = row.fileTextId
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
},
// 分页事件
pageChange (page) {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+90 -73
View File
@@ -28,16 +28,16 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
@@ -93,13 +93,22 @@
<el-table-column
prop="distributePerson"
label="分发责任人">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
<!-- <el-input-->
<!-- v-model="dataList.distributePerson"-->
<!-- placeholder="请选择分发责任人"-->
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
<!-- readonly-->
<!-- v-if="dataList[scope.$index].distributePerson==null"-->
<!-- />-->
<!-- </template>-->
<template slot-scope="scope,text" v-if="showColumn">
<div>
<div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
{{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
</div>
</div>
</template>
</el-table-column>
</el-table>
@@ -241,17 +250,26 @@
>
</el-table-column>
<el-table-column
prop="issueTime"
prop="putTime"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="xcxssrqgj"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="zccssrqgj"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -370,20 +388,20 @@ export default {
// 查询相关参数
searching: false,
standardSearch: {
standType:'',
standName:'',
standType: "",
standName: ""
},
standardTypeOptions: [
{
value: 'INLAND',
label: '国内标准法规',
item:'INLAND',
value: "INLAND",
label: "国内标准法规",
item: "INLAND"
},
{
value: 'FOREIGN',
label: '海外标准法规',
item:'FOREIGN',
},
value: "FOREIGN",
label: "海外标准法规",
item: "FOREIGN"
}
],
nodeList: [],
defaultProps: {
@@ -398,10 +416,10 @@ export default {
qualityEngineerName: "",
certifiedEngineerName: "",
distributePerson: "",
dockUser:'',
dockUser: "",
ministerUser: "",
dockUserName:'',
ministerUserName:"",
dockUserName: "",
ministerUserName: ""
},
formRules: {
standName: [
@@ -415,7 +433,7 @@ export default {
],
certifiedEngineer: [
{ required: true, message: "请选择认证工程师", trigger: "change" }
],
]
},
roleFormRules: {
dockUserName: [
@@ -423,7 +441,7 @@ export default {
],
ministerUserName: [
{ required: true, message: "请选择标准法规部领导", trigger: "change" }
],
]
},
ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据
@@ -464,19 +482,19 @@ export default {
distributePersonId: "", //分发责任人id
id: "",
sarStandProjectLibraries: [{
projectManager: '',
projectLevel: '',
projectNumber: '',
projectEndDate: '',
currentNode: '',
projectGroup: '',
productLine: '',
projectClassification: '',
projectStatus: '',
projectStartDate: '',
id: '',
projectName: '',
projectPlatfor: ''
projectManager: "",
projectLevel: "",
projectNumber: "",
projectEndDate: "",
currentNode: "",
projectGroup: "",
productLine: "",
projectClassification: "",
projectStatus: "",
projectStartDate: "",
id: "",
projectName: "",
projectPlatfor: ""
}]
}]
},
@@ -503,13 +521,14 @@ export default {
this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") {
this.listForm.distributePerson = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id
this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name
// this.dataList.distributePerson = data[0].id;
// this.dataList.distributePersonName = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
this.showColumn = false;
this.$nextTick(() => {
this.showColumn = true
})
this.showColumn = true;
});
}
this.modalshowflag = false;
},
@@ -521,7 +540,7 @@ export default {
this.active = name;
},
typeChange(type) {
this.standardSearch.standType = type
this.standardSearch.standType = type;
},
choiceShow() {
this.ListModel = true;
@@ -542,14 +561,14 @@ export default {
//点击添加事件
addList() {
this.standModel = true;
this.$refs.projectTable.clearSelection()
this.$refs.projectTable.clearSelection();
},
// 点击批量删除事件
deleteList() {
if (this.selectList.length < 1) {
this.$message.warning('请选择一条数据进行删除')
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm('您确认删除这些数据？', '提示', {
this.$confirm("您确认删除这些数据？", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
@@ -558,15 +577,15 @@ export default {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.productLine = item
})
return items.productLine = item;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.selectList = [];
}).catch(() => {
})
});
}
},
//取消添加事件
@@ -579,16 +598,16 @@ export default {
if (this.dataList.length >= 1) {
this.dataList.forEach(item => {
if (proData.length === 0) {
proData.push(item.productLine)
proData.push(item.productLine);
} else if (!proData.includes(item.productLine)) {
proData.push(item.productLine)
proData.push(item.productLine);
}
})
});
this.standList.forEach(items => {
if (!proData.includes(items.productLine)) {
this.dataList.push(items)
this.dataList.push(items);
}
})
});
this.standModel = false;
} else {
if (this.standList.length >= 1) {
@@ -607,7 +626,7 @@ export default {
let _formData = new FormData();
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", '5');
_formData.append("prcType", "5");
_formData.append("json", JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
@@ -625,19 +644,17 @@ export default {
},
//提交事件
handleSubmit() {
if (this.dataList.length < 1) {
this.$message.warning("请添加产品线信息");
}
this.dataList.forEach(item => {
if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){
this.$message.warning('请选择分发责任人')
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.$message.warning("请选择分发责任人");
} else {
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj
json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj
this.$refs['listForm'].validate((valid) => {
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
_this: this
@@ -666,7 +683,7 @@ export default {
}
});
}
})
});
},
//选择拆分标准取消事件
@@ -740,19 +757,19 @@ export default {
},
pageChange(page) {
this.page = page;
this.getStandData()
this.getStandData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.getStandData()
this.getStandData();
},
pageChangeNo(page) {
this.pageNO = page;
this.getProductData()
this.getProductData();
},
pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.getProductData()
this.getProductData();
},
//获取产品线数据
getProductData() {
@@ -770,26 +787,26 @@ export default {
},
//获取标准数据
getStandData() {
this.$http.post('SarStandItems/sar-stand-items/findStand',{
this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page,
size: this.pageSize,
...this.standardSearch,
...this.standardSearch
}, {
_this: this,
_this: this
}, res => {
this.sarAccessListDatas = res.records;
this.total = res.total
this.total = res.total;
}, e => {
})
});
},
clearSearch() {
this.standardSearch = {
standName: "",
standType:"",
standType: ""
};
this.getStandData();
},
}
},
computed: {},
mounted() {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+2 -2
View File
@@ -25,14 +25,14 @@
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
clearable
disabled
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+31 -24
View File
@@ -42,31 +42,37 @@
</process-title>
<el-table
:data="dataList"
border
ref="selection"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
style="width: 100%; border:1px solid #ccc"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
width="200"
label="标准编号">
>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
width="200"
label="标准名称">
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -78,21 +84,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -169,13 +175,6 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
bzFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,7 @@ export default {
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+32 -24
View File
@@ -42,31 +42,37 @@
</process-title>
<el-table
:data="dataList"
border
ref="selection"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
style="width: 100%; border:1px solid #ccc"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
width="200"
label="标准编号">
>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
width="200"
label="标准名称">
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -78,21 +84,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -169,13 +175,6 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
bzFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,8 @@ export default {
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+32 -25
View File
@@ -42,31 +42,37 @@
</process-title>
<el-table
:data="dataList"
border
ref="selection"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
style="width: 100%; border:1px solid #ccc"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
width="200"
label="标准编号">
>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
width="200"
label="标准名称">
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -78,21 +84,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -169,13 +175,6 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
dlFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dlFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dlFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,7 @@ export default {
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
@@ -404,7 +411,7 @@ export default {
mounted() {
this.processTable();
this.getData();
}
},
};
</script>
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+18 -47
View File
@@ -72,7 +72,7 @@
>
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -84,21 +84,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -112,7 +112,7 @@
label="合规">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].complianceReasons"
v-model="scope.row.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
@@ -130,7 +130,7 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].noCompliance"
v-model="scope.row.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
@@ -143,7 +143,7 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].countermeasures"
v-model="scope.row.countermeasures"
placeholder="请输入应对措施"
>
</el-input>
@@ -156,7 +156,7 @@
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-model="dataList[scope.$index].completionTime"
v-model="scope.row.completionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
@@ -174,7 +174,7 @@
label="合规(具体情况)">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcComplianceReasons"
v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
@@ -191,7 +191,7 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcNoCompliance"
v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
@@ -204,7 +204,7 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcCountermeasures"
v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
@@ -217,7 +217,7 @@
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-model="dataList[scope.$index].zcCompletionTime"
v-model="scope.row.zcCompletionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
@@ -396,6 +396,7 @@ export default {
pId: this.pId
}).then(res => {
if (res) {
console.log(res.mesg)
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
@@ -407,37 +408,13 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
console.log(this.listForm)
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
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"];
}
});
this.listForm.children = children;
// this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList;
console.log(this.dataList)
});
},
//保存事件
@@ -446,8 +423,6 @@ export default {
},
//提交事件
handleSubmit() {
this.listForm.dataList.forEach(item => {
if (item.workPeople !== undefined) {
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -463,10 +438,6 @@ export default {
}
}, e => {
});
} else {
this.$message.warning("请选择分发负责人");
}
});
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+32 -26
View File
@@ -42,31 +42,37 @@
</process-title>
<el-table
:data="dataList"
border
ref="selection"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
style="width: 100%; border:1px solid #ccc"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
width="200"
label="标准编号">
>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
width="200"
label="标准名称">
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -78,21 +84,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -169,13 +175,6 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
ffFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -392,10 +398,10 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
@@ -404,7 +410,7 @@ export default {
mounted() {
this.processTable();
this.getData();
}
},
};
</script>
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+31 -24
View File
@@ -42,31 +42,37 @@
</process-title>
<el-table
:data="dataList"
border
ref="selection"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
style="width: 100%; border:1px solid #ccc"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
width="200"
label="标准编号">
>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
width="200"
label="标准名称">
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -78,21 +84,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -169,13 +175,6 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
jgFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,7 +358,10 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.jgFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.jgFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,7 @@ export default {
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+30 -23
View File
@@ -42,31 +42,37 @@
</process-title>
<el-table
:data="dataList"
border
ref="selection"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
style="width: 100%; border:1px solid #ccc"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
width="200"
label="标准编号">
>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
width="200"
label="标准名称">
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -78,21 +84,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -169,13 +175,6 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -359,7 +358,10 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.gcFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -375,10 +377,14 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.gcFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -396,6 +402,7 @@ export default {
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+44 -26
View File
@@ -25,33 +25,39 @@
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item">
<el-input v-model="historySearch.responseUnitShow" v-show="false" />
<el-popover
placement="bottom"
popper-class="user-dept-popper"
trigger="click"
:value="false"
>
<el-input
slot="reference"
v-model="historySearch.responseUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
id="searchResp"
/>
<div class="api">
<laws-tree
:zNodes="zNodesSItem"
treeDivId="zNodesSItemSearch"
deptSelect
showRMenu
@treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
class="ztree" style="width: 200px;height: 400px;overflow: auto">
</laws-tree>
</div>
</el-popover>
<el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="责任部门" class="search-item">-->
<!-- <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
<!-- <el-popover-->
<!-- placement="bottom"-->
<!-- popper-class="user-dept-popper"-->
<!-- trigger="click"-->
<!-- :value="false"-->
<!-- >-->
<!-- <el-input-->
<!-- slot="reference"-->
<!-- v-model="historySearch.responseUnitShow"-->
<!-- placeholder="根据责任部门查找"-->
<!-- readonly-->
<!-- clearable-->
<!-- id="searchResp"-->
<!-- />-->
<!-- <div class="api">-->
<!-- <laws-tree-->
<!-- :zNodes="zNodesSItem"-->
<!-- treeDivId="zNodesSItemSearch"-->
<!-- deptSelect-->
<!-- showRMenu-->
<!-- @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
<!-- class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
<!-- </laws-tree>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </el-form-item>-->
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -374,6 +380,7 @@ export default {
total: 0,
// 当前页数
pageNo: 1,
zrbmOptions:[],
// 单页数量
pageSize: this.$store.getters.userInfo.configContent,
// 历史数据查看
@@ -652,6 +659,17 @@ 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)
}, e => {
})
this.getTableBtn()
this.getOrgTreeSource()
}
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+44 -26
View File
@@ -17,33 +17,39 @@
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item">
<el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />
<el-popover
placement="bottom"
popper-class="user-dept-popper"
trigger="click"
:value="false"
>
<el-input
slot="reference"
v-model="nonConformitySearch.responsibleUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
id="searchResp"
/>
<div class="api">
<laws-tree
:zNodes="zNodesSItem"
treeDivId="zNodesSItemSearch"
deptSelect
showRMenu
@treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
class="ztree" style="width: 200px;height: 400px;overflow: auto">
</laws-tree>
</div>
</el-popover>
<el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="责任部门" class="search-item">-->
<!-- <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />-->
<!-- <el-popover-->
<!-- placement="bottom"-->
<!-- popper-class="user-dept-popper"-->
<!-- trigger="click"-->
<!-- :value="false"-->
<!-- >-->
<!-- <el-input-->
<!-- slot="reference"-->
<!-- v-model="nonConformitySearch.responsibleUnitShow"-->
<!-- placeholder="根据责任部门查找"-->
<!-- readonly-->
<!-- clearable-->
<!-- id="searchResp"-->
<!-- />-->
<!-- <div class="api">-->
<!-- <laws-tree-->
<!-- :zNodes="zNodesSItem"-->
<!-- treeDivId="zNodesSItemSearch"-->
<!-- deptSelect-->
<!-- showRMenu-->
<!-- @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
<!-- class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
<!-- </laws-tree>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </el-form-item>-->
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -427,6 +433,7 @@ export default {
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
},
zrbmOptions: [], // 责任部门下拉框
// 责任部门
zNodesSItem: [],
myLoading: {
@@ -654,6 +661,17 @@ 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)
}, e => {
})
this.getTableByPage()
// 加载所有的部门
this.getOrgTreeSource()