Browse Source

10291522gw

liuhj 8 months ago
parent
commit
ded3994f5d

+ 52 - 6
src/components/Resource/OpOfficialActivities.vue

@@ -182,9 +182,29 @@
                         </el-form-item>
                     </div>
                     <div style="width: 385px;">
-                        <el-form-item label="翻译人员:" prop="translators" label-width="160px">
-                            <el-input clearable placeholder="翻译人员" v-model="OpOfficialActivitiesDto.translators">
-                            </el-input>
+                        <el-form-item label="翻译人员:" prop="translatorIdItem" label-width="160px">
+                            <el-select
+                                v-model="OpOfficialActivitiesDto.translatorIdItem"
+                                multiple
+                                collapse-tags
+                                placeholder="请选择">
+                                <el-option
+                                v-for="item in restaurants"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                            <!-- <el-autocomplete
+                            style="width: 100%;"
+                            class="inline-input"
+                            v-model="OpOfficialActivitiesDto.translators"
+                            :fetch-suggestions="querySearch"
+                            placeholder="请输入内容"
+                            @select="handleSelect"
+                            ></el-autocomplete> -->
+                            <!-- <el-input clearable placeholder="翻译人员" v-model="OpOfficialActivitiesDto.translators">
+                            </el-input> -->
                         </el-form-item>
                     </div>
                     <div style="width: 385px;">
@@ -194,7 +214,7 @@
                         </el-form-item>
                     </div>
                     <div style="width: 385px;">
-                        <el-form-item label="是否付费:" prop="type" label-width="160px">
+                        <el-form-item label="是否付费:" prop="isPay" label-width="160px">
                             <el-radio-group v-model="OpOfficialActivitiesDto.isPay">
                                 <el-radio :label=1>是</el-radio>
                                 <el-radio :label=0>否</el-radio>
@@ -400,7 +420,7 @@ export default {
                 dresscode: "",
                 attendees: "",
                 isNeedTrans: 0,
-                translators: "",
+                translatorIdItem: [],
                 language: "",
                 nature: "",
                 emailOrWeChat: "",
@@ -496,6 +516,10 @@ export default {
                 fileList: [
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
                 ],
+                isPay:[
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
             },
             uploadURL: "http://localhost:5256/api/Resource/UploadOfficialActivities",
             uploadFiles1: [],
@@ -533,6 +557,7 @@ export default {
             gwcfPermissions:[],
             btnPermissions:false,
             fileList:[],
+            restaurants: [],
         }
     },
 
@@ -546,6 +571,20 @@ export default {
             val=val+""
             return val.split(' ')[0]
         },
+        querySearch(queryString, cb) {
+            var restaurants = this.restaurants;
+            var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+        },
+        createFilter(queryString) {
+            return (restaurant) => {
+                return restaurant.value.replace("  ", "").toLowerCase().match(queryString.toLowerCase());
+            };
+        },
+        handleSelect(item) {
+            console.log(item);
+        },
         //日期处理(日)
         TimeProcessingri(val){
             let datetime=new Date(val)
@@ -595,6 +634,13 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
 
+                    that.restaurants = res.data.data.translatorData;
+                    // that.restaurants= res.data.data.translatorData.map((terminal) => {
+                    //     return {
+                    //         id:terminal.id,
+                    //         value:terminal.name,
+                    //     };
+                    // });
                     that.deleFile = res.data.data.deleFile;
                     that.deleFile.forEach(function (item) {
                         if (item.kind == 1) {
@@ -753,7 +799,7 @@ export default {
                     that.OpOfficialActivitiesDto.dresscode = dataList.dresscode;
                     that.OpOfficialActivitiesDto.attendees = dataList.attendees;
                     that.OpOfficialActivitiesDto.isNeedTrans = dataList.isNeedTrans;
-                    that.OpOfficialActivitiesDto.translators = dataList.translators;
+                    that.OpOfficialActivitiesDto.translatorIdItem = dataList.translatorIdItem;
                     that.OpOfficialActivitiesDto.language = dataList.language;
                     that.OpOfficialActivitiesDto.nature = dataList.nature;
                     that.OpOfficialActivitiesDto.emailOrWeChat = dataList.emailOrWeChat;

File diff suppressed because it is too large
+ 474 - 2
src/components/Resource/PerformanceT.vue


+ 19 - 1
src/components/Resource/TranslatorBase.vue

@@ -40,6 +40,11 @@
                     <el-form-item label="语种" prop="language">
                         <el-input v-model="ruleForm.language"></el-input>
                     </el-form-item>
+                    <el-form-item label="关联团组">
+                        <el-select multiple collapse-tags filterable v-model="ruleForm.officialDutyIdItem" placeholder="请选择活动区域">
+                            <el-option v-for="(item,index) in officialDutyData" :key="index" :label="item.client" :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
                 </div>
                 <el-form-item label="费用" prop="price">
                     <el-input-number :precision="2" placeholder="邀请费用" v-model="ruleForm.price" :controls='false'></el-input-number>
@@ -179,6 +184,7 @@ export default {
                 email:'',
                 wechatNo:'',
                 otherSocialAccounts:'',
+                officialDutyIdItem:[],
                 language:'',
                 price:0,
                 currency:'',
@@ -187,6 +193,7 @@ export default {
                 region: '',
             },
             currencyarr:[],
+            officialDutyData:[],
             opStatus:1,
             rules: {
                 area: [
@@ -242,7 +249,8 @@ export default {
                 url: url,
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    that.currencyarr=res.data.data;
+                    that.currencyarr=res.data.data.currencyData;
+                    that.officialDutyData=res.data.data.officialDutyData;
                 } else {
                     that.$message.error(res.data.msg);
                 }
@@ -267,6 +275,7 @@ export default {
                 files:[],
                 remark:'',
                 region: '',
+                officialDutyIdItem:[]
             }
         },
         //删除
@@ -337,6 +346,7 @@ export default {
                     that.ruleForm.currency=res.data.data.currency;
                     that.ruleForm.photo=res.data.data.photo;
                     that.ruleForm.remark=res.data.data.remark;
+                    that.ruleForm.officialDutyIdItem=res.data.data.officialDutyIdItem;
                     that.imageUrl=res.data.data.photo;
                     if (res.data.data.filePaths!=[]) {
                         for(let i=0;i<res.data.data.filePaths.length;i++){
@@ -460,6 +470,9 @@ export default {
         },
         //保存
         TranslatorLibraryOp(){
+            console.log(this.ruleForm.officialDutyIdItem);
+            
+            // return
             var ruleForms=new FormData();
             ruleForms.append('portType',1);
             ruleForms.append('status',this.opStatus);
@@ -476,6 +489,11 @@ export default {
             ruleForms.append('price',this.ruleForm.price);
             ruleForms.append('currency',this.ruleForm.currency);
             ruleForms.append('remark',this.ruleForm.remark);
+            // ruleForms.append('officialDutyIdItem',this.ruleForm.officialDutyIdItem);
+            this.ruleForm.officialDutyIdItem.forEach((item,index)=>{
+                ruleForms.append(`officialDutyIdItem[${index}]`,item);
+            })
+            // ruleForms.getAll('officialDutyIdItem[]');
             this.fileList.forEach((file) => {
                 if (file.status == 'ready') {
                     if(file.raw!=undefined){