Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue

@@ -199,6 +199,7 @@
        code: "",
        type: "PUBLIC",
        template: "",
        codeClassifyOid:""
      },
      visibleFlow: false,
      transferData: [],
@@ -258,6 +259,7 @@
    codeClassifyOid: {
      handler(newval, oldval) {
        this.codeClassifyOid = newval;
        this.parameter.codeClassifyOid=newval
      },
      deep: true,
    },

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

@@ -135,7 +135,7 @@
            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] })
            const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code],ids:this.parameter.ids, codeClassifyOid:this.parameter.codeClassifyOid})
            if (response.status === 200) {
                console.log(response)
                this.initFrom = response.data.data.user

 Source/UBCS-WEB/vue.config.js

@@ -27,8 +27,8 @@
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost:37000',
        target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46:37000',
        // target: 'http://192.168.1.51:37000',
        target: 'http://192.168.1.46:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        // target: 'http://192.168.1.104:37000',