diff --git a/src/views/modules/erf/approvalCycleReport.vue b/src/views/modules/erf/approvalCycleReport.vue
index 8037420..9cc2373 100644
--- a/src/views/modules/erf/approvalCycleReport.vue
+++ b/src/views/modules/erf/approvalCycleReport.vue
@@ -2,10 +2,10 @@
-
+
@@ -132,8 +132,8 @@
diff --git a/src/views/modules/erf/components/erfAttachmentManager.vue b/src/views/modules/erf/components/erfAttachmentManager.vue
index 7b09219..6d2bae0 100644
--- a/src/views/modules/erf/components/erfAttachmentManager.vue
+++ b/src/views/modules/erf/components/erfAttachmentManager.vue
@@ -102,7 +102,7 @@
-
+
diff --git a/src/views/modules/erf/components/expApplyForm.vue b/src/views/modules/erf/components/expApplyForm.vue
index 7c6ea54..0c79a27 100644
--- a/src/views/modules/erf/components/expApplyForm.vue
+++ b/src/views/modules/erf/components/expApplyForm.vue
@@ -7,6 +7,18 @@
label-position="top"
style="margin-left: 5px; margin-top: -5px;">
+
+
+
+
+
+
+
+
+
@@ -174,7 +186,7 @@
-
+
{{ saveHeaderData.applyNo }}
@@ -241,6 +253,7 @@ export default {
buList: [],
saveHeaderData: {
applyNo: '',
+ originalApplyNo: '',
buNo: '',
experimentType: '',
projectNo: '',
@@ -259,6 +272,9 @@ export default {
},
formRules: {
+ applyNo: [
+ { required: true, message: '请输入试验单号', trigger: 'blur' }
+ ],
buNo: [
{ required: true, message: '请选择事业部', trigger: 'change' }
],
@@ -284,7 +300,10 @@ export default {
mounted() {
this.loadBuList()
if (this.applyData && this.applyData.applyNo) {
- this.saveHeaderData = { ...this.applyData }
+ this.saveHeaderData = {
+ ...this.applyData,
+ originalApplyNo: this.applyData.applyNo
+ }
this.isEdit = true
}
},
diff --git a/src/views/modules/erf/expApplyApproval.vue b/src/views/modules/erf/expApplyApproval.vue
index a753539..5c2f5f3 100644
--- a/src/views/modules/erf/expApplyApproval.vue
+++ b/src/views/modules/erf/expApplyApproval.vue
@@ -44,7 +44,7 @@
筛选条件
-
+
@@ -257,7 +257,7 @@
- {{ currentApply.applyNo }}
+ {{ currentApply.applyNo }}
{{ currentApply.buNo }}
diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue
index 7c779ad..9c4c0eb 100644
--- a/src/views/modules/erf/expApplyList.vue
+++ b/src/views/modules/erf/expApplyList.vue
@@ -2,8 +2,12 @@
-
-
+
+
+
+
+
+
@@ -125,7 +129,7 @@
align="center"
header-align="center">
- 修改
@@ -470,7 +474,7 @@
不输入或输入0表示样品报废,大于0表示正常入库
-
+
{{ sampleConfirmData.applyNo }}
@@ -521,7 +525,7 @@
选择需要复制的内容,将创建一个新的草稿申请单
-
+
{{ copyData.sourceApplyNo }}
@@ -659,6 +663,7 @@ export default {
buNo: '',
experimentType: '',
status: '',
+ creatorName: '',
createStartDate: '',
createEndDate: '',
page: 1,
@@ -820,6 +825,7 @@ export default {
buNo: '',
experimentType: '',
status: '',
+ creatorName: '',
createStartDate: '',
createEndDate: '',
page: 1,
diff --git a/src/views/modules/erf/plannerSchedule.vue b/src/views/modules/erf/plannerSchedule.vue
index 825578a..a9f463b 100644
--- a/src/views/modules/erf/plannerSchedule.vue
+++ b/src/views/modules/erf/plannerSchedule.vue
@@ -44,7 +44,7 @@
筛选条件
-
+
@@ -250,7 +250,7 @@
申请单信息
- {{ scheduleData.applyNo }}
+ {{ scheduleData.applyNo }}
diff --git a/src/views/modules/erf/sampleCycleReport.vue b/src/views/modules/erf/sampleCycleReport.vue
index 1f2eb11..c496c5b 100644
--- a/src/views/modules/erf/sampleCycleReport.vue
+++ b/src/views/modules/erf/sampleCycleReport.vue
@@ -2,10 +2,10 @@
-
+
@@ -148,8 +148,8 @@
diff --git a/src/views/modules/erf/triConfirm.vue b/src/views/modules/erf/triConfirm.vue
index 62c6554..5db8675 100644
--- a/src/views/modules/erf/triConfirm.vue
+++ b/src/views/modules/erf/triConfirm.vue
@@ -44,7 +44,7 @@
筛选条件
-
+
@@ -203,7 +203,7 @@
- {{ confirmData.applyNo }}
+ {{ confirmData.applyNo }}
{{ confirmData.experimentType }}