Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

 Source/UBCS-WEB/src/components/template/SetPersonnel.vue

@@ -7,14 +7,14 @@
        <el-divider v-if="tags.length !== 0"></el-divider>
        <el-form :model="saveParam" class="demo-form-inline" label-position="left" label-width="auto" :rules="rules">
            <el-form-item label="流程模板">
                <el-input placeholder="流程模板" v-model="saveParam.modelName" disabled  ></el-input>
                <el-input placeholder="流程模板" v-model="saveParam.modelName" disabled></el-input>
            </el-form-item>
            <el-form-item label="流程名称" prop="processName">
                <el-input placeholder="流程名称" v-model="saveParam.processName"  >
                <el-input placeholder="流程名称" v-model="saveParam.processName">
                </el-input>
            </el-form-item>
            <el-form-item label="流程描述">
                <el-input placeholder="流程描述" type="textarea" :rows="4" v-model="saveParam.processDesc"  >
                <el-input placeholder="流程描述" type="textarea" :rows="4" v-model="saveParam.processDesc">
                </el-input>
            </el-form-item>
        </el-form>
@@ -24,7 +24,7 @@
        </div>
        <el-form :model="collectParam" class="demo-form-inline" label-position="left" label-width="auto">
            <el-form-item :label="item.taskName" v-for="(item, index) in initFrom" :key="index">
                <el-select style="width: 80%;"  filterable v-model="collectParam.flowTaskUsers[index]['userId']"
                <el-select style="width: 80%;" filterable v-model="collectParam.flowTaskUsers[index]['userId']"
                    :placeholder="item.taskName" @change="handleSelect($event, index)">
                    <el-option :label="key.userNames" :value="key.userId" v-for="(key, keyi) in typeName"
                        :key="keyi"></el-option>
@@ -62,7 +62,6 @@
            default: () => {
                return {
                    ids: 'ids',
                    flowName: 'flowName',
                    flowTemplate: 'flowTemplate',
                    code: 'code',
                    type: 'type'
@@ -105,11 +104,13 @@
    methods: {
        saveParam() {
            return {
                modelName: this.parameter[this.parameterKeys.flowName],
                processName: this.parameter[this.parameterKeys.flowTemplate],
                topName: this.title,
                ids: this.parameter[this.parameterKeys.ids],
            }
        },
        userIndex(arr1) {
            return this.initFrom.findIndex(i => i.taskId === arr1)
        },
        async apiInit() {
            const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code] })
@@ -117,15 +118,17 @@
                console.log(response)
                this.initFrom = response.data.data.user
                this.tags = response.data.data.collect
                const { modelKey, templateId } = response.data.data.flow
                const { modelKey, templateId, modelName } = response.data.data.flow
                let flowTaskUsers = response.data.data.user
                this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
                this.saveParam = { ...this.saveParam, modelKey, templateId }
                console.log(this.collectParam)
                this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
                this.handleClickTag(this.tags[0])
            }
        },
        async apiDict() {
            const response = await personnelDict()
            console.log(response)
            if (response.status === 200) {
                console.log(response)
                const data = response.data.data
@@ -147,6 +150,7 @@
                this.collectParam = { ...this.collectParam, name: value }
                console.log(this.collectParam)
                const response = await personnelCollect(this.collectParam)
                Console.log(response)
                if (response.status === 200) {
                    this.$nextTick(() => {
                        this.apiInit()
@@ -186,11 +190,20 @@
        },
        handleClickTag(event) {
            console.log(event)
            const flowTaskUsers = event.flowTaskUsers
            this.collectParam.flowTaskUsers = flowTaskUsers.map(item => {
                const { taskId, taskName, userId, userName } = item
                return { taskId, taskName, userId, userName }
            })
            const flowTaskUsers = event.flowTaskUsers//collet.flowTaskUsers
            let tasks =  this.collectParam.flowTaskUsers;//user
            for(let i=0;i<tasks.length;i++){
                let thisFlowTaskUsers = tasks[i];
                console.log('thisFlowTaskUsers',thisFlowTaskUsers)
                for(let j=0;j<flowTaskUsers.length;j++){
                    let thisFflowTaskUsers = flowTaskUsers[j];
                    if(thisFlowTaskUsers.taskId==thisFflowTaskUsers.taskId){
                        thisFlowTaskUsers['userName']=thisFflowTaskUsers.userName;
                        thisFlowTaskUsers['userId']=thisFflowTaskUsers.userId;
                    }
                }
            }
            console.log(this.collectParam)
        },
        handleCloseTag(event) {
            console.log(event)

 Source/UBCS-WEB/src/views/flow/flowPath.vue

@@ -23,11 +23,9 @@
                ids:['0000','22222222'],
                code:'8b5e2017-990f-454a-9c39-4c4eeeb57553',
                type:'PUBLIC',
                name:'模板name',
                template:'模板template'
            },
            props:{
                flowName:'name',
                flowTemplate:'template',
                type:'type',
                ids:'ids',

 Source/UBCS-WEB/vue.config.js

@@ -36,7 +36,7 @@
        //target: 'http://192.168.3.7:37000',
        // target: 'http://dev.vci-tech.com:37000',
        //target: 'http://192.168.1.51:37000/',
        // target:'http://192.168.1.104:37000',
        target:'http://192.168.1.104:37000',
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',
        ws: true,