apply-clients 4.1.35-weinan → 4.1.37-weinan
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
|
@@ -526,6 +526,20 @@ export default {
|
|
|
526
526
|
|
|
527
527
|
},
|
|
528
528
|
async showChargeModal() {
|
|
529
|
+
let http = new HttpResetClass()
|
|
530
|
+
let data = {
|
|
531
|
+
condition: " 1=1",
|
|
532
|
+
f_process_id: this.selectdata.f_process_id
|
|
533
|
+
}
|
|
534
|
+
let res = await http.load('POST', this.$androidUtil.getProxyUrl() +'/rs/sql/getAddresAndUserinfoAndUserfilesAmount', {data:data}, {
|
|
535
|
+
resolveMsg: null,
|
|
536
|
+
rejectMsg: null
|
|
537
|
+
})
|
|
538
|
+
if (res.data[0].f_user_id===null){
|
|
539
|
+
debugger
|
|
540
|
+
this.$showMessage("请先添加表具信息！！！")
|
|
541
|
+
return
|
|
542
|
+
}
|
|
529
543
|
this.getUserAddress()
|
|
530
544
|
console.log("材料费",this.selectdata.f_cost_sum)
|
|
531
545
|
this.charge.payment_terms[0].f_charge_money = this.selectdata.f_cost_sum
|
|
@@ -73,11 +73,11 @@
|
|
|
73
73
|
</div>
|
|
74
74
|
<div class="from-group">
|
|
75
75
|
<label>单价(元)</label>
|
|
76
|
-
<input type="number" class="form-control" v-model="addItem.f_material_price">
|
|
76
|
+
<input type="number" class="form-control" v-model="addItem.f_material_price" readonly>
|
|
77
77
|
</div>
|
|
78
78
|
<div class="from-group">
|
|
79
79
|
<label>数量</label>
|
|
80
|
-
<input type="number" class="form-control" v-model="addItem.f_material_number">
|
|
80
|
+
<input type="number" class="form-control" v-model="addItem.f_material_number" >
|
|
81
81
|
</div>
|
|
82
82
|
<div class="from-group">
|
|
83
83
|
<label>金额</label>
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
</article>
|
|
91
91
|
<footer slot="modal-footer" class="modal-footer">
|
|
92
92
|
<button v-show="showpay" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
93
|
-
<button v-show="showpay" type="button" class="btn btn-success" @click='addpaydipetail'>确认</button>
|
|
93
|
+
<button v-show="showpay" type="button" class="btn btn-success" @click='addpaydipetail' :disabled="!$v.valid">确认</button>
|
|
94
94
|
</footer>
|
|
95
95
|
</modal>
|
|
96
96
|
</template>
|
|
@@ -192,11 +192,18 @@ export default {
|
|
|
192
192
|
this.typeNumberList = this.$appdata.getParam(val)
|
|
193
193
|
},
|
|
194
194
|
setmaterialprice(val){
|
|
195
|
-
|
|
195
|
+
if(val==null){
|
|
196
|
+
this.addItem.f_material_price = 0
|
|
197
|
+
}
|
|
196
198
|
this.addItem.f_material_price = this.$appdata.getSingleValue(val)
|
|
197
199
|
}
|
|
198
200
|
},
|
|
199
|
-
watch: {
|
|
201
|
+
watch: {
|
|
202
|
+
'typeNumberList'(){
|
|
203
|
+
this.addItem.f_typenumber=null
|
|
204
|
+
this.addItem.f_material_price = 0
|
|
205
|
+
}
|
|
206
|
+
}
|
|
200
207
|
}
|
|
201
208
|
|
|
202
209
|
</script>
|