Merge branch 'develop' of http://git.manong.atliangtian.com/longbiao/hr-xinruitong-ui into develop

package.json

 {
-  "name": "ruoyi-vue-web",
+  "name": "xrt",
   "version": "3.8.3",
   "description": "薪瑞通",
   "author": "Tellsea",
@@ -88,4 +88,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
\ No newline at end of file
+}

src/api/business/adjustInfo.js

+import request from '@/utils/request'
+
+// 查询发薪记录薪资调整列表
+export function listAdjustInfo(query) {
+  return request({
+    url: '/business/adjustInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发薪记录薪资调整所有列表
+export function listAllAdjustInfo(query) {
+  return request({
+    url: '/business/adjustInfo/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发薪记录薪资调整详细
+export function getAdjustInfo(id) {
+  return request({
+    url: '/business/adjustInfo/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 计算调整薪资
+export function adjustCalculate(data) {
+  return request({
+    url: '/business/adjustInfo/adjust/calculate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增发薪记录薪资调整
+export function addAdjustInfo(data) {
+  return request({
+    url: '/business/adjustInfo/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发薪记录薪资调整
+export function updateAdjustInfo(data) {
+  return request({
+    url: '/business/adjustInfo/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除发薪记录薪资调整
+export function delAdjustInfo(id) {
+  return request({
+    url: '/business/adjustInfo/remove/' + id,
+    method: 'get'
+  })
+}

src/api/business/companyInfo.js

+import request from '@/utils/request'
+
+// 查询付款主体信息列表
+export function listCompanyInfo(query) {
+  return request({
+    url: '/business/companyInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询付款主体信息所有列表
+export function listAllCompanyInfo(query) {
+  return request({
+    url: '/business/companyInfo/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询付款主体信息详细
+export function getCompanyInfo(id) {
+  return request({
+    url: '/business/companyInfo/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增付款主体信息
+export function addCompanyInfo(data) {
+  return request({
+    url: '/business/companyInfo/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改付款主体信息
+export function updateCompanyInfo(data) {
+  return request({
+    url: '/business/companyInfo/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除付款主体信息
+export function delCompanyInfo(id) {
+  return request({
+    url: '/business/companyInfo/remove/' + id,
+    method: 'get'
+  })
+}

src/api/business/payAcc.js

-import request from '@/utils/request'
-
-export function listPayAccInfo() {
-  return request({
-    url: '/business/accInfo/listAll',
-    method: 'get',
-  })
-}

src/api/business/payOutDetail.js

@@ -52,14 +52,6 @@ export function updatePayOutDetail(data) {
   })
 }
 
-// 调整薪资
-export function adjustSalary(data) {
-  return request({
-    url: '/business/payOutDetail/adjust/salary',
-    method: 'post',
-    data: data
-  })
-}
 
 // 删除发薪详情
 export function delPayOutDetail(id) {

src/api/business/payOutRecord.js

@@ -62,6 +62,15 @@ export function pay(data) {
   })
 }
 
+// 调整薪资
+export function saveAdjustCalculate(data) {
+  return request({
+    url: '/business/payOutRecord/adjust/calculate',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除发薪批次信息
 export function delPayOutRecord(id) {
   return request({

src/views/business/accInfo/index.vue

@@ -65,22 +65,15 @@
     <!-- 添加或修改商户付款账户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单位名称" prop="companyName">
-          <el-input v-model="form.companyName" placeholder="请输入单位名称" />
-        </el-form-item>
-        <el-form-item label="单位机构代码" prop="companyCode">
-          <el-input v-model="form.companyCode" placeholder="请输入单位机构代码" />
-        </el-form-item>
-        <el-form-item label="法人姓名" prop="legalName">
-          <el-input v-model="form.legalName" placeholder="请输入法人姓名" />
-        </el-form-item>
-        <el-form-item label="法人电话" prop="legalPhone">
-          <el-input v-model="form.legalPhone" placeholder="请输入法人电话" />
-        </el-form-item>
-        <el-form-item label="归属客户" prop="deptId">
-          <el-cascader :props="cascaderProps" v-model="form.deptId" :options="deptOptions">
-          </el-cascader>
+        <el-form-item label="发薪主体" prop="companyId">
+          <el-select v-model="form.companyId">
+            <el-option v-for="item in payerCompanyArr" :key="item.id" :value="item.id" :label="item.companyName" />
+          </el-select>
         </el-form-item>
+<!--        <el-form-item label="归属客户" prop="deptId">-->
+<!--          <el-cascader :props="cascaderProps" v-model="form.deptId" :options="deptOptions">-->
+<!--          </el-cascader>-->
+<!--        </el-form-item>-->
         <el-form-item label="发薪账户" prop="payAccNo">
           <el-input v-model="form.payAccNo" placeholder="请输入发薪账户" />
         </el-form-item>
@@ -105,6 +98,7 @@
 <script>
 import { listAccInfo, getAccInfo, delAccInfo, addAccInfo, updateAccInfo } from "@/api/business/accInfo";
 import { deptTreeSelect } from "@/api/system/user";
+import { listAllCompanyInfo } from '@/api/business/companyInfo'
 export default {
   name: "AccInfo",
   computed: {
@@ -155,25 +149,14 @@ export default {
       },
       // 表单参数
       form: {},
+      payerCompanyArr: [],
       // 表单校验
       rules: {
         id: [
           { required: true, message: "$comment不能为空", trigger: "blur" }
         ],
-        companyName: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" }
-        ],
-        companyCode: [
-          { required: true, message: "单位机构代码不能为空", trigger: "blur" }
-        ],
-        legalName: [
-          { required: true, message: "法人姓名不能为空", trigger: "blur" }
-        ],
-        legalPhone: [
-          { required: true, message: "法人电话不能为空", trigger: "blur" }
-        ],
-        deptId: [
-          { required: true, message: "所属部门不能为空", trigger: "blur" }
+        companyId: [
+          { required: true, message: "请选择发薪主体", trigger: "blur" }
         ],
         payAccNo: [
           { required: true, message: "发薪账户不能为空", trigger: "blur" }
@@ -193,6 +176,7 @@ export default {
   created() {
     this.getList();
     this.getDeptTree();
+    this.getPayerCompanyList()
   },
   methods: {
     getDeptTree() {
@@ -261,6 +245,13 @@ export default {
         this.title = "修改商户付款账户";
       });
     },
+    getPayerCompanyList() {
+      listAllCompanyInfo().then(resp => {
+        if (200 == resp.code) {
+          this.payerCompanyArr = resp.data
+        }
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

src/views/business/component/paidUsers.vue

@@ -34,6 +34,11 @@
                 <el-input v-model="formData.userName" placeholder="请输入员工姓名"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="身份证号" prop="userCode">
+                <el-input v-model="formData.userCode" placeholder="请输入身份证号"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="人员性别">
                 <el-select v-model="formData.gender" placeholder="请选择人员性别">
@@ -42,11 +47,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="身份证号" prop="userCode">
-                <el-input v-model="formData.userCode" placeholder="请输入身份证号"></el-input>
-              </el-form-item>
-            </el-col>
           </el-row>
           <el-row :gutter="56">
             <el-col :span="8">
@@ -434,9 +434,9 @@ export default {
         payeeAccNo: [
           { required: true, message: '收款账号不能为空', trigger: 'blur' }
         ],
-        postName: [
-          { required: true, message: '所在岗位不能为空', trigger: 'blur' }
-        ],
+        // postName: [
+        //   { required: true, message: '所在岗位不能为空', trigger: 'blur' }
+        // ],
         postWage: [
           { required: true, message: '岗位工资不能为空', trigger: 'blur' }
         ],

src/views/business/component/staffForm.vue

@@ -19,7 +19,7 @@
                     </el-row>
                     <el-row :gutter="56">
                         <el-col :span="10">
-                            <el-form-item label="所在单位" prop="groupName">
+                            <el-form-item label="用工单位" prop="groupName">
                                 <el-input v-model="formData.groupName" placeholder="请输入所在单位"></el-input>
                             </el-form-item>
                         </el-col>
@@ -32,7 +32,14 @@
                     <el-row :gutter="56">
                         <el-col :span="10">
                             <el-form-item label="发薪主体">
-                                <el-input placeholder="请输入发薪主题"></el-input>
+                              <el-select v-model="formData.payerCompanyId" clearable placeholder="请选择发薪主体">
+                                <el-option
+                                  v-for="item in payerCompanyArr"
+                                  :key="item.id"
+                                  :label="item.companyName"
+                                  :value="item.id">
+                                </el-option>
+                              </el-select>
                             </el-form-item>
                         </el-col>
                         <el-col :span="10">
@@ -292,11 +299,14 @@
 
 <script>
 import { getOutContract, addOutContract, updateOutContract } from "@/api/business/outContract";
+import { listAllCompanyInfo } from '@/api/business/companyInfo'
 export default {
     name: "StaffForm",
     data() {
         return {
+            payerCompanyArr: [],
             formData: {
+                payerCompanyId: null,
                 contractName: null,
                 contractCode: null,
                 groupName: null,
@@ -420,8 +430,16 @@ export default {
         if (this.$route.query.id) {
             this.getOutContractFN(this.$route.query.id)
         }
+        this.getPayerCompanyList()
     },
     methods: {
+        getPayerCompanyList() {
+          listAllCompanyInfo().then(resp => {
+            if (200 == resp.code) {
+              this.payerCompanyArr = resp.data
+            }
+          })
+        },
         // 公积金个人比例变化执行
         providentFundPersonalRateChange(e) {
             if (this.formData.providentFundBase > 0 && e > 0) {

src/views/business/outContract/index.vue

@@ -54,13 +54,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="合同名称" align="center" prop="contractName" fixed />
       <el-table-column label="合同编号" align="center" prop="contractCode" fixed />
-      <el-table-column label="单位名称" align="center" prop="groupName" fixed />
-      <el-table-column label="单位信用代码" align="center" prop="groupCode" />
+      <el-table-column label="用工单位" align="center" prop="groupName" fixed />
+      <el-table-column label="信用代码" align="center" prop="groupCode" />
       <el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType" />
         </template>
       </el-table-column>
+      <el-table-column label="发薪主体" align="center" prop="payerCompanyName" />
       <el-table-column label="保险缴纳基数">
         <el-table-column label="失业保险(￥)" align="center" prop="sybxBase" />
         <el-table-column label="养老保险(￥)" align="center" prop="ylbxBase" />
@@ -528,4 +529,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>

src/views/business/payOutDetail/list.vue

@@ -53,7 +53,7 @@
       <el-table-column label="人员姓名" align="center" prop="userName" fixed />
       <el-table-column label="身份证号" align="center" prop="userCode" fixed />
       <el-table-column label="所属合同" align="center" prop="contractName" />
-      <el-table-column label="发薪主体" align="center" prop="companyName">
+      <el-table-column label="用工单位" align="center" prop="companyName">
         <template slot-scope="scope">
           {{ scope.row.companyName }}
           <el-tag>{{ scope.row.companyCode }}</el-tag>

src/views/business/payOutRecord/index.vue

@@ -179,7 +179,7 @@
 
 <script>
 import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, updatePayOutRecord, pay } from "@/api/business/payOutRecord";
-import { listPayAccInfo } from '@/api/business/payAcc'
+import { listAccInfo, listAllAccInfo } from '@/api/business/accInfo'
 
 export default {
   name: "PayOutRecord",
@@ -286,14 +286,12 @@ export default {
     this.getList();
   },
   methods: {
-    getPayAccList() {
-      if (!this.payAccList || this.payAccList.length < 1) {
-        listPayAccInfo().then(resp => {
-          if (resp.code == 200) {
-            this.payAccList = resp.data
-          }
-        })
-      }
+    getPayAccList(payerCompanyId) {
+      listAllAccInfo({payerCompanyId: payerCompanyId}).then(resp => {
+        if (resp.code == 200) {
+          this.payAccList = resp.data
+        }
+      })
     },
     /** 查询发薪批次信息列表 */
     getList() {
@@ -408,7 +406,7 @@ export default {
       this.payForm.totalCount = row.totalCount;
       this.payForm.totalAmount = row.totalAmount;
       this.payOpen = true
-      this.getPayAccList();
+      this.getPayAccList(row.payerCompanyId);
     },
     confirmPay() {
       pay(this.payForm).then(resp => {