0919quxiaolunxue

src/components/OP/HotelReservations.vue

@@ -82,24 +82,61 @@
             </div>
             <div class="hotelr-form">
                 <div class="form-head">
-                    <el-popover placement="right" trigger="hover">
-                        <div>币种：{{bizhong}}&nbsp;&nbsp;&nbsp;汇率：{{fournum(huilv)}}</div>
-                        <el-table :data="budgeting" border>
-                            <el-table-column width="50" property="day" label="天数"></el-table-column>
-                            <el-table-column width="100" property="date" label="日期"></el-table-column>
-                            <el-table-column width="300" property="accon" label="酒店名称"></el-table-column>
-                            <el-table-column width="300" property="itin" label="行程描述"></el-table-column>
-                            <el-table-column width="110" property="sgr" label="单人间(SGR)"></el-table-column>
-                            <el-table-column width="100" property="tbr" label="双人(TBR)"></el-table-column>
-                            <el-table-column width="100" property="jS_ES" label="套间(JS_ES)"></el-table-column>
-                            <el-table-column width="115" label="套房(SUITE)">
-                                <template slot-scope="scope">
-                                    {{ townum(scope.row.suite) }}
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                        <el-button slot="reference">移上提示每天详细房价</el-button>
-                    </el-popover>
+                    <div style="display: flex;align-items: center;">
+                        <el-popover placement="right" trigger="hover">
+                            <div>币种：{{bizhong}}&nbsp;&nbsp;&nbsp;汇率：{{fournum(huilv)}}</div>
+                            <el-table :data="budgeting" border>
+                                <el-table-column width="50" property="day" label="天数"></el-table-column>
+                                <el-table-column width="100" property="date" label="日期"></el-table-column>
+                                <el-table-column width="300" property="accon" label="酒店名称"></el-table-column>
+                                <el-table-column width="300" property="itin" label="行程描述"></el-table-column>
+                                <el-table-column width="110" property="sgr" label="单人间(SGR)"></el-table-column>
+                                <el-table-column width="100" property="tbr" label="双人(TBR)"></el-table-column>
+                                <el-table-column width="100" property="jS_ES" label="套间(JS_ES)"></el-table-column>
+                                <el-table-column width="115" label="套房(SUITE)">
+                                    <template slot-scope="scope">
+                                        {{ townum(scope.row.suite) }}
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <el-button slot="reference">移上提示每天详细房价</el-button>
+                        </el-popover>
+                        <!-- 客户名单 -->
+                        <el-popover
+                        placement="bottom"
+                        width="662"
+                        trigger="hover">
+                            <el-table max-height="600" border :data="rollcallarr">
+                                <el-table-column width="100" property="date" label="姓名">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.lastName}}{{scope.row.firstName}}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="200" property="lastName" label="拼音">
+                                    <template slot-scope="scope">
+                                        {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="50" property="sex" label="性别">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.sex==0?'男':'女'}}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="110" property="birthDay" label="生日">
+                                    <template slot-scope="scope">
+                                        {{ fgarr(scope.row.birthDay) }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="200" property="idCardNo" label="身份证号码">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.idCardNo }}
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <el-button style="margin-left: 10px;" slot="reference">移上查看客户名单</el-button>
+                            <!-- <span slot="reference" style="cursor: pointer;margin-left: 20px;">"移上查看客户名单"</span> -->
+                        </el-popover>
+                    </div>
                     <div class="form-head-btn">
                         <el-button type="primary" @click="DownloadVOUCHER">VOUCHER</el-button>
                         <el-button type="primary" @click="ConfirmWord">确认单</el-button>
@@ -814,6 +851,7 @@
 import { el } from '@fullcalendar/core/internal-common';
 import { set } from 'vue';
 import {debounce} from '../../store/statice'
+import { pinyin } from 'pinyin-pro';
 export default {
     data() {
         return {
@@ -1071,9 +1109,19 @@ export default {
             },
             currencyarrs:[],
             currencyarrss:[],
+            rollcallarr:[],
         }
     },
     methods: {
+        //拼音
+        pinyingxing(val){
+            return pinyin(val, { toneType: 'none' }).toUpperCase();
+        },
+        //fenge
+        fgarr(val){
+            val=val+""
+            return val.split(' ')[0]
+        },
         //保留两位小数
         townum(val){
             return val.toFixed(2)
@@ -1117,6 +1165,31 @@ export default {
         handleCurrentChange(val) {
             this.currentPage = val;
         },
+        //获取客户名单info
+        PostTourClientListByDiId(val) {
+            this.rollcallarr=[];
+            var that = this
+            var url = "/api/Groups/PostTourClientListByDiId"
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    portType:1,
+                    diid: val?val:that.OpHotelReservationsData.diId,
+                    pageId:104,
+                    userId:233
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.rollcallarr=res.data.data;
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         //获取ctable
         PostPageLinkCTable() {
             var url = "/api/Business/PostPageLinkCTable"
@@ -1183,6 +1256,9 @@ export default {
                         }
                     }
                     that.PostHotelReservationsItemsByDiId()
+                    setTimeout(function() {
+                        that.PostTourClientListByDiId();
+                    }, 200);
                     // that.PostHotelReservationsBasicsDataInit()
                     // that.delegationInfo=
                 }
@@ -1192,14 +1268,9 @@ export default {
         },
         //获取酒店表格
         PostHotelReservationsItemsByDiId() {
+            this.loading=true;
             var url = "/api/Groups/PostHotelReservationsItemsByDiId"
             var that = this
-            var data= {
-                    portType:1,
-                    userId:that.userId,
-                    pageId:that.pageId,
-                    diId:that.OpHotelReservationsData.diId
-                }
             that.tableDatas=[];
             this.$axios({
                 method: 'post',
@@ -1216,9 +1287,10 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.PostHotelReservationsBasicsDataInit()
-                    that.tableDatas=res.data.data
+                    that.tableDatas=res.data.data;
                 }
             }).catch(function (error) {
+                that.loading=false;
                 that.$message.error("获取酒店表格失败");
             });
         },
@@ -1299,8 +1371,10 @@ export default {
                         that.landtaxobj.payDId=that.payment[0].id;//地税支付方式
                         that.Hotelbreakfastobj.payDId=that.payment[0].id;//酒店早餐支付方式
                     }
+                    that.loading=false;
                 }
             }).catch(function (error) {
+                that.loading=false;
                 that.$message.error("获取基础数据失败");
             });
         },
@@ -2059,12 +2133,13 @@ export default {
             }
         },
         //切换团组
-        delegationSelectChange() {
+        delegationSelectChange(val) {
             this.delegationInfo=[];
             
             this.PostGroupListByCTableAndUserId();
             this.AddToggle();
             this.getcostbudgeting();
+            this.PostTourClientListByDiId(val);
         },
         
        

src/components/OP/OpAirTicketRes.vue

@@ -22,6 +22,40 @@
                         </el-table>
                         <span slot="reference" style="cursor: pointer;">"移上查看详细"</span>
                     </el-popover>
+                    <!-- 客户名单 -->
+                    <el-popover
+                    placement="bottom"
+                    width="662"
+                    trigger="hover">
+                        <el-table max-height="600" border :data="rollcallarr">
+                            <el-table-column width="100" property="date" label="姓名">
+                                <template slot-scope="scope">
+                                    {{ scope.row.lastName}}{{scope.row.firstName}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="200" property="lastName" label="拼音">
+                                <template slot-scope="scope">
+                                    {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="50" property="sex" label="性别">
+                                <template slot-scope="scope">
+                                    {{ scope.row.sex==0?'男':'女'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="110" property="birthDay" label="生日">
+                                <template slot-scope="scope">
+                                    {{ fgarr(scope.row.birthDay) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="200" property="idCardNo" label="身份证号码">
+                                <template slot-scope="scope">
+                                    {{ scope.row.idCardNo }}
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <span slot="reference" style="cursor: pointer;margin-left: 20px;">"移上查看客户名单"</span>
+                    </el-popover>
                 </div>
             </div>
             <div v-if="budgeting.length<=1">
@@ -37,12 +71,80 @@
                         </el-table>
                         <span slot="reference" style="cursor: pointer;">"移上查看详细"</span>
                     </el-popover>
+                    <!-- 客户名单 -->
+                    <el-popover
+                    placement="bottom"
+                    width="662"
+                    trigger="hover">
+                        <el-table max-height="600" border :data="rollcallarr">
+                            <el-table-column width="100" property="date" label="姓名">
+                                <template slot-scope="scope">
+                                    {{ scope.row.lastName}}{{scope.row.firstName}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="200" property="lastName" label="拼音">
+                                <template slot-scope="scope">
+                                    {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="50" property="sex" label="性别">
+                                <template slot-scope="scope">
+                                    {{ scope.row.sex==0?'男':'女'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="110" property="birthDay" label="生日">
+                                <template slot-scope="scope">
+                                    {{ fgarr(scope.row.birthDay) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="200" property="idCardNo" label="身份证号码">
+                                <template slot-scope="scope">
+                                    {{ scope.row.idCardNo }}
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <span slot="reference" style="cursor: pointer;margin-left: 20px;">"移上查看客户名单"</span>
+                    </el-popover>
                 </div>
             </div>
-            <div v-if="budgeting.length==0">
+            <div v-if="budgeting.length==0" style="display: flex;align-items: center;">
                 <div class="opcostbudgeting-li">
                     未设置团组成本或成本未通知
                 </div>
+                <!-- 客户名单 -->
+                <el-popover
+                placement="bottom"
+                width="662"
+                trigger="hover">
+                    <el-table max-height="600" border :data="rollcallarr">
+                        <el-table-column width="100" property="date" label="姓名">
+                            <template slot-scope="scope">
+                                {{ scope.row.lastName}}{{scope.row.firstName}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="200" property="lastName" label="拼音">
+                            <template slot-scope="scope">
+                                {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="50" property="sex" label="性别">
+                            <template slot-scope="scope">
+                                {{ scope.row.sex==0?'男':'女'}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="110" property="birthDay" label="生日">
+                            <template slot-scope="scope">
+                                {{ fgarr(scope.row.birthDay) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="200" property="idCardNo" label="身份证号码">
+                            <template slot-scope="scope">
+                                {{ scope.row.idCardNo }}
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <span slot="reference" style="cursor: pointer;margin-left: 20px;">"移上查看客户名单"</span>
+                </el-popover>
             </div>
         </div>
         <!-- <div style="display: flex;">
@@ -434,6 +536,7 @@
     </div>
 </template>
 <script>
+import { pinyin } from 'pinyin-pro';
 export default {
     data() {
         return {
@@ -564,10 +667,20 @@ export default {
             },
             IsAuditGM: 0,
             rateList: [],
-            budgeting:[]
+            budgeting:[],
+            rollcallarr:[],
         }
     },
     methods: {
+        //拼音
+        pinyingxing(val){
+            return pinyin(val, { toneType: 'none' }).toUpperCase();
+        },
+        //fenge
+        fgarr(val){
+            val=val+""
+            return val.split(' ')[0]
+        },
         //保留两位小数
         townum(val){
             return val.toFixed(2)
@@ -605,16 +718,43 @@ export default {
                     that.airTicketAgents = res.data.data.airTicketAgents//合作方资料下拉框
                     that.DiIdSelect = parseInt(that.DiId); //选中团组
                     that.getcostbudgeting();
+                    that.PostTourClientListByDiId();
                     //that.QueryTankType();
                 }
 
             })
         },
+        //获取客户名单info
+        PostTourClientListByDiId(val) {
+            this.rollcallarr=[];
+            var that = this
+            var url = "/api/Groups/PostTourClientListByDiId"
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    portType:1,
+                    diid: val?val:that.DiId,
+                    pageId:104,
+                    userId:that.userId
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.rollcallarr=res.data.data;
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         //团组切换
-        AirTicketResChange() {
+        AirTicketResChange(val) {
             this.getcostbudgeting();
             this.AirTicketResList();
             this.QueryClient();
+            this.PostTourClientListByDiId(val);
         },
         //获取成本提示
         getcostbudgeting(){

src/components/OP/OpInvitationOfficialActivities.vue

@@ -4,40 +4,77 @@
             <div class="communal-title">
                 <div>{{ title }}</div>
             </div>
-            <el-popover placement="right" trigger="hover">
-                <el-table height="700" :data="budgeting" border>
-                    <el-table-column width="100" property="date" label="日期"></el-table-column>
-                    <el-table-column width="120" label="会务活动费">
-                        <template slot-scope="scope">
-                            <span>
-                                {{ townum(scope.row.officialActivitiesFee)+'  '+ bizhong }}
-                            </span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="120" label="公务翻译费">
-                        <template slot-scope="scope">
-                            <span>
-                                {{ townum(scope.row.officialTransFee)+'  '+ bizhong }}
-                            </span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="120" label="邀请函费用">
-                        <template slot-scope="scope">
-                            <span>
-                                {{ townum(scope.row.invitationFee) +'  '+ bizhong }}
-                            </span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="120" label="会务费">
-                        <template slot-scope="scope">
-                            <span>
-                                {{ townum(scope.row.activitiesFee)+'  ' + bizhong }}
-                            </span>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-button type="primary" slot="reference">移上提示成本</el-button>
-            </el-popover>
+            <div style="display: flex;align-items: center;">
+                <el-popover placement="right" trigger="hover">
+                    <el-table height="700" :data="budgeting" border>
+                        <el-table-column width="100" property="date" label="日期"></el-table-column>
+                        <el-table-column width="120" label="会务活动费">
+                            <template slot-scope="scope">
+                                <span>
+                                    {{ townum(scope.row.officialActivitiesFee)+'  '+ bizhong }}
+                                </span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="公务翻译费">
+                            <template slot-scope="scope">
+                                <span>
+                                    {{ townum(scope.row.officialTransFee)+'  '+ bizhong }}
+                                </span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="邀请函费用">
+                            <template slot-scope="scope">
+                                <span>
+                                    {{ townum(scope.row.invitationFee) +'  '+ bizhong }}
+                                </span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="会务费">
+                            <template slot-scope="scope">
+                                <span>
+                                    {{ townum(scope.row.activitiesFee)+'  ' + bizhong }}
+                                </span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <el-button type="primary" slot="reference">移上提示成本</el-button>
+                </el-popover>
+                <!-- 客户名单 -->
+                <el-popover
+                placement="bottom"
+                width="662"
+                trigger="hover">
+                    <el-table max-height="600" border :data="rollcallarr">
+                        <el-table-column width="100" property="date" label="姓名">
+                            <template slot-scope="scope">
+                                {{ scope.row.lastName}}{{scope.row.firstName}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="200" property="lastName" label="拼音">
+                            <template slot-scope="scope">
+                                {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="50" property="sex" label="性别">
+                            <template slot-scope="scope">
+                                {{ scope.row.sex==0?'男':'女'}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="110" property="birthDay" label="生日">
+                            <template slot-scope="scope">
+                                {{ fgarr(scope.row.birthDay) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="200" property="idCardNo" label="身份证号码">
+                            <template slot-scope="scope">
+                                {{ scope.row.idCardNo }}
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <el-button style="margin-left: 10px;" slot="reference">移上查看客户名单</el-button>
+                    <!-- <span slot="reference" style="cursor: pointer;margin-left: 20px;">"移上查看客户名单"</span> -->
+                </el-popover>
+            </div>
         </div>
         <hr style='background-color:#5555; height:1px; border:none;margin: 10px 0;' />
         <div style="padding-top: 10px;">
@@ -349,6 +386,7 @@
     </div>
 </template>
 <script>
+import { pinyin } from 'pinyin-pro';
 export default {
     data() {
         return {
@@ -503,9 +541,19 @@ export default {
             rateList: [],
             budgeting:[],
             bizhong:'',
+            rollcallarr:[],
         }
     },
     methods: {
+        //拼音
+        pinyingxing(val){
+            return pinyin(val, { toneType: 'none' }).toUpperCase();
+        },
+        //fenge
+        fgarr(val){
+            val=val+""
+            return val.split(' ')[0]
+        },
         //保留两位小数
         townum(val) {
             if (val == 0.00) {
@@ -562,6 +610,31 @@ export default {
                 }
             })
         },
+        //获取客户名单info
+        PostTourClientListByDiId(val) {
+            this.rollcallarr=[];
+            var that = this
+            var url = "/api/Groups/PostTourClientListByDiId"
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    portType:1,
+                    diid: val?val:that.DiIdSelect,
+                    pageId:104,
+                    userId:233
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.rollcallarr=res.data.data;
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         //获取成本提示
         getcostbudgeting() {
             this.budgeting = [];
@@ -613,6 +686,7 @@ export default {
                             break;
                         }
                     }
+                    // that.PostTourClientListByDiId();
                     // that.payment = res.data.data.payment
                 }
             })
@@ -858,7 +932,7 @@ export default {
             }
             // 此时必填完成，做保存后的业务操作
         },
-        DecreasePaymentsChange() {
+        DecreasePaymentsChange(val) {
             for (let index = 0; index < this.delegationInfoList.length; index++) {
                 if (this.delegationInfoList[index].id == parseInt(this.DiIdSelect)) {
                     this.delegationInfo = this.delegationInfoList[index];
@@ -866,8 +940,10 @@ export default {
                 }
             }
             this.QueryRate();
+            // this.PostTourClientListByDiId(val);
+            // setTimeout(function(){
+            // },200)
         },
-
         //上传
         // 文件超出限制
         exceed(files, fileList) {
@@ -960,15 +1036,7 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    //汇率
-                    // console.log("汇率--", res.data.data);
                     that.rateList = res.data.data.teamRates;
-                    // console.log(that.rateList[0].currencyId)
-                    // that.InvitationOfficialActivities.inviteCurrency=that.rateList[0].currencyId;
-                    // that.InvitationOfficialActivities.eventsCurrency=that.rateList[0].currencyId;
-                    // that.InvitationOfficialActivities.translateCurrency=that.rateList[0].currencyId;
-                    // that.InvitationOfficialActivities.sendCurrency=that.rateList[0].currencyId;
-                    // that.InvitationOfficialActivities.paymentCurrency=that.rateList[0].currencyId;
                     that.getcostbudgeting()
                 }
             })

src/components/OP/SuppliesInventory.vue

@@ -1,6 +1,14 @@
 <template>
     <div class="SuppliesInventory-all">
         <el-dialog top="10vh" class="Approval-dialog" width="1100px" title="领用审核" :visible.sync="ApprovalVisible">
+            <el-select @change="typevaluechange" style="width: 150px;margin-bottom: 10px;" size="small" v-model="typevalue" placeholder="请选择">
+                <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+            </el-select>
             <div class="Approval-table">
                 <el-table
                     :data="ApprovalData"
@@ -450,7 +458,7 @@
                 </el-table-column>
                 <el-table-column
                 prop="typeName"
-                label="物品类型"
+                label="物品详细类型"
                 width="180">
                 </el-table-column>
                 <el-table-column
@@ -603,6 +611,7 @@ export default {
                     { required: true, message: '请输入', trigger: 'blur' },
                 ],
             },
+            typevalue:'',
             //领用参数
             ClaimitemVisible:false,
             ClaimitemData:[],
@@ -629,6 +638,24 @@ export default {
             },
             Claimitemlabel:'',
             //审核参数
+            options:[
+                {
+                    value: '',
+                    label: '全部'
+                },
+                {
+                    value: 0,
+                    label: '待审核'
+                },
+                {
+                    value: 1,
+                    label: '审核通过'
+                },
+                {
+                    value: 2,
+                    label: '未通过'
+                },
+            ],
             ApprovalVisible:false,
             ApprovalData:[],
             //shqx
@@ -679,7 +706,7 @@ export default {
             })
         },
         //物资类型切换
-        MaterialTypechange(){
+        MaterialTypechange(val){
             this.MaterialinfoType="";
             this.MaterialinfoTypearr=[];
             for(let i=0;i<this.MaterialTypearr.length;i++){
@@ -687,6 +714,9 @@ export default {
                     this.MaterialinfoTypearr=this.MaterialTypearr[i].subTypeItems;
                 }
             }
+            if(val==undefined){
+                this.GoodsList();
+            }
         },
         //物资详情选择
         MaterialinfoTypechange(){
@@ -964,6 +994,7 @@ export default {
                     });
                     that.instorage({'id':that.ID});
                     that.resetForm('warehousingsruleForm');
+                    that.GoodsList();
                 }else{
                     that.$message.error(res.data.msg);
                 }
@@ -1070,6 +1101,10 @@ export default {
             this.ClaimsruleForm.id=0;
             this.$refs[formName].resetFields();
         },
+        //审核状态切换
+        typevaluechange(){
+            this.GoodsReceiveLists()
+        },
         //领用审核列表
         GoodsReceiveLists(){
             this.ApprovalData=[];
@@ -1087,7 +1122,12 @@ export default {
                     pageIndex:that.ApprovalcurrentPage,
                     pageSize:that.Approvalpagesize,
                     goodsId:0,
-                    currUserId:0,
+                    userLabel:'',
+                    goodsName:'',
+                    beginDt:'',
+                    endDt:'',
+                    typeLabel:'',
+                    auditLabel:that.typevalue+'',
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -1124,7 +1164,12 @@ export default {
                     pageIndex:that.ClaimitemcurrentPage,
                     pageSize:that.Claimitempagesize,
                     goodsId:row.id,
-                    currUserId:that.Userid,
+                    userLabel:that.Userid+'',
+                    goodsName:'',
+                    beginDt:'',
+                    endDt:'',
+                    typeLabel:'',
+                    auditLabel:'',
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -1455,4 +1500,8 @@ export default {
     text-align: center;
     margin-top: 10px;
 }
+.Approval-dialog .el-dialog__body{
+    padding-top: 0px;
+    
+}
 </style>

src/components/Resource/OpOfficialActivities.vue

@@ -151,7 +151,7 @@
                         </el-form-item>
                     </div>
                     <div style="width: 385px;">
-                        <el-form-item label="翻译语种:" prop="language" label-width="160px">
+                        <el-form-item label="翻译语种:" :prop="OpOfficialActivitiesDto.isNeedTrans==0?'':'language'" label-width="160px">
                             <el-input clearable placeholder="翻译语种" v-model="OpOfficialActivitiesDto.language">
                             </el-input>
                         </el-form-item>

src/components/home.vue

@@ -677,13 +677,13 @@ export default {
     
     this.PotsMsgTypeData();
 
-    let timer = setInterval(() => {
-      this.PotsMessageUnreadTotalCount();
-    }, 10000)
-    this.$once('hook:beforeDestroy', () => {
-      clearInterval(timer)
-      timer = null
-    })
+    // let timer = setInterval(() => {
+    //   this.PotsMessageUnreadTotalCount();
+    // }, 10000)
+    // this.$once('hook:beforeDestroy', () => {
+    //   clearInterval(timer)
+    //   timer = null
+    // })
     // setTimeout(this.PotsMessagePageList(),500)
     // this.setIntervaltime();
     // setInterval(this.PotsMessageUnreadTotalCount, 10000);