diff --git a/src/assets/styles/process.less b/src/assets/styles/process.less
index 8efe7eea1..57a03f168 100644
--- a/src/assets/styles/process.less
+++ b/src/assets/styles/process.less
@@ -7,7 +7,7 @@
line-height: 50px;
}
.add-form-item:last-child {
- border-bottom: 0px dashed #e5e5e5;
+ //border-bottom: 0px dashed #e5e5e5;
}
.form-item-disabled {
.el-form-item__label, .el-form-item__content .el-input .el-input__inner,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 95cc2f08b..02e7df1b0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -411,7 +411,7 @@
:size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
-
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 3ba94cc91..a24a3c56e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -484,7 +484,6 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- console.log(data);
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index a27652d21..bbd89128c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -48,6 +48,65 @@
clearable
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+ 根据类别、编号、中英文名称查询
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
-
-
-
- 根据类别、编号、中英文名称查询
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index ea6779911..de3bbd85d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -23,69 +23,53 @@
-
-
-
- 国内标准入库
- 海外标准入库
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
+
+
+
+ 国内标准入库
+ 海外标准入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
是
否
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
-
-
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index e06763fa3..bc7bfdb7f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -30,56 +30,120 @@
海外标准入库
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
是
@@ -102,53 +166,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 38da23b1e..196173ea5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -60,20 +60,18 @@
clearable
>
-
-
-
-
-
-
-
- 是
- 否
-
+
+
+
@@ -121,19 +119,40 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index fb3d05ead..47b2cd752 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -30,9 +30,7 @@
海外标准入库
-
-
-
+
-
-
-
-
-
+
-
-
-
- 是
- 否
-
+ v-model="form.issueTime"
+ type="date"
+ placeholder="请选择标准发布日期"
+ value-format="yyyy-MM-dd">
+
@@ -117,32 +101,53 @@
>
-
-
-
-
是
否
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
-
-
+
+
+
+
+
@@ -536,7 +544,7 @@
-
+
{
if (item.fileText.length === 0) {
- flag=true
+ flag = true
this.isSubmit = false
}
})
diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue
index 26990a8cf..3d1bad651 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue
@@ -273,9 +273,9 @@
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
- this.form.file = data.form ? data.form.fileId : data.fileId
- this.form.fileName = data.form ? data.form.fileName : data.fileName
- this.form.fileId = data.form ? data.form.fileId : data.fileId
+ this.form.file = data.fileId || data.form.fileId
+ this.form.fileName = data.fileName || data.form.fileName
+ this.form.fileId = data.fileId || data.form.fileId
this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList
this.commentText4 = data.commentText4 || ''
diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue
index b271734f0..e5efb7f79 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue
@@ -26,8 +26,9 @@
-
+
+
@@ -230,10 +231,17 @@
:saveLoading="saveLoading"
@submit="handleSubmit"
show-back
+ show-transfer
+ @transfer="handleTransfer"
@back="handleSubmitNo"
submitBTNText="同意"
>
+