@@ -44,7 +44,8 @@
+ placeholder="请选择标准年份"
+ value-format="yyyy">
@@ -545,7 +546,7 @@
@@ -623,11 +624,12 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
+ import {saveTaskFirst} from "api/process";
export default {
name: "bzrkStep1",
data () {
return {
- textarea: '', // 意见
+ commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
@@ -737,11 +739,36 @@
handleTabs(name) {
this.active = name
},
- handleSave() {},
+ //保存
+ handleSave() {
+ this.saveLoading = true
+ let _formData = new FormData()
+ // _formData.append('id', this.bpnId)
+ _formData.append('createUser', this.$store.getters.userInfo.userId)
+ _formData.append('createUserName', this.$store.getters.userInfo.uName)
+ _formData.append('prcType', this.$route.query.type)
+ _formData.append('json', JSON.stringify({
+ prcForm: this.prcForm,
+ sarAccessInfoList: this.sarAccessInfoList,
+ sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
+ bzqdForm: this.bzqdForm,
+ listInfo: this.listInfo,
+ id: this.id
+ }))
+ saveTaskFirst(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ // this.$router.push('/processCenter')
+ // this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
+ },
handleSubmit() {
var json = this.form
json.zrUserId = this.$store.getters.userInfo.userId
json.jlUserId = this.$store.getters.userInfo.userId
+ json.commentText = this.commentText
json.applyUpdUserId = this.$store.getters.userInfo.userId
json.prcCreateUser = this.$store.getters.userInfo.userId
json.prcCreateUserName = this.$store.getters.userInfo.account
@@ -756,8 +783,8 @@
}, {
_this: this
}, res => {
- console.log(res);
- if (res.ok) {
+ if (res.success) {
+ this.$message.success(res.message)
}
})
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 55f15899b..ada10c0d7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -3,11 +3,12 @@
标准入库流程
- 申请人发起流程
+ 经理人审批
+ 基础信息
- 审批历史
+ 审批历史
+
@@ -45,7 +46,8 @@
disabled
v-model="form.standYear"
type="year"
- placeholder="请选择标准年份">
+ placeholder="请选择标准年份"
+ value-format="yyyy">
@@ -528,7 +530,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
- v-model="textarea">
+ v-model="commentText">
@@ -581,6 +583,75 @@
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{scope.row.commentText}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+
+
+ 标准入库流程
+ 经理人审批
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
new file mode 100644
index 000000000..67d7ba459
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -0,0 +1,843 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+ 基础信息
+
+
+ 实施日期
+
+
+ 文本信息
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+ 国内标准入库
+ 海外标准入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.xgd }}
+
+
+ - -
+
+
+ {{ form.fbgbjbd }}
+
+
+ - -
+
+
+ {{ form.zbjbd }}
+
+
+ - -
+
+
+ {{ form.bpg }}
+
+
+ - -
+
+
+ {{ form.ssg }}
+
+
+ - -
+
+
+ {{ form.kwj }}
+
+
+ - -
+
+
+ {{ form.zqyjg }}
+
+
+ - -
+
+
+ {{ form.ca }}
+
+
+ - -
+
+
+ {{ form.jdwj }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.glwj }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+ 责任人
+
+
+
+ 责任人
+
+
+ 标准法规工程师
+
+
+ 责任对接人，标准法规部部门负责人
+
+
+
+
+
+ 标准入库流程
+ 经理人审批
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
new file mode 100644
index 000000000..60d5e7e98
--- /dev/null
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -0,0 +1,1138 @@
+
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+ 基础信息
+
+
+ 实施日期
+
+
+ 文本信息
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+ 国内标准入库
+ 海外标准入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.xgd }}
+
+
+ - -
+
+
+ {{ form.fbgbjbd }}
+
+
+ - -
+
+
+ {{ form.zbjbd }}
+
+
+ - -
+
+
+ {{ form.bpg }}
+
+
+ - -
+
+
+ {{ form.ssg }}
+
+
+ - -
+
+
+ {{ form.kwj }}
+
+
+ - -
+
+
+ {{ form.zqyjg }}
+
+
+ - -
+
+
+ {{ form.ca }}
+
+
+ - -
+
+
+ {{ form.jdwj }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.glwj }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+ 责任人
+
+
+
+ 责任人
+
+
+ 标准法规工程师
+
+
+ 责任对接人，标准法规部部门负责人
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index 4cfd649b2..52aa76563 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -124,7 +124,7 @@
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.comment === '0' ? '同意' : scope.row.comment === '1' ? '不同意' : scope.row.comment === '3' ? '退回' : scope.row.comment === '4' ? '确认' :
+ (scope.row.comment === '2' ? scope.row.commentText : '')}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+