Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/GroupsTaskAssignment.vue

@@ -38,9 +38,10 @@
             <div style="display: flex;flex-wrap: wrap;">
                 <div v-for="(  item, index  ) in   user  " :key="index"
                     style="margin-left: 5px;width: 200px;margin-top: 10px;">
-                    <el-checkbox :label="item.id" :value="userStr.indexOf(item.id) != -1" border @change="check(item.id)">{{
-                        item.name
-                    }}</el-checkbox>
+                    <el-checkbox :label="item.id" :value="userStr.indexOf(item.id) != -1" border @change="check(item.id)"
+                        style="width: 120px;">{{
+                            item.name
+                        }}</el-checkbox>
                 </div>
             </div>
         </div>
@@ -149,6 +150,7 @@ export default {
             })
         },
         diidChange() {
+            this.userStr = [];
             this.TaskAssignmenQuery()
             console.log(this.userStr)
         },

src/components/OP/InvitationOfficialActivities.vue

@@ -81,7 +81,8 @@
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
-                            <el-button size="mini" @click="download(scope.$index, scope.row)">下载附件</el-button>
+                            <el-button size="mini" @click="download(scope.$index, scope.row)"
+                                v-show="scope.row.attachment">下载附件</el-button>
                             <el-button size="mini" @click="upDate(scope.$index, scope.row)">编辑</el-button>
                             <el-button size="mini" type="danger" @click="del(scope.$index, scope.row)">删除</el-button>
                         </template>

src/components/OP/OpAirTicketRes.vue

@@ -119,7 +119,6 @@
                             <el-input type="textarea" :rows="5"
                                 placeholder="请严格遵守此格式!!! 1. EK363 R1 WE08MAR CANDXB HK7 0015 0515 SEAME 2 3 (注意空格以及多条数据换行)"
                                 v-model="airTicketResOpData.flightsDescription" @change="flightsCodeChange"></el-input>
-
                         </el-form-item>
                     </div>
                 </div>
@@ -504,7 +503,7 @@ export default {
                 otherBankName: '',
                 otherSideNo: '',
                 otherSideName: '',
-                mfOperator: '',
+                mfOperator: 0,
                 mfOperatorDate: this.dateFormat(new Date()),
                 diId: this.DiId,
                 payThenMoney: 0,

src/components/OP/OpCustomers.vue

@@ -71,12 +71,12 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <!-- <div style="width: 25%;">
                         <el-form-item label="保险余额:" label-width="160px">
                             <el-input placeholder="保险余额" v-model="Balance" :disabled="true">
                             </el-input>
                         </el-form-item>
-                    </div>
+                    </div> -->
                     <div style="width: 25%;">
                         <el-form-item label="客户名称:" prop="clientName" label-width="160px">
                             <el-input placeholder="客户名称" v-model="OpCustomersData.clientName">
@@ -85,9 +85,9 @@
                     </div>
                     <div style="width: 25%;">
                         <el-form-item label="保险费用:" prop="insuranceCosts" label-width="160px">
-                            <el-input placeholder="保险费用" v-model="OpCustomersData.insuranceCosts" style="width: 50%;">
+                            <el-input placeholder="保险费用" v-model="OpCustomersData.insuranceCosts" style="width: 48%;">
                             </el-input>
-                            <el-select v-model="OpCustomersData.currency" filterable placeholder="币种" style="width: 40%;">
+                            <el-select v-model="OpCustomersData.currency" filterable placeholder="币种" style="width: 50%;">
                                 <el-option v-for="item in currencyList" :key="item.currencyId" :label="item.currencyCode"
                                     :value="item.currencyId">
                                 </el-option>

src/components/Resource/OfficialActivities.vue

@@ -6,14 +6,14 @@
                     <div>公务出访</div>
                 </div>
                 <div style="display: flex;">
-                    <div style="width: 90%;">
+                    <div style="width: 18%;">
                         <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="delegationSelectChange">
                             <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                 :value="item.id">
                             </el-option>
                         </el-select>
                     </div>
-                    <div>
+                    <div style="width: 82%;text-align: right;margin-right: 10%;">
                         <router-link :to="{ path: '/home/OpOfficialActivities', query: { DiId } }">
                             <el-button type="primary" style="margin-left: 10px;">新增</el-button>
                         </router-link>

src/components/Resource/OpAskData.vue

@@ -45,7 +45,7 @@
                 <el-form-item>
                     <div style="margin-left: 60%;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
-                        <router-link to='/home/OfficialActivities'>
+                        <router-link to='/home/AskData'>
                             <el-button>取消</el-button>
                         </router-link>
                     </div>

src/components/Resource/OpInvitationOfficialActivityData.vue

@@ -238,7 +238,7 @@ export default {
     methods: {
         //团组数据
         GetGroupNameList() {
-            var url = "/api/Groups/GetGroupNameList"
+            var url = "/api/Business/GetGroupNameList"
             var that = this
             this.$axios({
                 method: 'post',

src/components/Resource/OpOfficialActivities.vue

@@ -447,12 +447,12 @@ export default {
                         },
                         data: that.OpOfficialActivitiesDto
                     }).then(function (res) {
-
                         if (res.data.code == 200) {
                             that.$message({
                                 message: res.data.msg,
                                 type: 'success'
                             });
+
                             that.loading = true;
                         } else {
                             that.$message.error(res.data.msg);
@@ -619,6 +619,9 @@ export default {
                         message: res.data.msg,
                         type: 'success'
                     });
+                    setTimeout(() => {
+                        that.$router.push('/home/OfficialActivities')
+                    }, 3000);
                 } else {
                     that.$message.error(res.data.msg);
                 }

src/components/Resource/OpTicketBlackCode.vue

@@ -164,7 +164,7 @@ export default {
     methods: {
         //团组下拉框
         DelegationSelectFun() {
-            var url = "/api/Groups/GetGroupNameList"
+            var url = "/api/Business/GetGroupNameList"
             var that = this
             this.$axios({
                 method: 'post',
@@ -183,9 +183,7 @@ export default {
                     that.QueryTicketBlackCodeById()
                 }
 
-            }).catch(function (error) {
-                that.$message.error("网络错误，请稍后重试");
-            });
+            })
         },
         QueryTicketBlackCodeById() {
             debugger
@@ -220,9 +218,7 @@ export default {
                     }
                 }
 
-            }).catch(function (error) {
-                that.$message.error("网络错误，请稍后重试");
-            });
+            })
         },
         //团组下拉框选择事件
         AirTicketResChange() {

src/components/system/Company.vue

@@ -245,10 +245,7 @@ export default {
                     portType: 1,
                 }
             }).then(function (res) {
-                console.log(res)
-
                 if (res.data.code == 200) {
-
                     that.tableDatas = res.data.data;
                     that.tableData = that.tableDatas
                     that.tableDatas.forEach(function (item, index) {

src/components/system/JobPost.vue

@@ -225,8 +225,6 @@ export default {
                 console.log(res)
 
                 if (res.data.code == 200) {
-
-
                     that.tableDatas = res.data.data;
                     that.tableData = that.tableDatas
                     if (that.tableDatas.slice((that.currentPage - 1) * that.pageSize, that.currentPage * that.pageSize).length == 0) {
@@ -393,7 +391,7 @@ export default {
                             that.addData.CompanyId = '';
                             that.addData.DepId = '';
                             that.addData.JobName = ''
-                            that.addData.CreateUserId = this.userId;
+                            that.addData.CreateUserId = that.userId;
                             that.addData.Remark = "";
                             that.jobPost();
                         } else {

src/components/system/User.vue

@@ -34,7 +34,12 @@
                     </el-table-column>
                     <el-table-column label="人事审核" prop="hrAudit">
                         <template slot-scope="hrAudit">
-                            <span>{{ hrAudit.row.hrAudit == 1 ? "审核通过" : "未通过/未审核" }}</span>
+                            <span v-if="hrAudit.row.hrAudit == 1">审核通过</span>
+                            <span v-else-if="hrAudit.row.hrAudit == 2">审核未通过</span>
+                            <span v-else>
+                                <a style="color: cornflowerblue;" @click="hrAuditBtn(hrAudit.row.id, 1)">通过</a>
+                                <a style="color: red;" @click="hrAuditBtn(hrAudit.row.id, 2)">拒绝</a>
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column label="操作" width="180">
@@ -169,7 +174,6 @@ export default {
         //当前页改变时触发 跳转其他页
         handleCurrentChange(val) {
             this.currentPage = val;
-
         },
         //部门数据查询
         Department(companyId) {
@@ -187,9 +191,6 @@ export default {
                     CompanyId: companyId
                 }
             }).then(function (res) {
-
-                console.log(res)
-
                 if (res.data.code == 200) {
                     that.depData = res.data.data;
                 }
@@ -209,8 +210,6 @@ export default {
                     portType: 1,
                 }
             }).then(function (res) {
-                console.log(res)
-
                 if (res.data.code == 200) {
                     that.companyData = res.data.data;
                 }
@@ -244,8 +243,6 @@ export default {
                     DepId: depId
                 }
             }).then(function (res) {
-                console.log(res)
-
                 if (res.data.code == 200) {
                     that.JobData = res.data.data;
                 }
@@ -372,12 +369,12 @@ export default {
         //#endregion
         del(index, row) {
 
-            this.$confirm('此操作将取消订单, 是否继续?', '提示', {
+            this.$confirm('此操作将删除该员工, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                var url = "/api/System/DelDepartment"
+                var url = "/api/System/PostUserDelById"
                 var that = this
                 this.$axios({
                     method: 'post',
@@ -396,9 +393,9 @@ export default {
                             type: 'success',
                             message: '删除成功!'
                         });
-                        that.Department();
+                        that.user();
                     } else {
-                        that.$message.error("删除失败，请稍后重试");
+                        that.$message.error(res.data.msg);
                     }
                 })
 
@@ -410,8 +407,47 @@ export default {
             });
 
         },
-        //#region 添加
+        hrAuditBtn(id, HrAudit) {
+            debugger
+            this.$confirm('是否进行此操作?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                var url = "/api/System/PersonnelAudit"
+                var that = this
+                this.$axios({
+                    method: 'post',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                    data: {
+                        Id: id,
+                        isAudit: HrAudit
+                    }
+                }).then(function (res) {
+                    console.log(res)
 
+                    if (res.data.code == 200) {
+                        that.$message({
+                            type: 'success',
+                            message: '操作成功!'
+                        });
+                        that.user();
+                    } else {
+                        that.$message.error(res.data.msg);
+                    }
+                })
+            }).catch(() => {
+                debugger
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+
+        }
         //#endregion
 
     },