From 9e2c8933ed2fd4c7c4f2e5ab9de288a73be6e445 Mon Sep 17 00:00:00 2001 From: zxx <47968546@163.com> Date: Fri, 29 Mar 2024 12:02:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Middle/transport/DriverWages/DriverWages/List.vue | 7 ++----- .../Middle/transport/TrainNumber/TrainNumber/Edit.vue | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/pages/Middle/transport/DriverWages/DriverWages/List.vue b/src/pages/Middle/transport/DriverWages/DriverWages/List.vue index 1426d79..485cdec 100644 --- a/src/pages/Middle/transport/DriverWages/DriverWages/List.vue +++ b/src/pages/Middle/transport/DriverWages/DriverWages/List.vue @@ -444,12 +444,9 @@ export default { } }); - if (!ids.length) { // 如果没有选中行 - this.$mk.error("请选择行"); // 提示 - return; - } + - this.$mk.confirm('您确定要发放吗?').then(type => { // 确认删除 + this.$mk.confirm('确定发放选中的工资吗?').then(type => { // 确认删除 if (type == 'confirm') { // 如果确认删除 this.$mk.post({ url: this.actions.DriverWagesPay, // 请求发放工资数据地址 diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue index 167f105..64da8d3 100644 --- a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue +++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue @@ -382,7 +382,7 @@ export default { {field: 'is_need_outbound', title: '是否需要出车', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }}, - {field: 'truck_name', title: '选择车辆', span: 12, itemRender: { + {field: 'truck_name', title: '选择车辆', span: 12,isNeedOutbound:true, itemRender: { name: 'MkFormDataSelector', props: { params: { dataType: "string", @@ -398,7 +398,7 @@ export default { } } }}, - { field: 'driver_name',title: '司机', span: 12, + { field: 'driver_name',title: '司机', span: 12,isNeedOutbound:true, itemRender: { name: 'MkFormDataSelector', props: { @@ -416,7 +416,7 @@ export default { } } }, - {field: 'driver_salary', title: '司机工资', span: 12, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, + {field: 'driver_salary', title: '司机工资',isNeedOutbound:true, span: 12, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, { field: 'outbound_date', dataRule: {type: "timestamp"}, @@ -437,7 +437,7 @@ export default { {field: 'end_mileage',isNeedOutbound:true, title: '结束公里数', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, - {field: 'outbound_remark', title: '出车备注', span: 24, itemRender: {name: '$textarea'}}, + {field: 'outbound_remark', title: '出车备注', isNeedOutbound:true,span: 24, itemRender: {name: '$textarea'}}, // {field: 'outbound_mileage',isNeedOutbound:true,title: '出车公里数',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, {field:'',title:'',span:24,isTitle:true,Htitle:'基础信息',itemRender:{}},//分割线