修改

jinlin

2024-02-01 2df883fcbed176f83d8d144fd007e7f72fcb54d6

修改

 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("打印出库申请单")

 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);
    }
}

 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);

 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 #附件存储子目录

 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

 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

 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

 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

 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) {

 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,
            {

 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>

 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",

 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()"/>

 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%">

 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,