Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/Groupedit.vue

@@ -19,7 +19,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label-width="120px" label="团组类型:" prop="OP">
-                        <el-select class="op-type" v-model="ruleForm.OP" placeholder="请选择团组类型">
+                        <el-select @change="optypechange" class="op-type" v-model="ruleForm.OP" placeholder="请选择团组类型">
                             <el-option v-for="(item, index) in OPtype" :key="index" :label="item.name"
                                 :value="item.id"></el-option>
                         </el-select>
@@ -486,13 +486,27 @@ export default {
             let time = y + '-' + m + '-' + d;
             return time
         },
+        //agreeChange
+        optypechange(val){
+            if (val==1348) {
+                this.bidbr=false;
+                this.ruleForm.groupname='沟通中-'+this.ruleForm.groupname;
+            }else{
+                if(this.ruleForm.radioval!=1){
+                    this.bidbr=true;
+                }
+                this.ruleForm.groupname=this.ruleForm.groupname.split("沟通中-").join("");
+            }
+        },
         //是否用于投标
         agreeChange(val){
             if(val==1){
                 this.bidbr=false;
                 this.ruleForm.groupname='投标-'+this.ruleForm.groupname;
             }else{
-                this.bidbr=true;
+                if(this.ruleForm.OP!=1348){
+                    this.bidbr=true;
+                }
                 this.ruleForm.groupname=this.ruleForm.groupname.split("投标-").join("");
             }
         },

src/components/Resource/OpOfficialActivities.vue

@@ -88,8 +88,8 @@
                         </el-form-item>
                     </div>
                     <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
-                        <el-form-item label="来源:" prop="officialForm" label-width="160px">
-                            <el-select v-model="OpOfficialActivitiesDto.dataSource" clearable filterable placeholder="公务形式">
+                        <el-form-item label="公务机构来源:" prop="officialForm" label-width="160px">
+                            <el-select v-model="OpOfficialActivitiesDto.dataSource" clearable filterable placeholder="公务机构来源">
                                 <el-option v-for="item in dataSourceList" :key="item.id" :label="item.name" :value="item.id">
                                 </el-option>
                             </el-select>