diff --git a/src/views/util/SelectDepartment/selectDepartment.vue b/src/views/util/SelectDepartment/selectDepartment.vue
new file mode 100644
index 0000000..0e95421
--- /dev/null
+++ b/src/views/util/SelectDepartment/selectDepartment.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/util/uploadExcel/index.vue b/src/views/util/uploadExcel/index.vue
new file mode 100644
index 0000000..d718097
--- /dev/null
+++ b/src/views/util/uploadExcel/index.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/util/uploadFile/index.vue b/src/views/util/uploadFile/index.vue
new file mode 100644
index 0000000..a672a6e
--- /dev/null
+++ b/src/views/util/uploadFile/index.vue
@@ -0,0 +1,92 @@
+
+
+
+ 选取文件
+ {{ info }}
+
+
+
+
+
diff --git a/src/views/util/uploadImg/index.vue b/src/views/util/uploadImg/index.vue
new file mode 100644
index 0000000..1779f9a
--- /dev/null
+++ b/src/views/util/uploadImg/index.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index 248bb4a..ebb3f19 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -42,8 +42,8 @@
详情
- 流程详情
- 审批流程
+ 流程详情
+ 审批流程
审批
电子合格证
diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 90b56fc..dd60a8e 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -1,6 +1,13 @@
-
+
@@ -12,7 +19,10 @@
-
+
-
+
-
+
+
+
+
+
+
@@ -54,9 +79,11 @@
import vueQr from 'vue-qr'
import Treeselect from '@riophae/vue-treeselect'
import { requestFN } from '@/utils/request'
+import uploadFile from '../../../util/uploadFile/index.vue'
+import { upload } from '@/utils/upload'
export default {
- components: { Treeselect, vueQr },
+ components: { uploadFile, Treeselect, vueQr },
props: {
appendToBody: {
type: Boolean,
@@ -76,6 +103,7 @@ export default {
APPOINT_USER_ID: null,
APPOINT_USER_NAME: '',
OPINION: '',
+ APPOINT_ANNEX: [],
user: '',
tm: new Date().getTime(),
list: [],
@@ -94,6 +122,9 @@ export default {
],
OPINION: [
{ required: true, message: '请填写打回原因', trigger: 'change' }
+ ],
+ APPOINT_ANNEX: [
+ { required: true, message: '请上传文件', trigger: 'change' }
]
},
heirloom: {},
@@ -108,17 +139,23 @@ export default {
departmentTree: [],
peopleList: [],
- corpFlag: false
+ corpFlag: false,
+ menu: {
+ department: '',
+ user: '',
+ uploadFile: ''
+ }
}
},
methods: {
async init(e) {
- console.log(e)
this.loading = true
this.visible = true
this.heirloom = JSON.stringify(e)
this.form.list = JSON.stringify(e)
this.info = e[0]
+ await this.getMenu()
+
if (this.info.FLOWS_TYPE === '0') {
if (this.info.FLOWS_STEP === 0) {
this.isShow = true
@@ -142,12 +179,34 @@ export default {
}
this.loading = false
},
+ getMenu() {
+ return new Promise(resolve => {
+ requestFN(
+ '/flowTrain/getPintName', { FLOWS_TYPE: this.info.FLOWS_TYPE, FLOWS_STEP: this.info.FLOWS_STEP }
+ ).then((data) => {
+ this.menu.department = data.Department
+ this.menu.user = data.User
+ this.menu.uploadFile = data.UploadFile
+ resolve(true)
+ }).catch((e) => {
+ })
+ })
+ },
sendMessage(e) {
this.$refs.form.validate((valid) => {
if (!valid) {
this.$message.error('请填写完整信息')
} else {
- requestFN('/xgf/user/approve', this.form)
+ const formData = new FormData()
+ Object.keys(this.form).map(key => {
+ formData.append(key, this.form[key])
+ })
+ if (this.form.APPOINT_ANNEX) {
+ for (let i = 0; i < this.form.APPOINT_ANNEX.length; i++) {
+ formData.append('chengNuoShu', this.form.APPOINT_ANNEX[i].raw)
+ }
+ }
+ upload('/xgf/user/approvePlus', formData)
.then((data) => {
this.$message.success('推送成功')
this.visible = false
diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index 9d03d99..a582dda 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -139,12 +139,20 @@
+
+
+
集团单位承诺书
+
+
+ 下载附件
+
+