瀏覽代碼

04101123lhj

liuhj 1 年之前
父節點
當前提交
f11e0b5a0b

+ 23 - 0
src/components/Enroll.vue

@@ -445,6 +445,29 @@ export default {
       }).then(function (res) {
           if(res.data.code==200){
               console.log(res)
+              that.ruleForm= {
+                mandarinName: "",//中文名称
+                eflName: "",//英文名称
+                sex: "",//性别
+                email: "",//邮箱
+                phone: "",//手机号
+                urgentphone: "",//紧急电话
+                pass: "",//密码
+                checkPass: "",//确认密码
+                IDnumber: "",//身份证号
+                educated: "",//学历
+                specialized: "",//专业
+                school: "",//毕业院校
+                recruitment: "",//统招/成教
+                datebirth: "",//入职时间
+                homeAddress:"",//家庭地址
+                maritalstatus: "",//婚姻状况
+                address: "",//现在居住住址
+                corporation: "",//所属公司
+                division: "",//所属部门
+                posts:"",//职位
+                desc: "",//工作经历
+            },
               that.$notify({
                 title: '注册成功',
                 message: res.data.msg,

+ 2 - 2
src/components/Finance/DailyFeePayment.vue

@@ -67,8 +67,8 @@
             </div> -->
         </div>
         <el-row>
-            <el-button type="primary">导出费用</el-button>
-            <el-button type="primary">批量生成</el-button>
+            <!-- <el-button type="primary">导出费用</el-button>
+            <el-button type="primary">批量生成</el-button> -->
             <el-button @click="addDaily()" type="primary">新增数据</el-button>
           </el-row>
         <div class="dailyment-box">

+ 1 - 1
src/components/Finance/DailyFeeedit.vue

@@ -444,7 +444,7 @@ export default {
     .items-li .el-form-item{
         margin-bottom: 10px;
     }
-    .sub-box{
+    .dailyedit-box.sub-box{
         -ms-user-select: none;
         -khtml-user-select: none;
         -webkit-user-select: none;

+ 57 - 33
src/components/Finance/LncomingBills.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-loading.fullscreen.lock="fullscreenLoading">
         <div class="lncomingbill-all">
             <div class="lncomingbill-head">
                 <div class="lncomingbill-head-li">
@@ -54,14 +54,28 @@
                 style="width: 100%;"
                 >
                     <el-table-column
-                    prop="addingModeName"
                     label="增加方式"
-                    width="100">
+                    width="150">
+                        <template slot-scope="scope">
+                            <el-select filterable v-model="scope.row.addingWay">
+                                <el-option label="账单模块" :value=0></el-option>
+                                <el-option label="成本预算模块" :value=1></el-option>
+                            </el-select>
+                        </template>
                     </el-table-column>
                     <el-table-column
                     prop="createTime"
                     label="时间"
-                    width="100">
+                    width="200">
+                        <template slot-scope="scope">
+                            <el-date-picker
+                            style="width: 100%;"
+                            v-model="scope.row.createTime"
+                            type="datetime"
+                            format="yyyy-MM-dd HH:mm"
+                            placeholder="选择日期">
+                            </el-date-picker>
+                        </template>
                     </el-table-column>
                     <el-table-column
                     label="费用名称"
@@ -165,7 +179,7 @@ export default {
             ],
             currencyoptions:[],
             groupInfo:{},
-
+            fullscreenLoading:false,
         }
     },
     methods:{
@@ -190,6 +204,8 @@ export default {
         },
         //获取收款账单详情
         PostGroupReceivablesInfoByDiId(){
+            this.tableData=[];
+            this.fullscreenLoading=true;
             var url = "/api/Financial/PostGroupReceivablesInfoByDiId"
             var that = this
             this.$axios({
@@ -204,8 +220,14 @@ export default {
                 }
             }).then(function (res) {
                 console.log(res)
-                that.tableData=res.data.data.groupCollectionStatementData
-                that.groupInfo=res.data.data.groupInfo
+                if(res.data.code){
+                    that.tableData=res.data.data.groupCollectionStatementData;
+                    that.groupInfo=res.data.data.groupInfo;
+                    setTimeout(function(){that.fullscreenLoading=false;},0)
+                }else{
+                    setTimeout(function(){that.fullscreenLoading=false;},0)
+                }
+                
             })
         },
         //切换团组
@@ -216,6 +238,7 @@ export default {
         addition(){
             var newinif={
                 id: 0,
+                createTime:new Date(),//时间
                 priceName: "",//费用名称
                 price: 0,//费用
                 count: 0,//数量
@@ -226,32 +249,33 @@ export default {
                 addingWay:0,//添加方式
                 remark:""//备注
             }
-            var url = "/api/Financial/PostReceivablesSave"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data:{
-                    portType: 1,
-                    diId: that.value,
-                    userId:that.userid,
-                    foreignReceivablesInfos:[newinif]
-                }
-            }).then(function (res) {
-                if(res.data.code==200){
-                    that.$message({
-                        message: res.data.msg,
-                        type: 'success'
-                    });
-                    console.log(res)
-                    that.PostGroupReceivablesInfoByDiId()
-                }else{
-                    that.$message.error('添加失败!数据异常');
-                }
-            })
+            this.tableData.push(newinif)
+            // var url = "/api/Financial/PostReceivablesSave"
+            // var that = this
+            // this.$axios({
+            //     method: 'post',
+            //     url: url,
+            //     headers: {
+            //         Authorization: 'Bearer ' + this.token
+            //     },
+            //     data:{
+            //         portType: 1,
+            //         diId: that.value,
+            //         userId:that.userid,
+            //         foreignReceivablesInfos:[newinif]
+            //     }
+            // }).then(function (res) {
+            //     if(res.data.code==200){
+            //         that.$message({
+            //             message: res.data.msg,
+            //             type: 'success'
+            //         });
+            //         console.log(res)
+            //         that.PostGroupReceivablesInfoByDiId()
+            //     }else{
+            //         that.$message.error('添加失败!数据异常');
+            //     }
+            // })
         },
         //对外收款账单删除
         handleDelete(index, row,rows) {

+ 38 - 35
src/components/Finance/PayReceived.vue

@@ -158,15 +158,17 @@ export default {
             options:[],
             currencyoptions:[],
             UnassignedData:[
-                {
-                    sectionTime:'',
-                    client:'',
-                    price:'',
-                    customerName:'',
-                    currency:'',
-                    receivablesType:'',
-                    remark:""
-                }
+                // {
+                //     id: 0,
+                //     sectionTime: "",//费用名称
+                //     price: 0,//费用
+                //     currency:836,//币种
+                //     receivablesType:72,//收款类型
+                //     client:'',//收款单位
+                //     customerName:'',//收款单位 负责人 姓名
+                //     customerTel:'',//收款单位 负责人 电话号码
+                //     remark:""//备注
+                // }
             ],
             typeoptions:[],
             groupInfo:{
@@ -295,32 +297,33 @@ export default {
                 customerTel:'',//收款单位 负责人 电话号码
                 remark:""//备注
             }
-            var url = "/api/Financial/PostAmountReceivedAddOrEdit"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data:{
-                    portType: 1,
-                    diId: that.value,
-                    userId:that.userid,
-                    _ProceedsReceivedInfos:[newinif]
-                }
-            }).then(function (res) {
-                if(res.data.code==200){
-                    that.$message({
-                        message: res.data.msg,
-                        type: 'success'
-                    });
-                    console.log(res)
-                    that.PostAmountReceived()
-                }else{
-                    that.$message.error('添加失败!数据异常');
-                }
-            })
+            this.UnassignedData.push(newinif)
+            // var url = "/api/Financial/PostAmountReceivedAddOrEdit"
+            // var that = this
+            // this.$axios({
+            //     method: 'post',
+            //     url: url,
+            //     headers: {
+            //         Authorization: 'Bearer ' + this.token
+            //     },
+            //     data:{
+            //         portType: 1,
+            //         diId: that.value,
+            //         userId:that.userid,
+            //         _ProceedsReceivedInfos:[newinif]
+            //     }
+            // }).then(function (res) {
+            //     if(res.data.code==200){
+            //         that.$message({
+            //             message: res.data.msg,
+            //             type: 'success'
+            //         });
+            //         console.log(res)
+            //         that.PostAmountReceived()
+            //     }else{
+            //         that.$message.error('添加失败!数据异常');
+            //     }
+            // })
         },
         //保存已收款项
         ysSaveition(){

+ 8 - 6
src/components/Login.vue

@@ -15,7 +15,7 @@
         </div>
         <div class="login-dominant">
             <div class="login-box">
-                <div class="login-title">泛美国际 - AI智能办公系统</div>
+                <div class="login-title">泛美OA办公系统</div>
                 <div class="login-input">
                     <el-input @keyup.enter.native="Login()" class="accounts" placeholder="请输入您的账户" v-model="usernum">
                         <i slot="prefix" class="iconfont el-input__icon icon-zhanghu"></i>
@@ -29,9 +29,9 @@
                             <span class="two" @click="ckxclick"></span>
                             <label for="ckxjz">记住账户</label>
                         </div>
-                        <div class="fotger-pass">
+                        <!-- <div class="fotger-pass">
                             忘记密码?
-                        </div>
+                        </div> -->
                     </div>
                     <div class="loginbtn-box">
                         <el-button  @click="Login()" class="loginbtn"
@@ -43,7 +43,7 @@
         </div>
         <div class="fout-box">
             PAN AMEPICAN INTERNATIONAL OA AI SYSTEM<br>
-            © 2023 PAN AMEPICAN INTERNATIONAL CORPOPATION.ALL Rights Reserved.
+            © 2024 PAN AMEPICAN INTERNATIONAL CORPOPATION.ALL Rights Reserved.
         </div>
     </div>
 </template>
@@ -187,7 +187,7 @@ export default {
     border: 1px solid #FFF;
     background-color: transparent;
     position: absolute;
-    left: 0px;
+    left: 5px;
     top: 3px;
     cursor: pointer;
 }
@@ -252,7 +252,9 @@ export default {
     margin-left: 20px;
     color: #1DA3D8;
 }
-
+.el-input-box{
+    margin-left: 5px;
+}
 .login-box {
     width: 400px;
     height: 300px;

+ 8 - 9
src/components/OP/EntryDetails.vue

@@ -515,7 +515,7 @@ export default {
             value: '选项5',
             label: '北京烤鸭'
             }],
-            listvalue:'',
+            listvalue:1005,
             tablevalue:'',
             listvalueoptions:[],
             tablevalueoptions:[],
@@ -642,7 +642,6 @@ export default {
                     that.options=res.data.data.groupNameData;
                     that.currencys=res.data.data.currencyInit;
                     that.value=res.data.data.groupNameData[0].id;
-                    that.placeinif=res.data.data.nationalTravelFeeData;
                     that.listvalueoptions=res.data.data.wordTypeData;
                     that.tablevalueoptions=res.data.data.excelTypeData;
                     that.GetEnterExitCostInfobyDiId()
@@ -785,7 +784,7 @@ export default {
                     that.fullscreenLoading=false;
                 }else{
                     that.fullscreenLoading=false;
-                    that.$message.error(res.data.msg);
+                    that.$message.warning(res.data.msg);
                 }
             })
         },
@@ -1046,7 +1045,7 @@ export default {
                     id: that.storageid,
                     diId: that.value,
                     choiceOne: that.choiceOne?1:0,
-                    insidePay:0,
+                    insidePay:that.DomesticFees.total,
                     visa: that.DomesticFees.visafees,
                     visaRemark: that.DomesticFees.visafeesDescription,
                     yiMiao: that.DomesticFees.vaccinefees,
@@ -1089,7 +1088,7 @@ export default {
                     id: that.storageid,
                     diId: that.value,
                     choiceOne: that.choiceOne?1:0,
-                    insidePay:0,
+                    insidePay:that.DomesticFees.total,
                     visa: that.DomesticFees.visafees,
                     visaRemark: that.DomesticFees.visafeesDescription,
                     yiMiao: that.DomesticFees.vaccinefees,
@@ -1100,10 +1099,10 @@ export default {
                     choiceTwo: that.choiceTwo?1:0,
                     sumJJC:that.sumJJC?1:0,
                     sumGWC:that.sumGWC?1:0,
-                    outsideJJPay:that.TotalExpenses.EconomyClasstotal,
-                    outsaideGWPay:this.TotalExpenses.BusinessClasstotal,
-                    airJJ:that.jjctotal,
-                    airGW:that.gwctotal,
+                    outsideJJPay:that.jjctotal,
+                    outsaideGWPay:that.gwctotal,
+                    airJJ:that.TotalExpenses.EconomyClasstotal,
+                    airGW:that.TotalExpenses.BusinessClasstotal,
                     cityTranffic: that.TotalExpenses.TravellingExpenses,
                     currencys: that.currencys,
                     choiceThree:that.choiceThree?1:0,

+ 19 - 1
src/components/OP/OpCarTouristGuideGroundId.vue

@@ -412,7 +412,25 @@ export default {
                                 headers: {
                                     Authorization: 'Bearer ' + that.token
                                 },
-                                data: that.OpCarTouristGuideGroundData
+                                // data: that.OpCarTouristGuideGroundData
+                                data: {
+                                    status: that.OpCarTouristGuideGroundData.status,
+                                    id: that.OpCarTouristGuideGroundData.id,
+                                    diId: that.OpCarTouristGuideGroundData.diId,
+                                    area: that.OpCarTouristGuideGroundData.area.toString(),
+                                    serviceCompany: that.OpCarTouristGuideGroundData.serviceCompany,
+                                    serviceGuide: that.OpCarTouristGuideGroundData.serviceGuide,
+                                    serviceTel: that.OpCarTouristGuideGroundData.serviceTel,
+                                    busName: that.OpCarTouristGuideGroundData.busName,
+                                    busDescription: that.OpCarTouristGuideGroundData.busDescription,
+                                    busTel: that.OpCarTouristGuideGroundData.busTel,
+                                    serviceStartTime: that.OpCarTouristGuideGroundData.serviceStartTime,
+                                    serviceEndTime: that.OpCarTouristGuideGroundData.serviceEndTime,
+                                    serviceDescription: that.OpCarTouristGuideGroundData.serviceDescription,
+                                    orbitalPrivateTransfer: that.OpCarTouristGuideGroundData.orbitalPrivateTransfer,
+                                    createUserId: that.OpCarTouristGuideGroundData.createUserId,
+                                    remark: that.OpCarTouristGuideGroundData.remark
+                                }
                             }).then(function (res) {
                                 if (res.data.code == 200) {
                                     that.$message({

+ 9 - 1
src/components/OP/OpCustomers.vue

@@ -602,6 +602,14 @@ export default {
                 }
             })
         },
+        //处理时间
+        getdate(val){
+            var date=new Date(val);
+            var y=date.getFullYear();
+            var m=date.getMonth()+1<10?'0'+(date.getMonth()+1):date.getMonth()+1;
+            var d=date.getDate()<10?'0'+date.getDate():date.getDate();
+            return y+'-'+m+'-'+d
+        },
         addBtn() {
             if (this.IsAuditGM == 1) {
                 this.$message.error('已通过审核,不可修改!');
@@ -622,7 +630,7 @@ export default {
 
                                 var url = "/api/Groups/OpCustomers"
                                 that.OpCustomersData.clientName = that.ClientFormat(that.OpCustomersData.clientName);//处理数组
-
+                                that.OpCustomersData.consumptionDate = that.getdate(that.OpCustomersData.consumptionDate);//处理时间
                                 that.$axios({
                                     method: 'post',
                                     url: url,

+ 4 - 4
src/components/OP/OpInvitationOfficialActivities.vue

@@ -349,13 +349,13 @@ export default {
                 payMoney:0,
                 paymentCurrency:'',
                 eventsCost:0,
-                eventsCurrency:'',
+                eventsCurrency:836,
                 inviteCost: 0,
-                inviteCurrency: '',
+                inviteCurrency: 836,
                 translateCost:0,
-                translateCurrency: '',
+                translateCurrency: 836,
                 sendCost: 0,
-                sendCurrency:'',
+                sendCurrency:836,
                 isGoOfficaiaBussiness: 0,
                 createUserId: 0,
                 remark: '',

+ 39 - 8
src/components/OP/OpVisaPriec.vue

@@ -79,7 +79,7 @@
                         </el-form-item>
                     </div> -->
                     <div style="width: 25%;">
-                        <el-form-item label="签证费用:" prop="visaPrice" label-width="160px">
+                        <el-form-item label="签证费用:"  prop="visaCurrency" label-width="160px">
                             <el-input-number style="width:52%" :precision="2" placeholder="付款金额" v-model="OpVisaPriceData.visaPrice" :controls='false'>
                             </el-input-number>
                             <!-- <el-input placeholder="签证费用" v-model="OpVisaPriceData.visaPrice" style="width: 58%;">
@@ -155,7 +155,7 @@
                         </el-form-item>
                     </div>
                     <div style="width: 25%;">
-                        <el-form-item label="付款金额:" prop="payMoney" label-width="160px">
+                        <el-form-item label="付款金额:" label-width="160px">
                             <el-input placeholder="付款金额" v-model="OpVisaPriceData.visaPrice" style="width: 52%;"
                                 :disabled="true">
                             </el-input>
@@ -377,6 +377,7 @@ export default {
                     { required: true, message: '请输入消费方式', trigger: ['blur', 'change'] },
 
                 ],
+                visaCurrency:[{ required: true, message: '选择币种', trigger: ['blur', 'change'] },],
                 consumptionDate: [
                     { required: true, message: '请选择消费日期', trigger: ['blur', 'change'] },
                 ],
@@ -505,6 +506,14 @@ export default {
             this.OpVisaPriceData.visaNumber = val.length;
             console.log(this.ClientFormat(this.OpVisaPriceData.visaClient))
         },
+        //处理日期
+        getdate(val){
+            var date=new Date(val);
+            var y=date.getFullYear();
+            var m=date.getMonth()+1<10?'0'+(date.getMonth()+1):date.getMonth()+1;
+            var d=date.getDate()<10?'0'+date.getDate():date.getDate();
+            return y+'-'+m+'-'+d
+        },
         //获取团组客户名单
         QueryClientInfoByDIID() {
             var url = "/api/Groups/QueryClientInfoByDIID"
@@ -570,12 +579,9 @@ export default {
         },
         //验证人数W
         verifytoll() {
-            console.log(Number(this.OpVisaPriceData.visaNumber) + Number(this.OpVisaPriceData.visaFreeNumber) > this.OpVisaPriceData.visaClient.length)
             if (Number(this.OpVisaPriceData.visaNumber) + Number(this.OpVisaPriceData.visaFreeNumber) > this.OpVisaPriceData.visaClient.length) {
                 this.$message.error("请检查人数");
                 return
-            } else {
-                this.OpVisaPriceData.visaClient = this.ClientFormat(this.OpVisaPriceData.visaClient);
             }
         },
         addBtn() {
@@ -589,7 +595,6 @@ export default {
                     const that = this;
                     that.$refs.OpVisaPriceData.validate((valid) => {
                         if (valid) {
-                            debugger
                             that.OpVisaPriceData.createUserId = that.userId;
                             if (that.OpVisaPriceData.ctdId == '') {
                                 that.OpVisaPriceData.ctdId = 0
@@ -602,7 +607,33 @@ export default {
                                 headers: {
                                     Authorization: 'Bearer ' + that.token
                                 },
-                                data: that.OpVisaPriceData
+                                data:{
+                                    status:that.OpVisaPriceData.id?2:1,
+                                    id:that.OpVisaPriceData.id,
+                                    diId:that.OpVisaPriceData.diId,
+                                    visaClient:that.ClientFormat(that.OpVisaPriceData.visaClient),
+                                    visaPrice:that.OpVisaPriceData.visaPrice,
+                                    visaCurrency:that.OpVisaPriceData.visaCurrency,
+                                    isThird:that.OpVisaPriceData.isThird,
+                                    passengerType:that.OpVisaPriceData.passengerType,
+                                    visaNumber:that.OpVisaPriceData.visaNumber,
+                                    visaFreeNumber:that.OpVisaPriceData.visaFreeNumber,
+                                    createUserId:that.OpVisaPriceData.createUserId,
+                                    remark:that.OpVisaPriceData.remark,
+                                    payDId:that.OpVisaPriceData.payDId,
+                                    consumptionPatterns:that.OpVisaPriceData.consumptionPatterns,
+                                    consumptionDate:that.getdate(that.OpVisaPriceData.consumptionDate),
+                                    ctdId:that.OpVisaPriceData.ctdId,
+                                    companyBankNo:that.OpVisaPriceData.companyBankNo,
+                                    otherBankName:that.OpVisaPriceData.otherBankName,
+                                    otherSideNo:that.OpVisaPriceData.otherSideNo,
+                                    otherSideName:that.OpVisaPriceData.otherSideName,
+                                    bankNo:that.OpVisaPriceData.bankNo,
+                                    cardholderName:that.OpVisaPriceData.cardholderName,
+                                    payee:that.OpVisaPriceData.payee,
+                                    orbitalPrivateTransfer:that.OpVisaPriceData.orbitalPrivateTransfer,
+                                    cRemark:that.OpVisaPriceData.cRemark
+                                } ,
                             }).then(function (res) {
                                 if (res.data.code == 200) {
                                     that.$message({
@@ -690,7 +721,7 @@ export default {
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
         this.initializeSelect();
         this.QueryRate();
-        this.OpVisaPriceData.id = this.$route.query.id;
+        this.OpVisaPriceData.id = this.$route.query.id?this.$route.query.id:0;
         this.QueryClientInfoByDIID()
         if (this.OpVisaPriceData.id != null && this.OpVisaPriceData.id != undefined && this.OpVisaPriceData.id != 0) {
             this.QueryVisaById();

+ 0 - 1
src/components/Resource/InvitationOfficialActivityData.vue

@@ -479,7 +479,6 @@ export default {
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     min-height: 830px;
-    text-align: right;
 }
 .communal-list .block{
     margin-top: 15px;

+ 4 - 4
src/components/Resource/OpInvitationOfficialActivityData.vue

@@ -107,8 +107,8 @@
                         </el-form-item>
                     </div>
                     <div style="width: 25%;">
-                        <el-form-item label="团组名称:" prop="delegation" label-width="160px">
-                            <el-select v-model="OpInvitationOfficialActivityData.delegation" clearable filterable multiple
+                        <el-form-item label="团组名称:" label-width="160px">
+                            <el-select style="width: 100%;" v-model="OpInvitationOfficialActivityData.delegation" clearable filterable multiple
                                 placeholder="团组名称">
                                 <el-option v-for="item in DelegationList" :key="item.id" :label="item.groupName"
                                     :value="item.id">
@@ -470,13 +470,13 @@ export default {
         this.GetGroupNameList();
         this.id = this.$route.query.id
         if (this.id != null && this.id != undefined && this.id != 0) {
-            this.title = "修改团组增减款项费用";
+            this.title = "修改邀请资料";
             this.OpInvitationOfficialActivityData.status = 2
             this.OpInvitationOfficialActivityData.id = this.id
             this.QueryInvitationOfficialActivityById();
         } else {
             this.OpInvitationOfficialActivityData.status = 1
-            this.title = "新增团组增减款项费用"
+            this.title = "新增邀请资料"
         }
     }
 }

+ 2 - 0
src/components/child/PageConfig.vue

@@ -26,6 +26,8 @@
                 style="width: 100%">
                 <el-table-column prop="pageName" label="页面名称" width="130">
                 </el-table-column>
+                <el-table-column prop="pageid" label="页面id" width="80">
+                </el-table-column>
                 <el-table-column prop="systemMenuCode" label="页面Code" width="130">
                 </el-table-column>
                 <el-table-column prop="webUrl" label="WebUrl" width="100">

+ 1 - 1
src/components/home.vue

@@ -4,7 +4,7 @@
       <el-dialog
       style=""
       top="0"
-      title="消息通知"
+      title="系统通知"
       :visible.sync="dialogVisible"
       width="30%">
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">

+ 3 - 2
src/components/system/User.vue

@@ -94,13 +94,13 @@
                     <el-form-item label="试用期" prop="UsePeriod">
                         <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="upData.UsePeriod"></el-input>
                     </el-form-item>
-                    <el-form-item label="人事审核" prop="HrAudit">
+                    <!-- <el-form-item label="人事审核" prop="HrAudit">
                         <el-select v-model="upData.HrAudit" filterable placeholder="请选择状态">
                             <el-option v-for="item in HrAuditSelect" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                 </el-form>
             </div>
             <span slot="footer" class="dialog-footer">
@@ -423,6 +423,7 @@ export default {
                         Authorization: 'Bearer ' + this.token
                     },
                     data: {
+                        userId:that.userId,
                         Id: id,
                         isAudit: HrAudit
                     }