客户管理

.idea/compiler.xml

@@ -43,6 +43,7 @@
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="jeecg-boot-base-core" options="-parameters" />
       <module name="jeecg-boot-parent" options="" />
+      <module name="jeecg-module-system" options="-parameters" />
       <module name="jeecg-system-api" options="" />
       <module name="jeecg-system-biz" options="-parameters" />
       <module name="jeecg-system-cloud-api" options="-parameters" />

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/controller/ItdmWeituoYangpinController.java

@@ -1,177 +0,0 @@
-package org.jeecg.modules.itdmWeituoChaXun.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.itdmWeituoChaXun.entity.ItdmWeituoYangpin;
-import org.jeecg.modules.itdmWeituoChaXun.service.IItdmWeituoYangpinService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 委托样品
- * @Author: jeecg-boot
- * @Date:   2023-05-22
- * @Version: V1.0
- */
-@Api(tags="委托样品")
-@RestController
-@RequestMapping("/itdmWeituoChaXun/itdmWeituoYangpin")
-@Slf4j
-public class ItdmWeituoYangpinController extends JeecgController<ItdmWeituoYangpin, IItdmWeituoYangpinService> {
-	@Autowired
-	private IItdmWeituoYangpinService itdmWeituoYangpinService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param itdmWeituoYangpin
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "委托样品-分页列表查询")
-	@ApiOperation(value="委托样品-分页列表查询", notes="委托样品-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<ItdmWeituoYangpin>> queryPageList(ItdmWeituoYangpin itdmWeituoYangpin,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ItdmWeituoYangpin> queryWrapper = QueryGenerator.initQueryWrapper(itdmWeituoYangpin, req.getParameterMap());
-		Page<ItdmWeituoYangpin> page = new Page<ItdmWeituoYangpin>(pageNo, pageSize);
-		IPage<ItdmWeituoYangpin> pageList = itdmWeituoYangpinService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param itdmWeituoYangpin
-	 * @return
-	 */
-	@AutoLog(value = "委托样品-添加")
-	@ApiOperation(value="委托样品-添加", notes="委托样品-添加")
-	//@RequiresPermissions("org.jeecg.modules:itdm_weituo_yangpin:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ItdmWeituoYangpin itdmWeituoYangpin) {
-		itdmWeituoYangpinService.save(itdmWeituoYangpin);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param itdmWeituoYangpin
-	 * @return
-	 */
-	@AutoLog(value = "委托样品-编辑")
-	@ApiOperation(value="委托样品-编辑", notes="委托样品-编辑")
-	//@RequiresPermissions("org.jeecg.modules:itdm_weituo_yangpin:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ItdmWeituoYangpin itdmWeituoYangpin) {
-		itdmWeituoYangpinService.updateById(itdmWeituoYangpin);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "委托样品-通过id删除")
-	@ApiOperation(value="委托样品-通过id删除", notes="委托样品-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:itdm_weituo_yangpin:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		itdmWeituoYangpinService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "委托样品-批量删除")
-	@ApiOperation(value="委托样品-批量删除", notes="委托样品-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:itdm_weituo_yangpin:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.itdmWeituoYangpinService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "委托样品-通过id查询")
-	@ApiOperation(value="委托样品-通过id查询", notes="委托样品-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ItdmWeituoYangpin> queryById(@RequestParam(name="id",required=true) String id) {
-		ItdmWeituoYangpin itdmWeituoYangpin = itdmWeituoYangpinService.getById(id);
-		if(itdmWeituoYangpin==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(itdmWeituoYangpin);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param itdmWeituoYangpin
-    */
-    //@RequiresPermissions("org.jeecg.modules:itdm_weituo_yangpin:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ItdmWeituoYangpin itdmWeituoYangpin) {
-        return super.exportXls(request, itdmWeituoYangpin, ItdmWeituoYangpin.class, "委托样品");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    //@RequiresPermissions("itdm_weituo_yangpin:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ItdmWeituoYangpin.class);
-    }
-
-}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/entity/ItdmWeituoYangpin.java

@@ -1,82 +0,0 @@
-package org.jeecg.modules.itdmWeituoChaXun.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 委托样品
- * @Author: jeecg-boot
- * @Date:   2023-05-22
- * @Version: V1.0
- */
-@Data
-@TableName("itdm_weituo_yangpin")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="itdm_weituo_yangpin对象", description="委托样品")
-public class ItdmWeituoYangpin implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**所属部门*/
-    @ApiModelProperty(value = "所属部门")
-    private java.lang.String sysOrgCode;
-	/**委托单id*/
-	@Excel(name = "委托单id", width = 15)
-    @ApiModelProperty(value = "委托单id")
-    private java.lang.String weituoId;
-	/**样品名称*/
-	@Excel(name = "样品名称", width = 15)
-    @ApiModelProperty(value = "样品名称")
-    private java.lang.String sampleName;
-	/**样品规格/型号*/
-	@Excel(name = "样品规格/型号", width = 15)
-    @ApiModelProperty(value = "样品规格/型号")
-    private java.lang.String sampleModelSpecification;
-	/**样品数量*/
-	@Excel(name = "样品数量", width = 15)
-    @ApiModelProperty(value = "样品数量")
-    private java.lang.String sampleQuantities;
-	/**生产厂家*/
-	@Excel(name = "生产厂家", width = 15)
-    @ApiModelProperty(value = "生产厂家")
-    private java.lang.String sampleManufacturer;
-	/**样品编号*/
-	@Excel(name = "样品编号", width = 15)
-    @ApiModelProperty(value = "样品编号")
-    private java.lang.String sampleCode;
-}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/mapper/ItdmWeituoChaxunMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.itdmWeituoChaXun.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.itdmWeituoChaXun.entity.ItdmWeituoYangpin;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 委托样品
- * @Author: jeecg-boot
- * @Date:   2023-05-22
- * @Version: V1.0
- */
-public interface ItdmWeituoChaxunMapper extends BaseMapper<ItdmWeituoYangpin> {
-
-}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/mapper/xml/ItdmWeituoYangpinMapper.xml

@@ -1,5 +0,0 @@
-<?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="org.jeecg.modules.itdmWeituoChaXun.mapper.ItdmWeituoYangpinMapper">
-
-</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/service/IItdmWeituoYangpinService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.itdmWeituoChaXun.service;
-
-import org.jeecg.modules.itdmWeituoChaXun.entity.ItdmWeituoYangpin;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 委托样品
- * @Author: jeecg-boot
- * @Date:   2023-05-22
- * @Version: V1.0
- */
-public interface IItdmWeituoYangpinService extends IService<ItdmWeituoYangpin> {
-
-}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/service/impl/ItdmWeituoYangpinServiceImpl.java

@@ -1,20 +0,0 @@
-package org.jeecg.modules.itdmWeituoChaXun.service.impl;
-
-import org.jeecg.modules.itdmWeituoChaXun.entity.ItdmWeituoYangpin;
-import org.jeecg.modules.itdmWeituoChaXun.mapper.ItdmWeituoChaxunMapper;
-import org.jeecg.modules.itdmWeituoChaXun.service.IItdmWeituoYangpinService;
-import org.jeecg.modules.weituo.mapper.ItdmWeituoYangpinMapper;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 委托样品
- * @Author: jeecg-boot
- * @Date:   2023-05-22
- * @Version: V1.0
- */
-@Service
-public class ItdmWeituoYangpinServiceImpl extends ServiceImpl<ItdmWeituoChaxunMapper, ItdmWeituoYangpin> implements IItdmWeituoYangpinService {
-
-}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/vue/ItdmWeituoYangpinList.vue

@@ -1,201 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('委托样品')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <itdm-weituo-yangpin-modal ref="modalForm" @ok="modalFormOk"></itdm-weituo-yangpin-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ItdmWeituoYangpinModal from './modules/ItdmWeituoYangpinModal'
-
-  export default {
-    name: 'ItdmWeituoYangpinList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      ItdmWeituoYangpinModal
-    },
-    data () {
-      return {
-        description: '委托样品管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'委托单id',
-            align:"center",
-            dataIndex: 'weituoId'
-          },
-          {
-            title:'样品名称',
-            align:"center",
-            dataIndex: 'sampleName'
-          },
-          {
-            title:'样品规格/型号',
-            align:"center",
-            dataIndex: 'sampleModelSpecification'
-          },
-          {
-            title:'样品数量',
-            align:"center",
-            dataIndex: 'sampleQuantities'
-          },
-          {
-            title:'生产厂家',
-            align:"center",
-            dataIndex: 'sampleManufacturer'
-          },
-          {
-            title:'样品编号',
-            align:"center",
-            dataIndex: 'sampleCode'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/itdmWeituoChaXun/itdmWeituoYangpin/list",
-          delete: "/itdmWeituoChaXun/itdmWeituoYangpin/delete",
-          deleteBatch: "/itdmWeituoChaXun/itdmWeituoYangpin/deleteBatch",
-          exportXlsUrl: "/itdmWeituoChaXun/itdmWeituoYangpin/exportXls",
-          importExcelUrl: "itdmWeituoChaXun/itdmWeituoYangpin/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'weituoId',text:'委托单id',dictCode:''})
-        fieldList.push({type:'string',value:'sampleName',text:'样品名称',dictCode:''})
-        fieldList.push({type:'string',value:'sampleModelSpecification',text:'样品规格/型号',dictCode:''})
-        fieldList.push({type:'string',value:'sampleQuantities',text:'样品数量',dictCode:''})
-        fieldList.push({type:'string',value:'sampleManufacturer',text:'生产厂家',dictCode:''})
-        fieldList.push({type:'string',value:'sampleCode',text:'样品编号',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/vue/ItdmWeituoYangpin_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('2023052210297880490', NULL, '委托样品', '/itdmWeituoChaXun/itdmWeituoYangpinList', 'module-iTDM/itdmWeituoChaXun/ItdmWeituoYangpinList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-22 10:29:49', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023052210297880491', '2023052210297880490', '新增', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_weituo_yangpin:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-22 10:29:49', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023052210297880492', '2023052210297880490', '编辑', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_weituo_yangpin:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-22 10:29:49', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023052210297890493', '2023052210297880490', '删除', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_weituo_yangpin:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-22 10:29:49', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023052210297890494', '2023052210297880490', '批量删除', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_weituo_yangpin:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-22 10:29:49', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023052210297890495', '2023052210297880490', '导出excel', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_weituo_yangpin:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-22 10:29:49', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023052210297890496', '2023052210297880490', '导入excel', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_weituo_yangpin:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-22 10:29:49', NULL, NULL, 0, 0, '1', 0);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/vue/modules/ItdmWeituoYangpinForm.vue

@@ -1,141 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="委托单id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="weituoId">
-              <a-input v-model="model.weituoId" placeholder="请输入委托单id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="样品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleName">
-              <a-input v-model="model.sampleName" placeholder="请输入样品名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="样品规格/型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleModelSpecification">
-              <a-input v-model="model.sampleModelSpecification" placeholder="请输入样品规格/型号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="样品数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleQuantities">
-              <a-input v-model="model.sampleQuantities" placeholder="请输入样品数量"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="生产厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleManufacturer">
-              <a-input v-model="model.sampleManufacturer" placeholder="请输入生产厂家"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="样品编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sampleCode">
-              <a-input v-model="model.sampleCode" placeholder="请输入样品编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'ItdmWeituoYangpinForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-           sampleName: [
-              { required: true, message: '请输入样品名称!'},
-           ],
-           sampleModelSpecification: [
-              { required: true, message: '请输入样品规格/型号!'},
-           ],
-           sampleQuantities: [
-              { required: true, message: '请输入样品数量!'},
-           ],
-           sampleManufacturer: [
-              { required: true, message: '请输入生产厂家!'},
-           ],
-        },
-        url: {
-          add: "/itdmWeituoChaXun/itdmWeituoYangpin/add",
-          edit: "/itdmWeituoChaXun/itdmWeituoYangpin/edit",
-          queryById: "/itdmWeituoChaXun/itdmWeituoYangpin/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/vue/modules/ItdmWeituoYangpinModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <itdm-weituo-yangpin-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-weituo-yangpin-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import ItdmWeituoYangpinForm from './ItdmWeituoYangpinForm'
-
-  export default {
-    name: 'ItdmWeituoYangpinModal',
-    components: {
-      ItdmWeituoYangpinForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWeituoChaXun/vue/modules/ItdmWeituoYangpinModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <itdm-weituo-yangpin-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-weituo-yangpin-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import ItdmWeituoYangpinForm from './ItdmWeituoYangpinForm'
-  export default {
-    name: 'ItdmWeituoYangpinModal',
-    components: {
-      ItdmWeituoYangpinForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/entity/ItdmWeituoInfo.java

@@ -93,6 +93,7 @@ public class ItdmWeituoInfo implements Serializable {
     private String teshuyaoqiu;
 	/**审核状态*/
 	@Excel(name = "审核状态", width = 15)
+    @Dict(dicCode = "shenhe_status")
     @ApiModelProperty(value = "审核状态")
     private String shenheStatus;
 	/**审核错误原因*/