diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 89a3e872e..b0a620407 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -91,7 +91,7 @@ export default { let userInfo2 = decodeURIComponent(userInfoStr) let userInfoObj = JSON.parse(userInfo2) this.setToken(userInfoObj.usid) // vuex存储token - this.getByUserInfoCode().then((userInfo) => { + this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => { if (userInfo !== '' && userInfo !== null) { userInfo.workNum = userInfoObj.workNum if (userInfo.userPic !== null) { @@ -237,9 +237,9 @@ export default { }) }, // 获取用户信息 - getByUserInfoCode () { + getByUserInfoCode (userId) { return new Promise((resolve, reject) => { - this.$http.get('person/userInfo/getByUserInfoCode', { + this.$http.get('person/userInfo/getByUserInfoCode?userId='+ userId, { }, { _this: this, prefix: '/foton' diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 663aee630..efdff8dea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -766,7 +766,7 @@ }, handleSubmit() { var json = this.form - json.zrUserId = this.$store.getters.userInfo.userId + json.zrUserId = this.$store.getters.userInfo.userId+',5UM3769REUPLPRTRJ54R' json.jlUserId = this.$store.getters.userInfo.userId json.commentText = this.commentText json.applyUpdUserId = this.$store.getters.userInfo.userId diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 17a7e98ea..4107bd216 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -3,11 +3,12 @@ - +
基础信息
-
审批历史
+
审批历史
+
@@ -45,6 +46,7 @@ disabled v-model="form.standYear" type="year" + value-format="yyy" placeholder="请选择标准年份"> @@ -519,16 +521,16 @@
- - - - + + + + + v-model="commentText">
@@ -581,6 +583,75 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId + taskIds: this.taskIds, + pId: this.pId }).then(res => { if (res) { - this.form = JSON.parse(res.mesg) + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) } }).catch(e => { }) }) }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + this.$nextTick(() => { + this.form = JSON.parse(JSON.stringify(item)) + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = item.id + }) + }, closeDrawer() { this.ListModel = false }, @@ -728,20 +843,23 @@ export default { }, handleSave() {}, handleSubmit() { + this.form.commentText = this.commentText + this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); console.log(json) - // this.$http.post('lawss/activiti/completeTask', { - // taskIds: res.data, - // userId : this.$store.getters.userInfo.userId, - // json: json - // }, { - // _this: this - // }, res => { - // console.log(res); - // if (res.ok) { - // this.processCreateStand(json) - // } - // }) + 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) + }else { + this.$message.success(res.message) + } + }) }, /** @@ -754,7 +872,7 @@ export default { _formData.append('infoJson', json) processCreateStand(_formData).then(res => { if (res.result === '操作成功' || res.data === '入库成功') { - this.$message.success(res.data) + this.$message.success(res.message) setTimeout(() => { this.$router.push({ name: 'ProcessCenter' @@ -767,6 +885,7 @@ export default { }, }, mounted () { + this.processTable() this.getData() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 67d7ba459..e970a22cc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -3,11 +3,12 @@ - +
基础信息
-
审批历史
+
审批历史
+
@@ -24,13 +25,13 @@ - + 国内标准入库 海外标准入库 - + - + 是 否 @@ -74,14 +73,13 @@ - + - + - + 是 否 - + @@ -154,7 +149,6 @@ @@ -162,7 +156,6 @@ @@ -172,7 +165,6 @@ @@ -180,7 +172,6 @@ @@ -188,7 +179,6 @@ @@ -287,7 +277,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - +
- - - + + +
- - - - - - - - - - + + +
+ +
@@ -581,6 +560,75 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId + taskIds: this.taskIds, + pId: this.pId }).then(res => { if (res) { - this.form = JSON.parse(res.mesg) + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) } }).catch(e => { }) }) }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + this.$nextTick(() => { + this.form = JSON.parse(JSON.stringify(item)) + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = item.id + }) + }, closeDrawer() { this.ListModel = false }, @@ -728,20 +820,23 @@ export default { }, handleSave() {}, handleSubmit() { + this.form.commentText = this.commentText + this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); console.log(json) - // this.$http.post('lawss/activiti/completeTask', { - // taskIds: res.data, - // userId : this.$store.getters.userInfo.userId, - // json: json - // }, { - // _this: this - // }, res => { - // console.log(res); - // if (res.ok) { - // this.processCreateStand(json) - // } - // }) + 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) + }else { + this.$message.success(res.message) + } + }) }, /** @@ -767,6 +862,7 @@ export default { }, }, mounted () { + this.processTable() this.getData() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue new file mode 100644 index 000000000..a48901ce0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -0,0 +1,961 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 60d5e7e98..f9a21868b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -100,8 +100,7 @@ label="审批意见" align="center"> - + - - - + { // console.log(res.data) @@ -1181,7 +1217,9 @@ export default { }) return } - this.$http.get('lawss/sarProductInfo/validUserPermission', {productId: row.id}, { + this.$http.get('sarStandProjectLibrary/queryById', { + id: row.id + }, { _this: this, loading: 'loading' }, res => { if (res.data) { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 29f0c4948..4783a3960 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -4,28 +4,28 @@
-
{{localProEO.productSet}} 《{{localProEO.productName}}》 详情
+
车型《{{localProEO.projectName}}》 详情
- 产品平台: {{ localProEO.flatform}} - 项目编号: {{ localProEO.productNo }} - 项目名称: {{ localProEO.productName }} + 产品平台: {{ localProEO.projectPlatfor}} + 项目编号: {{ localProEO.projectNumber }} + 项目名称: {{ localProEO.projectName }} - 项目分类:{{ localProEO.productTypeShow }} + 项目分类:{{ localProEO.projectClassification }} - 项目状态: {{ localProEO.productBrandShow }} - 项目群: {{ localProEO.productBrandShow }} - 当前节点: {{ localProEO.productBrandShow }} - 项目级别: {{ localProEO.productBrandShow }} + 项目状态: {{ localProEO.projectStatus }} + 项目群: {{ localProEO.projectGroup }} + 当前节点: {{ localProEO.currentNode }} + 项目级别: {{ localProEO.projectLevel }} - 项目经理: {{ localProEO.productNo }} - 项目计划开始时间: {{ localProEO.baseCartype}} - 项目计划完成时间: {{ }} + 项目经理: {{ localProEO.projectManager }} + 项目计划开始时间: {{ localProEO.projectStartDate}} + 项目计划完成时间: {{localProEO.projectEndDate }}
@@ -45,8 +45,8 @@ icon="export" >导出
- - + +
数据获取中 - - + + import('@/pages/processCenter/pages/creatProcess/bzrk/step5.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzrkStep2', name: 'bzrkStep2',