From 9ccaff1031985417c58a0c6d9528fd621ca0a80b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 22 十一月 2023 14:20:53 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java | 2
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 109 +++++++++++++
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue | 42 +++++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java | 96 ++++++++++++
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 40 +++++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java | 23 ++
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml | 20 ++
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java | 83 ++++++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 12 +
web/src/views/modules/project/Environ-AddOrUpdate.vue | 10
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 2
14 files changed, 440 insertions(+), 11 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java
new file mode 100644
index 0000000..e4f716a
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java
@@ -0,0 +1,96 @@
+package com.zt.life.modules.itemCirculatOrder.controller;
+
+
+import com.zt.common.annotation.LogOperation;
+import com.zt.common.constant.Constant;
+import com.zt.common.annotation.QueryParam;
+import com.zt.common.db.query.QueryFilter;
+import com.zt.common.servlet.Result;
+import com.zt.common.servlet.PageResult;
+import com.zt.common.validator.AssertUtils;
+import com.zt.common.validator.ValidatorUtils;
+import com.zt.common.validator.group.AddGroup;
+import com.zt.common.validator.group.DefaultGroup;
+import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * item_circulat_order
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-22
+ */
+@RestController
+@RequestMapping("/itemCirculatOrder/ItemCirculatOrder/")
+@Api(tags="item_circulat_order")
+public class ItemCirculatOrderController {
+ @Autowired
+ private ItemCirculatOrderService itemCirculatOrderService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "code", value = "鐗╁搧娴佽浆鍗曠紪鍙�", dataType = Constant.QT.STRING, format = "code^LK") })
+ public PageResult<ItemCirculatOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+
+ return PageResult.ok(itemCirculatOrderService.page(queryFilter));
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("淇℃伅")
+ public Result<ItemCirculatOrder> get(@PathVariable("id") Long id){
+ ItemCirculatOrder data = itemCirculatOrderService.get(id);
+
+ return Result.ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("鏂板")
+ @LogOperation("鏂板")
+ public Result insert(@RequestBody ItemCirculatOrder itemCirculatOrder){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(itemCirculatOrder, AddGroup.class, DefaultGroup.class);
+ itemCirculatOrderService.insert(itemCirculatOrder);
+
+ return Result.ok();
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼")
+ @LogOperation("淇敼")
+ public Result update(@RequestBody ItemCirculatOrder itemCirculatOrder){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(itemCirculatOrder, UpdateGroup.class, DefaultGroup.class);
+ itemCirculatOrderService.update(itemCirculatOrder);
+
+ return Result.ok();
+ }
+
+ @DeleteMapping
+ @ApiOperation("鍒犻櫎")
+ @LogOperation("鍒犻櫎")
+ public Result delete(@RequestBody Long[] ids){
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ itemCirculatOrderService.delete(ids);
+
+ return Result.ok();
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java
new file mode 100644
index 0000000..f214240
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java
@@ -0,0 +1,23 @@
+package com.zt.life.modules.itemCirculatOrder.dao;
+
+import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * item_circulat_order
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-22
+ */
+@Mapper
+public interface ItemCirculatOrderDao extends BaseDao<ItemCirculatOrder> {
+
+ List<ItemCirculatOrder> getList(Map<String, Object> params);
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java
new file mode 100644
index 0000000..462b976
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java
@@ -0,0 +1,83 @@
+package com.zt.life.modules.itemCirculatOrder.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zt.common.entity.BusiEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * item_circulat_order
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("item_circulat_order")
+public class ItemCirculatOrder extends BusiEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "椤圭洰ID")
+ private Long projectId;
+
+ @ApiModelProperty(value = "鐗╁搧娴佽浆鍗曠紪鍙�")
+ private String code;
+
+ @ApiModelProperty(value = "鐗╁搧鍏朵粬瑕佹眰")
+ private String itemRequire;
+
+ @ApiModelProperty(value = "鐗╁搧鍏朵粬瑕佹眰鐨勫叾浠�")
+ private String itemOther;
+
+ @ApiModelProperty(value = "鐗╁搧鎺ユ敹浜�")
+ private String itemAccept;
+
+ @ApiModelProperty(value = "鐗╁搧鎺ユ敹鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date acceptDate;
+
+ @ApiModelProperty(value = "鐗╁搧鎺ユ敹鎯呭喌璇存槑")
+ private String acceptSituation;
+
+ @ApiModelProperty(value = "鏍″噯妫�娴嬩汉")
+ private String calibratDetect;
+
+ @ApiModelProperty(value = "鏍″噯妫�娴嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date detectDate;
+
+ @ApiModelProperty(value = "鏍″噯妫�娴嬫儏鍐佃鏄�")
+ private String detectSituation;
+
+ @ApiModelProperty(value = "鐗╁搧鍏ュ簱浜�")
+ private String warehouse;
+
+ @ApiModelProperty(value = "鐗╁搧鍏ュ簱鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date warehouseDate;
+
+ @ApiModelProperty(value = "鐗╁搧鍏ュ簱鎯呭喌")
+ private String warehouseSituation;
+
+ @ApiModelProperty(value = "鐗╁搧鍙戞斁浜�")
+ private String itemIssue;
+
+ @ApiModelProperty(value = "鐗╁搧鍙戞斁鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date issueDate;
+
+ @ApiModelProperty(value = "鐗╁搧鍙戞斁鎯呭喌璇存槑")
+ private String issueSituation;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "骞翠唤")
+ private String year;
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
new file mode 100644
index 0000000..f49494d
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -0,0 +1,40 @@
+package com.zt.life.modules.itemCirculatOrder.service;
+
+import com.zt.common.service.BaseService;
+import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import org.springframework.stereotype.Service;
+import com.zt.common.db.query.QueryFilter;
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * item_circulat_order
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-22
+ */
+@Service
+public class ItemCirculatOrderService extends BaseService<ItemCirculatOrderDao, ItemCirculatOrder> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param queryFilter
+ * @return
+ */
+ public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
+ return baseDao.getList(queryFilter.getQueryParams());
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ids
+ */
+ public void delete(Long[] ids) {
+ super.deleteLogic(ids);
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
index 35d0864..114e3c0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -18,6 +18,8 @@
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.oss.model.SysOss;
+import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +29,7 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import javax.swing.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -53,6 +56,9 @@
@Autowired
private SysCodeRuleService sysCodeRuleService;
+ @Autowired
+ private SysOssService sysOssService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -73,8 +79,14 @@
EnvironDto data = environService.getDto(environId, projectId);
if (environId != null) {
OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram");
+ List<SysOss> sysOss1 =sysOssService.getSysOssByBusiIdAnd(environId,"test_environt_diagram");
+ String Url = "";
+ for (SysOss sysOss: sysOss1){
+ Url=sysOss.getUrl();
+ }
if (ossDto != null) {
data.setFiles(ossDto);
+ data.setUrl(Url);
}
}
return Result.ok(data);
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java
index b3cf03f..a642ae3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java
@@ -20,5 +20,5 @@
public interface SoftwareTestOrderDao extends BaseDao<SoftwareTestOrder> {
List<SoftwareTestOrder> getList(Map<String, Object> params);
- List<DictIstance> dictList(String dictType, String projectCode,String softName);
+ List<DictIstance> dictList(String dictType, String projectCode,String softIdentity);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java
index bd5cb1d..4aecb73 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java
@@ -3,6 +3,7 @@
import com.zt.life.modules.project.model.*;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.sys.dto.OssDto;
+import com.zt.modules.oss.model.SysOss;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +24,9 @@
private TestAgencyInfo TestAgencyInfo;
@ApiModelProperty(value = "闄勪欢")
private OssDto files;
+ @ApiModelProperty(value = "鍥剧墖URL" )
+ private String Url;
+
@ApiModelProperty(value = "杞欢璧勬簮")
private List<EnvironSoftwareResources> softwareResourcesList = new ArrayList<>();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index 91bd749..326abdf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -8,6 +8,7 @@
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.oss.service.SysOssService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
@@ -50,6 +51,9 @@
@Autowired
private TestAgencyInfoService testAgencyInfoService;
+ @Autowired
+ private SysOssService sysOssService;
+
public EnvironDto getDto(Long environId, Long projectId) {
EnvironDto data = new EnvironDto();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index a4fa86c..a5a0624 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -152,8 +152,8 @@
} else {
Project project = projectService.get(projectId);
String projectCode = project.getCode();
- String softName =project.getSoftwareName();
- List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softName);
+ String softIdentity =project.getSoftwareIdentity();
+ List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softIdentity);
List<?> measuredList = testItemResult;
data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
diff --git a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
new file mode 100644
index 0000000..99d2c51
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
@@ -0,0 +1,20 @@
+<?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.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao">
+
+ <select id="getList" resultType="com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder">
+ select a.*
+ from item_circulat_order a
+ <where>
+ a.is_delete = 0
+ <if test="whereSql!=null">
+ and ${whereSql}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
+</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
index fd42f3c..e5b8ec0 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -20,7 +20,7 @@
<select id="dictList" resultType="com.zt.core.sys.dto.DictIstance">
SET @row_number = 0;
- SELECT concat('${softName}', dd.dict_label) AS name,
+ SELECT concat('${softIdentity}', dd.dict_label) AS name,
(@row_number := @row_number + 1) AS no,
case when '${dictType}'='product_library_file' then concat(dd.REMARK,'-${projectCode}') else
'1.0.0' end as identify
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
new file mode 100644
index 0000000..534782c
--- /dev/null
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -0,0 +1,109 @@
+<template>
+ <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
+ <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
+ <zt-form-item label="椤圭洰ID" prop="projectId" rules="required">
+ <el-input v-model="dataForm.projectId"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧娴佽浆鍗曠紪鍙�" prop="code" rules="required">
+ <el-input v-model="dataForm.code"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鍏朵粬瑕佹眰" prop="itemRequire" rules="required">
+ <el-input v-model="dataForm.itemRequire"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鍏朵粬瑕佹眰鐨勫叾浠�" prop="itemOther" rules="required">
+ <el-input v-model="dataForm.itemOther"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鎺ユ敹浜�" prop="itemAccept" rules="required">
+ <el-input v-model="dataForm.itemAccept"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鎺ユ敹鏃堕棿" prop="acceptDate" rules="required">
+ <el-input v-model="dataForm.acceptDate"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鎺ユ敹鎯呭喌璇存槑" prop="acceptSituation" rules="required">
+ <el-input v-model="dataForm.acceptSituation"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鏍″噯妫�娴嬩汉" prop="calibratDetect" rules="required">
+ <el-input v-model="dataForm.calibratDetect"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鏍″噯妫�娴嬫椂闂�" prop="detectDate" rules="required">
+ <el-input v-model="dataForm.detectDate"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鏍″噯妫�娴嬫儏鍐佃鏄�" prop="detectSituation" rules="required">
+ <el-input v-model="dataForm.detectSituation"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鍏ュ簱浜�" prop="warehouse" rules="required">
+ <el-input v-model="dataForm.warehouse"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鍏ュ簱鏃堕棿" prop="warehouseDate" rules="required">
+ <el-input v-model="dataForm.warehouseDate"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鍏ュ簱鎯呭喌" prop="warehouseSituation" rules="required">
+ <el-input v-model="dataForm.warehouseSituation"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鍙戞斁浜�" prop="itemIssue" rules="required">
+ <el-input v-model="dataForm.itemIssue"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鍙戞斁鏃堕棿" prop="issueDate" rules="required">
+ <el-input v-model="dataForm.issueDate"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐗╁搧鍙戞斁鎯呭喌璇存槑" prop="issueSituation" rules="required">
+ <el-input v-model="dataForm.issueSituation"></el-input>
+ </zt-form-item>
+ <zt-form-item label="澶囨敞" prop="remark" rules="required">
+ <el-input v-model="dataForm.remark"></el-input>
+ </zt-form-item>
+ <zt-form-item label="骞翠唤" prop="year" rules="required">
+ <el-input v-model="dataForm.year"></el-input>
+ </zt-form-item>
+ </el-form>
+ </zt-dialog>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ dataForm: {
+ id: '',
+ projectId: '',
+ code: '',
+ itemRequire: '',
+ itemOther: '',
+ itemAccept: '',
+ acceptDate: '',
+ acceptSituation: '',
+ calibratDetect: '',
+ detectDate: '',
+ detectSituation: '',
+ warehouse: '',
+ warehouseDate: '',
+ warehouseSituation: '',
+ itemIssue: '',
+ issueDate: '',
+ issueSituation: '',
+ remark: '',
+ year: ''
+ }
+ }
+ },
+ methods: {
+ // 鑾峰彇淇℃伅
+ async getInfo() {
+ let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/${this.dataForm.id}`)
+ this.dataForm = {
+ ...this.dataForm,
+ ...res.data
+ }
+ },
+ // 琛ㄥ崟鎻愪氦
+ async formSubmit() {
+ let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/itemCirculatOrder/ItemCirculatOrder/', this.dataForm)
+ if (res.success) {
+ await this.$tip.success()
+ this.$refs.dialog.close()
+ this.$emit('refreshDataList')
+ }
+ }
+ }
+ }
+</script>
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
new file mode 100644
index 0000000..e1c274a
--- /dev/null
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
@@ -0,0 +1,42 @@
+<template>
+ <el-card shadow="never" class="aui-card--fill">
+ <div class="mod-itemCirculatOrder-itemCirculatOrder}">
+ <zt-table-wraper query-url="/itemCirculatOrder/ItemCirculatOrder/page" delete-url="/itemCirculatOrder/ItemCirculatOrder" v-slot="{ table }">
+ <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
+ <el-form-item>
+ <el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ墿鍝佹祦杞崟缂栧彿" clearable></el-input>
+
+ </el-form-item>
+ <el-form-item>
+ <zt-button type="query" @click="table.query()"/>
+ <zt-button type="add" perm="itemCirculatOrder:add" @click="table.editHandle()"/>
+ <zt-button type="delete" perm="itemCirculatOrder:delete" @click="table.deleteHandle()"/>
+ </el-form-item>
+ </el-form>
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
+ <el-table-column type="selection" width="40"/>
+ <el-table-column prop="code" label="鐗╁搧娴佽浆鍗曠紪鍙�"/>
+ <zt-table-column-handle :table="table" edit-perm="itemCirculatOrder:update" delete-perm="itemCirculatOrder::delete"/>
+ </el-table>
+ <!-- 寮圭獥, 鏂板 / 淇敼 -->
+ <add-or-update @refreshDataList="table.query"/>
+ </zt-table-wraper>
+ </div>
+ </el-card>
+</template>
+
+<script>
+ import AddOrUpdate from './ItemCirculatOrder-AddOrUpdate'
+ export default {
+ data() {
+ return {
+ dataForm: {
+ code: '',
+ }
+ }
+ },
+ components: {
+ AddOrUpdate
+ }
+ }
+</script>
diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue
index a74e939..7c6c14c 100644
--- a/web/src/views/modules/project/Environ-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -111,8 +111,8 @@
<config-uploader busi-type="test_environt_diagram" model-name="dataForm" :dataForm="dataForm"
@getImageUrl="getImageUrl"
v-model="dataForm.files"/>
- <div v-if="image.url">
- <el-image :src="image.url"></el-image>
+ <div v-if="dataForm.url">
+ <el-image :src="dataForm.url"></el-image>
</div>
</div>
</div>
@@ -214,13 +214,9 @@
export default {
data() {
return {
- image: {
- url:'',
- width:'',
- height:1,
- },
dataForm: {
id: '',
+ url:'',
environ:{
code: '1',
hardSoftwareRes: '',
--
Gitblit v1.9.1