diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 315596a..c293a54 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.constant.WebsocketConst; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; @@ -14,6 +15,7 @@ import com.ruoyi.customer.domain.Customer; import com.ruoyi.priceVerification.domain.QuotHj; import com.ruoyi.priceVerification.service.IQuotHjService; import com.ruoyi.quot.domain.QuotFile; +import com.ruoyi.quot.domain.QuotMaterial; import com.ruoyi.quot.service.IQuotFileService; import com.ruoyi.system.service.ISysNoticeService; import com.ruoyi.technicalConfirm.domain.QuotJsqr; @@ -94,6 +96,32 @@ public class QuotController extends BaseController return success(quotService.selectQuotByQuotId(quotId)); } + /** + * 导出产品明细模板 + * @param response + */ + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) + { + ExcelUtil util = new ExcelUtil(QuotMaterial.class); + util.importTemplateExcel(response, "产品数据"); + } + + /** + * 导入产品明细 + * @param file + * @param updateSupport + * @return + * @throws Exception + */ + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception + { + ExcelUtil util = new ExcelUtil(QuotMaterial.class); + List userList = util.importExcel(file.getInputStream()); + return success(userList); + } + /** * 新增报价 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java index 259deec..e882da1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java @@ -4,7 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; - +import com.ruoyi.common.annotation.Excel.Type; import java.math.BigDecimal; /** @@ -21,18 +21,23 @@ public class QuotMaterial extends BaseEntity private String matId; /** 型号 */ + @Excel(name = "型号") private String matXingh; /** 规格 */ + @Excel(name = "规格") private String matGuig; /** 电压 */ + @Excel(name = "电压") private String matDiany; /** 单位 */ + @Excel(name = "单位") private String matDanw; /** 数量 */ + @Excel(name = "数量") private BigDecimal matSl; /** */ diff --git a/ruoyi-ui/src/views/noticeUserSelect/noticeUserSelect/index.vue b/ruoyi-ui/src/views/noticeUserSelect/noticeUserSelect/index.vue index 708b1a0..a064df1 100644 --- a/ruoyi-ui/src/views/noticeUserSelect/noticeUserSelect/index.vue +++ b/ruoyi-ui/src/views/noticeUserSelect/noticeUserSelect/index.vue @@ -96,10 +96,14 @@ let noticeEventType = this.noticeEventType; data.noticeEventType = noticeEventType; data.userName = item.userName; - delNoticeEventUser(data).then(response => { - this.$modal.msgSuccess("删除成功"); - this.selectEvent(noticeEventType) - }); + + this.$modal.confirm('是否确认删除该发送对象:'+item.nickName+'?').then(function() { + }).then(() => { + delNoticeEventUser(data).then(response => { + this.$modal.msgSuccess("删除成功"); + this.selectEvent(noticeEventType) + }); + }).catch(() => {}); }, //打开选人弹窗 diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index e5f0183..a02d8ca 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -144,7 +144,10 @@ /> - + + @@ -236,6 +239,18 @@ + + + + + + + + + + + + @@ -245,6 +260,9 @@ 删除 + + 导入 + @@ -689,6 +707,33 @@ + + + + + +
将文件拖到此处,或点击上传
+
+ 仅允许导入xls、xlsx格式文件。 + 下载模板 +
+
+ +