diff --git a/src/api/process.js b/src/api/process.js
index 873a4600a..b582172ae 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -804,3 +804,223 @@ export function upFile(data) {
data
})
}
+// 工作组协会信息数据统计导出
+export function exportAssocInfos(params) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-assoc-info/exportAllAssocInfos',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组参与外部标准制修订信息统计导出
+export function exportAllWbxds(params) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-wbxd/exportAllWbxds',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组委员信息数据统计导出
+export function exportAllCommiInfos(params) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-commi-info/exportAllCommiInfos',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组协会费用信息统计导出
+export function exportAllAssocCosts(params) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-assoc-cost/exportAllAssocCosts',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组参与外部协会会议统计导出
+export function exportAllWbtjs(params) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-wbtj/exportAllWbtjs',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组参会费用信息统计导出
+export function exportAllMeetCosts(params) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-meet-cost/exportAllMeetCosts',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组采购费用信息统计导出
+export function exportAllCgfys(params) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-cgfy/exportAllCgfys',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组参与外部标准制修订费用统计导出
+export function exportAllExReviseCost(params) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-ex-revise-cost/exportAllExReviseCost',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组翻译费用信息统计导出
+export function exportAllFyfys(params) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-fyfy/exportAllFyfys',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组标准制修订补助资金收支统计收入表导出
+export function exportAllSrbs(params) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-srb/exportAllSrbs',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 工作组标准制修订补助资金收支统计支出表导出
+export function exportAllZcbs(params) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-zcb/exportAllZcbs',
+ params,
+ method: 'get',
+ responseType: 'blob',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ }
+ })
+}
+// 协会信息数据统计导入
+export function importAllAssocInfos(data) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-assoc-info/importAllAssocInfos',
+ method: 'post',
+ data
+ })
+}
+// 委员信息数据统计导入
+export function importAllCommiInfos(data) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-commi-info/importAllCommiInfos',
+ method: 'post',
+ data
+ })
+}
+// 参与外部协会会议统计导入
+export function importAllAllWbtjs(data) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-wbtj/importAllAllWbtjs',
+ method: 'post',
+ data
+ })
+}
+// 参与外部标准制修订信息统计导入
+export function importAllWbxds(data) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-wbxd/importAllWbxds',
+ method: 'post',
+ data
+ })
+}
+// 协会费用信息统计导入
+export function importAssocCosts(data) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-assoc-cost/importAssocCosts',
+ method: 'post',
+ data
+ })
+}
+//参会费用信息统计导入
+export function importMeetCost(data) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-meet-cost/importMeetCost',
+ method: 'post',
+ data
+ })
+}
+//参与外部标准制修订费用统计导入
+export function importExReviseCost(data) {
+ return axios({
+ url: '/api/wgdCensusZ/wgd-ex-revise-cost/importExReviseCost',
+ method: 'post',
+ data
+ })
+}
+//采购费用信息统计导入
+export function importAllCgfys(data) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-cgfy/importAllCgfys',
+ method: 'post',
+ data
+ })
+}
+//翻译费用信息统计导入
+export function importAllFyfys(data) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-fyfy/importAllFyfys',
+ method: 'post',
+ data
+ })
+}
+//标准制修订补助资金收支统计收入表导入
+export function importAllSrbs(data) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-srb/importAllSrbs',
+ method: 'post',
+ data
+ })
+}
+//标准制修订补助资金收支统计支出表导入
+export function importAllZcbs(data) {
+ return axios({
+ url: '/api/wgdCensusLeo/wgd-zcb/importAllZcbs',
+ method: 'post',
+ data
+ })
+}
diff --git a/src/components/CustomFormComponents/Input.vue b/src/components/CustomFormComponents/Input.vue
index aa3e5a3ba..ceeaa8391 100644
--- a/src/components/CustomFormComponents/Input.vue
+++ b/src/components/CustomFormComponents/Input.vue
@@ -62,6 +62,9 @@ export default {
const value = event
this.$emit('input', value)
}
+ },
+ mounted() {
+ console.log(this.config);
}
}
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index 2a6ee0d94..97e82af5c 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -254,7 +254,7 @@ export default {
this.quoteIdList1 = []
this.replaceLawsNumForm.quoteIdList = ''
}
- this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', this.replaceLawsNumForm, {
_this: this,
loading: 'replaceLoading'
}, res => {
diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue
index fca2173aa..30cbb6b07 100644
--- a/src/components/mechanismTree/index.vue
+++ b/src/components/mechanismTree/index.vue
@@ -49,7 +49,6 @@
确定
-
取消
@@ -103,15 +102,13 @@ export default {
}
},
methods: {
- treeClass() {
-
- },
handleTreeDrawerCancel() {
this.filterText = ''
this.isVisible2 = false
},
saveUserInfo() {
let arr = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+ this.filterText = ''
this.isVisible2 = false
this.$emit('checkedRole', arr)
},
diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue
index 66c24d901..798ac4b3a 100644
--- a/src/components/phoneHistortTable/index.vue
+++ b/src/components/phoneHistortTable/index.vue
@@ -88,6 +88,8 @@
}
-
diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index b01facf1c..6bfcb1889 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -1,11 +1,11 @@
+ :title="isTitle"
+ :visible.sync="visible"
+ :wrapperClosable="false"
+ @close="handleTreeDrawerCancel"
+ size="460px">
{{tag.name}}
- 全部删除
+ 全部删除
@@ -124,9 +124,10 @@
},
data () {
return {
+ visible: false,
+ nodeList2: [],
delList: [],
roleList: [],
- isVisible2: false,
filterText: '',
defaultProps: {
children: 'children',
@@ -146,14 +147,24 @@
},
methods: {
handleClose (tag) {
+ let arr = []
for (let a = 0; a < this.delList.length; a++) {
if (tag.id === this.delList[a].id) {
this.delList.splice(a, 1)
}
}
- for (let b = 0; b < this.nodeList.length; b++) {
- if (tag.id === this.nodeList[b]) {
- this.nodeList.splice(b, 1)
+ this.delList.map(item => {
+ arr.push(item)
+ })
+ this.$refs.tree.setCheckedKeys(arr);
+ for (let b = 0; b < this.nodeList2.length; b++) {
+ if (tag.id === this.nodeList2[b]) {
+ this.nodeList2.splice(b, 1)
+ }
+ }
+ for (let c = 0; c < this.roleList.length; c++) {
+ if (tag.id === this.roleList[c].id) {
+ this.roleList.splice(c, 1)
}
}
},
@@ -166,7 +177,9 @@
cancelButtonText: '取消',
}).then(() => {
this.delList = []
- this.nodeList = []
+ this.nodeList2 = []
+ this.roleList = []
+ this.$refs.tree.setCheckedKeys([]);
}).catch(() => {
this.$message({
type: 'info',
@@ -193,11 +206,17 @@
if (this.checkBox) {
} else {
if (type) {
- this.nodeList.push(row.id)
+ this.nodeList2.push(row.id)
+ this.delList.push(row)
} else {
- for (let a = 0; a < this.nodeList.length; a ++) {
- if (row.id === this.nodeList[a]) {
- this.nodeList.splice(a, 1)
+ for (let a = 0; a < this.nodeList2.length; a ++) {
+ if (row.id === this.nodeList2[a]) {
+ this.nodeList2.splice(a, 1)
+ }
+ }
+ for (let b = 0; b < this.delList.length; b++) {
+ if (row.id === this.delList[b].id) {
+ this.delList.splice(b, 1)
}
}
}
@@ -207,30 +226,36 @@
if (this.checkBox) {
} else {
if (type) {
- this.nodeList.push(row.id)
+ this.nodeList2.push(row.id)
+ this.delList.push(row)
} else {
- for (let a = 0; a < this.nodeList.length; a ++) {
- if (row.id === this.nodeList[a]) {
- this.nodeList.splice(a, 1)
+ for (let a = 0; a < this.nodeList2.length; a++) {
+ if (row.id === this.nodeList2[a]) {
+ this.nodeList2.splice(a, 1)
+ }
+ }
+ for (let b = 0; b < this.delList.length; b++) {
+ if (row.id === this.delList[b].id) {
+ this.delList.splice(b, 1)
}
}
}
}
-
},
handleTreeDrawerCancel () {
this.filterText = ''
- this.isVisible2 = false
this.open1 = true
+ this.visible = false
},
saveUserInfo () {
if (this.checkBox) {
- this.isVisible2 = false
this.$emit('checkedRole', this.roleList)
+ this.nodeList2 = []
+ this.$emit('update:isVisible', false)
} else {
- if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
+ if (this.nodeList2.length > 0 && this.nodeList2[0].length !== 0) {
let ids = ''
- this.nodeList.forEach(item => {
+ this.nodeList2.forEach(item => {
if (ids.length > 0) {
ids += ','
ids += item
@@ -243,12 +268,14 @@
}, {
_this: this
}, res => {
- this.isVisible2 = false
this.$emit('checkedRole', res)
+ this.nodeList2 = []
+ this.$emit('update:isVisible', false)
})
} else {
- this.isVisible2 = false
this.$emit('checkedRole', this.roleList)
+ this.nodeList2 = []
+ this.$emit('update:isVisible', false)
}
}
this.open1 = true
@@ -261,10 +288,13 @@
this.$refs.tree.setCheckedKeys([])
this.$refs.tree.setCheckedKeys([data.id])
this.roleList = [data]
+ this.delList = [data]
} else if (getlist.length === 0) {
this.roleList = [{}]
+ this.delList = []
} else if (getlist.length === 1) {
this.roleList = [data]
+ this.delList = [data]
}
} else { // 多选
this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
@@ -294,12 +324,13 @@
},
watch: {
isVisible (val) {
- this.isVisible2 = val
+ this.visible = val
if (val) {
- if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
+ this.nodeList2 = this.nodeList
+ if (this.nodeList2.length && this.nodeList2[0].length) {
let ids = ''
- this.nodeList.forEach(item => {
- if (ids.length > 0) {
+ this.nodeList2.forEach(item => {
+ if (ids.length) {
ids += ','
ids += item
} else {
@@ -320,9 +351,9 @@
this.delList = []
}
},
- isVisible2 (val) {
+ visible(val) {
this.$emit('update:isVisible', val)
- },
+ }
},
mounted () {
this.getTree()
@@ -348,6 +379,7 @@
flex-wrap: wrap;
overflow: auto;
margin: 10px;
+ align-content: flex-start;
span {
margin: 0px 5px 5px 0;
}
diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue
index 0d805290e..d93320d38 100644
--- a/src/components/workTree/index.vue
+++ b/src/components/workTree/index.vue
@@ -175,6 +175,7 @@ export default {
this.filterText = ''
this.isVisible2 = false
this.open1 = true
+ this.nodeList = []
},
saveUserInfo () {
if (this.checkBox) {
diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue
index 3903b5b4f..249fa4514 100644
--- a/src/pages/config/pages/attributeCustom/components/laws.vue
+++ b/src/pages/config/pages/attributeCustom/components/laws.vue
@@ -282,7 +282,7 @@
+
+
diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
index ec4d5f16b..a0a277786 100644
--- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue
+++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
@@ -249,6 +249,7 @@ export default {
name: 'mechanism',
data() {
return {
+ formLoading: true,
peopleType: '', //1为树结构 2 为全机构
nodeKeyId: '',
searchForm: {
@@ -327,6 +328,7 @@ export default {
searchPostName() {
this.page = 1;
this.getTree2();
+ this.sarPost.name = "";
}, // 查询
resetSelect() {
this.sarPost.name = "";
@@ -531,12 +533,17 @@ export default {
},
selectEdit() {
- this.userId = []
- this.manageData.forEach(item=>{
- this.userId.push(item.userId)
- })
- this.drawerTitle = '批量配置岗位'
- this.modalPost = true
+ this.getTree2()
+ if(this.manageData.length){
+ this.userId = []
+ this.manageData.forEach(item=>{
+ this.userId.push(item.userId)
+ })
+ this.drawerTitle = '批量配置岗位'
+ this.modalPost = true
+ }else{
+ this.$message.warning('请选择需要批量配置岗位的角色')
+ }
},
},
computed: {},
diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue
index 70e06c64a..02d62b7f0 100644
--- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue
+++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue
@@ -244,7 +244,9 @@ export default {
}, {
_this: this
}, res => {
- res.data.records.map(item => {
+ this.workData = res.data.records
+ let work = res.data.records
+ work.map(item => {
item.workLeaderGroup = [];
item.workPeopleGroup = [];
var workLeaderArray = item.workLeader.split(",");
@@ -258,8 +260,8 @@ export default {
item.workPeopleGroup.push({ name: workPeopleArray[j], id: workPeopleIdArray[j] });
}
});
- this.workData = res.data.records;
this.total = res.data.total;
+ this.Loading = false
}, e => {
});
},
@@ -268,7 +270,7 @@ export default {
},
//查询
searchPostName() {
- this.page = 1;
+ this.workSearch.page = 1;
this.getWorkData();
},
//清空
@@ -340,11 +342,14 @@ export default {
},
//取消新增
cancelModel() {
+ this.Loading = true
this.addForm = {
workGroup: "",
workPeopleGroup: [],
workLeaderGroup: []
};
+ this.getWorkData();
+ this.$refs.workGroup.clearSelection()
this.addModel = false;
},
//确定新增
@@ -357,6 +362,7 @@ export default {
} else if (!this.addForm.workPeopleGroup.length) {
this.$message.warning("请选择工作组组员");
} else {
+ this.Loading = true
let workLeader = "", workLeaderId = "";
this.addForm.workLeaderGroup.map(item => {
workLeader += item.name;
@@ -390,41 +396,47 @@ export default {
this.nodeList2 = [];
}
} else {
- let workLeader = "";
- let workLeaderId = "";
- this.addForm.workLeaderGroup.map(item => {
- workLeader += item.name;
- workLeader += ",";
- workLeaderId += item.id;
- workLeaderId += ",";
- });
-
- let workPeople = "";
- let workPeopleId = "";
- this.addForm.workPeopleGroup.map(item => {
- workPeople += item.name;
- workPeople += ",";
- workPeopleId += item.id;
- workPeopleId += ",";
- });
- this.$http.put("workGroup/work-group", {
- id: this.addForm.id,
- workGroup: this.addForm.workGroup,
- workLeader: workLeader,
- workLeaderId: workLeaderId,
- workPeople: workPeople,
- workPeopleId: workPeopleId
- }, {
- _this: this
- }, res => {
- if (res.ok) {
- } else {
- this.$message.warning(res.message);
- }
- this.getWorkData();
- });
- this.addModel = false;
- this.$refs.workGroup.clearSelection();
+ if (!this.addForm.workLeaderGroup.length) {
+ this.$message.warning("请选择工作组组长");
+ } else if (!this.addForm.workPeopleGroup.length) {
+ this.$message.warning("请选择工作组组员");
+ } else {
+ this.Loading = true
+ let workLeader = "";
+ let workLeaderId = "";
+ this.addForm.workLeaderGroup.map(item => {
+ workLeader += item.name;
+ workLeader += ",";
+ workLeaderId += item.id;
+ workLeaderId += ",";
+ });
+ let workPeople = "";
+ let workPeopleId = "";
+ this.addForm.workPeopleGroup.map(item => {
+ workPeople += item.name;
+ workPeople += ",";
+ workPeopleId += item.id;
+ workPeopleId += ",";
+ });
+ this.$http.put("workGroup/work-group", {
+ id: this.addForm.id,
+ workGroup: this.addForm.workGroup,
+ workLeader: workLeader,
+ workLeaderId: workLeaderId,
+ workPeople: workPeople,
+ workPeopleId: workPeopleId
+ }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ } else {
+ this.$message.warning(res.message);
+ }
+ this.getWorkData();
+ });
+ this.addModel = false;
+ this.$refs.workGroup.clearSelection();
+ }
}
} else {
this.$message.warning("请填写整信息");
@@ -448,6 +460,7 @@ export default {
},
checkedRole(data) {
this.addForm = {
+ id: this.addForm.id,
workGroup: this.addForm.workGroup || "",
workPeopleGroup: this.addForm.workPeopleGroup || [],
workLeaderGroup: this.addForm.workLeaderGroup || []
@@ -463,9 +476,11 @@ export default {
}
});
this.roleModal = false
+ this.nodeList = []
},
checkedRole2(data) {
this.addForm = {
+ id: this.addForm.id,
workGroup: this.addForm.workGroup || "",
workPeopleGroup: this.addForm.workPeopleGroup || [],
workLeaderGroup: this.addForm.workLeaderGroup || []
@@ -481,6 +496,7 @@ export default {
}
});
this.roleModal2 = false
+ this.nodeList = []
},
pageChange(page) {
this.workSearch.page = page
diff --git a/src/pages/config/pages/operationLog/index.vue b/src/pages/config/pages/operationLog/index.vue
index 88a0a3959..f8a6f1c2f 100644
--- a/src/pages/config/pages/operationLog/index.vue
+++ b/src/pages/config/pages/operationLog/index.vue
@@ -167,8 +167,11 @@
loading: 'dataLoading'
}, res => {
if (res.ok) {
- this.total = res.data.total
- this.data = res.data.records
+ this.total = res.data.total;
+ res.data.records.forEach(item => {
+ item.account = "(" + item.account + ")" + item.accountName;
+ });
+ this.data = res.data.records;
}
})
},
diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 87d126f6c..595f0bca7 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -40,6 +40,12 @@
v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
size="mini">配置法规库权限
+ 配置法规库数据权限
+
+
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
0){
this.treeData3 = this.sortByKey(list1,"displaySeq")
+ this.treeData4 = this.sortByKey(list1,"displaySeq")
}
@@ -651,9 +692,27 @@ export default {
}
})
},
+ //配置数据确定按钮
+ confirmDialogData2(){
+ let menuIds = this.$refs.tree4.getCheckedKeys().join(',')
+ this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', {
+ menuIds: menuIds,
+ roleId: this.id
+ }, {}, res => {
+ if (res.ok) {
+ this.$message.success('设置权限成功')
+ this.modalflag2 = false
+ }else{
+ this.$message.warning(res.message)
+ }
+ })
+ },
closeDialogData() {
this.modalflag = false
},
+ closeDialogData2() {
+ this.modalflag2 = false
+ },
/** 父子节点的级联 */
nodeClick(currentObj, treeStatus) {
// 用于:父子节点严格互不关联时,父节点勾选变化时通知子节点同步变化,实现单向关联。
@@ -671,6 +730,30 @@ export default {
}
}
},
+ /** 父子节点的级联 */
+ nodeClick3(currentObj, treeStatus) {
+ // 用于:父子节点严格互不关联时,父节点勾选变化时通知子节点同步变化,实现单向关联。
+ let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中
+ // 选中
+ if (selected !== -1) {
+ // 子节点只要被选中父节点就被选中
+ this.selectedParent4(currentObj)
+ // 统一处理子节点为相同的勾选状态
+ this.uniteChildSame4(currentObj, true)
+ } else {
+ // 未选中 处理子节点全部未选中
+ if (currentObj.children.length !== 0) {
+ this.uniteChildSame4(currentObj, false)
+ }
+ }
+ },
+ // 统一处理子节点为相同的勾选状态
+ uniteChildSame4(treeList, isSelected) {
+ this.$refs.tree4.setChecked(treeList.id, isSelected)
+ for (let i = 0; i < treeList.children.length; i++) {
+ this.uniteChildSame4(treeList.children[i], isSelected)
+ }
+ },
// 统一处理子节点为相同的勾选状态
uniteChildSame(treeList, isSelected) {
this.$refs.tree3.setChecked(treeList.id, isSelected)
@@ -686,6 +769,14 @@ export default {
this.selectedParent(currentNode.parent)
}
},
+ // 统一处理父节点为选中
+ selectedParent4(currentObj) {
+ let currentNode = this.$refs.tree4.getNode(currentObj)
+ if (currentNode.parent.key !== undefined) {
+ this.$refs.tree4.setChecked(currentNode.parent, true)
+ this.selectedParent4(currentNode.parent)
+ }
+ },
nodeClick2(currentObj, treeStatus) {
// 用于:父子节点严格互不关联时,父节点勾选变化时通知子节点同步变化,实现单向关联。
let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中
@@ -726,6 +817,16 @@ export default {
}
})
},
+ roleDataAdd(){
+ this.$http.get('tsRoleMeunData/ts-role-menu-data/list', {
+ ids: this.id
+ }, {}, res => {
+ if (res.ok) {
+ this.nodeList4 = res.data
+ this.modalflag2 = true
+ }
+ })
+ },
closeDialog() {
this.treeData2 = []
this.modalshowflag = false
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 1b8d0e88c..f06032758 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -363,14 +363,14 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'"
+ v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
/>
@@ -384,13 +384,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
- v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'"
+ v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
/>
@@ -902,7 +902,7 @@
- 更新LOG
+ 更新记录
知识点分享
符合性状态
- 更新LOG
+ 更新记录
@@ -57,7 +56,7 @@
{{ sarStandardsInfoEO.lawsBulletin || '-' }}
{{ sarStandardsInfoEO.lawsSyqy || '-' }}
{{ sarStandardsInfoEO.lawsSycx || '-' }}
- {{ sarStandardsInfoEO.isRelateAccess || '-' }}
+ {{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}
{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}
{{ sarStandardsInfoEO.lawsYear || '-' }}
{{ sarStandardsInfoEO.lawsLabel || '-' }}
@@ -151,7 +150,6 @@
{{ file.oldFileName }}
- 上传时间:{{ dateFormat(file.modifyTime) }}
@@ -167,7 +165,7 @@
- 更多

+
{
// 动态属性字段-SYRZ 单独添加至基础信息
@@ -2158,17 +2158,9 @@ export default {
if (!list2[0].child) {
location['child2'] = []
}else {
- const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS');
- location['child2'] = childList
- }
- }
-
- for (let i = 0; i < displayLocation.length; i++) {
- // sss
- if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
- const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
- if(childList.length === 0){
- displayLocation.splice(i,1)
+ if(list2[0].child){
+ const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS');
+ location['child2'] = childList
}
}
}
@@ -2183,8 +2175,24 @@ export default {
})
location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
})
-
+ for (let i = 0; i < displayLocation.length; i++) {
+ // sss
+ if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
+ if(displayLocation[i].child !== undefined){
+ let childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+ if(childList.length === 0){
+ displayLocation.splice(i,1)
+ i -= 1
+ }
+ }else {
+ displayLocation.splice(i,1)
+ i -= 1
+ }
+ }
+ }
+ console.log(displayLocation)
this.dynamicFormField = displayLocation
+ console.log(this.dynamicFormField)
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false
})
@@ -2395,7 +2403,7 @@ export default {
display: inline-block;
width: calc(~'100% - 225px');
& > .files-title{
- width: calc(~'100% - 120px');
+ /*width: calc(~'100% - 120px');*/
min-height: 50px;
line-height: 50px;
font-size: 16px;
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 6965de85b..035e015d2 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -65,32 +65,32 @@
}}
-
+
-
+
-
- {{ file.oldFileName }}
-
+
+ {{ file.oldFileName }}
+
-
-
+
{{ file.oldFileName }}
@@ -116,10 +116,9 @@
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
style="right:62px"
- icon="icon-separate"
>标准分解单
-
+
@@ -158,7 +157,6 @@
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
style="right:62px"
- icon="icon-separate"
>标准分解单
标准分解单
标准分解单
{{ item }}
+ class="span-line" :title="item">{{ item }}
@@ -343,7 +339,7 @@
{{ item }}
+ class="span-line" :title="item">{{ item }}
@@ -397,7 +393,7 @@
>
- {{
+ {{
file.oldFileName
}}
上传时间:{{ dateFormat(file.modifyTime) }}-->
- {{
+ {{
file.oldFileName
}}
{{ item }}
+ class="span-line" :title="item">{{ item }}
@@ -466,7 +462,7 @@
{{ item }}
+ class="span-line" :title="item">{{ item }}
-
@@ -497,7 +493,7 @@
- {{
+ {{
file.oldFileName
}}
上传时间:{{ dateFormat(file.modifyTime) }}-->
- {{
+ {{
file.oldFileName
}}
标准分解单
@@ -641,7 +636,7 @@
{{ item }}
+ class="span-line" :title="item">{{ item }}
@@ -651,7 +646,7 @@
{{ item }}
+ class="span-line" :title="item">{{ item }}
-
@@ -679,7 +674,7 @@
- {{
+ {{
file.oldFileName
}}
上传时间:{{ dateFormat(file.modifyTime) }}-->
- {{
+ {{
file.oldFileName
}}
标准分解单
@@ -847,7 +841,6 @@
:height="tableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
- @select="select"
@selection-change="selectAllStand">
数据加载中...
-
@@ -2759,8 +2747,19 @@ export default {
}
},
choiceZRRS(type, title, id) {
- this.nodeList = []
- this.nodeList.push(id)
+ this.nodeList2 = []
+ if (id) {
+ let ids = id.split(',')
+ let idList = []
+ ids.forEach(item => {
+ let a, b
+ a = item.substring(item.indexOf('(') +1)
+ b = a.substring(0, a.lastIndexOf(')'))
+ idList.push(b)
+ })
+ idList = idList.join(',')
+ this.nodeList2.push(idList)
+ }
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
@@ -2779,31 +2778,30 @@ export default {
if (this.drawerTitle === '查询责任工程师') {
this.resolveListForm.dutyEngineer = nameList
}
-
- },
- select(selection, row) {
- // 清除 所有勾选项
- this.$refs.multipleTable.clearSelection()
- // 当表格数据都没有被勾选的时候 就返回
- // 主要用于将当前勾选的表格状态清除
- if (selection.length === 0) return
- this.$refs.multipleTable.toggleRowSelection(row, true)
},
+ // select(selection, row) {
+ // // 清除 所有勾选项
+ // this.$refs.multipleTable.clearSelection()
+ // // 当表格数据都没有被勾选的时候 就返回
+ // // 主要用于将当前勾选的表格状态清除
+ // if (selection.length === 0) return
+ // this.$refs.multipleTable.toggleRowSelection(row, true)
+ // },
selectAllStand(alldata) {
- this.selectedItemList = []
- this.selectedItemList.push(alldata[alldata.length - 1])
+ this.selectedItemList = alldata
},
editResolveList() {
- if (this.selectedItemList.length > 0) {
- this.editResolveListShowflag = true
- let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0]))
- this.resolveListForm = editItem
+ if (this.selectedItemList.length < 1) {
+ this.$message.warning('请选择一条数据')
+ } else if (this.selectedItemList.length === 1) {
+ this.resolveListForm = JSON.parse(JSON.stringify(this.selectedItemList[0]))
this.resolveListForm.termsConditions = this.resolveListForm.termsConditions ? this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' ') : ''
// this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq ? this.resolveListForm.xccssrq.split(',') : ''
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq ? this.resolveListForm.zccssrq.split(',') : ''
+ this.editResolveListShowflag = true
} else {
- this.$message.warning('请选择一条数据')
+ this.$message.warning('仅可选择一条数据')
}
},
saveEditInfo() {
@@ -2832,6 +2830,8 @@ export default {
)
},
resetEditResolveListForm() {
+ this.resolveListForm.applyArctic = ''
+ this.resolveListForm.dutyEngineer = ''
this.editResolveListShowflag = false
},
// 分页点击后方法
@@ -2851,7 +2851,6 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
_this: this
}, res => {
- console.log(res.data);
this.sarStandardsInfoEO = res.data || {}
this.itemExistList = this.sarStandardsInfoEO.attrInfoMap.itemExistList;
if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
@@ -3114,7 +3113,9 @@ export default {
}
},
showItemsModel(attField) {
- this.fileType = attField
+ if (attField) {
+ this.fileType = attField
+ }
this.getOrgTreeSource()
this.selectedItemList = []
this.selectSarStandItems()
@@ -3229,12 +3230,13 @@ export default {
window.open(routeUrl.href, '_blank')
},
searchSarStandItems() {
- this.standItemSearch.page = 1
+ this.page7 = 1
this.selectSarStandItems()
},
// 清空搜索框
clearAllSearch() {
// 标准条款搜索
+ this.page7 = 1
this.standItemSearch.responsibleUnit = ''
this.standItemSearch.orgName = ''
this.standItemSearch.parts = ''
@@ -3643,6 +3645,7 @@ export default {
},
handleRelatedTermsDrawerSubmit() {
+
this.btnLoading = true
this.$refs['relatedTermsSelect'].handleSubmit(() => {
this.selectSarStandItems()
@@ -3652,8 +3655,6 @@ export default {
type: 'success'
});
})
-
-
},
closeRelatedTermsDrawer() {
this.$refs['relatedTermsDrawer'].closeDrawer()
@@ -3845,7 +3846,6 @@ export default {
}
})
this.dynamicFormField = displayLocation
- console.log(displayLocation);
})
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false
@@ -3872,7 +3872,26 @@ export default {
diff --git a/src/pages/processCenter/pages/phone/xmpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue
similarity index 90%
rename from src/pages/processCenter/pages/phone/xmpg/step6.vue
rename to src/pages/processCenter/pages/phone/bzpg/step6.vue
index b58f8d2e4..88d2b3f31 100644
--- a/src/pages/processCenter/pages/phone/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue
@@ -136,29 +136,35 @@
style="width: 100%"
border
@selection-change="selectStandChange"
- height="55%"
+ height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
+ type="selection"
+ width="55"
+ align="center">
+
+
@@ -170,34 +176,41 @@
label="条款名称">
+
+
+ 查看条款内容
+
+
+
+
-
- {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}
-
-
- {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}
-
- {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}
-
-
-
+ width="180"
+ label="评估人"
+ />
@@ -294,7 +300,7 @@ import axios from "axios";
import ProcessHeader from "process/components/ProcessHeader";
export default {
- name: "phoneXmpgStep6",
+ name: "phoneBzpgStep6",
components: {
ProcessHeader,
ProcessFooter,
@@ -498,40 +504,56 @@ export default {
/**
* @description: 动态表单读取
*/
- getFormFieldList (item) {
+ getFormFieldList(item) {
+ console.log(item);
this.$nextTick(() => {
- this.listForm = JSON.parse(JSON.stringify(item))
- this.listForm.prcNum = this.prcNum
- this.listForm.prcName = this.prcName
- this.dataList = item.dataList
- this.listForm.id = item.step3DTOS[0].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 = JSON.parse(JSON.stringify(item));
+ if (item.form === undefined) {
+ this.fileType = item.fileType
+ this.listForm.prcNum = this.prcNum
+ this.listForm.prcName = this.prcName
+ this.listForm['id'] = item.id
+ this.dataList = item.dataList
+ } else {
+ this.listForm = item.form;
+ this.dataList = item.form.dataList;
+ }
+
+ });
},
//驳回事件
beforeBack () {
if(!this.commentText){
- this.$message.warning('请填写审批意见')
- } else {
- this.listForm.fenFlag = '2'
- this.handleSubmit()
- }
+ this.$message.warning('请填写审批意见')
+ }else{
+ this.listForm.dataList = this.dataList
+ this.listForm.passFlag = '1'
+ this.listForm.commentText = this.commentText;
+ const json = JSON.stringify(this.listForm);
+ this.isSubmit = true
+ this.$http.post('lawss/activiti/completeTask', {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json,
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.$router.push('/processCenter')
+ }
+ this.isSubmit = false
+ }, e => {
+ });
+ }
},
//提交事件
handleSubmit() {
- this.isSubmit = true
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
- this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
- this.listForm.commentText = this.commentText;
- this.listForm.standId = this.listForm.standId;
- this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
+ this.listForm.passFlag = '0'
+ this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
+ this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -545,9 +567,7 @@ export default {
}
this.isSubmit = false
}, e => {
-
});
-
},
//标准表格选择框改变
selectStandChange(data) {
diff --git a/src/pages/processCenter/pages/phone/xmpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue
similarity index 89%
rename from src/pages/processCenter/pages/phone/xmpg/step7.vue
rename to src/pages/processCenter/pages/phone/bzpg/step7.vue
index 582c84325..a4a689296 100644
--- a/src/pages/processCenter/pages/phone/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue
@@ -2,7 +2,7 @@
标准合规评估流程
- 标准法规部领导审批
+ 审定
@@ -294,7 +307,7 @@ import axios from "axios";
import ProcessHeader from "process/components/ProcessHeader";
export default {
- name: "phoneXmpgStep7",
+ name: "phoneBzpgStep7",
components: {
ProcessHeader,
ProcessFooter,
@@ -304,7 +317,9 @@ export default {
data() {
return {
phoneshowflag: false,
+ activeName: '',
phoneRoleList: [],
+ projectTabName: [],
phoneDrawerTitle: '',
//折叠的标志,true为折叠,false为不折叠
foldFormFlag: false,
@@ -388,6 +403,9 @@ export default {
};
},
methods: {
+ handleClick(tab) {
+ this.projectName = tab.name
+ },
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
@@ -498,36 +516,34 @@ export default {
/**
* @description: 动态表单读取
*/
- getFormFieldList (item) {
+ 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.dataList = item.dataList
- })
- },
- //驳回事件
- beforeBack () {
- if(!this.commentText){
- this.$message.warning('请填写审批意见')
- } else {
- this.listForm.fenFlag = '2'
- this.handleSubmit()
- }
+ this.listForm = JSON.parse(JSON.stringify(item));
+ if (item.form === undefined) {
+ this.fileType = item.fileType
+ this.listForm.prcNum = this.prcNum
+ this.listForm.prcName = this.prcName
+ this.listForm['id'] = item.id
+ this.dataList = item.dataList
+ item.dataList.forEach(item => {
+ if(!this.projectTabName.includes(item.projectName)){
+ this.projectTabName.push(item.projectName)
+ }
+ })
+ this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
+ } else {
+ this.listForm = item.form;
+ this.dataList = item.form.dataList;
+ }
+
+ });
},
//提交事件
handleSubmit() {
- this.isSubmit = true
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
- this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
- this.listForm.commentText = this.commentText;
- this.listForm.standId = this.listForm.standId;
- this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
+ this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
+ this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -541,7 +557,6 @@ export default {
}
this.isSubmit = false
}, e => {
-
});
},
diff --git a/src/pages/processCenter/pages/phone/xmpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step8.vue
similarity index 78%
rename from src/pages/processCenter/pages/phone/xmpg/step2.vue
rename to src/pages/processCenter/pages/phone/bzpg/step8.vue
index 2ee9bbc26..241b7d293 100644
--- a/src/pages/processCenter/pages/phone/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzpg/step8.vue
@@ -1,8 +1,8 @@
-
+
标准合规评估流程
- 业务经理审批
+ 批准
@@ -212,7 +307,7 @@ import axios from "axios";
import ProcessHeader from "process/components/ProcessHeader";
export default {
- name: "phoneXmpgStep2",
+ name: "phoneBzpgStep8",
components: {
ProcessHeader,
ProcessFooter,
@@ -222,7 +317,9 @@ export default {
data() {
return {
phoneshowflag: false,
+ activeName: '',
phoneRoleList: [],
+ projectTabName: [],
phoneDrawerTitle: '',
//折叠的标志,true为折叠,false为不折叠
foldFormFlag: false,
@@ -306,6 +403,9 @@ export default {
};
},
methods: {
+ handleClick(tab) {
+ this.projectName = tab.name
+ },
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
@@ -416,30 +516,32 @@ export default {
/**
* @description: 动态表单读取
*/
- getFormFieldList (item) {
+ 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
- })
- },
- //驳回事件
- beforeBack () {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写审批意见')
- }else{
- this.listForm.passFlag = '1'
- this.handleSubmit()
- }
+ this.listForm = JSON.parse(JSON.stringify(item));
+ if (item.form === undefined) {
+ this.fileType = item.fileType
+ this.listForm.prcNum = this.prcNum
+ this.listForm.prcName = this.prcName
+ this.listForm['id'] = item.id
+ this.dataList = item.dataList
+ item.dataList.forEach(item => {
+ if(!this.projectTabName.includes(item.projectName)){
+ this.projectTabName.push(item.projectName)
+ }
+ })
+ this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
+ } else {
+ this.listForm = item.form;
+ this.dataList = item.form.dataList;
+ }
+
+ });
},
//提交事件
handleSubmit() {
- this.listForm.commentText = this.commentText
+ this.listForm.dataList = this.dataList
+ this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
@@ -491,7 +593,7 @@ export default {
+
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
index f39181290..a1213bdfd 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
@@ -67,7 +67,7 @@
-
+
@@ -170,7 +170,7 @@
return {
drawerModal: false,
histortData: [],
- commentText: "",
+ commentText2: "",
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
nodeList: [],
@@ -299,7 +299,7 @@
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.form,
- commentText: this.commentText
+ commentText2: this.commentText2
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
@@ -314,7 +314,7 @@
if (valid) {
this.isSubmit = true;
var json = this.json;
- json.commentText = this.commentText;
+ json.commentText = this.commentText2;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
json.introduce = false;
@@ -341,19 +341,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- this.form.cid = data.cid
- this.form.endTime = data.endTime
- this.form.cname = data.cname
- this.form.fjList = data.fjList
- // this.form.fjListId = data.fjListId
- this.form.textType = data.textType
- this.form.modelList = data.modelList
- this.form.modelNameList = data.modelNameList
- if (data.fjListId === '') {
- this.form.fjListId = ''
- } else {
- this.form.fjListId = data.fjListId || data.form.fjListId
- }
+ this.commentText2 = data.commentText2 || ''
+ this.form.cid = data.form ? data.form.cid : data.cid
+ this.form.endTime = data.form ? data.form.endTime : data.endTime
+ this.form.fjList = data.form ? data.form.fjList : data.fjList
+ this.form.textType = data.form ? data.form.textType : data.textType
+ this.form.modelList = data.form ? data.form.modelList : data.modelList
+ this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName : '')
+ this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList : '')
this.json = data
}).catch(e => {
});
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
index 44b8500f1..e0e87fb9a 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
@@ -50,16 +50,19 @@
- -
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -133,7 +136,7 @@
-
+
@@ -245,7 +248,7 @@
drawerModal: false,
histortData: [],
data: [],
- commentText: '',
+ commentText41: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
@@ -368,14 +371,12 @@
handleTabs(name) {
this.active = name
},
- handleSave() {
- },
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
- json.commentText = this.commentText
+ json.commentText = this.commentText41
json.bzfgId = this.form.bzfgId
json.bzfgName = this.form.bzfgName
json.spFlag = '0'
@@ -396,10 +397,10 @@
})
},
handleSubmitNo() {
- if (this.commentText) {
+ if (this.commentText41) {
var json = this.json
json.spFlag = '1'
- json.commentText = this.commentText
+ json.commentText = this.commentText41
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -428,14 +429,15 @@
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
+ this.commentText41 = data.commentText41 || ''
+ this.form.bzfgId = data.startUser
+ this.form.bzfgName = data.startUserName
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
- this.form.bzfgId = data.bzfgId || ''
- this.form.bzfgName = data.bzfgName || ''
this.json = data
this.data = data.info || data.data
}).catch(e => {
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
index 8ee40316b..fc51c1fe6 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
@@ -123,7 +123,7 @@
-
+
@@ -236,7 +236,7 @@
drawerModal: false,
histortData: [],
data: [],
- commentText: '',
+ commentText42: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
@@ -362,12 +362,10 @@
handleTabs(name) {
this.active = name
},
- handleSave() {
- },
handleSubmit() {
this.isSubmit = true
var json = this.json
- json.commentText = this.commentText
+ json.commentText = this.commentText42
json.bzFlag = '0'
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -382,10 +380,10 @@
})
},
handleSubmitNo() {
- if (this.commentText) {
+ if (this.commentText42) {
var json = this.json
json.bzFlag = '1'
- json.commentText = this.commentText
+ json.commentText = this.commentText42
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -414,6 +412,7 @@
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
+ this.commentText42 = data.commentText42 || ''
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
index e21a6823b..55732899e 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
@@ -79,7 +79,7 @@
-
+
@@ -211,13 +211,14 @@
name: "phoneBzdyStep6",
data() {
return {
+ data2: [],
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
histortData: [],
oldData: [],
data: [],
- commentText: "",
+ commentText6: "",
oldText: "",
newText: "",
reason: "",
@@ -362,6 +363,8 @@
return "上报";
} else if (row === "2") {
return "处理后上报";
+ } else {
+ return "不上报";
}
},
upload(row, title) {
@@ -400,33 +403,37 @@
handleTabs(name) {
this.active = name;
},
- handleSave() {
- },
handleSubmit() {
- this.isSubmit = true;
- var json = this.json;
- json.hqFlag = '0';
- json.user7 = this.form.user7;
- json.user7Name = this.form.user7Name;
- json.commentText = this.commentText;
- this.$http.post("lawss/activiti/completeTask", {
- json: JSON.stringify(json),
- taskId: this.taskIds,
- userId: this.$store.getters.userInfo.userId
- }, {}, res => {
- if (res.success) {
- this.$message.success("提交成功");
- this.$router.push("/processCenter");
+ this.$refs['bzzqyjForm'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true;
+ var json = this.json;
+ json.hqFlag = '0';
+ json.commentText = this.commentText6;
+ json.user7 = this.form.user7;
+ json.user7Name = this.form.user7Name;
+ this.$http.post("lawss/activiti/completeTask", {
+ json: JSON.stringify(json),
+ taskId: this.taskIds,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success("提交成功");
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ });
+ } else {
+ this.$message.warning('请选择审批领导')
}
- this.isSubmit = false;
- });
+ })
},
handleSubmitNo() {
- if (this.commentText) {
+ if (this.commentText6) {
this.isSubmit = true;
var json = this.json;
json.hqFlag = '1';
- json.commentText = this.commentText;
+ json.commentText = this.commentText6;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -455,21 +462,24 @@
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
+ this.commentText6 = data.commentText6 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
- this.oldData = JSON.parse(JSON.stringify(data.info))
- var arr = []
- data.info.forEach(item => {
+ let newArr = data.info ? data.info : data.form.data
+ this.oldData = JSON.parse(JSON.stringify(newArr))
+ let arr = []
+ newArr.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
+ this.data2 = newArr
+ this.data = arr
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
- this.data = arr
}).catch(e => {
});
});
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
index 6a2b6643d..f8cc50e08 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
@@ -148,7 +148,7 @@
-
+
@@ -200,7 +200,7 @@
histortData: [],
oldData: [],
data: [],
- commentText: "",
+ commentText7: "",
oldText: "",
newText: "",
reason: "",
@@ -358,44 +358,42 @@
handleTabs(name) {
this.active = name;
},
- handleSave() {
- },
handleSubmit() {
- this.isSubmit = true;
- var json = this.json;
- json.hqFlag = '0';
- json.commentText = this.commentText;
- this.$http.post("lawss/activiti/completeTask", {
- json: JSON.stringify(json),
- taskId: this.taskIds,
- userId: this.$store.getters.userInfo.userId
- }, {}, res => {
- if (res.success) {
- this.$message.success("提交成功");
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
+ this.isSubmit = true
+ var json = this.json
+ json.bdFlag = '0'
+ json.commentText = this.commentText7
+ this.$http.post('lawss/activiti/completeTask', {
+ json: JSON.stringify(json),
+ taskId: this.taskIds,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success('提交成功')
+ this.$router.push('/processCenter')
+ }
+ this.isSubmit = false
+ })
},
handleSubmitNo() {
- if (this.commentText) {
- this.isSubmit = true;
- var json = this.json;
- json.hqFlag = '1';
- json.commentText = this.commentText;
- this.$http.post("lawss/activiti/completeTask", {
+ if (this.commentText7) {
+ this.isSubmit = true
+ var json = this.json
+ json.bdFlag = '1'
+ json.commentText = this.commentText7
+ this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
- this.$message.success("驳回成功");
- this.$router.push("/processCenter");
+ this.$message.success('驳回成功')
+ this.$router.push('/processCenter')
}
- this.isSubmit = false;
- });
+ this.isSubmit = false
+ })
} else {
- this.$message.warning("请输入反馈意见");
+ this.$message.warning('请输入反馈意见')
}
},
getData() {
@@ -411,6 +409,7 @@
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
+ this.commentText7 = data.commentText7 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
index 40fd42ee2..ba7bc47eb 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
@@ -148,7 +148,7 @@
-
+
@@ -200,7 +200,7 @@
histortData: [],
oldData: [],
data: [],
- commentText: "",
+ commentText8: "",
oldText: "",
newText: "",
reason: "",
@@ -361,41 +361,41 @@
handleSave() {
},
handleSubmit() {
- this.isSubmit = true;
- var json = this.json;
- json.hqFlag = '0';
- json.commentText = this.commentText;
- this.$http.post("lawss/activiti/completeTask", {
- json: JSON.stringify(json),
- taskId: this.taskIds,
- userId: this.$store.getters.userInfo.userId
- }, {}, res => {
- if (res.success) {
- this.$message.success("提交成功");
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
+ this.isSubmit = true
+ var json = this.json
+ json.directorFlag = '0'
+ json.commentText = this.commentText8
+ this.$http.post('lawss/activiti/completeTask', {
+ json: JSON.stringify(json),
+ taskId: this.taskIds,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success('提交成功')
+ this.$router.push('/processCenter')
+ }
+ this.isSubmit = false
+ })
},
handleSubmitNo() {
- if (this.commentText) {
- this.isSubmit = true;
- var json = this.json;
- json.hqFlag = '1';
- json.commentText = this.commentText;
- this.$http.post("lawss/activiti/completeTask", {
+ if (this.commentText8) {
+ this.isSubmit = true
+ var json = this.json
+ json.directorFlag = '1'
+ json.commentText = this.commentText8
+ this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
- this.$message.success("驳回成功");
- this.$router.push("/processCenter");
+ this.$message.success('驳回成功')
+ this.$router.push('/processCenter')
}
- this.isSubmit = false;
- });
+ this.isSubmit = false
+ })
} else {
- this.$message.warning("请输入反馈意见");
+ this.$message.warning('请输入反馈意见')
}
},
getData() {
@@ -416,6 +416,7 @@
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
+ this.commentText8 = data.commentText8 || ''
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
index fa042f0e9..a3e94b522 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
@@ -148,7 +148,7 @@
-
+
@@ -200,7 +200,7 @@
histortData: [],
oldData: [],
data: [],
- commentText: "",
+ commentText9: "",
oldText: "",
newText: "",
reason: "",
@@ -373,31 +373,29 @@
handleTabs(name) {
this.active = name;
},
- handleSave() {
- },
handleSubmit() {
- this.isSubmit = true;
- var json = this.json;
- json.hqFlag = '0';
- json.commentText = this.commentText;
- this.$http.post("lawss/activiti/completeTask", {
- json: JSON.stringify(json),
- taskId: this.taskIds,
- userId: this.$store.getters.userInfo.userId
- }, {}, res => {
- if (res.success) {
- this.$message.success("提交成功");
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
+ this.isSubmit = true;
+ var json = this.json;
+ json.presidentFlag = '0';
+ json.commentText = this.commentText9;
+ this.$http.post("lawss/activiti/completeTask", {
+ json: JSON.stringify(json),
+ taskId: this.taskIds,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success("提交成功");
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ });
},
handleSubmitNo() {
- if (this.commentText) {
+ if (this.commentText9) {
this.isSubmit = true;
var json = this.json;
- json.hqFlag = '1';
- json.commentText = this.commentText;
+ json.presidentFlag = '1';
+ json.commentText = this.commentText9;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -426,6 +424,7 @@
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
+ this.commentText9 = data.commentText9 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue
index 8e46d6363..c53548e21 100644
--- a/src/pages/processCenter/pages/phone/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue
@@ -11,6 +11,7 @@
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue
new file mode 100644
index 000000000..fb3bc8f6b
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue
@@ -0,0 +1,668 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue
new file mode 100644
index 000000000..635047f5a
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue
@@ -0,0 +1,689 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue
new file mode 100644
index 000000000..db88ffd4e
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue
@@ -0,0 +1,2128 @@
+
+
+
+
+ 企标制修订-产品标准
+ 审定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue
new file mode 100644
index 000000000..3acf6e9cb
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue
@@ -0,0 +1,2128 @@
+
+
+
+
+ 企标制修订-产品标准
+ 批准
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step13.vue b/src/pages/processCenter/pages/phone/qbrk-product/step13.vue
new file mode 100644
index 000000000..e2b1010cd
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step13.vue
@@ -0,0 +1,2354 @@
+
+
+
+
+ 企标制修订-产品标准
+ 发布
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue
new file mode 100644
index 000000000..e55f24ab3
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue
@@ -0,0 +1,2060 @@
+
+
+
+
+ 企标制修订-产品标准
+ 标准化初审
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue
new file mode 100644
index 000000000..9430bbcab
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue
@@ -0,0 +1,2266 @@
+
+
+
+
+ 企标制修订-产品标准
+ 标准化复审
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue
new file mode 100644
index 000000000..113c45a16
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue
@@ -0,0 +1,2128 @@
+
+
+
+
+ 企标制修订-产品标准
+ 审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue
new file mode 100644
index 000000000..784622707
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue
@@ -0,0 +1,993 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue
new file mode 100644
index 000000000..4ae929bf7
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue
@@ -0,0 +1,637 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue
new file mode 100644
index 000000000..5da7364f7
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue
@@ -0,0 +1,672 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk/step10.vue b/src/pages/processCenter/pages/phone/qbrk/step10.vue
new file mode 100644
index 000000000..f30ee8162
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk/step10.vue
@@ -0,0 +1,2047 @@
+
+
+
+
+ 企标制修订-技术标准
+ 审定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk/step11.vue b/src/pages/processCenter/pages/phone/qbrk/step11.vue
new file mode 100644
index 000000000..44b1b78c0
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk/step11.vue
@@ -0,0 +1,2047 @@
+
+
+
+
+ 企标制修订-技术标准
+ 批准
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk/step13.vue b/src/pages/processCenter/pages/phone/qbrk/step13.vue
new file mode 100644
index 000000000..a69e5a357
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk/step13.vue
@@ -0,0 +1,2047 @@
+
+
+
+
+ 企标制修订-技术标准
+ 发布
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk/step4.vue b/src/pages/processCenter/pages/phone/qbrk/step4.vue
new file mode 100644
index 000000000..65d3a039f
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk/step4.vue
@@ -0,0 +1,1996 @@
+
+
+
+
+ 企标制修订-技术标准
+ 标准化初审
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/qbrk/step8.vue b/src/pages/processCenter/pages/phone/qbrk/step8.vue
new file mode 100644
index 000000000..0ef8fbed9
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/qbrk/step8.vue
@@ -0,0 +1,2200 @@
+
+
+
+
+ 企标制修订-技术标准
+ 审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue
index ed67bb269..46d702c3b 100644
--- a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue
@@ -288,6 +288,7 @@ export default {
let json = {
dockUserList: list,
passInfo: this.passInfo,
+ passFlag: '0',
commentText: this.commentInfo
}
let flag=false
diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue
index c3d383d96..620e895f8 100644
--- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue
@@ -2,7 +2,7 @@
未符合项整改流程
- 确认负责人流程
+ 合规排查(上传合规举证材料)