基础信息
@@ -950,7 +950,7 @@
:model="roleForm"
:rules="roleRules"
class="label-input-form">
- 流程发起人
@@ -960,7 +960,7 @@会签责任人
@@ -971,7 +971,7 @@修订申请人
@@ -981,7 +981,7 @@标准法规业务经理
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index ea1ca6d4a..001546aa4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -3,7 +3,7 @@基础信息
@@ -1146,7 +1146,7 @@ export default {
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
- this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+ this.form.standYear = this.form.standYear ? this.form.standYear : ''
if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
this.form.country = this.form.country.split(",");
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index e1da8dbe3..4571b8626 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -3,7 +3,7 @@
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index e5f5eaa95..f5042d653 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -3,7 +3,7 @@
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
new file mode 100644
index 000000000..c24d9ab2b
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index b96977649..ed23826e3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -336,6 +336,7 @@
name: "bzzqyjStep3",
data() {
return {
+ standId: '',
modaltitle2: '',
addType: '',
onlyKey: '',
@@ -464,22 +465,16 @@
}
},
addModal() {
- var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
- this.itemId = id
- this.editForm = {
- chapterNumber: '',
- chapterName: '',
- oldText: '',
- newText: '',
- reason: '',
- id: id,
- department: this.$store.getters.userInfo.institutionName,
- responUserName: this.$store.getters.userInfo.userName,
- responUser: this.$store.getters.userInfo.userId
- }
- this.addType = 'add'
- this.modaltitle2 = '新增'
- this.modalshowflag2 = true
+ localStorage.setItem('freshClueNum', new Date().getTime())
+ let routeData = this.$router.resolve({
+ name: "ZQYJAddFileDetails",
+ query: {
+ standId: this.standId,
+ attId: this.form.fjList[0].attId,
+ fileType: this.form.fjList[0].standFileClassify,
+ }
+ });
+ window.open(routeData.href, '_blank')
},
itemEdit (row) {
this.addType = 'edit'
@@ -712,6 +707,7 @@
this.todoId = res.id
this.json = data
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
+ this.standId = data.standId
this.getItemList(data.standId,data.textType)
this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : []))
}).catch(e => {
@@ -720,9 +716,18 @@
},
},
mounted() {
+ window.addEventListener("storage", ev => {
+ if(ev.key === 'freshClueNum'){
+ let form = JSON.parse(window.localStorage.getItem('bzzqyjForm'))
+ form.department = this.$store.getters.userInfo.institutionName
+ form.responUserName = this.$store.getters.userInfo.userName
+ form.responUser = this.$store.getters.userInfo.userId
+ this.data.push(form)
+ }
+ })
this.getHistoryData()
this.getData()
- }
+ },
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index aa0bb8ae0..fed06959d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -346,6 +346,7 @@ export default {
name: "bzzqyjStep4",
data() {
return {
+ standId: '',
modaltitle2: '',
addType: '',
commentText4: '',
@@ -505,22 +506,32 @@ export default {
}
},
addModal() {
- var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
- this.itemId = id
- this.editForm = {
- chapterNumber: '',
- chapterName: '',
- oldText: '',
- newText: '',
- reason: '',
- id: id,
- department: this.$store.getters.userInfo.institutionName,
- responUserName: this.$store.getters.userInfo.userName,
- responUser: this.$store.getters.userInfo.userId
- }
- this.addType = 'add'
- this.modaltitle2 = '新增'
- this.modalshowflag2 = true
+ localStorage.setItem('freshClueNum', new Date().getTime())
+ let routeData = this.$router.resolve({
+ name: "ZQYJAddFileDetails",
+ query: {
+ standId: this.standId,
+ attId: this.form.fjList[0].attId,
+ fileType: this.form.fjList[0].standFileClassify,
+ }
+ });
+ window.open(routeData.href, '_blank')
+ // var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+ // this.itemId = id
+ // this.editForm = {
+ // chapterNumber: '',
+ // chapterName: '',
+ // oldText: '',
+ // newText: '',
+ // reason: '',
+ // id: id,
+ // department: this.$store.getters.userInfo.institutionName,
+ // responUserName: this.$store.getters.userInfo.userName,
+ // responUser: this.$store.getters.userInfo.userId
+ // }
+ // this.addType = 'add'
+ // this.modaltitle2 = '新增'
+ // this.modalshowflag2 = true
},
itemEdit (row) {
this.addType = 'edit'
@@ -673,6 +684,7 @@ export default {
this.form.spId = data.spId || ''
this.form.spName = data.spName || ''
this.json = data
+ this.standId = data.standId
this.getItemList(data.standId,data.textType)
this.data = data.info || data.data
}).catch(e => {
@@ -683,6 +695,15 @@ export default {
mounted() {
this.getHistoryData()
this.getData()
+ window.addEventListener("storage", ev => {
+ if(ev.key === 'freshClueNum'){
+ let form = JSON.parse(window.localStorage.getItem('bzzqyjForm'))
+ form.department = this.$store.getters.userInfo.institutionName
+ form.responUserName = this.$store.getters.userInfo.userName
+ form.responUser = this.$store.getters.userInfo.userId
+ this.data.push(form)
+ }
+ })
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
index 0a78312ec..d63e8d7d1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
@@ -101,7 +101,7 @@
>
+
+
+
+
+
+ 新增意见
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
- {{ scope.row.lawsNumber }}
+ {{ scope.row.standCode }}
@@ -972,12 +973,12 @@