From eb43d729ed8b2ce81a214859fb23fc7c4ecca6fb Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 26 May 2022 11:37:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=A5=E8=B4=A6?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E8=BD=A6=E5=9E=8B=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cheliangcaigou/cheliangcaigou.vue | 25 +++++------
.../cheliangcaigou/cheliangcaigouAdd.vue | 2 +-
.../cheliangcaigou/cheliangcaigouInfo.vue | 2 +-
.../src/views/cheliang/chexing/chexing.vue | 2 +-
.../ruzhang/ruzhangguanli/ruzhangAdd.vue | 41 ++++++++++---------
.../ruzhang/ruzhangguanli/ruzhangInfo.vue | 20 ++++-----
.../ruzhang/ruzhangguanli/ruzhangguanli.vue | 23 +++++------
.../ruzhangguanli/ruzhangEdit.vue | 20 ++++-----
.../ruzhangguanli/ruzhangInfo.vue | 20 ++++-----
9 files changed, 78 insertions(+), 77 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
index 1be484e1af..f5201fbd57 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
@@ -14,7 +14,7 @@
@@ -167,17 +167,18 @@ export default {
vinNo: e.vinNo
})
})
- } else {
- for (var i = 0; i < row[0].vehicleNum; i++) {
- this.formobj.vehicleList.push({
- applySid: '',
- remarks: '',
- modelSid: this.formobj.modelSid,
- sid: '',
- vinNo: ''
- })
- }
}
+ // else {
+ // for (var i = 0; i < row[0].vehicleNum; i++) {
+ // this.formobj.vehicleList.push({
+ // applySid: '',
+ // remarks: '',
+ // modelSid: this.formobj.modelSid,
+ // sid: '',
+ // vinNo: ''
+ // })
+ // }
+ // }
}).catch((e) => {
this.formobj = row
})
diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
index 2694646412..0d357dcebb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
@@ -61,16 +61,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -99,6 +89,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
index f63acd8984..fc4b9f32d1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
@@ -50,7 +50,7 @@
- 办理
+ 办理
查看
@@ -135,18 +135,17 @@ export default {
this.sides = this.sids.join() // 将sid数组的元素转化成字符串
console.log('获取sids数组', this.sids)
},
- toEdit() {
- if (this.sids.length === 0) {
- this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
- return
- }
- if (this.sids.length > 1) {
- this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
- return
- }
+ toEdit(row) {
+ // if (this.sids.length === 0) {
+ // this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+ // return
+ // }
+ // if (this.sids.length > 1) {
+ // this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
+ // return
+ // }
this.viewState = 3
- const sid = this.sids[0]
- const row = this.row
+ const sid = row.sid
this.$refs['divadd'].showEdit(sid, row)
},
toInfo(row) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
index 7ade453195..d19eb3228e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
@@ -65,16 +65,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -103,6 +93,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
index e4a875de4b..92fb94a8c0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
@@ -65,16 +65,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -115,6 +105,16 @@
+
+
+
+
+
+
+
+
+
+
From 415614c8aa9770aa783741ef5c2fc83665828644 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 26 May 2022 11:37:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=88=86=E9=A1=B5?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=8E=92?=
=?UTF-8?q?=E4=BA=A7=E7=94=B3=E8=AF=B7=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2sql=E8=AF=AD?=
=?UTF-8?q?=E5=8F=A5=E8=A1=A8=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui/base/api/busvehicleorder/VehicleOrderListVo.java | 3 +++
.../base/biz/busvehicleorder/BusVehicleOrderMapper.xml | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java
index e3399a5224..c0b4110163 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java
@@ -44,4 +44,7 @@ public class VehicleOrderListVo implements Vo {
@ApiModelProperty("下线日期")
private String offlineDate;
+
+ @ApiModelProperty("排产申请编号")
+ private String applicationCode;
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
index 25e9e35db6..316a671272 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
@@ -4,11 +4,10 @@