Commit e344c087 authored by wangxl's avatar wangxl

2222

parent 180ad5d3
...@@ -21,18 +21,22 @@ import { ...@@ -21,18 +21,22 @@ import {
import sModal from '@/components/modal/modal' import sModal from '@/components/modal/modal'
import BtnGroup from '@/components/btnGroup/index.vue' import BtnGroup from '@/components/btnGroup/index.vue'
import EComment from '@/components/comment/index.vue' import EComment from '@/components/comment/index.vue'
import FileUpload from '@/views/components/common/upload.vue'
import fModal from '@/components/modal/index' import fModal from '@/components/modal/index'
import fileLoad from '@/views/components/common/fileLoad' import fileLoad from '@/views/components/common/upLoad'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import Viewer from "v-viewer" import Viewer from "v-viewer"
import 'viewerjs/dist/viewer.css' import 'viewerjs/dist/viewer.css'
Vue.component('e-comment', EComment); Vue.component('e-comment', EComment);
Vue.component('btn-group', BtnGroup); Vue.component('btn-group', BtnGroup);
Vue.component('sModal', sModal) Vue.component('sModal', sModal)
Vue.component('FileUpload', FileUpload)
Vue.component('fileLoad', fileLoad) Vue.component('fileLoad', fileLoad)
Vue.component('fModal', fModal) Vue.component('fModal', fModal)
Vue.component('paraMultiSelect', paraMultiSelect)
Vue.component('paraSelect', paraSelect)
Vue.component('baseSelect', baseSelect)
// 设置ant日期选择框为中文样式 // 设置ant日期选择框为中文样式
import moment from 'moment' import moment from 'moment'
......
...@@ -80,10 +80,7 @@ ...@@ -80,10 +80,7 @@
<script> <script>
import { isEmptyParams } from '@/views/utils/common' import { isEmptyParams } from '@/views/utils/common'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import projectView from '@/views/report/project/components/projectView' import projectView from '@/views/report/project/components/projectView'
import baseSelect from '@/views/components/common/baseSelect'
import expertSelect from './components/expertSelect' import expertSelect from './components/expertSelect'
import projectAssignDetail from './components/projectAssignDetail' import projectAssignDetail from './components/projectAssignDetail'
import assignDetail from './components/assignDetail' import assignDetail from './components/assignDetail'
...@@ -93,7 +90,7 @@ import assignExpertView from './components/assignExpertView' ...@@ -93,7 +90,7 @@ import assignExpertView from './components/assignExpertView'
export default { export default {
name: "projectAssign", name: "projectAssign",
components: { components: {
projectView, paraSelect, paraMultiSelect, baseSelect, expertSelect, projectAssignDetail, assignExpertView, assignDetail projectView, expertSelect, projectAssignDetail, assignExpertView, assignDetail
}, },
data () { data () {
return { return {
......
...@@ -131,20 +131,17 @@ ...@@ -131,20 +131,17 @@
<script> <script>
import { isEmptyParams } from '@/views/utils/common' import { isEmptyParams } from '@/views/utils/common'
import paraMultiSelectTow from '@/views/components/common/paraMultiSelectTow' import paraMultiSelectTow from '@/views/components/common/paraMultiSelectTow'
import paraSelect from '@/views/components/common/paraSelect'
import projectView from '@/views/report/project/components/projectView' import projectView from '@/views/report/project/components/projectView'
import expertView from '@/views/expert/components/expertView' import expertView from '@/views/expert/components/expertView'
import baseSelect from '@/views/components/common/baseSelect'
import moment from 'moment' import moment from 'moment'
export default { export default {
name: "projectAssign", name: "projectAssign",
components: { components: {
projectView, projectView,
paraSelect,
paraMultiSelectTow, paraMultiSelectTow,
expertView, expertView,
evaluationView, baseSelect evaluationView,
}, },
data () { data () {
return { return {
......
...@@ -63,16 +63,14 @@ ...@@ -63,16 +63,14 @@
import { getType } from '@/views/utils/auth' import { getType } from '@/views/utils/auth'
import moment from 'moment' import moment from 'moment'
import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common"; import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
import paraSelect from '@/views/components/common/paraSelect'
import audit from '@/views/audit/project/audit' import audit from '@/views/audit/project/audit'
import projectView from '@/views/report/project/components/projectView' import projectView from '@/views/report/project/components/projectView'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import taskFileInfo from '@/views/report/task/components/taskFileInfo' import taskFileInfo from '@/views/report/task/components/taskFileInfo'
export default { export default {
name: "projectAudit", name: "projectAudit",
components: { components: {
projectView, paraSelect, audit, paraMultiSelect, taskFileInfo projectView, audit, taskFileInfo
}, },
data () { data () {
return { return {
......
...@@ -37,14 +37,12 @@ ...@@ -37,14 +37,12 @@
<script> <script>
import { isEmptyParams, hideIdCard, hidePhone, checkEmail } from "@/views/utils/common" import { isEmptyParams, hideIdCard, hidePhone, checkEmail } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
export default { export default {
name: "infoEdit", name: "infoEdit",
components: { components: {
paraMultiSelect, paraSelect, baseSelect
}, },
data () { data () {
return { return {
......
...@@ -263,14 +263,12 @@ ...@@ -263,14 +263,12 @@
<script> <script>
import { isEmptyParams } from "@/views/utils/common" import { isEmptyParams } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
export default { export default {
name: "infoEdit", name: "infoEdit",
components: { components: {
paraMultiSelect, paraSelect, baseSelect
}, },
data () { data () {
return { return {
......
<template>
<div v-if="file.downloadUrl" class="file-box">
<div>
<document-view :fileUrl="file.downloadUrl" :fileName="file.fileName" :imageArray="[file.downloadUrl]"></document-view>
</div>
<a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" />
</div>
<div v-else>
<a-form-model-item :prop="name +'.'+ index + '.downloadUrl'" :rules="{required: true, message: '请上传附件',trigger: 'blur',}">
<input type="file" :ref="name +'fileElem' + index" class="visually-hidden" @change="handleFiles(file, index)" />
<a-button @click="fileSelect(index)"><a-icon type="upload" />选择文件</a-button>
</a-form-model-item>
</div>
</template>
<script>
import documentView from '@/views/components/common/documentView'
export default {
name: "fileLoad",
components: {
documentView
},
data () {
return {
};
},
props: {
value: {
type: Object,
default: () => {
return null
}
},
file: {
type: Object,
default: () => {
return null
}
},
name: {
type: String,
default: () => {
return 'fileList'
}
},
index: {
type: Number,
default () {
return 0
},
},
},
created () {
},
methods: {
deletefile (item) {
this.$api.base.deletefile({ id: item.downloadId }).then(({ data = {} }) => {
if (data) {
item.fileName = ''
item.downloadUrl = ''
item.downloadId = ''
}
}).catch(() => {
this.$message.error('删除失败')
})
},
handleFiles (item, index) {
let fileElem = this.$refs[this.name + 'fileElem' + index]
let files = fileElem.files
if (files.length <= 0) {
this.$message.error('未选中文件,请尝试重新选择')
return
}
if (!this.fileCheck(files[0]))
return
this.$api.base.asyncUpload(this.uploadHandle(files[0], files[0].name)).then(({ data = {} }) => {
if (data) {
item.fileName = files[0].name
item.downloadUrl = data.downloadUrl
item.downloadId = data.id
console.log(item, data)
} else
this.$message.error('上传失败')
}).catch(() => {
this.$message.error('上传失败')
})
},
fileCheck (file) {
//判断是否小于1M
let isLtSize = file.size < 1024 * 1024 * 15;
if (!isLtSize) {
this.$message.error('文件大小不能超过15M!');
return false
}
// var fileNames = file.name.split('.')
// var fileType = fileNames[fileNames.length - 1].toLocaleLowerCase()
// var extList = ['doc', 'docx', 'pdf']
// if (!extList.find((item) => item == fileType)) {
// this.$message.error('文件格式错误!')
// return false
// }
return true
},
uploadHandle (file, fileName) {
let formData = new FormData()
formData.append('file', file)
formData.append('fileName', fileName)
return formData
},
fileSelect (index) {
let fileElem = this.$refs[this.name + 'fileElem' + index]
if (fileElem) {
fileElem.click()
}
},
},
watch: {
value: {
handler (value) {
},
}
}
};
</script>
<style scoped lang="less">
.upload-layout {
display: inline-block;
margin: 0 10px;
height: 30px;
line-height: 30px;
.file-box {
margin: 0 8px;
}
.visually-hidden {
display: none !important;
}
}
</style>
<template> <template>
<div class="upload-layout"> <div v-if="file.downloadUrl" class="file-box">
<div v-if="file.downloadUrl" class="file-box"> <div>
<div> <document-view :fileUrl="file.downloadUrl" :fileName="file.fileName" :imageArray="[file.downloadUrl]"></document-view>
<a-icon type="file" style="margin-right: 8px" />
<span class="hover-pointer" @click="downloadfile">{{file.fileName}}</span>
</div>
<a-icon type="delete" class="hover-pointer" @click="deletefile" style="margin-left: 8px" />
</div>
<div v-else>
<input type="file" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" ref="fileElem" class="visually-hidden" @change="handleFiles">
<a-button @click="fileSelect">
<a-icon type="upload" />选择文件
</a-button>
</div> </div>
<a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" />
</div>
<div v-else>
<a-form-model-item :prop="name +'.'+ index + '.downloadUrl'" :rules="{required: true, message: '请上传附件',trigger: 'blur',}">
<input type="file" :ref="name +'fileElem' + index" class="visually-hidden" @change="handleFiles(file, index)" />
<a-button @click="fileSelect(index)"><a-icon type="upload" />选择文件</a-button>
</a-form-model-item>
</div> </div>
</template> </template>
<script> <script>
const File = { fileName: null, downloadUrl: null, fileExplain: null, downloadId: null } import documentView from '@/views/components/common/documentView'
export default { export default {
name: "FileUpload", name: "fileLoad",
components: {
documentView
},
data () { data () {
return { return {
file: { ...File },
}; };
}, },
props: { props: {
value: { value: {
type: String, type: Object,
default () { default: () => {
return null return null
} }
} },
file: {
type: Object,
default: () => {
return null
}
},
name: {
type: String,
default: () => {
return 'fileList'
}
},
index: {
type: Number,
default () {
return 0
},
},
}, },
created () { created () {
this.fileLoad(this.value)
}, },
methods: { methods: {
fileLoad (value) { deletefile (item) {
}, this.$api.base.deletefile({ id: item.downloadId }).then(({ data = {} }) => {
fileSelect () { if (data) {
let fileElem = this.$refs['fileElem'] item.fileName = ''
if (fileElem) { item.downloadUrl = ''
fileElem.click() item.downloadId = ''
} }
}).catch(() => {
this.$message.error('删除失败')
})
}, },
handleFiles () { handleFiles (item, index) {
let fileElem = this.$refs['fileElem'] let fileElem = this.$refs[this.name + 'fileElem' + index]
let files = fileElem.files let files = fileElem.files
if (files.length <= 0) { if (files.length <= 0) {
this.$message.error('未选中文件,请尝试重新选择') this.$message.error('未选中文件,请尝试重新选择')
return return
} }
this.file.fileName = files[0].name if (!this.fileCheck(files[0]))
this.file.downloadUrl = '/' + files[0].name return
this.$emit("beforeUpload", files[0]); this.$api.base.asyncUpload(this.uploadHandle(files[0], files[0].name)).then(({ data = {} }) => {
// this.$api.base.asyncUpload(this.uploadHandle(files[0], files[0].name)).then(({ data = {} }) => { if (data) {
// this.file.downloadId = data.id item.fileName = files[0].name
// }).catch(() => { item.downloadUrl = data.downloadUrl
// this.$message.error('上传失败') item.downloadId = data.id
// }) console.log(item, data)
// this.$emit("change"); } else
}, this.$message.error('上传失败')
downloadfile () { }).catch(() => {
this.$message.error('上传失败')
})
}, },
deletefile () { fileCheck (file) {
this.file = { ...File } //判断是否小于1M
this.$emit("cancel"); let isLtSize = file.size < 1024 * 1024 * 15;
if (!isLtSize) {
this.$message.error('文件大小不能超过15M!');
return false
}
// var fileNames = file.name.split('.')
// var fileType = fileNames[fileNames.length - 1].toLocaleLowerCase()
// var extList = ['doc', 'docx', 'pdf']
// if (!extList.find((item) => item == fileType)) {
// this.$message.error('文件格式错误!')
// return false
// }
return true
}, },
uploadHandle (file, fileName) { uploadHandle (file, fileName) {
let formData = new FormData() let formData = new FormData()
...@@ -74,11 +107,17 @@ export default { ...@@ -74,11 +107,17 @@ export default {
formData.append('fileName', fileName) formData.append('fileName', fileName)
return formData return formData
}, },
fileSelect (index) {
let fileElem = this.$refs[this.name + 'fileElem' + index]
if (fileElem) {
fileElem.click()
}
},
}, },
watch: { watch: {
value: { value: {
handler (value) { handler (value) {
this.selected = value
}, },
} }
} }
...@@ -92,17 +131,7 @@ export default { ...@@ -92,17 +131,7 @@ export default {
line-height: 30px; line-height: 30px;
.file-box { .file-box {
display: flex;
justify-content: space-between;
align-items: center;
margin: 0 8px; margin: 0 8px;
> div:nth-child(1) {
max-width: 90%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
} }
.visually-hidden { .visually-hidden {
display: none !important; display: none !important;
......
...@@ -113,16 +113,13 @@ import { isEmptyParams, checkEmail, checkPhone, checkIdentitytionId, personBirth ...@@ -113,16 +113,13 @@ import { isEmptyParams, checkEmail, checkPhone, checkIdentitytionId, personBirth
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import moment from 'moment' import moment from 'moment'
import specSelect from '@/views/expert/components/specSelect' import specSelect from '@/views/expert/components/specSelect'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import unitSelect from '@/views/components/common/unitSelect' import unitSelect from '@/views/components/common/unitSelect'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
export default { export default {
name: 'expertEdit', name: 'expertEdit',
components: { components: {
paraMultiSelect, paraSelect, baseSelect, unitSelect, specSelect, unitTreeSelect unitSelect, specSelect, unitTreeSelect
}, },
data () { data () {
return { return {
......
...@@ -75,10 +75,10 @@ import moment from 'moment'; ...@@ -75,10 +75,10 @@ import moment from 'moment';
import expertView from './components/expertView' import expertView from './components/expertView'
import expertEdit from './components/expertEdit'; import expertEdit from './components/expertEdit';
import expertImport from './components/expertImport'; import expertImport from './components/expertImport';
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
export default { export default {
name: 'expertManager', name: 'expertManager',
components: { expertView, expertEdit, expertImport, paraMultiSelect }, components: { expertView, expertEdit, expertImport },
data () { data () {
return { return {
form: this.$form.createForm(this, { name: 'advanced_search' }), form: this.$form.createForm(this, { name: 'advanced_search' }),
......
...@@ -39,16 +39,13 @@ ...@@ -39,16 +39,13 @@
</template> </template>
<script> <script>
import Verify from "@/views/components/verifition/Verify"; import Verify from "@/views/components/verifition/Verify";
import paraMultiSelect from "@/views/components/common/paraMultiSelect";
import paraSelect from "@/views/components/common/paraSelect";
import baseSelect from "@/views/components/common/baseSelect";
import moment from "moment"; import moment from "moment";
import { setToken } from "@/views/utils/auth"; import { setToken } from "@/views/utils/auth";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { request } from "@/api/request"; import { request } from "@/api/request";
export default { export default {
components: { Verify, paraMultiSelect, paraSelect, baseSelect }, components: { Verify },
data () { data () {
return { return {
id: "", id: "",
......
...@@ -86,15 +86,12 @@ ...@@ -86,15 +86,12 @@
import { isEmptyParams, getCardInfo } from "@/views/utils/common" import { isEmptyParams, getCardInfo } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import moment from 'moment' import moment from 'moment'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
export default { export default {
name: "personEdit", name: "personEdit",
components: { components: {
paraMultiSelect, paraSelect, baseSelect, unitTreeSelect unitTreeSelect
}, },
data () { data () {
return { return {
......
...@@ -85,8 +85,7 @@ ...@@ -85,8 +85,7 @@
import { isEmptyParams, checkPhone, checkEmail, checkIdentitytionId, personBirthday, personGender } from "@/views/utils/common" import { isEmptyParams, checkPhone, checkEmail, checkIdentitytionId, personBirthday, personGender } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
const Member = { const Member = {
personName: null, personName: null,
...@@ -163,8 +162,7 @@ export default { ...@@ -163,8 +162,7 @@ export default {
}, },
}, },
components: { components: {
paraMultiSelect,
paraSelect
}, },
created () { created () {
......
...@@ -105,8 +105,7 @@ ...@@ -105,8 +105,7 @@
<script> <script>
import { isEmptyParams, checkPhone, checkIdentitytionId } from "@/views/utils/common" import { isEmptyParams, checkPhone, checkIdentitytionId } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
var columns1 = [ var columns1 = [
{ title: '姓名', dataIndex: 'personName', align: 'center' }, { title: '姓名', dataIndex: 'personName', align: 'center' },
...@@ -132,7 +131,7 @@ var columns2 = [ ...@@ -132,7 +131,7 @@ var columns2 = [
export default { export default {
name: "managerSetting", name: "managerSetting",
components: { components: {
paraMultiSelect, paraSelect,
}, },
data () { data () {
return { return {
......
...@@ -69,16 +69,13 @@ ...@@ -69,16 +69,13 @@
<script> <script>
import { isEmptyParams } from "@/views/utils/common" import { isEmptyParams } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
import managerAdd from './managerAdd.vue' import managerAdd from './managerAdd.vue'
export default { export default {
name: "unitEdit", name: "unitEdit",
components: { components: {
paraMultiSelect, paraSelect, baseSelect, unitTreeSelect, managerAdd unitTreeSelect, managerAdd
}, },
data () { data () {
return { return {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<script> <script>
import { getType } from '@/views/utils/auth' import { getType } from '@/views/utils/auth'
import { isEmptyParams, hideIdCard } from '@/views/utils/common' import { isEmptyParams, hideIdCard } from '@/views/utils/common'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
export default { export default {
name: "projectSelect", name: "projectSelect",
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
} }
}, },
components: { components: {
paraMultiSelect
}, },
data() { data() {
return { return {
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<script> <script>
import { getType } from '@/views/utils/auth' import { getType } from '@/views/utils/auth'
import { isEmptyParams, hideIdCard } from '@/views/utils/common' import { isEmptyParams, hideIdCard } from '@/views/utils/common'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
export default { export default {
name: "projectSelectIntoGroup", name: "projectSelectIntoGroup",
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
} }
}, },
components: { components: {
paraMultiSelect
}, },
data() { data() {
return { return {
......
...@@ -53,8 +53,7 @@ ...@@ -53,8 +53,7 @@
<script> <script>
import { isEmptyParams, hideIdCard, hidePhone } from "@/views/utils/common"; import { isEmptyParams, hideIdCard, hidePhone } from "@/views/utils/common";
import moment from 'moment'; import moment from 'moment';
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import UnitTreeSelect from '@/views/components/common/unitTreeSelect' import UnitTreeSelect from '@/views/components/common/unitTreeSelect'
import personView from '@/views/person/components/personView' import personView from '@/views/person/components/personView'
import auditPerson from '@/views/person/components/personAudit' import auditPerson from '@/views/person/components/personAudit'
...@@ -62,7 +61,7 @@ import auditPerson from '@/views/person/components/personAudit' ...@@ -62,7 +61,7 @@ import auditPerson from '@/views/person/components/personAudit'
export default { export default {
name: 'personAudit', name: 'personAudit',
components: { components: {
paraMultiSelect, paraSelect, UnitTreeSelect, personView, auditPerson UnitTreeSelect, personView, auditPerson
}, },
data () { data () {
return { return {
......
...@@ -77,14 +77,12 @@ ...@@ -77,14 +77,12 @@
import { isEmptyParams, getCardInfo } from "@/views/utils/common" import { isEmptyParams, getCardInfo } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import moment from 'moment' import moment from 'moment'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
export default { export default {
name: "personEdit", name: "personEdit",
components: { components: {
paraMultiSelect, paraSelect, baseSelect
}, },
data () { data () {
return { return {
......
...@@ -49,8 +49,7 @@ ...@@ -49,8 +49,7 @@
<script> <script>
import { isEmptyParams, hideIdCard, hidePhone } from "@/views/utils/common"; import { isEmptyParams, hideIdCard, hidePhone } from "@/views/utils/common";
import moment from 'moment'; import moment from 'moment';
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
import personView from '@/views/person/components/personView' import personView from '@/views/person/components/personView'
import personEdit from '@/views/person/components/personEdit' import personEdit from '@/views/person/components/personEdit'
...@@ -58,7 +57,7 @@ import personEdit from '@/views/person/components/personEdit' ...@@ -58,7 +57,7 @@ import personEdit from '@/views/person/components/personEdit'
export default { export default {
name: 'personList', name: 'personList',
components: { components: {
paraMultiSelect, paraSelect, unitTreeSelect, personView, personEdit unitTreeSelect, personView, personEdit
}, },
data () { data () {
return { return {
......
...@@ -123,9 +123,7 @@ ...@@ -123,9 +123,7 @@
</template> </template>
<script> <script>
import { isEmptyParams, checkPhone, checkEmail, checkIdentitytionId, getCardInfo } from "@/views/utils/common" import { isEmptyParams, checkPhone, checkEmail, checkIdentitytionId, getCardInfo } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
import verifiCode from '@/views/register/components/verifiCode' import verifiCode from '@/views/register/components/verifiCode'
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
...@@ -133,7 +131,7 @@ import { isIdentityId } from '@/views/utils/validate' ...@@ -133,7 +131,7 @@ import { isIdentityId } from '@/views/utils/validate'
export default { export default {
name: "unitRegister", name: "unitRegister",
components: { components: {
paraMultiSelect, paraSelect, baseSelect, unitTreeSelect, verifiCode unitTreeSelect, verifiCode
}, },
data () { data () {
return { return {
......
...@@ -84,9 +84,7 @@ ...@@ -84,9 +84,7 @@
</template> </template>
<script> <script>
import { isEmptyParams, checkPhone, checkEmail, checkIdentitytionId, getCardInfo, personGender, personBirthday } from "@/views/utils/common" import { isEmptyParams, checkPhone, checkEmail, checkIdentitytionId, getCardInfo, personGender, personBirthday } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import unitSelect from '@/views/components/common/unitSelect' import unitSelect from '@/views/components/common/unitSelect'
import verifiCode from '@/views/register/components/verifiCode' import verifiCode from '@/views/register/components/verifiCode'
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
...@@ -95,7 +93,7 @@ import { isIdentityId } from '@/views/utils/validate' ...@@ -95,7 +93,7 @@ import { isIdentityId } from '@/views/utils/validate'
export default { export default {
name: "userRegister", name: "userRegister",
components: { components: {
paraMultiSelect, paraSelect, baseSelect, unitSelect, verifiCode unitSelect, verifiCode
}, },
data () { data () {
return { return {
......
...@@ -113,16 +113,13 @@ import { isEmptyParams, checkEmail, checkPhone, checkIdentitytionId, personBirth ...@@ -113,16 +113,13 @@ import { isEmptyParams, checkEmail, checkPhone, checkIdentitytionId, personBirth
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import moment from 'moment' import moment from 'moment'
import specSelect from '@/views/expert/components/specSelect' import specSelect from '@/views/expert/components/specSelect'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import unitSelect from '@/views/components/common/unitSelect' import unitSelect from '@/views/components/common/unitSelect'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
export default { export default {
name: 'expertEdit', name: 'expertEdit',
components: { components: {
paraMultiSelect, paraSelect, baseSelect, unitSelect, specSelect, unitTreeSelect unitSelect, specSelect, unitTreeSelect
}, },
data () { data () {
return { return {
......
...@@ -86,10 +86,10 @@ import moment from 'moment'; ...@@ -86,10 +86,10 @@ import moment from 'moment';
import expertView from './components/expertView' import expertView from './components/expertView'
import expertEdit from './components/expertEdit'; import expertEdit from './components/expertEdit';
import expertImport from './components/expertImport'; import expertImport from './components/expertImport';
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
export default { export default {
name: 'expertManager', name: 'expertManager',
components: { expertView, expertEdit, expertImport, paraMultiSelect }, components: { expertView, expertEdit, expertImport },
data () { data () {
return { return {
form: this.$form.createForm(this, { name: 'advanced_search' }), form: this.$form.createForm(this, { name: 'advanced_search' }),
......
...@@ -146,8 +146,6 @@ ...@@ -146,8 +146,6 @@
import { getType, getComplete, setComplete } from '@/views/utils/auth' import { getType, getComplete, setComplete } from '@/views/utils/auth'
import moment from 'moment' import moment from 'moment'
import { isEmptyParams, filterExportExcelData, tableColumnsName, checkEmail, personGender, personBirthday, checkImageFileType, checkDocumentFileType } from "@/views/utils/common" import { isEmptyParams, filterExportExcelData, tableColumnsName, checkEmail, personGender, personBirthday, checkImageFileType, checkDocumentFileType } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import projectCreate from '@/views/report/project/components/projectCreate' import projectCreate from '@/views/report/project/components/projectCreate'
import projectEdit from '@/views/report/project/components/projectEdit' import projectEdit from '@/views/report/project/components/projectEdit'
import projectEditKey from "@/views/report/project/components/keyProject/projectEdit" import projectEditKey from "@/views/report/project/components/keyProject/projectEdit"
...@@ -158,7 +156,7 @@ import axios from 'axios' ...@@ -158,7 +156,7 @@ import axios from 'axios'
export default { export default {
name: 'reportProject', name: 'reportProject',
components: { components: {
projectView, projectCreate, projectEdit, paraMultiSelect, paraSelect, previewFile, projectEditKey projectView, projectCreate, projectEdit,previewFile, projectEditKey
}, },
data () { data () {
return { return {
......
...@@ -154,8 +154,7 @@ ...@@ -154,8 +154,7 @@
//用法 <proj-group-member :members.sync="formData.members" /> //用法 <proj-group-member :members.sync="formData.members" />
import { checkIdentitytionId } from "@/views/utils/common" import { checkIdentitytionId } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
const Model = { name: null, certId: null, title: null, education: null, degree: null, spec: null, workUnit: null } const Model = { name: null, certId: null, title: null, education: null, degree: null, spec: null, workUnit: null }
...@@ -175,7 +174,7 @@ export default { ...@@ -175,7 +174,7 @@ export default {
}, },
}, },
components: { components: {
paraMultiSelect, paraSelect
}, },
created () { created () {
}, },
......
...@@ -97,9 +97,7 @@ ...@@ -97,9 +97,7 @@
<script> <script>
//用法 <proj-group-member :members.sync="formData.members" /> //用法 <proj-group-member :members.sync="formData.members" />
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
const Model = { name: null, certId: null, title: null, education: null, degree: null, spec: null, workUnit: null } const Model = { name: null, certId: null, title: null, education: null, degree: null, spec: null, workUnit: null }
...@@ -119,7 +117,7 @@ ...@@ -119,7 +117,7 @@
}, },
}, },
components: { components: {
paraMultiSelect, paraSelect
}, },
created () { created () {
}, },
......
...@@ -886,9 +886,7 @@ ...@@ -886,9 +886,7 @@
<script> <script>
import { getType } from '@/views/utils/auth' import { getType } from '@/views/utils/auth'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import projectMemberEdit from '@/views/report/project/components/projectMemberEdit' import projectMemberEdit from '@/views/report/project/components/projectMemberEdit'
import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit' import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit'
import participateUnitsEdit from '@/views/report/project/components/participateUnitsEdit' import participateUnitsEdit from '@/views/report/project/components/participateUnitsEdit'
...@@ -952,7 +950,7 @@ const projectKPI = { ...@@ -952,7 +950,7 @@ const projectKPI = {
export default { export default {
name: 'projectEdit', name: 'projectEdit',
components: { components: {
paraMultiSelect, paraSelect, baseSelect, projectMemberEdit, cooperativeUnitsEdit, participateUnitsEdit, budgetEdit, fundPlanEdit, equipmentsEdit, unitPaymentEdit, projectKpiEdit, projectResearchEdit, projectSubEdit, managementRuleEdit, fileEdit projectMemberEdit, cooperativeUnitsEdit, participateUnitsEdit, budgetEdit, fundPlanEdit, equipmentsEdit, unitPaymentEdit, projectKpiEdit, projectResearchEdit, projectSubEdit, managementRuleEdit, fileEdit
}, },
props: { props: {
value: { value: {
......
...@@ -141,14 +141,12 @@ ...@@ -141,14 +141,12 @@
import { isEmptyParams, checkEmail, checkPhone, checkIdentitytionId, personBirthday, personGender } from "@/views/utils/common" import { isEmptyParams, checkEmail, checkPhone, checkIdentitytionId, personBirthday, personGender } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import { getType } from '@/views/utils/auth' import { getType } from '@/views/utils/auth'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
export default { export default {
name: "memberEdit", name: "memberEdit",
components: { components: {
paraMultiSelect, paraSelect, baseSelect
}, },
data () { data () {
return { return {
......
...@@ -540,9 +540,6 @@ ...@@ -540,9 +540,6 @@
<script> <script>
import { getType } from '@/views/utils/auth' import { getType } from '@/views/utils/auth'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import projectMemberEdit from '@/views/report/project/components/projectMemberEdit' import projectMemberEdit from '@/views/report/project/components/projectMemberEdit'
import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit' import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit'
import participateUnitsEdit from '@/views/report/project/components/participateUnitsEdit' import participateUnitsEdit from '@/views/report/project/components/participateUnitsEdit'
...@@ -606,7 +603,7 @@ const projectKPI = { ...@@ -606,7 +603,7 @@ const projectKPI = {
export default { export default {
name: 'projectEdit', name: 'projectEdit',
components: { components: {
paraMultiSelect, paraSelect, baseSelect, projectMemberEdit, cooperativeUnitsEdit, participateUnitsEdit, budgetEdit, fundPlanEdit, equipmentsEdit, unitPaymentEdit, projectKpiEdit, projectResearchEdit, projectSubEdit, managementRuleEdit, fileEdit projectMemberEdit, cooperativeUnitsEdit, participateUnitsEdit, budgetEdit, fundPlanEdit, equipmentsEdit, unitPaymentEdit, projectKpiEdit, projectResearchEdit, projectSubEdit, managementRuleEdit, fileEdit
}, },
props: { props: {
value: { value: {
......
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
<div>学位</div> <div>学位</div>
</div> </div>
</a-col> </a-col>
<a-col :span="1" class="bg-gray"> <a-col :span="2" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>工作单位</div> <div>工作单位</div>
</div> </div>
</a-col> </a-col>
<a-col :span="2" class="bg-gray"> <a-col :span="1" class="bg-gray">
<div class="special-middle"> <div class="special-middle">
<div>电话</div> <div>电话</div>
</div> </div>
...@@ -123,14 +123,14 @@ ...@@ -123,14 +123,14 @@
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="1"> <a-col :span="2">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.workUnit }} {{ item.workUnit }}
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="2"> <a-col :span="1">
<div class="special-middle"> <div class="special-middle">
<div> <div>
{{ item.mobile }} {{ item.mobile }}
......
...@@ -86,15 +86,12 @@ ...@@ -86,15 +86,12 @@
<script> <script>
import { isEmptyParams, checkPhone } from "@/views/utils/common" import { isEmptyParams, checkPhone } from "@/views/utils/common"
import moment from 'moment' import moment from 'moment'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import UnitTreeSelect from '@/views/components/common/unitTreeSelect' import UnitTreeSelect from '@/views/components/common/unitTreeSelect'
export default { export default {
name: "PersonRegister", name: "PersonRegister",
components: { components: {
paraMultiSelect, paraSelect, baseSelect, UnitTreeSelect UnitTreeSelect
}, },
data () { data () {
return { return {
......
...@@ -67,14 +67,11 @@ import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/ ...@@ -67,14 +67,11 @@ import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/
import projectView from '@/views/report/project/components/projectView' import projectView from '@/views/report/project/components/projectView'
import projectEdit from '@/views/report/project/components/projectEdit' import projectEdit from '@/views/report/project/components/projectEdit'
import unitEdit from '@/views/statistic/project/components/unitEdit' import unitEdit from '@/views/statistic/project/components/unitEdit'
import paraSelect from '@/views/components/common/paraSelect'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import baseSelect from '@/views/components/common/baseSelect'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
export default { export default {
name: 'serchProject', name: 'serchProject',
components: { components: {
projectEdit, projectView, paraSelect, paraMultiSelect, baseSelect, unitTreeSelect, unitEdit projectEdit, projectView, unitTreeSelect, unitEdit
}, },
data () { data () {
return { return {
......
...@@ -50,12 +50,10 @@ ...@@ -50,12 +50,10 @@
<script> <script>
import { isEmptyParams, hideIdCard, hidePhone, checkEmail } from "@/views/utils/common" import { isEmptyParams, hideIdCard, hidePhone, checkEmail } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
export default { export default {
name: 'systemSet', name: 'systemSet',
components: { components: {
paraMultiSelect, paraSelect
}, },
data () { data () {
return { return {
......
...@@ -85,8 +85,6 @@ ...@@ -85,8 +85,6 @@
import { isEmptyParams, checkPhone, checkEmail, checkIdentitytionId, personBirthday, personGender } from "@/views/utils/common" import { isEmptyParams, checkPhone, checkEmail, checkIdentitytionId, personBirthday, personGender } from "@/views/utils/common"
import { isIdentityId } from '@/views/utils/validate' import { isIdentityId } from '@/views/utils/validate'
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
const Member = { const Member = {
personName: null, personName: null,
...@@ -163,8 +161,7 @@ export default { ...@@ -163,8 +161,7 @@ export default {
}, },
}, },
components: { components: {
paraMultiSelect,
paraSelect
}, },
created () { created () {
......
...@@ -105,13 +105,11 @@ ...@@ -105,13 +105,11 @@
<script> <script>
import { isEmptyParams, checkPhone, checkIdentitytionId } from "@/views/utils/common" import { isEmptyParams, checkPhone, checkIdentitytionId } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
export default { export default {
name: "managerSetting", name: "managerSetting",
components: { components: {
paraMultiSelect, paraSelect,
}, },
data () { data () {
return { return {
......
...@@ -59,16 +59,13 @@ ...@@ -59,16 +59,13 @@
<script> <script>
import { isEmptyParams } from "@/views/utils/common" import { isEmptyParams } from "@/views/utils/common"
import paraMultiSelect from '@/views/components/common/paraMultiSelect'
import paraSelect from '@/views/components/common/paraSelect'
import baseSelect from '@/views/components/common/baseSelect'
import unitTreeSelect from '@/views/components/common/unitTreeSelect' import unitTreeSelect from '@/views/components/common/unitTreeSelect'
import managerAdd from './managerAdd.vue' import managerAdd from './managerAdd.vue'
export default { export default {
name: "unitEdit", name: "unitEdit",
components: { components: {
paraMultiSelect, paraSelect, baseSelect, unitTreeSelect, managerAdd unitTreeSelect, managerAdd
}, },
data () { data () {
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment