apply-clients 3.5.4-72 → 3.5.4-74
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -32,91 +32,93 @@
|
|
|
32
32
|
</div>
|
|
33
33
|
</div>
|
|
34
34
|
<div v-show="!showQrCode">
|
|
35
|
-
<
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
<
|
|
43
|
-
|
|
35
|
+
<div style="max-height: 70vh; overflow-y: auto;">
|
|
36
|
+
<apply-material-one v-for="(i, item) in material " :index="$index" :item="item"
|
|
37
|
+
:materialnameandcode="materialnameandcode"
|
|
38
|
+
:newmaterialnameandcode="newmaterialnameandcode"
|
|
39
|
+
:newmaterialnameandtype="newmaterialnameandtype"
|
|
40
|
+
:typenumbers="materialtypenumber" @number_chenge="getChangePayNumber"
|
|
41
|
+
@delete_material="delete_material"></apply-material-one>
|
|
42
|
+
<div style="padding: 10px;display: flex;justify-content: space-around;">
|
|
43
|
+
<button type="button" class="btn btn-primary" @click="addUserFile">添加</button>
|
|
44
|
+
</div>
|
|
44
45
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
<div class="row">
|
|
47
|
+
<label class="text-justify lb-left" style="width: 100px">收款</label>
|
|
48
|
+
<!-- <div class="row">
|
|
48
49
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
50
|
+
<data-grid partial='list' v-ref:grid :model="{rows:summarize}" v-show="summarize.length>0" class="list_area table_sy">
|
|
51
|
+
<template partial='head'>
|
|
52
|
+
<tr>
|
|
53
|
+
<th>
|
|
54
|
+
<nobr>收费类型</nobr>
|
|
55
|
+
</th>
|
|
56
|
+
<th>
|
|
57
|
+
<nobr>数量</nobr>
|
|
58
|
+
</th>
|
|
59
|
+
<th>
|
|
60
|
+
<nobr>总金额</nobr>
|
|
61
|
+
</th>
|
|
62
|
+
</tr>
|
|
63
|
+
</template>
|
|
64
|
+
<template partial='body'>
|
|
65
|
+
<td style="text-align: center;">
|
|
66
|
+
<nobr>{{row.material_type }}</nobr>
|
|
67
|
+
</td>
|
|
68
|
+
<td style="text-align: center;">
|
|
69
|
+
<nobr>{{ row.amount }}</nobr>
|
|
70
|
+
</td>
|
|
71
|
+
<td style="text-align: center;">
|
|
72
|
+
<nobr>{{ row.money }}</nobr>
|
|
73
|
+
</td>
|
|
74
|
+
</template>
|
|
75
|
+
</data-grid>
|
|
76
|
+
<!– <div v-for="item in summarize" style="display: flex;justify-content: center;">
|
|
77
|
+
{{item.}} - {{item.}} - {{item.}}
|
|
78
|
+
</div>–>
|
|
79
|
+
</div>-->
|
|
80
|
+
<div class="row row_sty">
|
|
81
|
+
<label class="lab_sty col-xs-4">收费优惠金额</label>
|
|
82
|
+
<div class="col-xs-8">
|
|
83
|
+
<input type="number" class="form-control" v-model="f_discounts_money_materials" :value.sync="f_discounts_money_materials" @change="getChangePayNumber()">
|
|
84
|
+
</div>
|
|
83
85
|
</div>
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
<div class="row row_sty">
|
|
87
|
+
<label class="lab_sty col-xs-4">总优惠金额</label>
|
|
88
|
+
<div class="col-xs-8">
|
|
89
|
+
<input type="number" class="form-control" v-model="f_discounts_money" :value.sync="f_discounts_money" readonly>
|
|
90
|
+
</div>
|
|
89
91
|
</div>
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
92
|
+
<div class="row row_sty">
|
|
93
|
+
<label class="lab_sty col-xs-4">合计金额</label>
|
|
94
|
+
<div class="col-xs-8">
|
|
95
|
+
<input type="number" class="form-control" v-model="payNumber" :value.sync="payNumber" readonly>
|
|
96
|
+
</div>
|
|
95
97
|
</div>
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
98
|
+
<div class="row row_sty">
|
|
99
|
+
<label class="lab_sty col-xs-4">收款方式</label>
|
|
100
|
+
<div class="col-xs-8">
|
|
101
|
+
<v-select
|
|
102
|
+
:width="'100%'"
|
|
103
|
+
:value.sync="payType"
|
|
104
|
+
v-model="payType"
|
|
105
|
+
:options='payTypes'
|
|
106
|
+
placeholder='请选择'
|
|
107
|
+
close-on-select
|
|
108
|
+
:value-single="true"
|
|
109
|
+
></v-select>
|
|
110
|
+
</div>
|
|
109
111
|
</div>
|
|
112
|
+
<!-- <div class="y-form-item" v-if="payType=='二维码支付'">
|
|
113
|
+
<div id="qrcode" class="qrcode" v-ref:qrcode></div>
|
|
114
|
+
</div>-->
|
|
115
|
+
</div>
|
|
116
|
+
<div style="padding: 10px;display: flex;justify-content: space-around;">
|
|
117
|
+
<button type="button" name="button" class="btn btn-primary btn-sm" style="float: right;margin-right:10px;"
|
|
118
|
+
@click="beforeSaveCharge()">保存
|
|
119
|
+
</button>
|
|
120
|
+
<button type="button" class="btn btn-primary" @click="cancel">取消</button>
|
|
110
121
|
</div>
|
|
111
|
-
<!-- <div class="y-form-item" v-if="payType=='二维码支付'">
|
|
112
|
-
<div id="qrcode" class="qrcode" v-ref:qrcode></div>
|
|
113
|
-
</div>-->
|
|
114
|
-
</div>
|
|
115
|
-
<div style="padding: 10px;display: flex;justify-content: space-around;">
|
|
116
|
-
<button type="button" name="button" class="btn btn-primary btn-sm" style="float: right;margin-right:10px;"
|
|
117
|
-
@click="beforeSaveCharge()">保存
|
|
118
|
-
</button>
|
|
119
|
-
<button type="button" class="btn btn-primary" @click="cancel">取消</button>
|
|
120
122
|
</div>
|
|
121
123
|
</div>
|
|
122
124
|
</div>
|
|
@@ -608,6 +610,8 @@ export default {
|
|
|
608
610
|
},
|
|
609
611
|
async saveUserFile(type) {
|
|
610
612
|
for (let i = 0; i < this.material.length; i++) {
|
|
613
|
+
this.material[i].f_material_name=this.material[i].f_material_name.name
|
|
614
|
+
this.material[i].f_typenumber=this.material[i].f_typenumber.name
|
|
611
615
|
this.material[i].f_process_id = this.selectdata.f_process_id
|
|
612
616
|
this.material[i].f_department = Vue.user.f_department_name
|
|
613
617
|
this.material[i].f_fee = this.material[i].f_material_price * this.material[i].f_material_number
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
</div>
|
|
38
38
|
<div class="y-form-item">
|
|
39
39
|
<label>单价(元/{{ item.unit }})</label>
|
|
40
|
-
<input type=
|
|
40
|
+
<input type="number" class="form-control y-form-item-input"
|
|
41
41
|
v-model="item.f_material_price"
|
|
42
42
|
@change="material_number_chenge"
|
|
43
43
|
>
|