From b714ab2dcaffabcbd5dc534fd75c12f6a23bd854 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Fri, 25 Aug 2023 14:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=EF=BC=8C?=
=?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AE=A1=E7=90=86bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mine.js | 2 +-
src/components/cellGroup.vue | 9 ++++-
src/components/twoBtnCommon.vue | 61 ++++++++++++++++++++++++++++--
src/views/index/driverAdd.vue | 12 ++++--
src/views/index/driverManage.vue | 5 ++-
src/views/index/vehicleManage.vue | 1 +
src/views/workOrder/accounting.vue | 2 +-
7 files changed, 79 insertions(+), 13 deletions(-)
diff --git a/src/api/mine.js b/src/api/mine.js
index 8c4bb37a..9e49200b 100644
--- a/src/api/mine.js
+++ b/src/api/mine.js
@@ -165,7 +165,7 @@ export function notifyInvoiceDetail(data){
// /supplier/supplierTrainingMaterials/pageList 获取培训材料列表
export function pageList(data){
return request({
- url:'/supplier/supplierTrainingMaterials/pageList',
+ url:'/supplierAppV2/dispatchApp/user/supplierTrainingMaterialsPageList',
method:'POST',
contentType:'application/json',
data
diff --git a/src/components/cellGroup.vue b/src/components/cellGroup.vue
index d97f8d51..231f08f1 100644
--- a/src/components/cellGroup.vue
+++ b/src/components/cellGroup.vue
@@ -5,6 +5,7 @@
:label="label"
:placeholder="placeholder"
required
+ :disabled="disabled"
@input="$emit('input', $event)"
@blur="$emit('blurIn')"
input-align="right"
@@ -24,11 +25,15 @@ export default {
type:String,
default: ''
},
- value: [String, Number]
+ value: [String, Number],
+ disabled:{
+ type:Boolean,
+ default:false
+ }
},
data(){
return{
- name:''
+ name:'',
}
},
mounted() {
diff --git a/src/components/twoBtnCommon.vue b/src/components/twoBtnCommon.vue
index a9558147..533a131b 100644
--- a/src/components/twoBtnCommon.vue
+++ b/src/components/twoBtnCommon.vue
@@ -1,7 +1,7 @@
-
-
+
+
@@ -12,7 +12,9 @@ export default {
mixins:[myMixins],
data(){
return{
- noClick:true
+ noClick:true,
+ loading: false,
+ loading1: false
}
},
props:{
@@ -30,7 +32,32 @@ export default {
this.$emit('cancelClick')
},
submitClick(){
- this.$emit('submitClick')
+ // 设置 loading 状态
+ this.loading = true;
+
+ // 模拟异步请求
+ setTimeout(() => {
+ // 处理请求结果
+ // ...
+ this.$emit('submitClick')
+ // 重置 loading 状态
+ this.loading = false;
+ }, 2000);
+
+ },
+ submitClick1(){
+ // 设置 loading1状态
+ this.loading1 = true;
+
+ // 模拟异步请求
+ setTimeout(() => {
+ // 处理请求结果
+ // ...
+ this.$emit('submitClick1')
+ // 重置 loading1 状态
+ this.loading1 = false;
+ }, 2000);
+
}
}
}
@@ -39,6 +66,32 @@ export default {