소스 검색

add:延时分账

ct 4 일 전
부모
커밋
3b172563a8
2개의 변경된 파일42개의 추가작업 그리고 16개의 파일을 삭제
  1. 9 1
      src/api/his/divItem.js
  2. 33 15
      src/views/his/divItem/index.vue

+ 9 - 1
src/api/his/divItem.js

@@ -50,4 +50,12 @@ export function exportDivItem(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 延迟分账确认
+export function confirm(payCode) {
+  return request({
+    url: '/his/divItem/confirm/' + payCode,
+    method: 'get'
+  })
+}

+ 33 - 15
src/views/his/divItem/index.vue

@@ -39,7 +39,18 @@
           </el-option>
         </el-select>
       </el-form-item>
-      
+
+      <el-form-item label="延迟确认" prop="delayStatus" v-if="queryParams.isDelay === 1">
+        <el-select v-model="queryParams.delayStatus" placeholder="请选择是否确认交易" @keyup.enter.native="handleQuery" size="small">
+          <el-option
+            v-for="item in delayOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -113,24 +124,19 @@
       <el-table-column label="退款明细" align="center" prop="refundDetail" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="更新时间" align="center" prop="updateTime" />
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['his:divItem:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['his:divItem:remove']"
-          >删除</el-button>
+            icon="el-icon-success"
+            @click="handleConfirm(scope.row)"
+            v-hasPermi="['his:divItem:confirm']"
+            v-if="scope.row.isDelay == 1 && scope.row.isPay == 1 && !(scope.row.delayStatus)"
+          >延迟分账确认交易</el-button>
+
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -175,7 +181,7 @@
 </template>
 
 <script>
-import { listDivItem, getDivItem, delDivItem, addDivItem, updateDivItem, exportDivItem } from "@/api/his/divItem";
+import { listDivItem, getDivItem, delDivItem, addDivItem, updateDivItem, exportDivItem ,confirm} from "@/api/his/divItem";
 
 export default {
   name: "DivItem",
@@ -230,6 +236,7 @@ export default {
         detail: null,
         isPay: null,
         isDelay: 0,
+        delayStatus: null,
         isRefund: null,
         refundDetail: null,
         status:1
@@ -254,10 +261,20 @@ export default {
     this.getList();
   },
   methods: {
+    /** 确认延迟分账 **/
+    handleConfirm(row){
+      confirm(row.payCode).then(response => {
+        this.getList();
+        this.msgSuccess("已确认");
+      });
+    },
     /** 查询分账明细列表 */
     getList() {
       this.loading = true;
       var params = this.queryParams;
+      if (params.isDelay == 0) {
+        params.delayStatus = null;
+      }
       if(params.status == 1){
         params.isPay = null;
         params.isRefund = 0;
@@ -286,6 +303,7 @@ export default {
         isPay: null,
         isDelay: null,
         isRefund: null,
+        delayStatus: null,
         createTime: null,
         updateTime: null,
         refundDetail: null