Changes

jinlin

2023-11-22 d363e8168a9d821a87ff75406aec9a87ed19722a

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

@@ -3,7 +3,7 @@
    <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>
          <span>{{dataForm.circulatOrder.code}}</span>
        </el-form-item>
      </div>
      <div style="border: 1px solid rgba(0,0,0,.2);width: 99%" >
@@ -12,16 +12,16 @@
            <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-input v-model="dataForm.project.softwareIdentity" 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>
            <zt-dict v-model="dataForm.project.softwareType" dict="is_embed_software" :radio="true"></zt-dict>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="物品编号" style="width: 32%">
            <el-input v-model="dataForm.testAgencyInfo.site" placeholder="物品编号"></el-input>
            <el-input v-model="dataForm.project.softwareIdentity" 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>
@@ -38,24 +38,39 @@
                    <span v-html="indexFormat(scope.$index)"></span>
                  </template>
                </el-table-column>
                <el-table-column prop="name" min-width="300" label="软件项名称">
                <el-table-column prop="infoName" min-width="300" label="技术资料名称">
                  <template v-slot="{ row }">
                    <el-input v-model="row.itemName" placeholder="软件项名称/版本"></el-input>
                    <el-input v-model="row.infoName" placeholder="技术资料名称"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="versions" align="center" width="180" label="版本">
                <el-table-column prop="identify" align="center" width="180" label="标识">
                  <template v-slot="{ row }">
                    <el-input v-model="row.identify" placeholder="标识"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="version" 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="用途">
                <el-table-column prop="secretClass" label="密级" width="180"  align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.purposes" placeholder="用途"></el-input>
                    <el-input v-model="row.secretClass" placeholder="密级"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="unit" label="提供单位" width="180"  align="center">
                <el-table-column prop="medium" label="介质" width="180"  align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.provideUnit" placeholder="提供单位"></el-input>
                    <el-input v-model="row.medium" placeholder="介质"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="amount" label="数量" width="180"  align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.amount" placeholder="数量"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="remark" label="备注" width="180"  align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.remark" placeholder="备注"></el-input>
                  </template>
                </el-table-column>
              </el-table>
@@ -73,54 +88,54 @@
          <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"
                <zt-dict v-model="dataForm.circulatOrder.itemRequire" :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-input v-model="dataForm.circulatOrder.itemOther"></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-input v-model="dataForm.circulatOrder.itemAccept" 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-input v-model="dataForm.circulatOrder.acceptDate" 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-input v-model="dataForm.circulatOrder.acceptSituation" 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-input v-model="dataForm.circulatOrder.calibratDetect" 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-input v-model="dataForm.circulatOrder.detectDate" 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-input v-model="dataForm.circulatOrder.detectSituation" 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-input v-model="dataForm.circulatOrder.warehouse" 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-input v-model="dataForm.circulatOrder.warehouseDate" 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-input v-model="dataForm.circulatOrder.warehouseSituation" 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-input v-model="dataForm.circulatOrder.itemIssue" 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-input v-model="dataForm.circulatOrder.issueDate" 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-input v-model="dataForm.circulatOrder.issueSituation" 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-input v-model="dataForm.circulatOrder.remark" placeholder="备注"></el-input>
            </el-form-item>
          </div>
      </div>
@@ -134,20 +149,23 @@
      return {
        dataForm: {
          id: '',
          url:'',
          environ:{
          circulatOrder:{
            code: '1',
            hardSoftwareRes: '',
            testEnvirontDiagram: '',
            establishStaff:'',
            establishDate:'',
            environAnalysis: '',
            environEstablish: '',
            environConfirmat: '',
            confirmatStaff: '',
            confirmatDate: '',
            isVirusScan: '',
            virusDatabaseVersion: '',
            itemAccept: '',
            itemRequire: '',
            itemOther:'',
            acceptSituation:'',
            acceptDate: '',
            calibratDetect: '',
            detectDate: '',
            detectSituation: '',
            warehouse: '',
            warehouseDate: '',
            warehouseSituation: '',
            itemIssue: '',
            issueDate: '',
            issueSituation: '',
            remark: '',
          },
          project: {
            softwareIdentity: '',
@@ -155,14 +173,8 @@
          },
          testAgencyInfo: {
            agencyName:'',
            site:'',
          },
          softwareTestOrder:{
            requireOther:'',
          },
          softwareResourcesList:[],
          hardwareResourcesList:[],
          environAnalysisList:[]
          technicalList:[]
        }
      }
    },
@@ -176,11 +188,16 @@
      },
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/${this.dataForm.id}`)
        let params = {
          circulatOrderid: this.dataForm.id,
          projectId: this.dataForm.projectId
        }
        let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/getDto`,{params: params})
        this.dataForm = {
          ...this.dataForm,
          ...res.data
        }
        console.log(this.dataForm,"this.dataForm")
      },
      // 表单提交
      async formSubmit() {