@@ -214,6 +217,7 @@
name: "bzdyStep5",
data() {
return {
+ foldFormFlag: false,
histortData: [],
commentText: '',
tableData: [],
@@ -244,6 +248,9 @@
ProcessTitle
},
methods: {
+ foldForm() {
+ this.foldFormFlag = !this.foldFormFlag
+ },
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index 3e33eac63..37bc0fe66 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -21,7 +21,7 @@
基础信息
-
+
@@ -58,6 +58,8 @@
+
隐藏基础信息
+
展开基础信息
调研信息
@@ -74,6 +76,7 @@
ref="selection"
>
@@ -210,6 +213,7 @@
name: "bzdyStep6",
data() {
return {
+ foldFormFlag: false,
histortData: [],
commentText: '',
tableData: [],
@@ -241,6 +245,9 @@
ProcessTitle
},
methods: {
+ foldForm() {
+ this.foldFormFlag = !this.foldFormFlag
+ },
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index 2d7c2e343..425a57a14 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -21,7 +21,7 @@
基础信息
-
+
@@ -58,6 +58,8 @@
+
隐藏基础信息
+
展开基础信息
调研信息
@@ -75,6 +77,7 @@
>
@@ -210,6 +213,7 @@
name: "bzdyStep7",
data() {
return {
+ foldFormFlag: false,
histortData: [],
commentText: '',
tableData: [],
@@ -241,6 +245,9 @@
ProcessTitle
},
methods: {
+ foldForm() {
+ this.foldFormFlag = !this.foldFormFlag
+ },
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index 2942c2ccb..42d73606b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -21,7 +21,7 @@
基础信息
-
+
@@ -58,6 +58,8 @@
+
隐藏基础信息
+
展开基础信息
调研信息
@@ -76,6 +78,7 @@
基础信息
-
+
@@ -58,6 +58,8 @@
+
隐藏基础信息
+
展开基础信息
调研信息
@@ -76,6 +78,7 @@
0) {
- this.$message.warning('请输入核心技术要求')
- } else if (num2 > 0) {
- if (this.sarType === 'INLAND') {
- this.$message.warning('请输入国内标准的差异点')
- } else {
- this.$message.warning('请输入基于上一版本差异')
+ if (this.form.itemsNum1) {
+ if (num1 > 0) {
+ this.$message.warning('请输入核心技术要求')
+ return
}
- } else if (num3 > 0) {
+ } else {
+ if (num2 > 0) {
+ if (this.sarType === 'INLAND') {
+ this.$message.warning('请输入国内标准的差异点')
+ return
+ } else {
+ this.$message.warning('请输入基于上一版本差异')
+ return
+ }
+ }
+ }
+ if (num3 > 0) {
this.$message.warning('请输入符合性要求')
} else if (num4 > 0) {
this.$message.warning('请输入新车型实施日期')
@@ -634,11 +642,15 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- console.log(data);
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
- this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
- this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+ if (data.form) {
+ this.form.itemsName1 = data.form.itemsName1 || ''
+ this.form.itemsNum1 = data.form.itemsNum1 || ''
+ } else {
+ this.form.itemsName1 = data.itemsName1 || ''
+ this.form.itemsNum1 = data.itemsNum1 || ''
+ }
this.sarType = data.standInData || data.sarType
this.json = data
let itemList
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 48fc0eb8f..11505e1e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -438,8 +438,13 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
- this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
- this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+ if (data.form) {
+ this.form.itemsName1 = data.form.itemsName1 || ''
+ this.form.itemsNum1 = data.form.itemsNum1 || ''
+ } else {
+ this.form.itemsName1 = data.itemsName1 || ''
+ this.form.itemsNum1 = data.itemsNum1 || ''
+ }
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 2c45b91da..578af61fe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -438,8 +438,13 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
- this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
- this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+ if (data.form) {
+ this.form.itemsName1 = data.form.itemsName1 || ''
+ this.form.itemsNum1 = data.form.itemsNum1 || ''
+ } else {
+ this.form.itemsName1 = data.itemsName1 || ''
+ this.form.itemsNum1 = data.itemsNum1 || ''
+ }
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index efca7cbaf..1b7eb099a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -437,8 +437,13 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
- this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
- this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+ if (data.form) {
+ this.form.itemsName1 = data.form.itemsName1 || ''
+ this.form.itemsNum1 = data.form.itemsNum1 || ''
+ } else {
+ this.form.itemsName1 = data.itemsName1 || ''
+ this.form.itemsNum1 = data.itemsNum1 || ''
+ }
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList