项目表

wente

2023-11-22 4a24c7fdeeb3c4979608dd9af80855ce66b8c58d

项目表

 web/src/assets/css/custom.css

@@ -318,3 +318,12 @@
  text-overflow: ellipsis;
  line-height: 34px;
}
.DAlign {
  text-align: center;
}
.el-border-left {
  border-left: 1px solid rgba(0, 0, 0, .2);
}
.el-border-bottom {
  border-bottom: 1px solid rgba(0, 0, 0, .2);
}

 web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue

@@ -1,60 +1,129 @@
<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 :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto">
      <div class="">
        <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: -5px">
          <span>{{dataForm.environ.code}}</span>
        </el-form-item>
      </div>
      <div style="border: 1px solid rgba(0,0,0,.2);width: 99%" >
        <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="circulationContentWidth">
          <el-form-item class="marginTopAndMarginBottom" label="专业实验室" style="width: 32%">
            <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="专业实验室"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom" label="任务编号" style="width: 32%">
            <el-input v-model="dataForm.testAgencyInfo.site" placeholder="任务编号"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom" label="物品名称" style="width: 32%">
            <el-input v-model="dataForm.project.softwareName" placeholder="物品名称"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="型号" style="width: 32%">
            <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="型号"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="物品编号" style="width: 32%">
            <el-input v-model="dataForm.testAgencyInfo.site" placeholder="物品编号"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="数 量" style="width: 32%">
            <el-input v-model="dataForm.project.softwareName" placeholder="数量"></el-input>
          </el-form-item>
        </div>
        <div style="border-bottom: 1px solid rgba(0,0,0,.2);">
          <div style="padding-left:5px;padding-right:5px;">
            <div style="padding: 5px">物品技术资料及数量：</div>
            <div class="table-container">
              <el-table ref="tableSoftwareList" class="el-software el-margin-top-bot" border :data="dataForm.softwareResourcesList"
                        stripe>
                <el-table-column prop="no" align="center" width="80" label="序号">
                  <template slot-scope="scope">
                    <span v-html="indexFormat(scope.$index)"></span>
                  </template>
                </el-table-column>
                <el-table-column prop="name" min-width="300" label="软件项名称">
                  <template v-slot="{ row }">
                    <el-input v-model="row.itemName" placeholder="软件项名称/版本"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="versions" align="center" width="180" label="版本">
                  <template v-slot="{ row }">
                    <el-input v-model="row.version" placeholder="版本"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="purposes" align="center" width="180" label="用途">
                  <template v-slot="{ row }">
                    <el-input v-model="row.purposes" placeholder="用途"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="unit" label="提供单位" width="180"  align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.provideUnit" placeholder="提供单位"></el-input>
                  </template>
                </el-table-column>
              </el-table>
<!--              <div class="icon-container" @click="addSoftwareRow()">-->
<!--                &lt;!&ndash; 放置固定的图标 &ndash;&gt;-->
<!--                <i class="el-icon-plus"></i>-->
<!--              </div>-->
            </div>
          </div>
        </div>
        <div class="el-flexCirculationDialog el-border-bottom">
          <div class="DHold">
            物品的其它要求
          </div>
          <div style="width: calc(100% - 120px);">
            <div  class="el-border-left">
              <el-form-item label="物品是否需要返还" label-width="150px" style="width:100%;padding-left:5%;margin-bottom:0">
                <zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
                         dict="is_or_not"></zt-dict>
              </el-form-item>
              <el-form-item label="物品的其他要求：" label-width="150px" style="width:100%;padding-left:5%;margin-bottom:0">
                <el-input v-model="dataForm.softwareTestOrder.requireOther"></el-input>
              </el-form-item>
            </div>
          </div>
        </div>
          <div class="circulationContentWidth">
            <el-form-item class="marginTopAndMarginBottom" label="物品接收人" style="width: 32%">
              <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="物品接收人"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom" label="时间" style="width: 32%">
              <el-input v-model="dataForm.testAgencyInfo.site" placeholder="时间"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom" label="情况说明" style="width: 32%">
              <el-input v-model="dataForm.project.softwareName" placeholder="情况说明"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom3" label="校准检测人" style="width: 32%">
              <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="校准检测人"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom3" label="时间" style="width: 32%">
              <el-input v-model="dataForm.testAgencyInfo.site" placeholder="时间"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom3" label="情况说明" style="width: 32%">
              <el-input v-model="dataForm.project.softwareName" placeholder="情况说明"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="物品入库人" style="width: 32%">
              <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="物品入库人"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="时间" style="width: 32%">
              <el-input v-model="dataForm.testAgencyInfo.site" placeholder="时间"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="情况说明" style="width: 32%">
              <el-input v-model="dataForm.project.softwareName" placeholder="情况说明"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="物品发放人" style="width: 32%">
              <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="物品发放人"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="时间" style="width: 32%">
              <el-input v-model="dataForm.testAgencyInfo.site" placeholder="时间"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="情况说明" style="width: 32%">
              <el-input v-model="dataForm.project.softwareName" placeholder="情况说明"></el-input>
            </el-form-item>
            <el-form-item  class="marginTopAndMarginBottom2 lastChild" label="备注" style="width: 100%">
              <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="备注"></el-input>
            </el-form-item>
          </div>
      </div>
    </el-form>
  </zt-dialog>
</template>
@@ -65,28 +134,46 @@
      return {
        dataForm: {
          id: '',
          projectId: '',
          code: '',
          itemRequire: '',
          itemOther: '',
          itemAccept: '',
          acceptDate: '',
          acceptSituation: '',
          calibratDetect: '',
          detectDate: '',
          detectSituation: '',
          warehouse: '',
          warehouseDate: '',
          warehouseSituation: '',
          itemIssue: '',
          issueDate: '',
          issueSituation: '',
          remark: '',
          year: ''
          url:'',
          environ:{
            code: '1',
            hardSoftwareRes: '',
            testEnvirontDiagram: '',
            establishStaff:'',
            establishDate:'',
            environAnalysis: '',
            environEstablish: '',
            environConfirmat: '',
            confirmatStaff: '',
            confirmatDate: '',
            isVirusScan: '',
            virusDatabaseVersion: '',
          },
          project: {
            softwareIdentity: '',
            softwareName: '',
          },
          testAgencyInfo: {
            agencyName:'',
            site:'',
          },
          softwareTestOrder:{
            requireOther:'',
          },
          softwareResourcesList:[],
          hardwareResourcesList:[],
          environAnalysisList:[]
        }
      }
    },
    methods: {
      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')
      },
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/${this.dataForm.id}`)
@@ -107,3 +194,28 @@
    }
  }
</script>
<style>
.el-flexCirculationDialog{
  display: flex;
  align-items: center
}
.circulationContentWidth > .el-form-item > .el-form-item__content {
  width: calc(100% - 120px);
}
.circulationContentWidth > .el-form-item.lastChild > .el-form-item__content {
  width: calc(100% - 142px);
}
.circulationFormAuto .marginTopAndMarginBottom {
  margin-top: 10px !important;
  margin-bottom: 0 !important;
}

.circulationFormAuto .marginTopAndMarginBottom2 {
  margin-top: -10px !important;
  margin-bottom: 10px !important;
}
.circulationFormAuto .marginTopAndMarginBottom3 {
  margin-top: 0 !important;
  margin-bottom: 10px !important;
}
</style>

 web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue

@@ -19,7 +19,7 @@
              <zt-table-column-handle :table="table" edit-perm="itemCirculatOrder:update" delete-perm="itemCirculatOrder::delete"/>
        </el-table>
        <!-- 弹窗, 新增 / 修改 -->
        <add-or-update @refreshDataList="table.query"/>
        <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
        <ProjectSelect ref="projectSelect"
                       @refreshDataList="table.query"
                       @setProjectInfo="openAddWin">
@@ -53,6 +53,7 @@
      },
      openAddWin(row) {
        console.log(row.id, 'row.id')
        // this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
        this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
      },
    }

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

@@ -1,6 +1,6 @@
<template>
  <zt-dialog ref="dialog" column="2" @confirm="formSubmit" append-to-body title="测试环境建立确认表">
      <el-form :model="dataForm" style="padding: 0" :inline="true"  ref="dataForm" :disabled="dataForm.disabled" label-width="130px" class="confirmFormAuto">
      <el-form :model="dataForm" style="padding-top: 0" :inline="true"  ref="dataForm" :disabled="dataForm.disabled" label-width="130px" class="confirmFormAuto">
        <div class="DConfirmForm">
          <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: 0">
            <span>{{dataForm.environ.code}}</span>
@@ -323,11 +323,6 @@
.DFormWidth {
  width: 120px;
}

.DAlign {
  text-align: center;
}

.DConfirmForm {
  /*border-left: 1px solid;*/
  width: 100%;

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

@@ -29,7 +29,7 @@
          <el-table v-loading="table.dataLoading"
                    :data="table.dataList"
                    height="100px"
                    v-adaptive="{bottomOffset:120}"
                    v-adaptive="{bottomOffset:150}"
                    @row-dblclick="selectedProject"
                    border @selection-change="table.selectionChangeHandle">
            <el-table-column type="selection" align="center" width="40"/>
@@ -41,7 +41,7 @@
            <zt-table-column-dict prop="secretClass" label="密级" dict="secret_class"/>
            <zt-table-column-dict prop="criticalLevel" label="关键等级" dict="critical_level"/>
            <!--<zt-table-column-dict prop="testLevel" label="测试级别" dict="test_level"/>-->
            <zt-table-column-dict prop="softwareType" label="软件类型" dict="software_type"/>
            <zt-table-column-dict prop="softwareType" width="150px" label="软件类型" dict="software_type"/>
            <el-table-column prop="projectLeader" label="项目负责人"/>
            <zt-table-column-dict prop="isContract" label="是否签署合同" dict="is_or_not"/>
          </el-table>