合同增加发薪主体字段;一些其他优化

package.json

 {
-  "name": "ruoyi-vue-web",
+  "name": "xrt",
   "version": "3.8.3",
   "description": "薪瑞通",
   "author": "Tellsea",

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/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" />

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 => {
+    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 => {