From e973ff52c9cfe64e6f5cb0ab1ab298890fa05802 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 22 十一月 2024 14:37:39 +0800
Subject: [PATCH] -产线信息
---
/dev/null | 288 ---------------
billion-main/src/main/java/com/billion/main/bs/controller/BsLineInfoController.java | 104 +++++
billion-ui/src/api/main/bs/lineInfo.js | 44 ++
billion-ui/src/views/main/da/materialCollection/index.vue | 66 +-
billion-main/src/main/java/com/billion/main/bs/domain/BsLineInfo.java | 43 ++
billion-main/src/main/java/com/billion/main/bs/service/impl/BsLineInfoServiceImpl.java | 98 +++++
billion-generator/src/main/resources/vm/vue/index.vue.vm | 2
billion-ui/src/views/main/bs/lineInfo/index.vue | 256 +++++++++++++
billion-main/src/main/java/com/billion/main/bs/mapper/BsLineInfoMapper.java | 63 +++
billion-main/src/main/resources/mapper/bs/BsLineInfoMapper.xml | 90 ++++
billion-main/src/main/java/com/billion/main/bs/service/IBsLineInfoService.java | 63 +++
11 files changed, 795 insertions(+), 322 deletions(-)
diff --git a/billion-generator/src/main/resources/vm/vue/index.vue.vm b/billion-generator/src/main/resources/vm/vue/index.vue.vm
index 5522dd5..9fc14f0 100644
--- a/billion-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/billion-generator/src/main/resources/vm/vue/index.vue.vm
@@ -548,7 +548,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
- this.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + ${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() {
+ this.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎').then(function() {
return del${BusinessName}(${pkColumn.javaField}s);
}).then(() => {
this.getList();
diff --git a/billion-main/src/main/java/com/billion/main/bs/controller/BsLineInfoController.java b/billion-main/src/main/java/com/billion/main/bs/controller/BsLineInfoController.java
new file mode 100644
index 0000000..d6cd816
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/bs/controller/BsLineInfoController.java
@@ -0,0 +1,104 @@
+package com.billion.main.bs.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.billion.common.annotation.Log;
+import com.billion.common.core.controller.BaseController;
+import com.billion.common.core.domain.AjaxResult;
+import com.billion.common.enums.BusinessType;
+import com.billion.main.bs.domain.BsLineInfo;
+import com.billion.main.bs.service.IBsLineInfoService;
+import com.billion.common.utils.poi.ExcelUtil;
+import com.billion.common.core.page.TableDataInfo;
+
+/**
+ * 浜х嚎淇℃伅Controller
+ *
+ * @author Billion-Yi
+ * @date 2024-11-22
+ */
+@RestController
+@RequestMapping("/bs/lineInfo")
+public class BsLineInfoController extends BaseController
+{
+ @Autowired
+ private IBsLineInfoService bsLineInfoService;
+
+ /**
+ * 鏌ヨ浜х嚎淇℃伅鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('bs:lineInfo:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(BsLineInfo bsLineInfo)
+ {
+ startPage();
+ List<BsLineInfo> list = bsLineInfoService.selectBsLineInfoList(bsLineInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭浜х嚎淇℃伅鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('bs:lineInfo:export')")
+ @Log(title = "浜х嚎淇℃伅", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, BsLineInfo bsLineInfo)
+ {
+ List<BsLineInfo> list = bsLineInfoService.selectBsLineInfoList(bsLineInfo);
+ ExcelUtil<BsLineInfo> util = new ExcelUtil<BsLineInfo>(BsLineInfo.class);
+ util.exportExcel(response, list, "浜х嚎淇℃伅鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇浜х嚎淇℃伅璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('bs:lineInfo:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(bsLineInfoService.selectBsLineInfoById(id));
+ }
+
+ /**
+ * 鏂板浜х嚎淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('bs:lineInfo:add')")
+ @Log(title = "浜х嚎淇℃伅", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody BsLineInfo bsLineInfo)
+ {
+ return toAjax(bsLineInfoService.insertBsLineInfo(bsLineInfo));
+ }
+
+ /**
+ * 淇敼浜х嚎淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('bs:lineInfo:edit')")
+ @Log(title = "浜х嚎淇℃伅", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody BsLineInfo bsLineInfo)
+ {
+ return toAjax(bsLineInfoService.updateBsLineInfo(bsLineInfo));
+ }
+
+ /**
+ * 鍒犻櫎浜х嚎淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('bs:lineInfo:remove')")
+ @Log(title = "浜х嚎淇℃伅", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(bsLineInfoService.deleteBsLineInfoByIds(ids));
+ }
+}
diff --git a/billion-main/src/main/java/com/billion/main/bs/domain/BsLineInfo.java b/billion-main/src/main/java/com/billion/main/bs/domain/BsLineInfo.java
new file mode 100644
index 0000000..38c1f77
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/bs/domain/BsLineInfo.java
@@ -0,0 +1,43 @@
+package com.billion.main.bs.domain;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.billion.common.annotation.Excel;
+import com.billion.main.common.BaseEntity;
+
+/**
+ * 浜х嚎淇℃伅瀵硅薄 bs_line_info
+ *
+ * @author Billion-Yi
+ * @date 2024-11-22
+ */
+@Data
+public class BsLineInfo extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭id */
+ private Long id;
+
+ /** 浜х嚎缂栧彿 */
+ @Excel(name = "浜х嚎缂栧彿")
+ private String lineCode;
+
+ /** 浜х嚎鍚嶇О */
+ @Excel(name = "浜х嚎鍚嶇О")
+ private String lineName;
+
+ /** 澶囨敞 */
+ @Excel(name = "澶囨敞")
+ private String remarks;
+
+ /** 鐘舵�� */
+ @Excel(name = "鐘舵��")
+ private String status;
+
+ /** 閫昏緫鍒犻櫎 */
+ private String delFlag;
+
+
+}
diff --git a/billion-main/src/main/java/com/billion/main/bs/mapper/BsLineInfoMapper.java b/billion-main/src/main/java/com/billion/main/bs/mapper/BsLineInfoMapper.java
new file mode 100644
index 0000000..c1c157d
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/bs/mapper/BsLineInfoMapper.java
@@ -0,0 +1,63 @@
+package com.billion.main.bs.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.billion.main.bs.domain.BsLineInfo;
+
+/**
+ * 浜х嚎淇℃伅Mapper鎺ュ彛
+ *
+ * @author Billion-Yi
+ * @date 2024-11-22
+ */
+public interface BsLineInfoMapper extends BaseMapper<BsLineInfo>
+{
+ /**
+ * 鏌ヨ浜х嚎淇℃伅
+ *
+ * @param id 浜х嚎淇℃伅涓婚敭
+ * @return 浜х嚎淇℃伅
+ */
+ public BsLineInfo selectBsLineInfoById(Long id);
+
+ /**
+ * 鏌ヨ浜х嚎淇℃伅鍒楄〃
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 浜х嚎淇℃伅闆嗗悎
+ */
+ public List<BsLineInfo> selectBsLineInfoList(BsLineInfo bsLineInfo);
+
+ /**
+ * 鏂板浜х嚎淇℃伅
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 缁撴灉
+ */
+ public int insertBsLineInfo(BsLineInfo bsLineInfo);
+
+ /**
+ * 淇敼浜х嚎淇℃伅
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 缁撴灉
+ */
+ public int updateBsLineInfo(BsLineInfo bsLineInfo);
+
+ /**
+ * 鍒犻櫎浜х嚎淇℃伅
+ *
+ * @param id 浜х嚎淇℃伅涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteBsLineInfoById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎浜х嚎淇℃伅
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteBsLineInfoByIds(Long[] ids);
+}
diff --git a/billion-main/src/main/java/com/billion/main/bs/service/IBsLineInfoService.java b/billion-main/src/main/java/com/billion/main/bs/service/IBsLineInfoService.java
new file mode 100644
index 0000000..830daeb
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/bs/service/IBsLineInfoService.java
@@ -0,0 +1,63 @@
+package com.billion.main.bs.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.billion.main.bs.domain.BsLineInfo;
+
+/**
+ * 浜х嚎淇℃伅Service鎺ュ彛
+ *
+ * @author Billion-Yi
+ * @date 2024-11-22
+ */
+public interface IBsLineInfoService extends IService<BsLineInfo>
+{
+ /**
+ * 鏌ヨ浜х嚎淇℃伅
+ *
+ * @param id 浜х嚎淇℃伅涓婚敭
+ * @return 浜х嚎淇℃伅
+ */
+ public BsLineInfo selectBsLineInfoById(Long id);
+
+ /**
+ * 鏌ヨ浜х嚎淇℃伅鍒楄〃
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 浜х嚎淇℃伅闆嗗悎
+ */
+ public List<BsLineInfo> selectBsLineInfoList(BsLineInfo bsLineInfo);
+
+ /**
+ * 鏂板浜х嚎淇℃伅
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 缁撴灉
+ */
+ public int insertBsLineInfo(BsLineInfo bsLineInfo);
+
+ /**
+ * 淇敼浜х嚎淇℃伅
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 缁撴灉
+ */
+ public int updateBsLineInfo(BsLineInfo bsLineInfo);
+
+ /**
+ * 鎵归噺鍒犻櫎浜х嚎淇℃伅
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑浜х嚎淇℃伅涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteBsLineInfoByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎浜х嚎淇℃伅淇℃伅
+ *
+ * @param id 浜х嚎淇℃伅涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteBsLineInfoById(Long id);
+}
diff --git a/billion-main/src/main/java/com/billion/main/bs/service/impl/BsLineInfoServiceImpl.java b/billion-main/src/main/java/com/billion/main/bs/service/impl/BsLineInfoServiceImpl.java
new file mode 100644
index 0000000..fc39aca
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/bs/service/impl/BsLineInfoServiceImpl.java
@@ -0,0 +1,98 @@
+package com.billion.main.bs.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.billion.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.billion.main.bs.mapper.BsLineInfoMapper;
+import com.billion.main.bs.domain.BsLineInfo;
+import com.billion.main.bs.service.IBsLineInfoService;
+
+/**
+ * 浜х嚎淇℃伅Service涓氬姟灞傚鐞�
+ *
+ * @author Billion-Yi
+ * @date 2024-11-22
+ */
+@Service
+public class BsLineInfoServiceImpl extends ServiceImpl<BsLineInfoMapper, BsLineInfo> implements IBsLineInfoService
+{
+ @Autowired
+ private BsLineInfoMapper bsLineInfoMapper;
+
+ /**
+ * 鏌ヨ浜х嚎淇℃伅
+ *
+ * @param id 浜х嚎淇℃伅涓婚敭
+ * @return 浜х嚎淇℃伅
+ */
+ @Override
+ public BsLineInfo selectBsLineInfoById(Long id)
+ {
+ return bsLineInfoMapper.selectBsLineInfoById(id);
+ }
+
+ /**
+ * 鏌ヨ浜х嚎淇℃伅鍒楄〃
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 浜х嚎淇℃伅
+ */
+ @Override
+ public List<BsLineInfo> selectBsLineInfoList(BsLineInfo bsLineInfo)
+ {
+ return bsLineInfoMapper.selectBsLineInfoList(bsLineInfo);
+ }
+
+ /**
+ * 鏂板浜х嚎淇℃伅
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertBsLineInfo(BsLineInfo bsLineInfo)
+ {
+ bsLineInfo.setCreateTime(DateUtils.getNowDate());
+ return bsLineInfoMapper.insertBsLineInfo(bsLineInfo);
+ }
+
+ /**
+ * 淇敼浜х嚎淇℃伅
+ *
+ * @param bsLineInfo 浜х嚎淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateBsLineInfo(BsLineInfo bsLineInfo)
+ {
+ bsLineInfo.setUpdateTime(DateUtils.getNowDate());
+ return bsLineInfoMapper.updateBsLineInfo(bsLineInfo);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎浜х嚎淇℃伅
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑浜х嚎淇℃伅涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteBsLineInfoByIds(Long[] ids)
+ {
+ return bsLineInfoMapper.deleteBsLineInfoByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎浜х嚎淇℃伅淇℃伅
+ *
+ * @param id 浜х嚎淇℃伅涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteBsLineInfoById(Long id)
+ {
+ return bsLineInfoMapper.deleteBsLineInfoById(id);
+ }
+}
diff --git a/billion-main/src/main/resources/mapper/bs/BsLineInfoMapper.xml b/billion-main/src/main/resources/mapper/bs/BsLineInfoMapper.xml
new file mode 100644
index 0000000..f1c89d8
--- /dev/null
+++ b/billion-main/src/main/resources/mapper/bs/BsLineInfoMapper.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.billion.main.bs.mapper.BsLineInfoMapper">
+
+ <resultMap type="BsLineInfo" id="BsLineInfoResult">
+ <result property="id" column="id" />
+ <result property="lineCode" column="line_code" />
+ <result property="lineName" column="line_name" />
+ <result property="remarks" column="remarks" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="status" column="status" />
+ <result property="delFlag" column="del_flag" />
+ </resultMap>
+
+ <sql id="selectBsLineInfoVo">
+ select id, line_code, line_name, remarks, create_by, create_time, update_by, update_time, status, del_flag from bs_line_info
+ </sql>
+
+ <select id="selectBsLineInfoList" parameterType="BsLineInfo" resultMap="BsLineInfoResult">
+ <include refid="selectBsLineInfoVo"/>
+ <where>
+ <if test="lineCode != null and lineCode != ''"> and line_code like concat('%', #{lineCode}, '%')</if>
+ <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
+ <if test="status != null and status != ''"> and status = #{status}</if>
+ </where>
+ </select>
+
+ <select id="selectBsLineInfoById" parameterType="Long" resultMap="BsLineInfoResult">
+ <include refid="selectBsLineInfoVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertBsLineInfo" parameterType="BsLineInfo" useGeneratedKeys="true" keyProperty="id">
+ insert into bs_line_info
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="lineCode != null and lineCode != ''">line_code,</if>
+ <if test="lineName != null">line_name,</if>
+ <if test="remarks != null">remarks,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="status != null">status,</if>
+ <if test="delFlag != null">del_flag,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="lineCode != null and lineCode != ''">#{lineCode},</if>
+ <if test="lineName != null">#{lineName},</if>
+ <if test="remarks != null">#{remarks},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="status != null">#{status},</if>
+ <if test="delFlag != null">#{delFlag},</if>
+ </trim>
+ </insert>
+
+ <update id="updateBsLineInfo" parameterType="BsLineInfo">
+ update bs_line_info
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="lineCode != null and lineCode != ''">line_code = #{lineCode},</if>
+ <if test="lineName != null">line_name = #{lineName},</if>
+ <if test="remarks != null">remarks = #{remarks},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="status != null">status = #{status},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteBsLineInfoById" parameterType="Long">
+ delete from bs_line_info where id = #{id}
+ </delete>
+
+ <delete id="deleteBsLineInfoByIds" parameterType="String">
+ delete from bs_line_info where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/billion-ui/src/api/main/bs/lineInfo.js b/billion-ui/src/api/main/bs/lineInfo.js
new file mode 100644
index 0000000..b2f634f
--- /dev/null
+++ b/billion-ui/src/api/main/bs/lineInfo.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ浜х嚎淇℃伅鍒楄〃
+export function listLineInfo(query) {
+ return request({
+ url: '/bs/lineInfo/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ浜х嚎淇℃伅璇︾粏
+export function getLineInfo(id) {
+ return request({
+ url: '/bs/lineInfo/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板浜х嚎淇℃伅
+export function addLineInfo(data) {
+ return request({
+ url: '/bs/lineInfo',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼浜х嚎淇℃伅
+export function updateLineInfo(data) {
+ return request({
+ url: '/bs/lineInfo',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎浜х嚎淇℃伅
+export function delLineInfo(id) {
+ return request({
+ url: '/bs/lineInfo/' + id,
+ method: 'delete'
+ })
+}
diff --git a/billion-ui/src/api/main/bs/workshop.js b/billion-ui/src/api/main/bs/workshop.js
deleted file mode 100644
index f062146..0000000
--- a/billion-ui/src/api/main/bs/workshop.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ杞﹂棿淇℃伅鍒楄〃
-export function listWorkshop(query) {
- return request({
- url: '/bs/workshop/list',
- method: 'get',
- params: query
- })
-}
-
-// 鏌ヨ杞﹂棿淇℃伅璇︾粏
-export function getWorkshop(id) {
- return request({
- url: '/bs/workshop/' + id,
- method: 'get'
- })
-}
-
-// 鏂板杞﹂棿淇℃伅
-export function addWorkshop(data) {
- return request({
- url: '/bs/workshop',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼杞﹂棿淇℃伅
-export function updateWorkshop(data) {
- return request({
- url: '/bs/workshop',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎杞﹂棿淇℃伅
-export function delWorkshop(id) {
- return request({
- url: '/bs/workshop/' + id,
- method: 'delete'
- })
-}
diff --git a/billion-ui/src/views/main/bs/lineInfo/index.vue b/billion-ui/src/views/main/bs/lineInfo/index.vue
new file mode 100644
index 0000000..ef17838
--- /dev/null
+++ b/billion-ui/src/views/main/bs/lineInfo/index.vue
@@ -0,0 +1,256 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="浜х嚎缂栧彿" prop="lineCode">
+ <el-input
+ v-model="queryParams.lineCode"
+ placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="浜х嚎鍚嶇О" prop="lineName">
+ <el-input
+ v-model="queryParams.lineName"
+ placeholder="璇疯緭鍏ヤ骇绾垮悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item style="float: right">
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['bs:lineInfo:add']"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['bs:lineInfo:edit']"
+ >淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['bs:lineInfo:remove']"
+ >鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['bs:lineInfo:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ </el-row>
+
+ <el-table border v-loading="loading" :data="lineInfoList" @selection-change="handleSelectionChange">
+ <el-table-column show-overflow-tooltip="true" type="selection" width="55" align="center" />
+ <el-table-column label="涓婚敭id" align="center" prop="id" />
+ <el-table-column label="浜х嚎缂栧彿" align="center" prop="lineCode" />
+ <el-table-column label="浜х嚎鍚嶇О" align="center" prop="lineName" />
+ <el-table-column label="澶囨敞" align="center" prop="remarks" />
+ <el-table-column label="鐘舵��" align="center" prop="status" />
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+
+ <!-- 娣诲姞鎴栦慨鏀逛骇绾夸俊鎭璇濇 -->
+ <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="浜х嚎缂栧彿" prop="lineCode">
+ <el-input v-model="form.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" />
+ </el-form-item>
+ <el-form-item label="浜х嚎鍚嶇О" prop="lineName">
+ <el-input v-model="form.lineName" placeholder="璇疯緭鍏ヤ骇绾垮悕绉�" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remarks">
+ <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { listLineInfo, getLineInfo, delLineInfo, addLineInfo, updateLineInfo } from "@/api/main/bs/lineInfo";
+
+export default {
+ name: "LineInfo",
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 浜х嚎淇℃伅琛ㄦ牸鏁版嵁
+ lineInfoList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ lineCode: null,
+ lineName: null,
+ status: null,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ lineCode: [
+ { required: true, message: "浜х嚎缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 鏌ヨ浜х嚎淇℃伅鍒楄〃 */
+ getList() {
+ this.loading = true;
+ listLineInfo(this.queryParams).then(response => {
+ this.lineInfoList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ lineCode: null,
+ lineName: null,
+ remarks: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null,
+ status: null,
+ delFlag: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ this.single = selection.length!==1
+ this.multiple = !selection.length
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞浜х嚎淇℃伅";
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getLineInfo(id).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.title = "淇敼浜х嚎淇℃伅";
+ });
+ },
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.id != null) {
+ updateLineInfo(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addLineInfo(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎').then(function() {
+ return delLineInfo(ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('bs/lineInfo/export', {
+ ...this.queryParams
+ }, `lineInfo_${new Date().getTime()}.xlsx`)
+ }
+ }
+};
+</script>
diff --git a/billion-ui/src/views/main/bs/workshop/index.vue b/billion-ui/src/views/main/bs/workshop/index.vue
deleted file mode 100644
index 7864932..0000000
--- a/billion-ui/src/views/main/bs/workshop/index.vue
+++ /dev/null
@@ -1,288 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="杞﹂棿缂栫爜" prop="workshopCode">
- <el-input
- v-model="queryParams.workshopCode"
- placeholder="璇疯緭鍏ヨ溅闂寸紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="杞﹂棿鍚嶇О" prop="workshopName">
- <el-input
- v-model="queryParams.workshopName"
- placeholder="璇疯緭鍏ヨ溅闂村悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['bs:workshop:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['bs:workshop:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['bs:workshop:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['bs:workshop:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="workshopList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="id" align="center" prop="id" />
- <el-table-column label="杞﹂棿缂栫爜" align="center" prop="workshopCode" />
- <el-table-column label="杞﹂棿鍚嶇О" align="center" prop="workshopName" />
- <el-table-column label="澶囨敞" align="center" prop="remarks" />
- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" />
-<!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">-->
-<!-- <template slot-scope="scope">-->
-<!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
- <el-table-column label="鏇存柊浜�" align="center" prop="updateBy" />
-<!-- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180">-->
-<!-- <template slot-scope="scope">-->
-<!-- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['bs:workshop:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['bs:workshop:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀硅溅闂翠俊鎭璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="杞﹂棿缂栫爜" prop="workshopCode">
- <el-input v-model="form.workshopCode" placeholder="璇疯緭鍏ヨ溅闂寸紪鐮�" />
- </el-form-item>
- <el-form-item label="杞﹂棿鍚嶇О" prop="workshopName">
- <el-input v-model="form.workshopName" placeholder="璇疯緭鍏ヨ溅闂村悕绉�" />
- </el-form-item>
- <el-form-item label="澶囩敤瀛楁1" prop="spareField1">
- <el-input v-model="form.spareField1" placeholder="璇疯緭鍏ュ鐢ㄥ瓧娈�1" />
- </el-form-item>
- <el-form-item label="澶囩敤瀛楁2" prop="spareField2">
- <el-input v-model="form.spareField2" placeholder="璇疯緭鍏ュ鐢ㄥ瓧娈�2" />
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/main/bs/workshop";
-
-export default {
- name: "Workshop",
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 杞﹂棿淇℃伅琛ㄦ牸鏁版嵁
- workshopList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- workshopCode: null,
- workshopName: null,
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ杞﹂棿淇℃伅鍒楄〃 */
- getList() {
- this.loading = true;
- listWorkshop(this.queryParams).then(response => {
- this.workshopList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- workshopCode: null,
- workshopName: null,
- spareField1: null,
- spareField2: null,
- remarks: null,
- createBy: null,
- createTime: null,
- updateBy: null,
- updateTime: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞杞﹂棿淇℃伅";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getWorkshop(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼杞﹂棿淇℃伅";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateWorkshop(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addWorkshop(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎杞﹂棿淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delWorkshop(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('bs/workshop/export', {
- ...this.queryParams
- }, `workshop_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/billion-ui/src/views/main/da/materialCollection/index.vue b/billion-ui/src/views/main/da/materialCollection/index.vue
index 697fd61..7ab4717 100644
--- a/billion-ui/src/views/main/da/materialCollection/index.vue
+++ b/billion-ui/src/views/main/da/materialCollection/index.vue
@@ -40,38 +40,38 @@
</el-form>
<el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['da:materialCollection:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['da:materialCollection:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['da:materialCollection:remove']"
- >鍒犻櫎</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- icon="el-icon-plus"-->
+<!-- size="mini"-->
+<!-- @click="handleAdd"-->
+<!-- v-hasPermi="['da:materialCollection:add']"-->
+<!-- >鏂板</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="success"-->
+<!-- plain-->
+<!-- icon="el-icon-edit"-->
+<!-- size="mini"-->
+<!-- :disabled="single"-->
+<!-- @click="handleUpdate"-->
+<!-- v-hasPermi="['da:materialCollection:edit']"-->
+<!-- >淇敼</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="danger"-->
+<!-- plain-->
+<!-- icon="el-icon-delete"-->
+<!-- size="mini"-->
+<!-- :disabled="multiple"-->
+<!-- @click="handleDelete"-->
+<!-- v-hasPermi="['da:materialCollection:remove']"-->
+<!-- >鍒犻櫎</el-button>-->
+<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -86,7 +86,7 @@
<el-table border v-loading="loading" :data="materialCollectionList" @selection-change="handleSelectionChange">
<el-table-column show-overflow-tooltip="true" type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭id" align="center" prop="id" />
+<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
<el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode" />
<el-table-column label="宸ヤ綅缂栫爜" align="center" prop="locationCode" />
<el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode" />
--
Gitblit v1.9.3