liuhj 8 meses atrás
pai
commit
f1a0930ecb

+ 2 - 0
src/components/Resource/OfficialActivities.vue

@@ -53,6 +53,8 @@
                     </el-table-column>
                     <el-table-column prop="createUserName" label="记录者">
                     </el-table-column>
+                    <el-table-column prop="nature" label="性质">
+                    </el-table-column>
                     <el-table-column prop="createTime" label="记录时间">
                     </el-table-column>
                     <el-table-column label="操作" width="280">

+ 37 - 3
src/components/Resource/OpOfficialActivities.vue

@@ -172,6 +172,24 @@
                             </el-radio-group>
                         </el-form-item>
                     </div>
+                    <div 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;">
+                        <el-form-item label="邮箱/微信:" prop="language" label-width="160px">
+                            <el-input clearable placeholder="邮箱/微信" v-model="OpOfficialActivitiesDto.emailOrWeChat">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 385px;">
+                        <el-form-item label="网址:" prop="language" 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;">
@@ -345,6 +363,9 @@ export default {
                 isNeedTrans: 0,
                 translators: "",
                 language: "",
+                nature: "",
+                emailOrWeChat: "",
+                website: "",
                 trip: "",
                 createUserId: 0,
                 isPay:0,
@@ -416,6 +437,18 @@ export default {
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
                 ],
+                nature: [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
+                emailOrWeChat: [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
+                website: [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
                 type: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
@@ -512,9 +545,7 @@ export default {
                         }
                     });
 
-                    console.log(that.uploadFiles1)
-                    console.log(that.uploadFiles2)
-                    console.log(that.uploadFiles3)
+
 
                     that.delegationInfoList = res.data.data.delegation;
                     that.OfficialFormList = res.data.data.setData;
@@ -649,6 +680,9 @@ export default {
                     that.OpOfficialActivitiesDto.isNeedTrans = dataList.isNeedTrans;
                     that.OpOfficialActivitiesDto.translators = dataList.translators;
                     that.OpOfficialActivitiesDto.language = dataList.language;
+                    that.OpOfficialActivitiesDto.nature = dataList.nature;
+                    that.OpOfficialActivitiesDto.emailOrWeChat = dataList.emailOrWeChat;
+                    that.OpOfficialActivitiesDto.website = dataList.website;
                     that.OpOfficialActivitiesDto.trip = dataList.trip;
                     that.OpOfficialActivitiesDto.createUserId = dataList.createUserId;
                     that.OpOfficialActivitiesDto.remark = dataList.remark;