Jelajahi Sumber

新增支付

谢杰标 2 tahun lalu
induk
melakukan
ac901ec1ed

+ 2 - 2
src/views/financed/accountsPayable/commissionSettlement/index.vue

@@ -60,7 +60,7 @@
             props.scope.row.checkStatus === 5
           "
           :disabled="getRoles(props.scope.row.roleId)"
-          @click="openDialog({ ...props.scope.row, type: 2 })"
+          @click="openDialog({ ...props.scope.row, type: 3 })"
         >
           支付
         </el-button>
@@ -71,7 +71,7 @@
             props.scope.row.checkStatus !== 0 ||
             getRoles(props.scope.row.roleId)
           "
-          @click="openDialog({ ...props.scope.row, type: 3 })"
+          @click="openDialog({ ...props.scope.row, type: 2 })"
         >
           审核
         </el-button>

+ 39 - 12
src/views/financed/accountsPayable/components/dislogCmsAudit.vue

@@ -4,7 +4,7 @@
       :disabledBtn="disabledBtn"
       width="860px"
       :isShow.sync="isShow"
-      :title="'佣金' + ['详情', '审核', '支付'][type]"
+      :title="'佣金' + ['详情', '审核', '支付'][type - 1]"
       @open="init"
       :isShowFooter="false"
     >
@@ -29,7 +29,10 @@
         </p>
       </div>
       <div class="centent">
-        <p>订单号:{{ info.orderSn }}</p>
+        <p>
+          订单号:{{ info.orderSn }}
+          <span class="btn" @click="orderDialogVisible = true">订单详情</span>
+        </p>
         <p>申请备注:{{ info.remark || "无" }}</p>
         <p>
           订单金额:<span>{{ info.orderPrice | formatPrice }}</span>
@@ -61,15 +64,28 @@
           }}
         </p>
       </div>
-      <div class="dialog-footer" v-if="type == 2">
-        <el-button @click="batchAudit(1)" type="primary"> 审核通过 </el-button>
-        <el-button v-if="isTj" @click="batchAudit(-1)" type="warning"
-          >审核不通过</el-button
-        >
+      <div class="dialog-footer" v-if="type !== 1">
+        <template v-if="type == 2">
+          <el-button @click="batchAudit(1)" type="primary">
+            审核通过
+          </el-button>
+          <el-button v-if="isTj" @click="batchAudit(-1)" type="warning"
+            >审核不通过</el-button
+          >
+        </template>
+        <el-button v-else @click="handelPay" type="primary">
+          确定支付
+        </el-button>
       </div>
     </BaseDialog>
-    <!-- 订单列表 -->
-    <dislogOrderList :info="info" :dialogVisible.sync="orderDialogVisible" />
+    <!-- 订单详情 -->
+    <dislog-order-details
+      :appendToBody="true"
+      :ShowStatus="3"
+      :orderSn="info.orderSn"
+      :orderFrom="info.orderFrom"
+      :dialogVisible.sync="orderDialogVisible"
+    />
     <!-- 审核 -->
     <dislog-batch-audit
       :info="orderInfo"
@@ -80,7 +96,7 @@
 </template>
 
 <script>
-import dislogOrderList from "./dislogOrderList";
+import dislogOrderDetails from "../../components/dislogOrderDetails.vue";
 import dislogBatchAudit from "./dislogBatchAudit";
 export default {
   name: "DislogDividePay",
@@ -138,6 +154,8 @@ export default {
       console.log(this.orderInfo);
       this.auditDialogVisible = true;
     },
+
+    handelPay() {},
   },
   computed: {
     isShow: {
@@ -156,7 +174,7 @@ export default {
     },
   },
   components: {
-    dislogOrderList,
+    dislogOrderDetails,
     dislogBatchAudit,
   },
 };
@@ -170,6 +188,14 @@ p {
   span {
     color: rgb(235, 59, 59);
   }
+  .btn {
+    border: 1px solid #409eff;
+    border-radius: 5px;
+    padding: 2px 6px;
+    color: #409eff;
+    margin-left: 10px;
+    cursor: pointer;
+  }
 }
 .df {
   p {
@@ -177,7 +203,7 @@ p {
   }
 }
 .centent {
-  margin: 10px 0 30px;
+  margin-top: 10px;
   padding: 12px 15px;
   box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2);
   border-radius: 6px;
@@ -189,6 +215,7 @@ em {
   font-style: unset;
 }
 .dialog-footer {
+  margin-top: 30px;
   display: flex;
   align-items: center;
   justify-content: flex-end;