liuhj преди 3 месеца
родител
ревизия
475418f4c1
променени са 4 файла, в които са добавени 3001 реда и са изтрити 59 реда
  1. 1 0
      src/components/OP/EntryDetails.vue
  2. 2720 0
      src/components/OP/EntryDetailsdraft.vue
  3. 269 54
      src/components/Resource/OpOfficialActivities.vue
  4. 11 5
      src/router/index.js

+ 1 - 0
src/components/OP/EntryDetails.vue

@@ -1897,6 +1897,7 @@ export default {
                 this.storageAPI(quarterageDatas, boardWagesDatas, miscellaneousFeeDatas, trainingExpenseDatas, otherDatas)
             })
         }, 1000, true),
+        //导出保存
         //保存API
         storageAPI(arrthre, arrfour, arrfive, arrsix, arrSeven) {
             var url = "/api/Groups/PostEnterExitCostOperate"

Файловите разлики са ограничени, защото са твърде много
+ 2720 - 0
src/components/OP/EntryDetailsdraft.vue


+ 269 - 54
src/components/Resource/OpOfficialActivities.vue

@@ -75,11 +75,26 @@
                         </el-form-item>
                     </div>
                 </div>
-
             </el-form>
             <el-form :model="OpOfficialActivitiesDto" ref="OpOfficialActivitiesDto" :rules="OpOfficialActivitiesRules"
                 label-width="100px" class="demo-ruleForm">
                 <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 385px;">
+                        <el-form-item label="公务形式:" prop="officialForm" label-width="160px">
+                            <el-select @change="Officchange" v-model="OpOfficialActivitiesDto.officialForm" clearable filterable placeholder="公务形式">
+                                <el-option v-for="item in OfficialFormList" :key="item.id" :label="item.name" :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </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-option v-for="item in dataSourceList" :key="item.id" :label="item.name" :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
                     <div style="width: 385px;">
                         <el-form-item label="国家:" prop="country" label-width="160px">
                             <el-input clearable placeholder="国家" v-model="OpOfficialActivitiesDto.country">
@@ -117,7 +132,7 @@
 
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="邀请方:" prop="type" label-width="160px">
                             <el-select v-model="OpOfficialActivitiesDto.type" clearable filterable placeholder="邀请方选择">
                                 <el-option v-for="item in yqfarr" :key="item.id" :label="item.name"
@@ -133,47 +148,40 @@
                 <!-- </div>
                 <div style="display: flex;flex-wrap: wrap;"> -->
 
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="公务方联系人职务:" prop="job" label-width="160px">
                             <el-input clearable placeholder="公务方联系人职务" v-model="OpOfficialActivitiesDto.job">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="公务方联系人:" prop="contact" label-width="160px">
                             <el-input clearable placeholder="公务方联系人" v-model="OpOfficialActivitiesDto.contact">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="电话:" prop="tel" label-width="160px">
                             <el-input clearable placeholder="电话" v-model="OpOfficialActivitiesDto.tel">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
-                        <el-form-item label="公务形式:" prop="officialForm" label-width="160px">
-                            <el-select v-model="OpOfficialActivitiesDto.officialForm" clearable filterable placeholder="公务形式">
-                                <el-option v-for="item in OfficialFormList" :key="item.id" :label="item.name" :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </div>
+                    
                 <!-- </div>
                 <div style="display: flex;flex-wrap: wrap;"> -->
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="着装要求:" prop="dresscode" label-width="160px">
                             <el-input clearable placeholder="着装要求" v-model="OpOfficialActivitiesDto.dresscode">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="涉及领域:" prop="field" label-width="160px">
                             <el-input clearable placeholder="涉及领域" v-model="OpOfficialActivitiesDto.field">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="需要翻译:" prop="isNeedTrans" label-width="160px">
                             <el-radio-group v-model="OpOfficialActivitiesDto.isNeedTrans">
                                 <el-radio :label=1>是</el-radio>
@@ -181,9 +189,9 @@
                             </el-radio-group>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
-                        <el-form-item label="翻译人员:" prop="translatorIdItem" label-width="160px">
-                            <el-select
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.name" label="翻译人员:" label-width="160px">
+                            <!-- <el-select
                                 v-model="OpOfficialActivitiesDto.translatorIdItem"
                                 multiple
                                 collapse-tags
@@ -194,26 +202,82 @@
                                 :label="item.name"
                                 :value="item.id">
                                 </el-option>
-                            </el-select>
-                            <!-- <el-autocomplete
+                            </el-select> -->
+                            <el-autocomplete
                             style="width: 100%;"
                             class="inline-input"
-                            v-model="OpOfficialActivitiesDto.translators"
+                            v-model="OpOfficialActivitiesDto.translatorInfo.name"
                             :fetch-suggestions="querySearch"
                             placeholder="请输入内容"
                             @select="handleSelect"
-                            ></el-autocomplete> -->
+                            ></el-autocomplete>
                             <!-- <el-input clearable placeholder="翻译人员" v-model="OpOfficialActivitiesDto.translators">
                             </el-input> -->
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
-                        <el-form-item label="翻译语种:" :prop="OpOfficialActivitiesDto.isNeedTrans==0?'':'language'" label-width="160px">
-                            <el-input clearable placeholder="翻译语种" v-model="OpOfficialActivitiesDto.language">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.area" label="翻译人员地区:" label-width="160px">
+                            <el-input clearable placeholder="翻译人员地区" v-model="OpOfficialActivitiesDto.translatorInfo.area">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.sex" label="翻译性别:" label-width="160px">
+                            <el-radio-group v-model="OpOfficialActivitiesDto.translatorInfo.sex">
+                                <el-radio :label=0>未设置</el-radio>
+                                <el-radio :label=1>男</el-radio>
+                                <el-radio :label=2>女</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </div>
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.tel" label="翻译联系电话:" label-width="160px">
+                            <el-input clearable placeholder="翻译联系电话" v-model="OpOfficialActivitiesDto.translatorInfo.tel">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.email" label="翻译邮箱号:" label-width="160px">
+                            <el-input clearable placeholder="翻译邮箱号" v-model="OpOfficialActivitiesDto.translatorInfo.email">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.wechatNo" label="翻译微信号:" label-width="160px">
+                            <el-input clearable placeholder="翻译微信号" v-model="OpOfficialActivitiesDto.translatorInfo.wechatNo">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.otherSocialAccounts" label="翻译其他账号:" label-width="160px">
+                            <el-input clearable placeholder="翻译其他账号" v-model="OpOfficialActivitiesDto.translatorInfo.otherSocialAccounts">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.language" label="翻译语种:" label-width="160px">
+                            <el-input clearable placeholder="翻译语种" v-model="OpOfficialActivitiesDto.translatorInfo.language">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.price" label="翻译费用:" label-width="160px">
+                            <el-input-number style="width:100%" :precision="2" placeholder="翻译费用" v-model="OpOfficialActivitiesDto.translatorInfo.price"
+                        :controls='false'></el-input-number>
+                        </el-form-item>
+                    </div>
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337&&OpOfficialActivitiesDto.isNeedTrans==1" style="width: 385px;">
+                        <el-form-item prop="translatorInfo.currency" label="翻译币种:" label-width="160px">
+                            <el-select filterable v-model="OpOfficialActivitiesDto.translatorInfo.currency" placeholder="请选择币种">
+                                <el-option v-for="(item,index) in currencyarr" :key="index" :label="item.name"
+                                    :value="item.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+
+
+                    
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="是否付费:" prop="isPay" label-width="160px">
                             <el-radio-group v-model="OpOfficialActivitiesDto.isPay">
                                 <el-radio :label=1>是</el-radio>
@@ -221,7 +285,7 @@
                             </el-radio-group>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="是否报批:" prop="type" label-width="160px">
                             <el-radio-group v-model="OpOfficialActivitiesDto.isSubmitApproval">
                                 <el-radio :label=1>是</el-radio>
@@ -229,33 +293,31 @@
                             </el-radio-group>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <!-- <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="性质:" prop="nature" label-width="160px">
                             <el-input clearable placeholder="性质" v-model="OpOfficialActivitiesDto.nature">
                             </el-input>
                         </el-form-item>
-                    </div>
-                    <div style="width: 385px;">
+                    </div> -->
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="邮箱号/微信号:" prop="emailOrWeChat" label-width="160px">
                             <el-input clearable placeholder="邮箱号/微信号" v-model="OpOfficialActivitiesDto.emailOrWeChat">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 385px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 385px;">
                         <el-form-item label="网址:" prop="website" label-width="160px">
                             <el-input clearable placeholder="网址" v-model="OpOfficialActivitiesDto.website">
                             </el-input>
                         </el-form-item>
                     </div>
-                </div>
-                <div style="display: flex; flex-wrap: wrap;">
-                    <div style="width: 770px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 770px;">
                         <el-form-item label="公务地址:" prop="address" label-width="160px">
                             <el-input type="textarea" :rows="3" placeholder="公务地址"
                                 v-model="OpOfficialActivitiesDto.address"></el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 770px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 770px;">
                         <el-form-item label="公务方背景:" prop="setting" label-width="160px">
                             <el-input 
                             type="textarea" 
@@ -265,7 +327,7 @@
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 770px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 770px;">
                         <el-form-item style="position: relative;" label="公务请示范例:" label-width="160px">
                             <el-input @blur="reqSampleblur" @focus="PostOfficialActivitiesReqReqSampleTips" type="textarea" :rows="3" placeholder="公务请示范例" v-model="OpOfficialActivitiesDto.reqSample">
                             </el-input>
@@ -278,19 +340,25 @@
                     </div>
                 <!-- </div>
                 <div style="display: flex;"> -->
-                    <div style="width: 770px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width: 770px;">
                         <el-form-item label="暂定议程:" prop="trip" label-width="160px">
                             <el-input type="textarea" :rows="3" placeholder="暂定议程"
                                 v-model="OpOfficialActivitiesDto.trip"></el-input>
                         </el-form-item>
                     </div>
-                    <div style="width:770px;">
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width:770px;">
                         <el-form-item label="参会人员:" prop="attendees" label-width="160px">
                             <el-input type="textarea" :rows="3" placeholder="参会人员"
                                 v-model="OpOfficialActivitiesDto.attendees"></el-input>
                         </el-form-item>
                     </div>
                     <div style="width:770px;">
+                        <el-form-item label="备注:" prop="remark" label-width="160px">
+                            <el-input type="textarea" :rows="3" placeholder="备注"
+                                v-model="OpOfficialActivitiesDto.remark"></el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="OpOfficialActivitiesDto.officialForm!=384&&OpOfficialActivitiesDto.officialForm!=1337" style="width:770px;">
                         <el-form-item label="邮件截图:" label-width="160px">
                             <span style="display: inline-block;position: absolute;left: -82px;color: red;">*</span>
                             <!-- <el-upload 
@@ -405,19 +473,21 @@ export default {
             delegationInfo: {},
             delegationInfoList: [],//团组下拉框
             OfficialFormList: [],//公务形式下拉框
+            dataSourceList: [],//来源下拉框
             deleFile: [],//文件数据
             headers: {
                 Authorization: JSON.parse(localStorage.getItem('userinif')).token,
                 TypeName: "A"
             },
+            currencyarr:[],
             OpOfficialActivitiesDto: {
                 status: 0,
                 id: 0,
                 diId: "",
                 type: "",
-                client: "",
-                date: "",
-                time: "",
+                client: "",//
+                date: "",//
+                time: "",//
                 address: "",
                 contact: "",
                 job: "",
@@ -436,16 +506,31 @@ export default {
                 createUserId: 0,
                 isPay:0,
                 isSubmitApproval:0,
-                remark: "",
-                country: "",
-                area: "",
+                remark: "",//
+                country: "",//
+                area: "",//
                 field: "",
                 reqSample: "",
+                dataSource:"",//来源
+                translatorInfo:{
+                    id:"",
+                    area: "",
+                    name: "",
+                    sex: 1,
+                    tel: "",
+                    email: "",
+                    wechatNo: "",
+                    otherSocialAccounts: "",
+                    language: "",
+                    price: "",
+                    currency: "",
+                }
             },
             reqSampleArr:[],
             reqSampleArrpd:false,
             rollcallarr:[],
             OpOfficialActivitiesRules: {
+
                 officialForm: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' }
@@ -456,6 +541,37 @@ export default {
                 area: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                 ],
+                "translatorInfo.area": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
+                "translatorInfo.sex": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
+                "translatorInfo.name": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
+                "translatorInfo.tel": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
+                "translatorInfo.email": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
+                "translatorInfo.wechatNo": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
+                "translatorInfo.otherSocialAccounts": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
+                "translatorInfo.language": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
+                "translatorInfo.price": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
+                "translatorInfo.currency": [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                ],
                 inviteCosts: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
@@ -592,6 +708,32 @@ export default {
         },
         handleSelect(item) {
             console.log(item);
+            console.log(this.OpOfficialActivitiesDto.name);
+            
+            this.OpOfficialActivitiesDto.translatorInfo={
+                id:"",
+                area: "",
+                name: "",
+                sex: 1,
+                tel: "",
+                email: "",
+                wechatNo: "",
+                otherSocialAccounts: "",
+                language: "",
+                price: "",
+                currency: "",
+            };
+            this.OpOfficialActivitiesDto.translatorInfo.id=item.id;
+            this.OpOfficialActivitiesDto.translatorInfo.area=item.area;
+            this.OpOfficialActivitiesDto.translatorInfo.name=item.value;
+            this.OpOfficialActivitiesDto.translatorInfo.sex=item.sex;
+            this.OpOfficialActivitiesDto.translatorInfo.tel=item.tel;
+            this.OpOfficialActivitiesDto.translatorInfo.email=item.email;
+            this.OpOfficialActivitiesDto.translatorInfo.wechatNo=item.wechatNo;
+            this.OpOfficialActivitiesDto.translatorInfo.otherSocialAccounts=item.otherSocialAccounts;
+            this.OpOfficialActivitiesDto.translatorInfo.language=item.language;
+            this.OpOfficialActivitiesDto.translatorInfo.price=item.price;
+            this.OpOfficialActivitiesDto.translatorInfo.currency=item.currency;
         },
         //日期处理(日)
         TimeProcessingri(val){
@@ -641,14 +783,24 @@ 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,
-                    //     };
-                    // });
+                    let datainfo=res.data.data;
+                    that.currencyarr=datainfo.currencyData;
+                    // that.restaurants = res.data.data.translatorData;
+                    that.restaurants= datainfo.translatorData.map((terminal) => {
+                        return {
+                            id:terminal.id,
+                            value:terminal.name,
+                            area:terminal.area,
+                            sex:terminal.sex,
+                            tel:terminal.tel,
+                            email:terminal.email,
+                            wechatNo:terminal.wechatNo,
+                            otherSocialAccounts:terminal.otherSocialAccounts,
+                            language:terminal.language,
+                            price:terminal.price,
+                            currency:terminal.currency,
+                        };
+                    });
                     that.deleFile = res.data.data.deleFile;
                     that.deleFile.forEach(function (item) {
                         if (item.kind == 1) {
@@ -677,6 +829,7 @@ export default {
 
                     that.delegationInfoList = res.data.data.delegation;
                     that.OfficialFormList = res.data.data.setData;
+                    that.dataSourceList = res.data.data.dataSource;
                     if (that.OfficialFormList.length != 0) {
                         if(that.id!=that.id){
                             that.OpOfficialActivitiesDto.officialForm = that.OfficialFormList[0].id
@@ -821,7 +974,22 @@ export default {
                     that.OpOfficialActivitiesDto.area = dataList.area;
                     that.OpOfficialActivitiesDto.field = dataList.field;
                     that.OpOfficialActivitiesDto.reqSample = dataList.reqSample;
-                    that.confirmTheInvitation=dataList.confirmTheInvitation
+                    that.confirmTheInvitation=dataList.confirmTheInvitation;
+
+                    that.OpOfficialActivitiesDto.dataSource = dataList.dataSource;//来源
+
+
+                    that.OpOfficialActivitiesDto.translatorInfo.id = dataList.translatorInfo.id;//翻译详细
+                    that.OpOfficialActivitiesDto.translatorInfo.area = dataList.translatorInfo.area;
+                    that.OpOfficialActivitiesDto.translatorInfo.name = dataList.translatorInfo.name;
+                    that.OpOfficialActivitiesDto.translatorInfo.sex = dataList.translatorInfo.sex;
+                    that.OpOfficialActivitiesDto.translatorInfo.tel = dataList.translatorInfo.tel;
+                    that.OpOfficialActivitiesDto.translatorInfo.email = dataList.translatorInfo.email;
+                    that.OpOfficialActivitiesDto.translatorInfo.wechatNo = dataList.translatorInfo.wechatNo;
+                    that.OpOfficialActivitiesDto.translatorInfo.otherSocialAccounts = dataList.translatorInfo.otherSocialAccounts;
+                    that.OpOfficialActivitiesDto.translatorInfo.language = dataList.translatorInfo.language;
+                    that.OpOfficialActivitiesDto.translatorInfo.price = dataList.translatorInfo.price;
+                    that.OpOfficialActivitiesDto.translatorInfo.currency = dataList.translatorInfo.currency;
                     // that.fileList
                     that.fileList=[]
                     for(let i=0;i<dataList.screenshotOfMailUrls.length;i++){
@@ -845,6 +1013,41 @@ export default {
             this.OpOfficialActivitiesDto.date=this.TimeProcessingri(this.OpOfficialActivitiesDto.date)
             that.OpOfficialActivitiesDto.createUserId = that.userId
             that.OpOfficialActivitiesDto.diId = that.DiId
+
+            if(that.OpOfficialActivitiesDto.officialForm==384||that.OpOfficialActivitiesDto.officialForm==1337){
+                that.OpOfficialActivitiesDto.type='';
+                that.OpOfficialActivitiesDto.address='';
+                that.OpOfficialActivitiesDto.contact='';
+                that.OpOfficialActivitiesDto.job='';
+                that.OpOfficialActivitiesDto.tel='';
+                that.OpOfficialActivitiesDto.setting='';
+                that.OpOfficialActivitiesDto.dresscode='';
+                that.OpOfficialActivitiesDto.attendees='';
+                that.OpOfficialActivitiesDto.isNeedTrans=0;
+                that.OpOfficialActivitiesDto.translatorIdItem=[];
+                that.OpOfficialActivitiesDto.language='';
+                that.OpOfficialActivitiesDto.nature='';
+                that.OpOfficialActivitiesDto.emailOrWeChat='';
+                that.OpOfficialActivitiesDto.website='';
+                that.OpOfficialActivitiesDto.trip='';
+                that.OpOfficialActivitiesDto.isPay='';
+                that.OpOfficialActivitiesDto.isSubmitApproval='';
+                that.OpOfficialActivitiesDto.field='';
+                that.OpOfficialActivitiesDto.reqSample='';
+                that.OpOfficialActivitiesDto.dataSource='';
+                that.OpOfficialActivitiesDto.translatorInfo={};
+            }
+            if (that.OpOfficialActivitiesDto.isNeedTrans==0) {
+                that.OpOfficialActivitiesDto.translatorInfo={};
+            }
+
+            let filteredObjects = that.restaurants.filter(obj => 
+                 that.OpOfficialActivitiesDto.translatorInfo.name==obj.value
+                
+            );
+            if (filteredObjects.length<1) {
+                that.OpOfficialActivitiesDto.translatorInfo.id = 0;
+            }
             that.$refs.OpOfficialActivitiesDto.validate((valid) => {
                 if (valid) {
                     var url = "/api/Resource/OpOfficialActivities"
@@ -1183,6 +1386,11 @@ export default {
                     that.$message.error(res.data.msg);
                 }
             })
+        },
+        //控制表单
+        Officchange(val){
+            console.log(this.OpOfficialActivitiesDto.officialForm!=384,this.OpOfficialActivitiesDto.officialForm!=1337);
+            
         }
     },
 
@@ -1296,6 +1504,13 @@ export default {
     color: red;
     font-size: 12px;
 }
+::v-deep input[aria-hidden="true"] {
+    display: none !important;
+}
+ 
+::v-deep .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
+    box-shadow: none !important;
+}
 @media screen and (max-width: 1700px) {
     .appraise-box>div {
         width: 48%;

+ 11 - 5
src/router/index.js

@@ -124,11 +124,12 @@ import GroupUnreviewed from '@/components/Finance/GroupUnreviewed';
 import VisaCommission from '@/components/OP/VisaCommission';
 import SuppliesInventory from '@/components/OP/SuppliesInventory';
 import CardReconciliation from '@/components/Finance/CardReconciliation';
-import EvaluationForm from '@/components/EvaluationForm'
-import TranslatorBase from '@/components/Resource/TranslatorBase'
-import PerformanceT from '@/components/Resource/PerformanceT'
-import InsCountry from '@/components/Resource/InsCountry'
-import WorldMap from '@/components/ConferenceModule/WorldMap'
+import EvaluationForm from '@/components/EvaluationForm';
+import TranslatorBase from '@/components/Resource/TranslatorBase';
+import PerformanceT from '@/components/Resource/PerformanceT';
+import InsCountry from '@/components/Resource/InsCountry';
+import WorldMap from '@/components/ConferenceModule/WorldMap';
+import EntryDetailsdraft from '@/components/OP/EntryDetailsdraft';
 
 Vue.use(Router)
 
@@ -775,6 +776,11 @@ export default new Router({
           name: 'WorldMap',
           component: WorldMap
         },
+        {
+          path: '/home/EntryDetailsdraft',
+          name: 'EntryDetailsdraft',
+          component: EntryDetailsdraft
+        },
       ]
     },
     {