项目表

wente

2023-11-15 61e93a9bea52ae963b228fcb157d019607b0a051

项目表

 web/src/main.js

@@ -102,12 +102,13 @@
  let minutes = '  '
  let seconds = '  '
  if (data != null) {
    // year = data.getFullYear()
    // months = (data.getMonth() + 1).toString().padStart(2, '0')
    // days = data.getDate()
    // hours = (data.getHours() + 1).toString().padStart(2, '0')
    // minutes = (data.getMinutes() + 1).toString().padStart(2, '0')
    // seconds = (data.getSeconds() + 1).toString().padStart(2, '0')
    const dateObject = new Date(data);
    year = dateObject.getFullYear()
    months = (dateObject.getMonth() + 1).toString().padStart(2, '0')
    days = dateObject.getDate()
    hours = (dateObject.getHours() + 1).toString().padStart(2, '0')
    minutes = (dateObject.getMinutes() + 1).toString().padStart(2, '0')
    seconds = (dateObject.getSeconds() + 1).toString().padStart(2, '0')
  }
  return format.replace('YYYY', year).replace('MM', months).replace('DD', days).replace('hh', hours).replace('mm', minutes).replace('ss', seconds);
})

 web/src/views/modules/project/Project-select.vue

@@ -70,7 +70,9 @@
    methods: {
      init(tableName) {
        this.dataForm.tableName = tableName
        this.$nextTick(()=>{
        this.$refs.tableObj.query()
        })
        // console.log(this.dataForm,'this.dataForm')
      },
      async selectedProject(row) {

 web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue

@@ -106,11 +106,15 @@
                              @cell-click="handleCellClick"
                              stripe>
                      <el-table-column type="index" align="center" width="80" label="序号"/>
                      <el-table-column prop="name" min-width="300" label="名称"></el-table-column>
                      <el-table-column min-width="300" label="名称">
                        <template slot-scope="scope">
                          <span>{{ (dataForm.project.softwareName||'') + scope.row.name }}</span>
                        </template>
                      </el-table-column>
                      <el-table-column align="center" width="180" label="标识/版本">
                        <template slot-scope="scope">
                          <span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
                            <el-input ref="editInput" @change="changeExpireSituation(scope.row)" v-model="scope.row.identify" placeholder="标识/版本"></el-input>
                            <el-input ref="editInput" v-model="scope.row.identify" placeholder="标识/版本"></el-input>
                          </span>
                          <span v-else>{{ scope.row.identify }}</span>
                        </template>
@@ -168,11 +172,11 @@
                    测试类型
                  </div>
                  <div class="el-border-left" style="width: 98%">
                    <el-form-item style="width: 40%;padding-left:5%;">
                    <el-form-item  style="width: 40%;padding-left:5%;margin-bottom: 0">
                      <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType1" column="2" dict="test_type1"
                                        clearable></zt-dict-checkbox>
                    </el-form-item>
                    <el-form-item style="width: 60%;padding-left: 15%;border-left: 1px solid rgba(0,0,0,.2);">
                    <el-form-item style="width: 60%;padding-left: 15%;border-left: 1px solid rgba(0,0,0,.2);margin-bottom: 0">
                      <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType2" dict="test_type2"
                                        clearable></zt-dict-checkbox>
                    </el-form-item>
@@ -350,7 +354,7 @@
                  <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="请输入单位名称"></el-input>
                </el-form-item>
                <!-- 联系人 -->
                <el-form-item class="marginTopAndMarginBottom2" label-width="130px" label="地址" style="width: 98%">
                <el-form-item class="marginTopAndMarginBottom3" label-width="130px" label="地址" style="width: 98%">
                  <el-input v-model="dataForm.testAgencyInfo.site" placeholder="请输入联系人"></el-input>
                </el-form-item>
                <!-- 详细地址 -->
@@ -420,7 +424,7 @@

    </el-form>
    <template v-slot:footer>
      <zt-button v-if="dataForm.disabled" type="primary">打印</zt-button>
      <el-button v-if="dataForm.disabled" type="primary">打印</el-button>
    </template>
  </zt-dialog>
</template>
@@ -473,11 +477,21 @@
          softwareName: '',
          softwareType: '',
          tenantId: '',
          testLevel: ''
          testLevel: '',

        },
        testAgencyInfo: {
          agencyName:'',
          site:'',
          businContact:'',
          businComplaint:'',
          laborContact:'',
          labContactNum:'',
          postalCode:'',
          fax:''
        },
        deliverableList: [],
        measuredList: [],
        testAgencyInfo: {}
      }
    }
  },
@@ -495,6 +509,7 @@
    init(id,row){
      this.dataForm.id = row.id
      this.dataForm.projectId = row.projectId
      // this.dataForm.disabled
      this.getInfo()
      console.log(this.dataForm.id,this.dataForm.projectId,'params params')
    },
@@ -504,17 +519,24 @@
        orderId: this.dataForm.id,
        projectId: this.dataForm.projectId
      }

      console.log(this.dataForm, "this.dataForm")
      let res = await this.$http.get(`/project/SoftwareTestOrder/getDto`, {params: params})
      if (res.data) {
        this.dataForm = {
          ...this.dataForm,
          ...res.data
        }
        if(this.dataForm.project === null){
          this.dataForm.project={}
        }
        if(this.dataForm.softwareTestOrder === null){
          this.dataForm.softwareTestOrder={}
        }
        if(this.dataForm.testAgencyInfo === null){
          this.dataForm.testAgencyInfo={}
      }
      console.log(this.dataForm, "this.dataForm")
      }
      // console.log(this.dataForm, "this.dataForm")
    },

    // 表单提交
@@ -538,6 +560,7 @@

.weiTuoDanAuto .el-radio {
  padding: 5px;
  margin-right: 10px;
}

.zt .weiTuoDanAuto .el-form-item.el-form-item--default {
@@ -619,7 +642,10 @@
  margin-top: -10px !important;
  margin-bottom: 10px !important;
}

.weiTuoDanAuto .marginTopAndMarginBottom3 {
  margin-top: 0 !important;
  margin-bottom: 10px !important;
}
.csjgxx > .el-form-item > .el-form-item__content {
  width: calc(100% - 130px);
}

 web/src/views/modules/project/SoftwareTestOrder.vue

@@ -1,7 +1,7 @@
<template>
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-project-softwareTestOrder}">
      <zt-table-wraper query-url="/project/SoftwareTestOrder/page" delete-url="/project/SoftwareTestOrder"
      <zt-table-wraper query-url="/project/SoftwareTestOrder/page" delete-url="/project/SoftwareTestOrder/deleteOrder"
                       v-slot="{ table }">
        <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
          <el-form-item>
@@ -29,7 +29,7 @@
                  border @selection-change="table.selectionChangeHandle">
          <el-table-column type="selection" align="center" width="40"/>
          <el-table-column prop="softwareName" label="软件名称"/>
          <el-table-column prop="code" label="委托单编号"/>
          <el-table-column prop="code" min-width="270" label="委托单编号"/>
          <el-table-column prop="softwareIdentity" label="项目标识"/>
          <zt-table-column-dict prop="testBasis" label="测试依据" dict="test_basis"/>
          <zt-table-column-dict prop="testStandard" width="370px" label="测试标准" dict="test_standard"/>
@@ -37,7 +37,7 @@
          <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
        </el-table>
        <!-- 弹窗, 新增 / 修改 -->
        <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
        <add-or-update ref="addOrUpdate" @refreshDataList="ctable.query"/>
        <ProjectSelect ref="projectSelect"
                       @refreshDataList="table.query"
                       @setProjectInfo="openAddWin">