From 2df883fcbed176f83d8d144fd007e7f72fcb54d6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 01 二月 2024 17:21:24 +0800
Subject: [PATCH] 修改
---
starter/src/main/resources/application.yml | 4 +-
web/packages/components/zt-dialog/src/zt-dialog.vue | 5 +-
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 44 ++++++++++++++++++----
web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue | 2
modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java | 9 ++--
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 2
web/public/index.html | 6 +-
web/report.20220119.103056.5416.0.001.json | 4 +-
web/.env.production | 4 +-
web/.env.production.sit | 4 +-
web/src/views/modules/configItemOutbound/ConfigItemOutbound.vue | 4 +-
modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java | 1
web/.env.production.uat | 4 +-
web/packages/components/zt-table-wraper/src/zt-table-wraper.vue | 1
web/.env.development | 4 +-
15 files changed, 65 insertions(+), 33 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java
index 31d292c..fdc6b4a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java
@@ -120,6 +120,7 @@
projectService.deleteItem(ids,"config_item_outbound_detail","outbound_id");
return Result.ok();
}
+
@GetMapping("exportConfigOutbound")
@ApiOperation("鎵撳嵃鍑哄簱鐢宠鍗�")
@LogOperation("鎵撳嵃鍑哄簱鐢宠鍗�")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
index b9b8ed2..fbb1b8a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
@@ -103,8 +103,8 @@
User user = UserContext.getUser();
Integer secretClass = user.getSecretClass();
Long deptId = user.getDeptId();
- queryFilter.getQueryParams().put("secretClass",secretClass);
- queryFilter.getQueryParams().put("deptId",deptId);
+ queryFilter.getQueryParams().put("secretClass", secretClass);
+ queryFilter.getQueryParams().put("deptId", deptId);
List<ConfigItemOutbound> list = baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
workflowService.getRunFlow(list, "pzxck");
@@ -222,8 +222,9 @@
}
public void downloadFiles(HttpServletResponse response, HttpServletRequest request, Long id) {
- String projectName="鍑哄簱鏂囦欢";
+ ConfigItemOutboundDto data = this.getDto(null, id);
+ String projectName = data.getProject().getSoftwareName() + "鍑哄簱鏂囦欢";
List<SysOss> list = baseDao.getFilesByBusiId(id);
- sysOssConfigService.downloadFilesByosList(request,response,list,projectName);
+ sysOssConfigService.downloadFilesByosList(request, response, list, projectName);
}
}
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
index df8cc30..89acf2c 100644
--- 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
@@ -200,7 +200,7 @@
itemName = itemName.replace(Code, "");
warehouseConfigItem.setItemName(itemName);
warehouseConfigItem.setItemIdentify(circulatOrderTechnical.getName());
- warehouseConfigItem.setVersion(circulatOrderTechnical.getVersion());
+ warehouseConfigItem.setVersion(circulatOrderTechnical.getIdentify());
warehouseConfigItem.setSecretClass(circulatOrderTechnical.getSecretClass());
// insert
configItemService.insert(warehouseConfigItem);
diff --git a/starter/src/main/resources/application.yml b/starter/src/main/resources/application.yml
index 89e1e95..7532cc0 100644
--- a/starter/src/main/resources/application.yml
+++ b/starter/src/main/resources/application.yml
@@ -6,7 +6,7 @@
min-spare-threads: 30
port: 8050
servlet:
- context-path: /test-item
+ context-path: /test-project
session:
cookie:
http-only: true
@@ -120,7 +120,7 @@
zt:
oss:
type: local
- local-domain: http://127.0.0.1:8050/test-item/
+ local-domain: http://127.0.0.1:8050/test-project/
local-path: D:/TestProjectFiles/ #闄勪欢瀛樺偍鐩綍
local-qd-path: D:/TestProjectFiles/ #闄勪欢瀛樺偍鐩綍
local-prefix: accessories #闄勪欢瀛樺偍瀛愮洰褰�
diff --git a/web/.env.development b/web/.env.development
index 73bf26d..9d174cb 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -1,4 +1,4 @@
NODE_ENV=development
VUE_APP_NODE_ENV=dev
-VUE_APP_API_URL=http://localhost:8050/test-item
-VUE_APP_SOCKET_URL=ws://localhost:8050/test-item/websocket
+VUE_APP_API_URL=http://localhost:8050/test-project
+VUE_APP_SOCKET_URL=ws://localhost:8050/test-project/websocket
diff --git a/web/.env.production b/web/.env.production
index 3416d69..3990e8a 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_NODE_ENV=prod
-VUE_APP_API_URL=http://localhost:8050/test-item
-VUE_APP_SOCKET_URL=ws://localhost:8050/test-item/websocket
+VUE_APP_API_URL=http://localhost:8050/test-project
+VUE_APP_SOCKET_URL=ws://localhost:8050/test-project/websocket
diff --git a/web/.env.production.sit b/web/.env.production.sit
index 610d685..8861e02 100644
--- a/web/.env.production.sit
+++ b/web/.env.production.sit
@@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_NODE_ENV=prod:sit
-VUE_APP_API_URL=http://localhost:8050/test-item
-VUE_APP_SOCKET_URL=ws://localhost:8050/test-item/websocket
+VUE_APP_API_URL=http://localhost:8050/test-project
+VUE_APP_SOCKET_URL=ws://localhost:8050/test-project/websocket
diff --git a/web/.env.production.uat b/web/.env.production.uat
index 3cd71f1..ef331a3 100644
--- a/web/.env.production.uat
+++ b/web/.env.production.uat
@@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_NODE_ENV=prod:uat
-VUE_APP_API_URL=http://localhost:8050/test-item
-VUE_APP_SOCKET_URL=ws://localhost:8050/test-item/websocket
+VUE_APP_API_URL=http://localhost:8050/test-project
+VUE_APP_SOCKET_URL=ws://localhost:8050/test-project/websocket
diff --git a/web/packages/components/zt-dialog/src/zt-dialog.vue b/web/packages/components/zt-dialog/src/zt-dialog.vue
index 1ad99f7..b8b85eb 100644
--- a/web/packages/components/zt-dialog/src/zt-dialog.vue
+++ b/web/packages/components/zt-dialog/src/zt-dialog.vue
@@ -60,7 +60,7 @@
},
editAble: {
type: Boolean,
- default: false
+ default: true
},
hasSubmit: {
type: Boolean,
@@ -96,6 +96,8 @@
methods: {
init(id, row, isView) {
this.isView = isView
+
+
this.$nextTick(() => {
// 娓呯┖琛ㄥ崟鏍￠獙
console.log(this.$parent.$refs.dataForm, id, row, isView, 'this.$parent.$refs.dataForm')
@@ -103,7 +105,6 @@
this.$parent.$refs.dataForm.resetFields()
}
- this.editAble = isView !== true // 鏄惁鍙紪杈�
this.$parent.dataForm = cloneDeep(this.dataFormBack)
if (this.$parent.dataForm) {
diff --git a/web/packages/components/zt-table-wraper/src/zt-table-wraper.vue b/web/packages/components/zt-table-wraper/src/zt-table-wraper.vue
index afaf596..28a7964 100644
--- a/web/packages/components/zt-table-wraper/src/zt-table-wraper.vue
+++ b/web/packages/components/zt-table-wraper/src/zt-table-wraper.vue
@@ -134,6 +134,7 @@
}
if (await this.$tip.confirm(this.$t('prompt.info', {'handle': this.$t('delete')}))) {
console.log(this.dataSelectedList,' this.dataSelectedList')
+ console.log( this.deleteUrl,' async deleteHandle(row) this.deleteUrl')
let res = await this.$http.delete(
this.deleteUrl,
{
diff --git a/web/public/index.html b/web/public/index.html
index dad608b..2053fbe 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -219,8 +219,8 @@
window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false; // 鍔ㄦ��(鑿滃崟)璺敱鏄惁宸茬粡娣诲姞鐨勭姸鎬佹爣绀猴紙鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕侀噸鏂版媺鍙栨暟鎹苟杩涜鍔ㄦ�佹坊鍔犳搷浣滐級
// 鏈嶅姟鍦板潃
- window.SITE_CONFIG['apiURL'] = 'http://' + location.hostname + ':8050/test-item';
- window.SITE_CONFIG['apiURL2'] = 'http://' + location.hostname + ':8050/test-item';
+ window.SITE_CONFIG['apiURL'] = 'http://' + location.hostname + ':8050/test-project';
+ window.SITE_CONFIG['apiURL2'] = 'http://' + location.hostname + ':8050/test-project';
//window.SITE_CONFIG['apiURL2'] = 'http://'+location.hostname+':8066';
//window.SITE_CONFIG['apiURL'] = '<%= process.env.VUE_APP_API_URL %>';
@@ -228,7 +228,7 @@
// WebSocket鍦板潃
- window.SITE_CONFIG['socketURL'] = 'http://' + location.hostname + ':8050/test-item';
+ window.SITE_CONFIG['socketURL'] = 'http://' + location.hostname + ':8050/test-project';
//window.SITE_CONFIG['socketURL'] ='<%= process.env.VUE_APP_SOCKET_URL %>';
</script>
diff --git a/web/report.20220119.103056.5416.0.001.json b/web/report.20220119.103056.5416.0.001.json
index 4af6011..dcf589d 100644
--- a/web/report.20220119.103056.5416.0.001.json
+++ b/web/report.20220119.103056.5416.0.001.json
@@ -413,9 +413,9 @@
"USERDOMAIN_ROAMINGPROFILE": "LAPTOP-FFJLI4DC",
"USERNAME": "14539",
"USERPROFILE": "C:\\Users\\14539",
- "VUE_APP_API_URL": "http://localhost:8050/test-item",
+ "VUE_APP_API_URL": "http://localhost:8050/test-project",
"VUE_APP_NODE_ENV": "dev",
- "VUE_APP_SOCKET_URL": "ws://localhost:8050/test-item/websocket",
+ "VUE_APP_SOCKET_URL": "ws://localhost:8050/test-project/websocket",
"VUE_CLI_ENTRY_FILES": "[\"D:\\\\zhpt\\\\web\\\\src\\\\main.js\"]",
"WEBPACK_DEV_SERVER": "true",
"windir": "C:\\Windows",
diff --git a/web/src/views/modules/configItemOutbound/ConfigItemOutbound.vue b/web/src/views/modules/configItemOutbound/ConfigItemOutbound.vue
index ace44a0..dd0f3e5 100644
--- a/web/src/views/modules/configItemOutbound/ConfigItemOutbound.vue
+++ b/web/src/views/modules/configItemOutbound/ConfigItemOutbound.vue
@@ -1,6 +1,6 @@
<template>
<div class="fa-card-a">
- <zt-table-wraper :dataForm="dataForm" query-url="/configItemOutbound/ConfigItemOutbound/page" delete-url="/configItemOutbound/configItemOutbound/deleteConfigOutbound" v-slot="{ table }">
+ <zt-table-wraper :dataForm="dataForm" query-url="/configItemOutbound/ConfigItemOutbound/page" delete-url="/configItemOutbound/ConfigItemOutbound/deleteConfigOutbound" 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>
@@ -12,7 +12,7 @@
<el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable></el-input>
</el-form-item>
<el-form-item>
- <zt-dict v-model="dataForm.libraryType" dict="library_type" clearable></zt-dict>
+ <zt-dict v-model="dataForm.libraryType" placeholder="璇烽�夋嫨鍑哄簱绫诲瀷" dict="library_type" clearable></zt-dict>
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
diff --git a/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue b/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
index 0c49fec..76d53c7 100644
--- a/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
+++ b/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
@@ -94,7 +94,7 @@
v-model="dataForm.contractReview.reviewConclusion"></el-input>
</el-form-item>
<el-form-item label="鎶�鏈礋璐ｄ汉锛�" style="width: 48%">
- <el-input type="textarea" :rows="1" placeholder="璇疯緭鍏ユ妧鏈礋璐ｄ汉"
+ <el-input placeholder="璇疯緭鍏ユ妧鏈礋璐ｄ汉"
v-model="dataForm.contractReview.technicalDirector"></el-input>
</el-form-item>
<el-form-item label="鏃ユ湡锛�" style="width: 48%">
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 47181d0..f580989 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -43,7 +43,8 @@
</el-table-column>
<el-table-column prop="infoName" min-width="180" label="鎶�鏈祫鏂欏悕绉�">
<template v-slot="{ row }">
- <el-input :disabled="stepMarker!=='wplz_first'" v-model="row.name" placeholder="鎶�鏈祫鏂欏悕绉�"></el-input>
+ <el-input :disabled="stepMarker!=='wplz_first'" v-model="row.name"
+ placeholder="鎶�鏈祫鏂欏悕绉�"></el-input>
</template>
</el-table-column>
<el-table-column prop="identify" align="center" width="150" label="鏍囪瘑">
@@ -53,13 +54,15 @@
</el-table-column>
<el-table-column prop="version" align="center" width="120" label="鐗堟湰">
<template v-slot="{ row }">
- <el-input :disabled="stepMarker!=='wplz_first'" v-model="row.identify" placeholder="鐗堟湰"></el-input>
+ <el-input :disabled="stepMarker!=='wplz_first'" v-model="row.identify"
+ placeholder="鐗堟湰"></el-input>
</template>
</el-table-column>
<el-table-column prop="secretClass" label="瀵嗙骇" width="100" align="center">
<template v-slot="{ row }">
<!-- <el-input v-model="row.secretClass" placeholder="瀵嗙骇"></el-input>-->
- <zt-dict :disabled="stepMarker!=='wplz_first'" v-model="row.secretClass" dict="secret_class"></zt-dict>
+ <zt-dict :disabled="stepMarker!=='wplz_first'" v-model="row.secretClass"
+ dict="secret_class"></zt-dict>
</template>
</el-table-column>
<el-table-column prop="medium" label="浠嬭川" width="100" align="center">
@@ -74,10 +77,10 @@
</el-table-column>
<el-table-column prop="remark" label="澶囨敞" width="100" align="center">
<template v-slot="{ row }">
- <el-input :disabled="stepMarker!=='wplz_first'" v-model="row.remark" placeholder="澶囨敞"></el-input>
+ <el-input :disabled="stepMarker!=='wplz_first'" v-model="row.remark" placeholder="澶囨敞"></el-input>
</template>
</el-table-column>
- <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
+ <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
<template v-slot="{ row }">
<table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
v-model="row.files"/>
@@ -414,13 +417,37 @@
this.dataForm.technicalList.forEach(item => {
if (parseInt(item.secretClass) > localStorage.getItem('userSecretClass')) {
this.$alert("褰撳墠椤圭洰璁剧疆鐨勫瘑绾ч珮浜庡綋鍓嶇敤鎴风殑瀵嗙骇锛岃閲嶆柊璁剧疆")
- flag =false
+ flag = false
}
})
- if (!flag){
+ if (!flag) {
return
}
if (submitType === 'tj' || submitType === 'bl') {
+ if (this.stepMarker === 'wplz_wpjs') {
+ if (this.dataForm.circulatOrder.acceptSituation == null || this.dataForm.circulatOrder.virusLibraryVersion == null) {
+ this.$alert("褰撳墠鏈夋湭濉啓鐨勬儏鍐佃鏄�")
+ return
+ }
+ }
+ if (this.stepMarker === 'wplz_jcjs') {
+ if (this.dataForm.circulatOrder.detectAcceptSituation == null) {
+ this.$alert("褰撳墠鏈夋湭濉啓鐨勬儏鍐佃鏄�")
+ return
+ }
+ }
+ if (this.stepMarker === 'wplz_xzjc') {
+ if (this.dataForm.circulatOrder.detectSituation == null) {
+ this.$alert("褰撳墠鏈夋湭濉啓鐨勬儏鍐佃鏄�")
+ return
+ }
+ }
+ if (this.stepMarker === 'wplz_wprk') {
+ if (this.dataForm.circulatOrder.depositSituation == null) {
+ this.$alert("褰撳墠鏈夋湭濉啓鐨勬儏鍐佃鏄�")
+ return
+ }
+ }
this.dataForm.technicalList.forEach(item => {
item.files.groups.forEach(groups => {
groups.fields.forEach(files => {
@@ -432,9 +459,10 @@
})
})
})
- if (!isFiles){
+ if (!isFiles) {
return
}
+
let flowInfo = {
flowCode: 'wplz',
stepIdMark: this.stepMarker,
--
Gitblit v1.9.1