发薪任务支付

src/api/business/payOutDetail.js

@@ -47,7 +47,7 @@ export function updatePayOutDetail(data) {
 // 删除发薪详情
 export function delPayOutDetail(id) {
   return request({
-    url: '/business/payOutDetail/remove/' + id,
+    url: '/business/payOutRecord/detail/remove/' + id,
     method: 'get'
   })
 }

src/api/business/payOutRecord.js

@@ -53,6 +53,15 @@ export function updatePayOutRecord(data) {
   })
 }
 
+// 发薪任务支付
+export function pay(data) {
+  return request({
+    url: '/business/payOutRecord/pay',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除发薪批次信息
 export function delPayOutRecord(id) {
   return request({

src/layout/components/Navbar.vue

@@ -98,7 +98,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/ruoyi-vue-web/index';
+          location.href = '/index';
         })
       }).catch(() => {});
     }

src/router/index.js

@@ -171,8 +171,9 @@ Router.prototype.push = function push(location) {
 }
 
 export default new Router({
-  base: "/ruoyi-vue-web",
-  mode: 'history', // 去掉url中的#
-  scrollBehavior: () => ({ y: 0 }),
-  routes: constantRoutes
-})
+  mode: "history", // 去掉url中的#
+  scrollBehavior: () => ({
+    y: 0
+  }),
+  routes: constantRoutes,
+});

src/views/business/outContract/index.vue

@@ -515,7 +515,8 @@ export default {
       this.$refs["bcoForm"].validate(valid => {
         if (valid) {
           // console.log(this.bcoForm);
-          buildPayOutRecord(this.bcoForm).then(resp => {
+          this.bcoForm.salaryMonth =this.bcoForm.salaryMonth + '-01'
+            buildPayOutRecord(this.bcoForm).then(resp => {
             if (resp.code == 200) {
               this.bcoOpen = false
               this.$modal.alertSuccess("操作成功,请耐心等待任务生成")

src/views/business/outPersonal/index.vue

@@ -56,7 +56,7 @@
       <el-table-column label="收款账号" align="center" prop="payeeAccNo">
         <template slot-scope="scope">
             {{ scope.row.payeeAccNo }}
-          <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.bearType"/>
+          <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType"/>
         </template>
       </el-table-column>
       <el-table-column label="性别" align="center" prop="gender" />

src/views/business/payOutDetail/index.vue

@@ -66,7 +66,7 @@
       <el-table-column label="收款账号" align="center" prop="payeeAccNo">
         <template slot-scope="scope">
           {{ scope.row.payeeAccNo }}
-          <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.bearType" />
+          <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType" />
         </template>
       </el-table-column>
       <el-table-column label="岗位名称" align="center" prop="postName" />
@@ -180,13 +180,16 @@
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus"
+            size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['business:payOutDetail:edit']">修改
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="checkWork(scope.row)"
+          <el-button v-if="scope.row.payStatus && 1 == scope.row.payStatus"
+            size="mini" type="text" icon="el-icon-edit" @click="checkWork(scope.row)"
             v-hasPermi="['business:payOutDetail:edit']">考勤核对
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus"
+            size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['business:payOutDetail:remove']">删除
           </el-button>
         </template>
@@ -630,6 +633,7 @@ export default {
     // this.getList();
   },
   mounted() {
+    this.reset()
     this.queryParams.batchNo = this.$route.query.batchNo
     this.batchName = this.$route.query.batchName
     this.getList()

src/views/business/payOutRecord/index.vue

@@ -70,8 +70,7 @@
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-if="scope.row.payStatus && scope.row.payStatus > 0"
             v-hasPermi="['business:payOutRecord:edit']">修改</el-button> -->
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-if="scope.row.payStatus && scope.row.payStatus > 0"
+          <el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['business:payOutRecord:remove']">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-money" @click="paySalary(scope.row)"
             v-if="scope.row.payStatus && 1 == scope.row.payStatus"
@@ -168,7 +167,7 @@
 </template>
 
 <script>
-import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, updatePayOutRecord } from "@/api/business/payOutRecord";
+import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, updatePayOutRecord, pay} from "@/api/business/payOutRecord";
 import { listPayAccInfo } from '@/api/business/payAcc'
 
 export default {
@@ -401,7 +400,13 @@ export default {
       this.getPayAccList();
     },
     confirmPay() {
-      console.log(this.payForm)
+      pay(this.payForm).then(resp => {
+        if (resp.code == 200) {
+          this.payOpen = false
+          this.$modal.alertSuccess("操作成功，请等待支付结果")
+          this.getList()
+        }
+      })
     }
   },
 };

vue.config.js

@@ -18,9 +18,9 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/ruoyi-vue-web" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'ruoyi-vue-web',
+  outputDir: 'xrt',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
   assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'