11

111

src/views/businessManager/orderManager/payRecord.vue

@@ -168,12 +168,17 @@
                            fixed="right"
                            label="操作">
             <template slot-scope="scope">
-              <el-popconfirm title="确定删除该条数据吗？"
-                             @onConfirm="() => removeRecord(scope.row.id)"
-                             v-permission="'financialExpenditure/batchDel/902'">
+              <div>
+                <el-popconfirm title="确定删除该条数据吗？"
+                               @onConfirm="() => removeRecord(scope.row.id)"
+                               v-permission="'financialExpenditure/batchDel/902'">
+                  <el-button type="text"
+                             slot="reference">删除</el-button>
+                </el-popconfirm>
                 <el-button type="text"
-                           slot="reference">删除</el-button>
-              </el-popconfirm>
+                           @click="lookDetail(scope.row)">详情</el-button>
+              </div>
+
             </template>
           </el-table-column>
         </el-table>
@@ -183,6 +188,10 @@
                     :page-sizes="pageInfo.page_size"
                     @pagination="getList" />
       </div>
+      <recorddetail :show="show"
+                    @closeReset='closeReset'
+                    @getList='getList'
+                    :item='activeRow' />
     </div>
     <!-- <el-dialog
       title="修改支出记录"
@@ -222,14 +231,15 @@ import { getFinancialExpenditure, applyRefundAudit, removeFinancialExpenditure,
 import { getEmployeeOrgan, getCooperation } from '@/api/buildTeam'
 import { getToken } from "@/utils/auth";
 import { paymentChannelStatus } from '@/utils/searchArray'
+import recorddetail from '@/views/businessManager/orderManager/payRecordConponents/payRecordDetail'
 import load from '@/utils/loading'
 import dayjs from 'dayjs'
 export default {
-  components: { pagination },
+  components: { pagination, recorddetail },
   name: 'backMoney',
   data () {
     return {
-      visible: false,
+      show: false,
       detail: null,
       paymentChannelStatus: paymentChannelStatus,
       orderDate: null,
@@ -256,6 +266,7 @@ export default {
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       passed: [], // 传递的参数
+      activeRow: null,
     }
   },
   mounted () {
@@ -281,7 +292,7 @@ export default {
   },
   methods: {
     editRecord (detail) {
-      this.visible = true
+      this.show = true
       this.detail = detail
     },
     removeRecord (id) {
@@ -395,7 +406,15 @@ export default {
       })
         .then(() => this.getList())
         .catch(() => { });
-    }
+    },
+    lookDetail (row) {
+      this.activeRow = row
+      this.show = true
+      console.log(111)
+    },
+    closeReset () {
+      this.show = false
+    },
   }
 }
 </script>

src/views/businessManager/orderManager/payRecordConponents/payRecordDetail.vue

@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <el-dialog title="支出详情"
+               width="600px"
+               :visible.sync="payVisible">
+      <el-form :model="payForm"
+               label-position="right"
+               label-width="120px"
+               :inline="true"
+               class="payForm"
+               ref="payForm">
+        <el-form-item label="批次号:">
+          <div>
+            {{payForm.id}}
+          </div>
+        </el-form-item>
+        <br>
+        <el-form-item label="流程号:">
+          <div>
+            {{payForm.financialProcessNo}}
+          </div>
+        </el-form-item>
+        <br>
+        <el-form-item label="钉钉流程号:">
+          <div>
+            {{payForm.dingtalkProcessNo}}
+          </div>
+
+        </el-form-item>
+        <br>
+        <el-form-item label="归属分部:">
+          <div>
+            {{payForm.organName}}
+          </div>
+        </el-form-item>
+        <el-form-item label="归属学校:">
+          <div>
+            {{payForm.cooperationName}}
+          </div>
+
+        </el-form-item>
+        <br>
+        <el-form-item label="申请人:">
+          <div>
+            {{payForm.applyUser}}
+          </div>
+
+        </el-form-item>
+        <br>
+        <el-form-item label="付款金额:">
+          <div>
+            {{payForm.amount |moneyFormat}}
+          </div>
+
+        </el-form-item>
+        <el-form-item label="付款时间:">
+          <div>
+            {{payForm.paymentTime |dayjsFormat}}
+          </div>
+
+        </el-form-item>
+        <br>
+        <el-form-item label="费用类型:">
+          <div>
+            {{payForm.type | feeType }}
+          </div>
+
+        </el-form-item>
+        <el-form-item label="费用项目:">
+          <div>
+            {{payForm.feeProject  | feeProject }}
+          </div>
+        </el-form-item>
+        <br>
+        <el-form-item label="事由:">
+          <div style="width:370px">
+            {{payForm.cause}}
+          </div>
+        </el-form-item>
+        <br>
+        <el-form-item label="备注:">
+          <div style="width:370px">
+            {{payForm.itemDetail}}
+          </div>
+        </el-form-item>
+      </el-form>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button type="primary"
+                   @click="payVisible = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  props: ["show", "item"],
+  data () {
+    return {
+      payForm: {
+        id: null,
+        financialProcessNo: null,
+        dingtalkProcessNo: null,
+        organName: null,
+        cooperationName: null,
+        applyUser: null,
+        amount: null,
+        paymentTime: null,
+        cause: null,
+        type: null,
+        feeProject: null,
+        itemDetail: null,
+      },
+      payVisible: false
+    }
+  },
+  watch: {
+    show (val) {
+      this.payVisible = val;
+    },
+    payVisible (val) {
+      if (!val) {
+        this.$emit("closeReset");
+      }
+    },
+    item: {
+      immediate: true,
+      deep: true,
+      handler (row, oldValue) {
+        if (row) {
+          this.payForm = { ...row }
+        } else {
+          this.payForm = {
+            id: null,
+            financialProcessNo: null,
+            dingtalkProcessNo: null,
+            organName: null,
+            cooperationName: null,
+            applyUser: null,
+            amount: null,
+            paymentTime: null,
+            cause: null,
+            type: null,
+            feeProject: null,
+            itemDetail: null,
+          }
+        }
+      }
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.payForm {
+  /deep/.el-form-item {
+    min-width: 40%;
+  }
+}
+</style>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -272,10 +272,10 @@
                        v-model.trim="checkList.soundInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             原价:
-            <input type="text"
-                   placeholder="请输入"
-                   :disabled="basdisabled"
-                   v-model.trim="checkList.soundInfo.value" />
+            <el-input type="text"
+                      placeholder="请输入"
+                      :disabled="basdisabled"
+                      v-model.trim="checkList.soundInfo.value" />
           </div>
           <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.soundInfo.checkBuy">是否可选择购买</el-checkbox>
@@ -287,10 +287,10 @@
                        v-model.trim="checkList.allInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             原价:
-            <input type="text"
-                   placeholder="请输入"
-                   :disabled="basdisabled"
-                   v-model.trim="checkList.allInfo.value" />
+            <el-input type="text"
+                      placeholder="请输入"
+                      :disabled="basdisabled"
+                      v-model.trim="checkList.allInfo.value" />
           </div>
           <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.allInfo.checkBuy">是否可选择购买</el-checkbox>
@@ -302,11 +302,11 @@
                        v-model.trim="checkList.holidayInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             原价:
-            <input type="number"
-                   @mousewheel.native.prevent
-                   :disabled="basdisabled"
-                   placeholder="请输入"
-                   v-model.trim="checkList.holidayInfo.value" />
+            <el-input type="number"
+                      @mousewheel.native.prevent
+                      :disabled="basdisabled"
+                      placeholder="请输入"
+                      v-model.trim="checkList.holidayInfo.value" />
           </div>
           <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.holidayInfo.checkBuy">是否可选择购买</el-checkbox>
@@ -319,11 +319,11 @@
                        v-model="checkList.networkInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             原价:
-            <input type="number"
-                   :disabled="basdisabled"
-                   @mousewheel.native.prevent
-                   placeholder="请输入"
-                   v-model.trim="checkList.networkInfo.value" />
+            <el-input type="number"
+                      :disabled="basdisabled"
+                      @mousewheel.native.prevent
+                      placeholder="请输入"
+                      v-model.trim="checkList.networkInfo.value" />
           </div>
           <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.networkInfo.checkBuy">是否可选择购买</el-checkbox>
@@ -335,11 +335,11 @@
                        v-model.trim="checkList.baseInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             原价:
-            <input type="number"
-                   :disabled="basdisabled"
-                   @mousewheel.native.prevent
-                   placeholder="请输入"
-                   v-model.trim="checkList.baseInfo.value" />
+            <el-input type="number"
+                      :disabled="basdisabled"
+                      @mousewheel.native.prevent
+                      placeholder="请输入"
+                      v-model.trim="checkList.baseInfo.value" />
           </div>
           <!-- <div class="inputWrap">
             <el-checkbox v-model="checkList.baseInfo.checkBuy">是否可选择购买</el-checkbox>
@@ -368,19 +368,19 @@
                        v-model="newStudentList.baseInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             原价:
-            <input type="number"
-                   @mousewheel.native.prevent
-                   :disabled="basdisabled"
-                   placeholder="请输入"
-                   v-model.trim="newStudentList.baseInfo.nowValue" />
+            <el-input type="number"
+                      @mousewheel.native.prevent
+                      :disabled="basdisabled"
+                      placeholder="请输入"
+                      v-model.trim="newStudentList.baseInfo.nowValue" />
           </div>
           <div class="inputWrap">
             现价:
-            <input type="number"
-                   :disabled="basdisabled"
-                   @mousewheel.native.prevent
-                   placeholder="请输入"
-                   v-model.trim="newStudentList.baseInfo.value" />
+            <el-input type="number"
+                      :disabled="basdisabled"
+                      @mousewheel.native.prevent
+                      placeholder="请输入"
+                      v-model.trim="newStudentList.baseInfo.value" />
           </div>
           <!-- <div class="inputWrap">
             <el-checkbox v-model="newStudentList.baseInfo.checkBuy">是否可选择购买</el-checkbox>
@@ -416,17 +416,15 @@
           </div>
           <div class="inputWrap">
             预计收费:
-            <input type="textarea"
-                   v-model.trim="payList.school.price"
-                   :disabled="basdisabled"
-                   placeholder="请输入" />
+            <el-input v-model.trim="payList.school.price"
+                      :disabled="basdisabled"
+                      placeholder="请输入" />
           </div>
           <div class="inputWrap">
             备注:
-            <input type="textarea"
-                   v-model.trim="payList.school.value"
-                   :disabled="basdisabled"
-                   placeholder="请输入" />
+            <el-input v-model.trim="payList.school.value"
+                      :disabled="basdisabled"
+                      placeholder="请输入" />
           </div>
         </div>
         <div class="checkRow">
@@ -462,17 +460,15 @@
           </div>
           <div class="inputWrap">
             预计收费:
-            <input type="textarea"
-                   placeholder="请输入"
-                   :disabled="basdisabled"
-                   v-model.trim="payList.company.price" />
+            <el-input placeholder="请输入"
+                      :disabled="basdisabled"
+                      v-model.trim="payList.company.price" />
           </div>
           <div class="inputWrap">
             备注:
-            <input type="textarea"
-                   placeholder="请输入"
-                   :disabled="basdisabled"
-                   v-model.trim="payList.company.value" />
+            <el-input placeholder="请输入"
+                      :disabled="basdisabled"
+                      v-model.trim="payList.company.value" />
           </div>
         </div>
       </div>
@@ -1317,10 +1313,10 @@ export default {
         color: #777;
         margin-left: 65px;
         input {
-          border: none;
-          width: 80px;
-          margin-right: 10px;
-          outline: none;
+          // border: none;
+          // width: 80px;
+          // margin-right: 10px;
+          // outline: none;
         }
       }
       .inputWrap.rightFirst {

src/views/teamBuild/signupList.vue

@@ -8,11 +8,11 @@
           </el-page-header>
         </h2>
         <p style="margin-bottom:15px; font-size:18px;
-             font-weight:400">报名缴费截止时间:{{ applyExpireDate | formatTimer }}</p>
+             font-weight:400">报名截止时间:{{ applyExpireDate | formatTimer }} 缴费截止时间:{{ applyExpireDate | formatTimer }} </p>
         <div class="btnList">
-          <div class='newBand close'
+          <!-- <div class='newBand close'
                v-permission="'musicGroup/cancelMusicGroup'"
-               @click="onClose">停止乐团</div>
+               @click="onClose">停止乐团</div> -->
           <div class='newBand'
                @click="payStart"
                v-permission="'musicGroup/openPay'"
@@ -23,9 +23,12 @@
                @click="onGoHome">确认开团</div>
           <div class='newBand'
                v-permission="'musicGroup/extensionPayment'"
-               @click="extendPaymentStatus = true"
+               @click="extendTime(true)"
                v-show="status=='PAY'">延长缴费</div>
           <div class='newBand'
+               v-permission="'musicGroup/extensionApplyExpireDate'"
+               @click="extendTime(false)">延长报名</div>
+          <div class='newBand'
                @click="onCreateQRCode">报名链接</div>
           <div class='newBand'
                @click="onCreateQRCode2">缴费详情</div>
@@ -266,7 +269,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="延长缴费"
+    <el-dialog :title="!isPay?'延长报名':'延长缴费'"
                :visible.sync="extendPaymentStatus"
                width="400px">
       <el-form :model="extendForm"
@@ -288,7 +291,11 @@
            class="dialog-footer">
         <el-button @click="extendPaymentStatus = false">取 消</el-button>
         <el-button type="primary"
-                   @click="onExtendPayment('extendForm')">确 定</el-button>
+                   v-if="isPay"
+                   @click="onExtendPayment('extendForm',isPay)">确 定</el-button>
+        <el-button v-else
+                   type="primary"
+                   @click="onExtendPayment('extendForm',isPay)">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -656,7 +663,8 @@ export default {
         feedback: [{ required: true, message: "请输入家长反馈" }],
         visitTime: [{ required: true, message: "请输入回访时间" }],
         visitType: [{ required: true, message: "请选择回访类型" }]
-      }
+      },
+      isPay: false
     }
   },
   created () {
@@ -987,25 +995,30 @@ export default {
       })
 
     },
-    onExtendPayment (formName) {
+    onExtendPayment (formName, isPay) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          extensionPayment({
-            musicGroupId: this.id,
-            expireDate: this.extendForm.expireDate
-          }).then(res => {
-            if (res.code == 200) {
-              this.$message.success('延长缴费成功')
-              this.extendPaymentStatus = false
-              getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
-                if (res.code == 200) {
-                  this.applyExpireDate = res.data.musicGroup.applyExpireDate;
-                }
-              })
-            } else {
-              this.$message.error(res.msg);
-            }
-          })
+          if (!isPay) {
+
+          } else {
+            extensionPayment({
+              musicGroupId: this.id,
+              expireDate: this.extendForm.expireDate
+            }).then(res => {
+              if (res.code == 200) {
+                this.$message.success('延长缴费成功')
+                this.extendPaymentStatus = false
+                getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
+                  if (res.code == 200) {
+                    this.applyExpireDate = res.data.musicGroup.applyExpireDate;
+                  }
+                })
+              } else {
+                this.$message.error(res.msg);
+              }
+            })
+          }
+
         }
       })
     },
@@ -1180,6 +1193,16 @@ export default {
         }
       };
     },
+    extendTime (isPay) {
+      this.isPay = isPay
+      this.extendPaymentStatus = true
+      if (isPay) {
+        // 点击的延长缴费
+
+      } else {
+        // 点击的延长报名
+      }
+    }
   },
   watch: {
     orderVisible (val) {

src/views/teamDetail/teamList.vue

@@ -205,8 +205,8 @@
                            v-if="scope.row.status == 'DRAFT' && permission('teamDetail/draft/update')"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
                 <el-button type="text"
-                           v-if="scope.row.status == 'DRAFT' && permission('musicGroup/cancelMusicGroup')"
-                           @click="stopTeam(scope.row)">取消申请</el-button>
+                           v-if="(scope.row.status == 'DRAFT' || scope.row.status == 'AUDIT' || (scope.row.status == 'APPLY'|| scope.row.status == 'PAY') && permission('musicGroup/cancelMusicGroup'))"
+                           @click="stopTeam(scope.row)">取消乐团</el-button>
                 <!-- 审核失败 编辑 -->
                 <el-button type="text"
                            v-if="scope.row.status == 'AUDIT_FAILED' && permission('teamDetail/aduitFailed/update')"
@@ -215,9 +215,9 @@
                 <el-button v-if="scope.row.status == 'PREPARE' && permission('musicGroup/action')"
                            @click="startTeam(scope.row)"
                            type="text">确认成团</el-button>
-                <el-button type="text"
+                <!-- <el-button type="text"
                            v-if="scope.row.status == 'AUDIT' && permission('musicGroup/cancelMusicGroup')"
-                           @click="stopTeam(scope.row)">取消申请</el-button>
+                           @click="stopTeam(scope.row)">取消乐团</el-button> -->
                 <el-button v-if="scope.row.status == 'PAUSE' && permission('musicGroup/resumeMusicGroup')"
                            @click="onTeamOpeation('start', scope.row)"
                            type="text">启动</el-button>