公务部分修改

src/components/Resource/OfficialActivities.vue

@@ -32,7 +32,7 @@
                     <span style="font-weight: bold;">出访国家：</span>
                     {{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;
                     <span style="font-weight: bold;">起止日期：</span>
-                    {{ delegationInfo.visitStartDate|capitalize }}~{{ delegationInfo.visitEndDate|capitalize
+                    {{ delegationInfo.visitStartDate | capitalize }}~{{ delegationInfo.visitEndDate | capitalize
                     }}&nbsp;&nbsp;&nbsp;
                     <span style="font-weight: bold;">天数/人数：</span>
                     {{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人
@@ -56,16 +56,19 @@
                     </el-table-column>
                     <el-table-column prop="createUserName" label="记录者">
                     </el-table-column>
-                    <el-table-column prop="nature" label="性质">
+                    <!-- <el-table-column prop="nature" label="性质">
+                    </el-table-column> -->
+                    <el-table-column prop="officialFormName" label="公务形式">
                     </el-table-column>
                     <el-table-column prop="createTime" label="记录时间">
                     </el-table-column>
                     <el-table-column prop="confirmTheInvitation" label="复核确认" width="80">
                         <template slot-scope="scope">
-                            <span style="font-size: 20px;" :style="scope.row.confirmTheInvitation==0?'color: #555;':'color: #00cb00;'">
-                                {{ scope.row.confirmTheInvitation==0?'-':'✓' }}
+                            <span style="font-size: 20px;"
+                                :style="scope.row.confirmTheInvitation == 0 ? 'color: #555;' : 'color: #00cb00;'">
+                                {{ scope.row.confirmTheInvitation == 0 ? '-' : '✓' }}
                             </span>
-                            
+
                         </template>
                     </el-table-column>
                     <el-table-column label="操作" width="280">
@@ -83,17 +86,10 @@
                 </el-pagination>
             </div>
         </div>
-        <el-dialog title="导出公务出访" width="400px" :visible.sync="dialogFormVisible"  :close-on-click-modal="false">
+        <el-dialog title="导出公务出访" width="400px" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
             <el-form>
-                <el-date-picker
-                v-model="valuedate"
-                type="daterange"
-                align="right"
-                unlink-panels
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :picker-options="pickerOptions">
+                <el-date-picker v-model="valuedate" type="daterange" align="right" unlink-panels range-separator="至"
+                    start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
                 </el-date-picker>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -116,12 +112,12 @@ export default {
             token: '',
             userId: 0,
             DiId: '',
-            diids:'',
+            diids: '',
             delegationInfoList: [],
             delegationInfo: {},
-            dialogFormVisible:false,
-            valuedate:'',
-            fullscreenLoading:false,
+            dialogFormVisible: false,
+            valuedate: '',
+            fullscreenLoading: false,
             pickerOptions: {
                 shortcuts: [{
                     text: '最近一周',
@@ -153,12 +149,12 @@ export default {
     },
     methods: {
         //处理日期
-        datetime(val){
-            var date=new Date(val);
-            var y=date.getFullYear();
-            var m=date.getMonth()+1>=10?date.getMonth()+1:'0'+(date.getMonth()+1).toString();
-            var d=date.getDate()>=10?date.getDate():'0'+(date.getDate()).toString();
-            return y+'-'+m+'-'+d
+        datetime(val) {
+            var date = new Date(val);
+            var y = date.getFullYear();
+            var m = date.getMonth() + 1 >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1).toString();
+            var d = date.getDate() >= 10 ? date.getDate() : '0' + (date.getDate()).toString();
+            return y + '-' + m + '-' + d
         },
         //每页条数改变时触发 选择一页显示多少行
         handleSizeChange(val) {
@@ -171,7 +167,7 @@ export default {
         },
         //团组下拉框
         OfficialActivitiesGroupNameList() {
-            this.fullscreenLoading=true;
+            this.fullscreenLoading = true;
             var url = "/api/Resource/OfficialActivitiesGroupNameList"
             var that = this
             this.$axios({
@@ -189,26 +185,26 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.delegationInfoList = res.data.data;
-                    if(that.diids!=that.diids){
+                    if (that.diids != that.diids) {
                         that.DiId = that.delegationInfoList[0].id;
                         that.delegationInfo = that.delegationInfoList[0];
-                    }else{
-                        that.DiId=that.diids;
+                    } else {
+                        that.DiId = that.diids;
                     }
-                    that.fullscreenLoading=false;
+                    that.fullscreenLoading = false;
                     that.delegationSelectChange();
                     // that.QueryOfficialActivitiesByDiId();
-                }else{
-                    that.fullscreenLoading=false;
+                } else {
+                    that.fullscreenLoading = false;
                 }
             }).catch(function (error) {
-                that.fullscreenLoading=false;
+                that.fullscreenLoading = false;
                 that.$message.error("网络错误，请稍后重试");
             });
         },
         //团组下拉框
         GetGroupAllList() {
-            this.fullscreenLoading=true;
+            this.fullscreenLoading = true;
             var url = "/api/Resource/GetGroupAllList"
             var that = this
             this.$axios({
@@ -225,20 +221,20 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.delegationInfoList = res.data.data.delegation;
-                    if(that.diids!=that.diids){
+                    if (that.diids != that.diids) {
                         that.DiId = that.delegationInfoList[0].id;
                         that.delegationInfo = that.delegationInfoList[0];
-                    }else{
-                        that.DiId=that.diids;
+                    } else {
+                        that.DiId = that.diids;
                     }
-                    that.fullscreenLoading=false;
+                    that.fullscreenLoading = false;
                     that.delegationSelectChange();
                     // that.QueryOfficialActivitiesByDiId();
-                }else{
-                    that.fullscreenLoading=false;
+                } else {
+                    that.fullscreenLoading = false;
                 }
             }).catch(function (error) {
-                that.fullscreenLoading=false;
+                that.fullscreenLoading = false;
                 that.$message.error("网络错误，请稍后重试");
             });
         },
@@ -259,7 +255,7 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     window.open(res.data.data)
-                }else{
+                } else {
                     that.$message.error(res.data.msg);
                 }
             }).catch(function (error) {
@@ -277,8 +273,8 @@ export default {
         },
         //团组信息绑定
         QueryOfficialActivitiesByDiId() {
-            this.tableData=[];
-            this.tableDatas=[];
+            this.tableData = [];
+            this.tableDatas = [];
             var url = "/api/Resource/QueryOfficialActivitiesByDiId"
             var that = this
             if (that.DiId == "" && that.DiId == null && that.DiId == undefined) { that.DiId = 0 }
@@ -320,12 +316,12 @@ export default {
             })
 
         },
-        deriveclick(){
-            this.dialogFormVisible=true;
+        deriveclick() {
+            this.dialogFormVisible = true;
         },
-        Confirmexport(){
+        Confirmexport() {
             console.log(this.datetime(this.valuedate[0]));
-            
+
         },
         del(index, row) {
             this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
@@ -373,14 +369,14 @@ export default {
     },
     filters: {
         capitalize(val) {
-            if(val){
+            if (val) {
                 return val.split(" ")[0]
-            }else{
+            } else {
                 return val
             }
         }
     },
-    created(){
+    created() {
         this.diids = Number(this.$route.query.DiId);
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
@@ -388,7 +384,7 @@ export default {
         this.OfficialActivitiesGroupNameList();
     },
     mounted() {
-        
+
         //this.AirTicketResList()
     }
 }
@@ -421,10 +417,12 @@ export default {
     margin-left: 10px;
     padding: 8px 20px;
 }
-.communal-box-title{
+
+.communal-box-title {
     margin: 10px 0;
 }
-.communal-box-title span{
+
+.communal-box-title span {
     font-size: 16px;
     font-weight: 600;
     color: #555;