|
@@ -139,7 +139,7 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<div style="padding: 10px 0 20px;">合计:累计观影人员{{ viewerList.length }}人</div>
|
|
|
- <!-- <div>
|
|
|
+ <div>
|
|
|
<el-form
|
|
|
:model="ruleForm"
|
|
|
:rules="rules"
|
|
@@ -149,7 +149,7 @@
|
|
|
size="mini"
|
|
|
>
|
|
|
|
|
|
- <el-form-item label="用户来源 :" prop="source">
|
|
|
+ <!-- <el-form-item label="用户来源 :" prop="source">
|
|
|
<el-radio-group v-model="ruleForm.source">
|
|
|
<el-radio label="12">窗口赠票</el-radio>
|
|
|
</el-radio-group>
|
|
@@ -171,9 +171,12 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="找零金额 :" v-if="ruleForm.paymentType == 2">
|
|
|
¥{{ ruleForm.small }}元
|
|
|
+ </el-form-item> -->
|
|
|
+ <el-form-item label="订单备注 :" prop="remark">
|
|
|
+ <el-input style="width: 400px;" type="textarea" :rows="2" maxlength="200" v-model="ruleForm.remark" show-word-limit></el-input>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
- </div> -->
|
|
|
+ </div>
|
|
|
<!-- 支付过程 控制 -->
|
|
|
<div v-if="payStatus" class="increase-viewers-pay-status">
|
|
|
<div class="increase-viewers-pay-status-info" v-if="!loading">
|
|
@@ -218,7 +221,7 @@
|
|
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="handleClose()">取 消</el-button>
|
|
|
- <el-button v-if="!orderId&&!payStatus" :loading="loading" type="primary" @click="submitFormTicket('ruleForm11')">确认打印</el-button>
|
|
|
+ <el-button v-if="!orderId&&!payStatus" :loading="loading" type="primary" @click="submitForm('ruleForm11')">确认打印</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
</template>
|
|
@@ -288,6 +291,9 @@ import {
|
|
|
realPrice: [
|
|
|
{ required: true, message: '请输入实付金额', trigger: ['blur','change']},
|
|
|
],
|
|
|
+ remark: [
|
|
|
+ { required: true, message: '请输入订单备注', trigger: ['blur','change']},
|
|
|
+ ]
|
|
|
},
|
|
|
moneyAll: '',
|
|
|
payment: '',
|
|
@@ -332,6 +338,7 @@ import {
|
|
|
paymentType: '2', // 支付方式
|
|
|
small: '',// 找零
|
|
|
realPrice: '0', // 实付金额
|
|
|
+ remark: '', // 订单备注
|
|
|
}
|
|
|
this.payStatus = null
|
|
|
this.orderId = null
|
|
@@ -371,9 +378,9 @@ import {
|
|
|
|
|
|
console.log(this.viewerList)
|
|
|
this.loading = false
|
|
|
- // this.$nextTick(()=>{
|
|
|
- // this.$refs.ruleForm11.clearValidate()
|
|
|
- // })
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ this.$refs.ruleForm11.clearValidate()
|
|
|
+ })
|
|
|
} catch (error) {
|
|
|
console.error("error====",error)
|
|
|
}
|
|
@@ -720,7 +727,11 @@ import {
|
|
|
clearInterval(this.payTime)
|
|
|
}
|
|
|
if(this.ruleForm.paymentType == 2){
|
|
|
- this.$message.error('"订单入库成功"');
|
|
|
+ // this.$message.error('"订单入库成功"');
|
|
|
+ this.$message({
|
|
|
+ message: '订单入库成功',
|
|
|
+ type: 'success'
|
|
|
+ });
|
|
|
this.loading = false
|
|
|
// this.payStatus = 8
|
|
|
// this.getPrintListApi()
|