付款金额
@@ -1021,7 +1021,11 @@ export default {
},
valueAmoutChange(data) {
+ if(data == '' || data == null) {
+ data = 0
+ this.cardValueForm.amount = 0
+ }
this.cardValueForm.points = ''
this.cardValueForm.bidBalance =''
@@ -1105,6 +1109,15 @@ export default {
this.cardValueForm.staffMobile= data.staffMobile
},
+ refStaff() {
+ this.cardFuelDieselForm.mtStaffId= ''
+ this.cardFuelDieselForm.realName= ''
+ this.cardFuelDieselForm.staffMobile= ''
+
+ this.cardValueForm.mtStaffId= ''
+ this.cardValueForm.realName= ''
+ this.cardValueForm.staffMobile= ''
+ },
// 查询参加存油卡油品
getCountOilType() {
getCountOilTypeApi().then(res => {
@@ -1172,8 +1185,12 @@ export default {
this.realyPayBills = this.cardFuelDieselForm.rechargeBalance
}
- this.isPay = true
this.openConfirm = true;
+ this.isPay = true
+
+ console.log("11111",this.isPay)
+ // this.isPaySuccess=false
+
this.title = this.payment
},
// 支付方式
@@ -1230,8 +1247,9 @@ export default {
this.cardValueForm.giftBalance = 0
this.cardValueForm.growthValue = 0
this.cardValueForm.bidBalance = 0
+
// this.cardValueForm.bidBalance = 1
- // this.cardValueForm.amount = 0
+ this.cardValueForm.amount = 0
}else {
let file={}
@@ -1307,7 +1325,7 @@ export default {
}
});
let this_ = this
-
+ //
let timer = setInterval(async () => {
getCheckTheStatusOfYourPaymentApi(id).then(response => {
if (response.data!=null){
@@ -1331,10 +1349,12 @@ export default {
this_.loading = false;
this_.isPay = false;
clearInterval(timer);
+ clearTimeout(timer3);
+
}
},500)
- setTimeout(function (){
+ var timer3 = setTimeout(function (){
clearInterval(timer2);
clearInterval(timer);
this_.loading = false;
@@ -1411,11 +1431,13 @@ export default {
// 关闭支付窗口
handClose(){
- this.isPay = true;
+ this.isPay=true,
+ this.isPaySuccess=false,
+ this.isQuery=true,
this.openConfirm = false
this.openRecharge = false
- this.isPaySuccess = false;
+ // this.isPaySuccess = false;
this.authCode = null
this.activeRecharge='balance',
@@ -1469,6 +1491,7 @@ export default {
},
handleClick(tab, event) {
// console.log(tab, event);
+ this.refStaff()
this.realyPayBills = 0
},
handleChange(value) {
diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
index 3965c87b8..4cf4581e5 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@@ -144,7 +144,7 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
},
rules: {
gunName: [
- { required: true, message: '请输入油罐名称', trigger: 'blur' },
+ { required: true, message: '请输入油枪名称', trigger: 'blur' },
],
tankId: [
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java
index f1cdcf520..78a2303a2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java
@@ -108,7 +108,7 @@ public class MtPurchaseController extends BaseController {
/**
- * 盘点审核
+ * 进货审核
* @param id
* @return
*/
@@ -117,11 +117,21 @@ public class MtPurchaseController extends BaseController {
return getSuccessResult(this.mtPurchaseService.audit(id));
}
+ /**
+ * 进货废除
+ * @param id
+ * @return
+ */
@GetMapping("abolition")
public ResponseObject abolition(Integer id) {
return getSuccessResult(this.mtPurchaseService.abolition(id));
}
+ /**
+ * 进货入库
+ * @param id
+ * @return
+ */
@GetMapping("storage")
public ResponseObject storage(Integer id) {
return getSuccessResult(this.mtPurchaseService.storage(id));
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml
index c17842d1c..6e6eee79f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml
@@ -144,6 +144,7 @@
left join mt_goods mg ON md.goods_id = mg.id
where
damage_id = #{mtDamageDetails.damageId}
+
-
+
@@ -1217,6 +1217,15 @@ export default {
this.cardValueForm.staffMobile= data.staffMobile
},
+ refStaff() {
+ this.cardFuelDieselForm.mtStaffId= ''
+ this.cardFuelDieselForm.realName= ''
+ this.cardFuelDieselForm.staffMobile= ''
+
+ this.cardValueForm.mtStaffId= ''
+ this.cardValueForm.realName= ''
+ this.cardValueForm.staffMobile= ''
+ },
// 查询参加存油卡油品
getCountOilType() {
getCountOilTypeApi().then(res => {
@@ -1448,11 +1457,13 @@ export default {
// 关闭支付窗口
handClose(){
- this.isPay = true;
+ this.isPay=true,
+ this.isPaySuccess=false,
+ this.isQuery=true,
this.openConfirm = false
this.openRecharge = false
- this.isPaySuccess = false;
+ // this.isPaySuccess = false;
this.authCode = null
this.activeRecharge='balance',
@@ -1533,6 +1544,9 @@ export default {
this.openConfirm = false;
},
handleClick(tab, event) {
+ this.refStaff();
+ this.realyPayBills = 0
+
// console.log(tab, event);
},
handleChange(value) {