From 73fd25bed1d2d92f09ac62535dc7d8ec1837b7e5 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 29 Jul 2022 13:58:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/base/api/basevehicle/BaseVehicleDto.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index cb56a17450..908429d78b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -1,15 +1,12 @@ package com.yxt.anrui.base.api.basevehicle; -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.util.Date; -import java.util.List; /** * Project: anrui-base(安瑞基础信息模块)
@@ -56,26 +53,20 @@ public class BaseVehicleDto implements Dto { @ApiModelProperty(value = "厂家采购订单类型value") private String manPurOrderTypeValue; @ApiModelProperty(value = "厂家入库日期") - @NotBlank(message = "厂家入库日期不能为空") private String priceDate; @ApiModelProperty("发车日期") - @NotBlank(message = "发车日期不能为空") private String departureDate; @ApiModelProperty("到货日期") - @NotBlank(message = "到货日期不能为空") private String arrivalDate; @ApiModelProperty("销售日期") - @NotBlank(message = "销售日期不能为空") private String salesDate; @ApiModelProperty(value = "买断日期") - @NotBlank(message = "买断日期不能为空") private String solidDate; @ApiModelProperty("结算状态key") private String settlementStatus; @ApiModelProperty("结算状态value") private String settlementStatusValue; @ApiModelProperty("采购退库日期") - @NotBlank(message = "采购退库日期不能为空") private String returnDate; @ApiModelProperty("存放地点sid（陕汽必须的字段）") private String location; From a35ce12fa8fbd46f7177aa7b83489024b57c31a6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 29 Jul 2022 14:35:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E4=BB=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=BD=A6=E5=9E=8B=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=94=80=E5=94=AE=E6=8C=87=E5=AF=BC=E4=BB=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue | 5 +++++ .../tiaojiaguanli/chexingbyconfiguration.vue | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue index 5a1c5eac24..d62ad4ae7f 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue @@ -40,6 +40,11 @@ {{ scope.row.configName }} + + +
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue index d0a0901bdb..7d91ad804d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue @@ -40,6 +40,11 @@ {{ scope.row.configName }} + + +
From 49b15380adb084bb164819f1686678a974c04b15 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 29 Jul 2022 14:36:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E5=85=AC=E5=8F=B8=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruzhang/ruzhangguanli/ruzhangguanli.vue | 66 +++++-------------- 1 file changed, 15 insertions(+), 51 deletions(-) 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 362f048a56..0f69cd0631 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 @@ -73,6 +73,7 @@ import req from '@/api/ruzhang/scmapplyinbound' import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' +import { getPathSidByUserSid } from '@/api/cheliang/dictcommons' import divAdd from './ruzhangAdd' import divInfo from './ruzhangInfo' @@ -115,14 +116,15 @@ export default { applicationDateEnd: '', nodeState: '', purchaseOrderNo: '', - modelName: '' + modelName: '', + createOrgSid: '' } }, row: {} } }, created() { - this.loadList() + this.init() }, mounted() { this.$refs['btnbar'].setButtonList(this.btnList) @@ -137,6 +139,14 @@ export default { break } }, + init() { + getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { + if (resp.success) { + this.queryParams.params.createOrgSid = resp.data + this.loadList() + } + }) + }, // 获取数据sid handleSelectionChange(row) { this.multipleSelection = row @@ -150,14 +160,6 @@ export default { console.log('获取sids数组', this.sids) }, 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 = row.sid this.$refs['divadd'].showEdit(sid, row) @@ -184,10 +186,11 @@ export default { applicationDateEnd: '', nodeState: '', purchaseOrderNo: '', - modelName: '' + modelName: '', + createOrgSid: '' } } - this.dosearch() + this.init() }, // 加载分页列表 loadList() { @@ -209,45 +212,6 @@ export default { var pageindex = index + 1 + pagestart return pageindex }, - // 删除 - doDel(row) { - if (this.sids.length === 0) { - this.$message({showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作'}) - return - } - var b = false; - this.multipleSelection.forEach(row => { - if (!(row.nodeState === '待提交')) { - b = true - } - }) - if (b) { - this.$message({showClose: true, type: 'error', message: '提交流程审批的记录不能进行删除!'}) - return - } - const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' - this.$confirm(tip, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - const loading = this.$loading({ - lock: true, - text: 'Loading', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }) - const _this = this - req.delBySids(this.sids).then(resp => { - loading.close() - _this.$message({type: 'success', message: resp.msg, showClose: true}) - _this.loadList() - }).catch(e => { - loading.close() - }) - }).catch(() => { - }) - }, // 子组件关闭（返回） resetState() { this.viewState = 1