diff --git a/src/components/treeSelect/treeSelect.vue b/src/components/treeSelect/treeSelect.vue
index f52259f19..f980c43f9 100644
--- a/src/components/treeSelect/treeSelect.vue
+++ b/src/components/treeSelect/treeSelect.vue
@@ -92,17 +92,11 @@
}
},
width: {
- type: Number,
+ type: String,
default () {
- return 593;
+ return "";
}
},
- height: {
- type: Number,
- default () {
- return 300;
- }
- }
},
data () {
return {
@@ -110,7 +104,7 @@
isShowSelect: false, // 是否显示树状选择器
options: [],
selectedData: [], // 选中的节点
- style: 'width:' + this.width + 'px;' + 'height:' + this.height + 'px;',
+ style: 'width:' + this.width + 'px;' + 'height:100%;',
selectStyle: 'width:100%;',
checkedIds: [],
checkedData: []
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 43f10be3d..b4cb77b38 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -2621,9 +2621,9 @@ export default {
const dynamicFormField = standEO ? standEO.attrInfoMap : {}
formFieldList.forEach((field) => {
// 相关流程权限
- if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
- return
- }
+ // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
+ // return
+ // }
console.log("displayLocation");
console.log(displayLocation);
displayLocation.forEach((location) => {
@@ -2693,6 +2693,7 @@ export default {
}
})
this.dynamicFormField = displayLocation
+ console.log(this.dynamicFormField)
})
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 30b380397..aa6cb8d76 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -7,16 +7,17 @@
-
-
-
+
+
+
基础信息
@@ -41,12 +42,11 @@
-
-
+
@@ -621,6 +622,13 @@
placeholder="请输入代替标准号"
clearable
>
+ {{'手动查找'}}
@@ -628,13 +636,13 @@
-
-
-
+
+
+
+
+
+
+
+ {{'手动查找'}}
+ {{'手动查找'}}
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+ 会签责任人
+
+
+
+
+
+
+
+
+
+ 修订申请人
+
+
+
+
+
+
+
+
+
+ 标准法规业务经理
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- 流程发起人
-
-
-
-
-
-
-
- 责任人
-
-
-
-
-
-
-
- 责任人
-
-
-
-
-
-
-
- 标准法规工程师
-
-
-
-
-
-
-
- 责任对接人,标准法规部部门负责人
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
+ {{ scope.row.standSort }} {{ scope.row.standNumber }}
+
+
+
+
+
+ {{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{$t('m.dataAcquisition')}}
+
+
+
+
+
+
+
+
+
@@ -791,8 +941,36 @@
name: "bzrkStep1",
data () {
return {
+ activeName:'1',
+ roleRow: {},
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
+ config: {
+ attrName : '',
+ },
+ dataSource: false,
+ replaceLawsNumModel: false,
+ replaceLawType: '',
+ sarBussionessLawsEO: {
+ replaceLawsNum: ''
+ },
+ // 代替标准号
+ replaceLawsNumForm: {
+ dataSource: '',
+ standNumber: '', // 标准编号
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent,
+ total: 0,
+ standType: 'INLAND',
+ quoteIdList: '',
+ validFlag: '0',
+ menuId: 'nomenu'
+ },
+ replaceLawsNumRow: [], // 代替政策号 数组内容
+ replaceTotal: 0,
+ selectedListRep: [],
+ replaceLoading: true,
+ replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
isSubmit: false,
@@ -801,6 +979,15 @@
children: 'children',
label: 'menuName'
},
+ nodeList: [],
+ type: '',
+ defaultUserProps: {
+ children: 'children',
+ label: 'name'
+ },
+ treeData: [], // 人员数据
+ modalShowFlag: false, // drawer开关
+ drawerTitle: '', //drawer标题
nodeKey: 'id',
defaultCheckedKeys: [],
fileUrl: 'api/att/attFile/upload',
@@ -877,6 +1064,58 @@
xglc: '', // 相关流程
chjl: '', // 参会记录
}, // 标准信息
+ roleForm:{
+ zrUserId: '',
+ zrUserName: '',
+ jlUserId: '',
+ jlUserName: '',
+ applyUpdUserId: this.$store.getters.userInfo.userId,
+ applyUpdUserName: this.$store.getters.userInfo.userName,
+ prcCreateUser: this.$store.getters.userInfo.userId,
+ prcCreateUserName: this.$store.getters.userInfo.userName,
+ },
+ roleRules:{
+ zrUserName: [
+ { required: true, message: '请选择会签责任人', trigger: 'blur' },
+ ],
+ jlUserName: [
+ { required: true, message: '选择标准法规业务经理', trigger: 'blur' },
+ ],
+ },
+ rules:{
+ standSort: [
+ { required: true, message: '请选择标准类别', trigger: 'change' }
+ ],
+ standNumber: [
+ { required: true, message: '请输入标准编号', trigger: 'blur' },
+ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+ ],
+ standYear: [
+ { required: true, message: '请输入标准年份'},
+ { type: 'number', message: '年标准年份必须为数字值'}
+ ],
+ standName: [
+ { required: true, message: '请输入标准名称', trigger: 'blur' },
+ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+ ],
+ standNature: [
+ { required: false, message: '请选择标准性质', trigger: 'change' }
+ ],
+ textStatus: [
+ { required: true, message: '请选择文本状态', trigger: 'change' }
+ ],
+ issueTime: [
+ { required: true, message: '请选择标准发布日期', trigger: 'change' }
+ ],
+ qcdw: [
+ { required: true, message: '请选择起草单位', trigger: 'change' }
+ ],
+ cysd: [
+ { required: true, message: '请选择我司参与深度', trigger: 'change' }
+ ],
+ },
+ zrUserIds: [], // 选择多个会签责任人
+ userType:'', // 选择用户ID判断
standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
@@ -891,11 +1130,6 @@
txlbOptions: [], // 体系类别
data: [], // 标准列表数据
ListForm: {}, // 新增数据
- user1: '',
- user2: '',
- user3: '',
- user4: '',
- user5: '',
}
},
components: {
@@ -905,6 +1139,225 @@
TreeSelect
},
methods: {
+ saveUserInfo () {
+ if (this.userType === 'zrUserId') {
+ this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
+ this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
+ } else if (this.userType === 'jlUserId') {
+ this.roleForm.jlUserId = this.roleRow.id
+ this.roleForm.jlUserName = this.roleRow.name
+ }
+
+ this.modalShowFlag = false
+ },
+ cancelUserInfo () {
+ this.modalShowFlag = false
+ },
+ drawerCheck (data) {
+ if(this.userType === 'zrUserId'){
+
+ if(this.zrUserIds.length > 0){
+ const list = this.zrUserIds.filter ( item => item.id === data.id);
+ if(list.length === 0){
+ this.zrUserIds.push(data)
+ }else {
+ this.zrUserIds.forEach((item,index) => {
+ if(item.id === data.id){
+ this.zrUserIds.splice(index,1)
+ }
+ })
+ }
+ }else {
+ this.zrUserIds.push(data)
+ }
+
+ console.log(this.zrUserIds)
+ }else {
+ var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+ if(getlist.length == 1) {
+ this.roleRow = getlist[0]
+ }else {
+ this.$refs.tree.setCheckedKeys([data.id]);
+ this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+ }
+ }
+ },
+ choiceZRR (type, title, id) {
+ this.nodeList = []
+ this.nodeList.push(id)
+ this.userType = type
+ this.drawerTitle = title
+ this.modalShowFlag = true
+ },
+ getTree () {
+ this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+ this.treeData = res.data
+ })
+ },
+ // 代替政策号 请求数据
+ getReplaceLawsNumRowFirst () {
+ if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
+ this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
+ } else {
+ this.quoteIdList1 = []
+ this.replaceLawsNumForm.quoteIdList = ''
+ }
+ this.replaceLawsNumForm.page = 1
+ this.replacePage = 1
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+ _this: this,
+ loading: 'replaceLoading'
+ }, res => {
+ this.replaceLawsNumRow = res.data.list
+ this.replaceTotal = res.data.count
+ if (this.selectedListRep.length !== 0) {
+ this.selectedListRep.map((list) => {
+ this.replaceLawsNumRow.map((item) => {
+ if (list.id === item.id) {
+ item._checked = true
+ }
+ })
+ })
+ }
+ }, e => {
+ })
+ },
+ dataSourceChange (val) {
+ },
+ handleChange (event) {
+ // const value = event.target.value
+ const value = event
+ this.$emit('input', value)
+ if (value.length==1000){
+ return this.$message({
+ message: '相关标准不能输入超过1000个字符',
+ type: 'warning'
+ });
+ }
+ },
+ // 代替政策编号-取消
+ replaceLawsNumModelCancel () {
+ // this.replaceLawsNumModel = false
+ this.$refs.selections.clearSelection()
+ },
+ // 代替政策号 table选择事件
+ selectReplaceStandNumRowChange (row) {
+ this.selectedListRep = row
+ },
+ // 代替政策分页
+ pageChangeReplace (page) {
+ this.replacePage = page
+ this.replaceLawsNumForm.page = page
+ this.getReplaceLawsNumRow()
+ },
+ pageSizeChangeReplace (pageSize) {
+ // this.replaceRows = pageSize
+ this.replaceLawsNumForm.pageSize = pageSize
+ this.getReplaceLawsNumRow()
+ },
+ // 代替政策编号确定
+ replaceLawsNumModelBt () {
+ let textArr = []
+
+ if (typeof this.value === 'string') {
+ if (this.value) {
+ textArr = this.value.split(',')
+ }
+ }
+ if (this.selectedListRep.length === 0) {
+ return this.$message({
+ message: '请先选择数据',
+ type: 'warning'
+ })
+ }
+ if (this.selectedListRep.length + textArr.length > 20) {
+ return this.$message({
+ message: '标准最多选择20项',
+ type: 'warning'
+ })
+ }
+ this.selectedListRep.map((item) => {
+ let texts = ''
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
+ textArr.push(texts)
+ textArr = [...new Set(textArr)]
+ this.replaceLawsNumModel = false
+ })
+ // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
+ if(this.replaceLawType === 'dtbjh'){
+ this.form.dtbjh = textArr.join(',')
+ }else if(this.replaceLawType === 'yybj'){
+ this.form.yybj = textArr.join(',')
+ }else {
+ this.form.byybj = textArr.join(',')
+ }
+ // this.$emit('input', textArr.join(','))
+ this.$refs.selections.clearSelection()
+ },
+ // 点击查看
+ handlePreview (item) {
+ let routeUrl = this.$router.resolve({
+ name: 'OtherStandardDetails',
+ params: {
+ id: item.id,
+ pageType: 'INLAND_STAND'
+ }
+ })
+ window.open(routeUrl.href, '_blank')
+ },
+ getResetLawsNumRow () {
+ this.replaceLawsNumForm = {
+ standNumber: '', // 标准编号
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent,
+ total: 0,
+ standType: 'INLAND',
+ quoteIdList: '',
+ validFlag: '0'
+ }
+ this.getReplaceLawsNumRow()
+ },
+ selectLaws (type) {
+ // if (this.standNumFlag === 1) {
+ // this.$refs.selections.selectAll(false)
+ // }
+ // this.sarBussionessLawsEO.replaceLawsNum = ''
+ this.replaceLawsNumModel = true
+ this.replaceLawType = ''
+ this.replaceLawType = type
+ this.getReplaceLawsNumRow()
+ },
+ // 代替政策号 请求数据
+ getReplaceLawsNumRow () {
+ if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
+ this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
+ } else {
+ this.quoteIdList1 = []
+ this.replaceLawsNumForm.quoteIdList = ''
+ }
+ this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+ _this: this,
+ loading: 'replaceLoading'
+ }, res => {
+ this.replaceLawsNumRow = res.data.list
+ this.replaceTotal = res.data.count
+ if (this.selectedListRep.length !== 0) {
+ this.selectedListRep.map((list) => {
+ this.replaceLawsNumRow.map((item) => {
+ if (list.id === item.id) {
+ item._checked = true
+ }
+ })
+ })
+ }
+ }, e => {
+ })
+ },
beginImportFile (file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
@@ -1026,33 +1479,46 @@
})
},
handleSubmit() {
- var json = this.form
- json.zrUserId = this.$store.getters.userInfo.userId
- json.jlUserId = this.$store.getters.userInfo.userId
- json.commentText = this.commentText
- json.applyUpdUserId = this.$store.getters.userInfo.userId
- json.prcCreateUser = this.$store.getters.userInfo.userId
- json.prcCreateUserName = this.$store.getters.userInfo.account
- this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: res.data,
- userId : this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message)
+ this.$refs['form'].validate((valid) => {
+ if (valid) {
+ this.$refs['userForm'].validate((valid) => {
+ if (valid) {
+ var json = Object.assign(this.form, this.roleForm)
+ json.zrUserId = this.form.zrUserId
+ json.jlUserId = this.form.jlUserId
+ json.commentText = this.commentText
+ json.applyUpdUserId = this.form.applyUpdUserId
+ json.prcCreateUser = this.form.prcCreateUser
+ json.prcCreateUserName = this.form.prcCreateUserName
+ this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post('lawss/activiti/completeTask', {
+ taskIds: res.data,
+ userId : this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ }
+ })
+ }
+ })
+ }else {
+ this.$message.warning('请检查人员信息表单是否填写完整')
}
})
+ } else {
+ this.$message.warning('请检查基础信息表单是否填写完整')
}
})
}
},
mounted () {
+ this.getTree()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 06544ba2a..f1a9cb9f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -350,10 +350,10 @@
clearable
>
-
+
@@ -521,8 +521,8 @@