diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index e1b47eff..d91cc6ce 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -133,6 +133,13 @@ const enStandardStartUseReject = (params) => postAction('', params)
const toDoTurnTo = (params) => postAction('', params)
// 已发-强制撤回
const compulsoryWithdrawal = (params) => postAction('', params)
+
+/*标准法规入库/变更流程*/
+// 发起
+const initiateStandardECProcess = (params) => postAction('/process/fb/processFbEntryChange/startProcess', params)
+// 保存
+const saveStandardECProcess = (params) => postAction('/process/fb/processFbEntryChange/saveToDraft', params)
+
export {
getProcessNodeList,
@@ -200,5 +207,8 @@ export {
enStandardStartUseReject,
toDoTurnTo,
- compulsoryWithdrawal
+ compulsoryWithdrawal,
+
+ initiateStandardECProcess,
+ saveStandardECProcess
}
diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue
index 6d87e04c..ba9a9809 100644
--- a/src/components/PersonnelInfo.vue
+++ b/src/components/PersonnelInfo.vue
@@ -28,7 +28,6 @@
-
diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index 94135d63..81fe83f0 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -299,7 +299,7 @@ export default {
}
},
watch: {
- // 国内、海外的零部件名称、适用认证、适用车型和标准性质关联,准入标准必填,非准入标准不必填
+ // 国内的零部件名称、适用认证、适用车型和标准性质关联,准入标准必填,非准入标准不必填
'formInline.standard_property' () {
this.handleDomesticSpecialCheck()
},
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index a5e43c2a..dec41838 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -175,6 +175,12 @@ export const StandardizedActivityType = new EsEnums({
// 支付状态
export const PayState = new EsEnums({
- 已支付: { text: '已支付', value: '1' },
- 未支付: { text: '未支付', value: '2' }
+ havePaid: { text: '已支付', value: '1' },
+ nonPayment: { text: '未支付', value: '2' }
})
+
+// 标准法规入库/变更流程
+export const FGEntryChangeProcessNode = {
+ initiate: { text: '法规工程师发起', value: '1', btn: ['save', 'submit'] },
+ approve: { text: '审批', value: '2', btn: ['return', 'save', 'agree', 'reject'] }
+}
diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
index c5fec7eb..9b214ca5 100644
--- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
+++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
@@ -1,5 +1,5 @@
-
+
@@ -26,7 +26,7 @@
@change="event => event.target.value = event.target.value.trim()"
:maxLength="50"
disabled
- v-decorator="['nodeName']" />
+ v-decorator="['processName']" />
@@ -37,6 +37,7 @@
:getCalendarContainer="(trigger) => trigger.parentNode"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
+ v-decorator="['processDueDate']"
style="width: 100%" />
@@ -47,13 +48,13 @@
@change="event => event.target.value = event.target.value.trim()"
:maxLength="500"
type="textarea"
- v-decorator="['nodeName']" />
+ v-decorator="['processDescription']" />
{{ $t('basicServiceInformation') }}
-
+
-
+
-
+ v-model="formInline[item.dbFieldName]"
+ @listChange="handleStandardChange" />
event.target.value = event.target.value.trim()"
:placeholder="specialPlaceholder[item.dbFieldName] || $t('pleaseEnter')+item.dbFieldTxt" />
@@ -137,26 +141,26 @@
:getCalendarContainer="(trigger) => trigger.parentNode"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
- v-model="basicFormInfo[item.dbFieldName]"
+ v-model="formInline[item.dbFieldName]"
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
style="width: 100%" />
@@ -164,16 +168,18 @@
:placeholder="$t('pleaseEnter')+item.dbFieldTxt"
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
:maxLength="500"
- v-model="basicFormInfo[item.dbFieldName]" :rows="4" />
+ v-model="formInline[item.dbFieldName]" :rows="4" />
+ :exclude-standard-numbers="excludeStandardFields.includes(item.dbFieldName) ? excludeStandardNumbers : null"
+ v-model="formInline[item.dbFieldName]" />
@@ -181,8 +187,8 @@
{{
- (basicFormInfo[item.dbFieldName] === 'null' || basicFormInfo[item.dbFieldName] === ''
- || basicFormInfo[item.dbFieldName] === null || basicFormInfo[item.dbFieldName] === undefined)
+ (formInline[item.dbFieldName] === 'null' || formInline[item.dbFieldName] === ''
+ || formInline[item.dbFieldName] === null || formInline[item.dbFieldName] === undefined)
? $t('uploadFile.clickUpload')
: $t('uploadFile.viewUploadedFiles')
}}
@@ -191,14 +197,14 @@
event.target.value = event.target.value.trim()"
:placeholder="specialPlaceholder[item.dbFieldName] || $t('pleaseEnter')+item.dbFieldTxt" />
+
+
@@ -259,11 +275,11 @@
@change="event => event.target.value = event.target.value.trim()"
:maxLength="500"
type="textarea"
- v-decorator="['remarks']" />
+ v-decorator="['handleText']" />
-
+
@@ -271,21 +287,31 @@
-
{{ $t('turnTo') }}
+
+ {{ $t('turnTo') }}
+
-
{{ $t('preservation') }}
+
+ {{ $t('preservation') }}
+
-
{{ $t('submit') }}
+
+ {{ $t('submit') }}
+
-
{{ $t('agree') }}
+
+ {{ $t('agree') }}
+
-
{{ $t('reject') }}
+
+ {{ $t('reject') }}
+
@@ -297,8 +323,20 @@