diff --git a/supervise-crm-ui/src/api/project/project.js b/supervise-crm-ui/src/api/project/project.js index 36fc6e6d..0cc08e3a 100644 --- a/supervise-crm-ui/src/api/project/project.js +++ b/supervise-crm-ui/src/api/project/project.js @@ -70,7 +70,7 @@ export default { fetchBySid: function(sid) { return request({ baseURL: '/api/crm', - url: '/v1/projectinformation/getProjectBySid/' + sid + url: '/v1/projectinformation/getEnterpriseBySid/' + sid }) }, diff --git a/supervise-crm-ui/src/views/project/projectAdd.vue b/supervise-crm-ui/src/views/project/projectAdd.vue index fbb01723..6d2c9ca7 100644 --- a/supervise-crm-ui/src/views/project/projectAdd.vue +++ b/supervise-crm-ui/src/views/project/projectAdd.vue @@ -283,6 +283,23 @@ + + + + + 关联企业 + + + + + + + + + + @@ -365,6 +382,9 @@ fillInDate: "", // 填表日期 storeHouseProjectDto :{ shSids:[] + }, + enterpriseProjectDto:{ + enterpriseSids:[] } }, industryAllList: [], @@ -377,12 +397,18 @@ bManagerList: [], enterpriseAllList: [], enterpriseList: [], + enterpriseLists: [], temps: [], tableData: [], ValSid:[], ARRSid:[], ImgSid:[], getImgsid:[], + Sidlists:[], + enterSids:{ + enterpriseName:'', + enterpriseSid:'' + }, } }, created() { @@ -419,6 +445,7 @@ if (res.success) { console.log(">>>>>>>>>2222222", res.data) this.enterpriseAllList = res.data + this.enterpriseLists = [] this.enterpriseList = [] for (var i = 0; i < this.enterpriseAllList.length; i++) { @@ -426,8 +453,14 @@ dictValue: this.enterpriseAllList[i].enterpriseName, dictKey: this.enterpriseAllList[i].sid, + } + let enterprises = { + enterpriseName: this.enterpriseAllList[i].enterpriseName, + enterpriseSid: this.enterpriseAllList[i].sid, + } this.enterpriseList.push(enterprise) + this.enterpriseLists.push(enterprises) } } @@ -521,12 +554,18 @@ this.formobj.managerSid = choose[0].dictKey }, + getEnterName(value) { + var EnterSidss=[] + for(let i=0;i>>>>>>>>getBManager", value) const choose = this.enterpriseList.filter((item) => item.dictKey === value) this.formobj.enterpriseName = choose[0].dictValue this.formobj.enterpriseSid = choose[0].dictKey - let items = this.enterpriseAllList.filter( // function(item) { // return item.id == val.id; @@ -544,6 +583,13 @@ saveOrUpdate() { console.log(">>>>>>>>>saveOrUpdate", this.formobj) if (this.formobj.sid) { + if(this.formobj.enterpriseProjectDto.enterpriseSids.length==0){ + let EnterSidss=[] + for(let i=0;i { if (resp.success) { @@ -645,12 +691,20 @@ storeHouseProjectDto :{ shSids:[] }, - + enterpriseProjectDto:{ + enterpriseSids:[] + } } this.ImgSid=[] this.ValSid=[] this.ARRSid=[] this.getImgsid=[] + this.enterSids=[] + this.Sidlists=[] + this.enterSids={ + enterpriseName:'', + enterpriseSid:'' + }, this.title= "【新增】项目信息", this.$emit('doback') }, @@ -687,6 +741,11 @@ this.formobj.generalManager=resp.data.generalManager this.formobj.endDate=resp.data.endDate this.formobj.fillInDate=resp.data.fillInDate + this.Sidlists=resp.data.enterpriseProjectVoList + this.enterSids.enterpriseSid = [] + for (let i = 0; i < this.Sidlists.length; i++) { + this.enterSids.enterpriseSid.push(this.Sidlists[i].enterpriseSid) + } } }) diff --git a/supervise-enterprise-ui/src/views/Yjsq/upluad.vue b/supervise-enterprise-ui/src/views/Yjsq/upluad.vue index 405b4dd1..926a6771 100644 --- a/supervise-enterprise-ui/src/views/Yjsq/upluad.vue +++ b/supervise-enterprise-ui/src/views/Yjsq/upluad.vue @@ -72,7 +72,7 @@ nameArr: '', loadding: false, uploadFile: - "http://supervise.yxtsoft.com/enterprisecentre/v1/sealrecord/upload", + "https://supervise.yxtsoft.com/enterprisecentre/v1/sealrecord/upload", } }, watch: {