9.19

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
     })
   },
 

supervise-crm-ui/src/views/project/projectAdd.vue

@@ -283,6 +283,23 @@
               </el-form-item>
             </el-col>
           </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">关联企业</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <el-select v-model="enterSids.enterpriseSid" multiple  class="addinputw" placeholder="请选择企业单位" style="width:100%"
+                  @change="getEnterName">
+                  <el-option v-for="(item,i) in enterpriseLists" :key="i" :label="item.enterpriseName"
+                    :value="item.enterpriseSid" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
 
       </div>
@@ -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<value.length;i++){
+          EnterSidss.push(value[i])
+        }
+        this.formobj.enterpriseProjectDto.enterpriseSids=EnterSidss
+      },
       getEnterpriseName(value) {
         console.log(">>>>>>>>>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<this.Sidlists.length;i++){
+             EnterSidss.push(this.Sidlists[i].enterpriseSid)
+            }
+            this.formobj.enterpriseProjectDto.enterpriseSids=EnterSidss
+          }
           req.updateData(this.formobj)
             .then(resp => {
               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)
+                }
             }
 
           })

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: {