编号

zzw

2023-11-17 1dbc6552c58451496aa0aa72086911f68bd5ca2d

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

@@ -1,10 +1,10 @@
<template>
  <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
    <el-form ref="form" :inline="true" :model="dataForm" :disabled="dataForm.disabled" label-width="120px"
             class="weiTuoDanAuto">
             class="weiTuoDanAuto" style="padding-top: 0">
      <div class="DManageForm">
        <el-form-item readonly label-width="60px" label="编号:" style="width: 99% ;margin-bottom:-5px">
          <span>{{ dataForm.project.code }}</span>
        <el-form-item readonly label-width="50px" label="编号:" style="width: 99% ;margin-bottom:-5px">
          <span>{{ dataForm.softwareTestOrder.code}}</span>
        </el-form-item>
      </div>
      <div style="border: 1px solid rgba(0,0,0,.2)">
@@ -105,12 +105,12 @@
                    <el-table class="el-software" height="230" border :data="dataForm.measuredList"
                              @cell-click="handleCellClick"
                              stripe>
                      <el-table-column type="index" align="center" width="80" label="序号"/>
                      <el-table-column prop="dictLabel" min-width="300" label="名称"></el-table-column>
                      <el-table-column align="center" width="180" label="标识/版本">
                      <el-table-column prop="no"  align="center"  width="80" label="序号"/>
                      <el-table-column prop="name" min-width="300" label="名称"/>
                      <el-table-column align="center" prop="identify" 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>
@@ -118,10 +118,6 @@
                      <el-table-column label="是否被测件" width="180" align="center">
                        <template slot-scope="scope">
                          <zt-dict v-model="scope.row.isMeasured" dict="is_or_not" :radio="true"></zt-dict>
                          <!--                          <el-radio-group v-model="scope.row.isMeasured">-->
                          <!--                            <el-radio :label="1">是</el-radio>-->
                          <!--                            <el-radio :label="0">否</el-radio>-->
                          <!--                          </el-radio-group>-->
                        </template>
                      </el-table-column>
                    </el-table>
@@ -133,11 +129,6 @@
                  </div>
                  <div style="width: calc(100% - 120px)">
                    <zt-dict v-model="dataForm.project.softwareType" :radio="true" dict="software_type"></zt-dict>
                    <!--                    <el-checkbox-group v-model="dataForm.checkList">-->
                    <!--                      <el-checkbox :label="0">通用应用软件</el-checkbox>-->
                    <!--                      <el-checkbox :label="1">行业应用软件</el-checkbox>-->
                    <!--                      <el-checkbox :label="2">嵌入式软件</el-checkbox>-->
                    <!--                    </el-checkbox-group>-->
                  </div>
                </div>
              </div>
@@ -155,11 +146,6 @@
                    <el-form-item style="width: 20%;padding-left:5%;margin-bottom: 0">
                      <zt-dict v-model="dataForm.softwareTestOrder.testBasis" :radio="true" dict="test_basis"
                               clearable></zt-dict>
                      <!--                      <el-checkbox-group v-model="dataForm.checkList">-->
                      <!--                        <el-checkbox :label="0">GB/T 25000.21-2016</el-checkbox>-->
                      <!--                        <el-checkbox :label="1">GJB/Z 141-2004</el-checkbox>-->
                      <!--                        <el-checkbox :label="2">其他：{{dataForm.other}}</el-checkbox>-->
                      <!--                      </el-checkbox-group>-->
                    </el-form-item>
                  </div>
                </div>
@@ -167,12 +153,12 @@
                  <div class="DWidth DAlign DHold">
                    测试类型
                  </div>
                  <div class="el-border-left" style="width: 98%">
                    <el-form-item style="width: 40%;padding-left:5%;">
                  <div class="el-border-left test-type-line-height" style="width: 98%">
                    <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>
@@ -184,15 +170,7 @@
                  </div>
                  <div class="el-border-left" style="width: 98%">
                    <el-form-item style="width: 20%;padding-left:5%;margin-bottom: 0">
                      <zt-dict v-model="dataForm.softwareTestOrder.testStandard" :radio="true"
                               dict="test_standard"></zt-dict>
                      <!--                      <el-checkbox-group v-model="dataForm.checkList">-->
                      <!--                        <el-checkbox :label="0">GJB 438B-2009《军用软件开发文档通用要求》</el-checkbox>-->
                      <!--                        <el-checkbox :label="1">HJB 754-2017 《海军军用软件定型测评大纲编制要求》</el-checkbox>-->
                      <!--                        <el-checkbox :label="2">HJB 753-2017 《海军军用软件定型测评报告编制要求》</el-checkbox>-->
                      <!--                        <el-checkbox :label="3">《海军装备软件测试细则》</el-checkbox>-->
                      <!--                        <el-checkbox :label="4">其他：{{dataForm.other}}</el-checkbox>-->
                      <!--                      </el-checkbox-group>-->
                      <zt-dict v-model="dataForm.softwareTestOrder.testStandard" :radio="true" dict="test_standard"></zt-dict>
                    </el-form-item>
                  </div>
                </div>
@@ -202,11 +180,7 @@
                  </div>
                  <div class="el-border-left" style="width: 98%">
                    <el-form-item style="padding-left:5%;margin-bottom:0">
                      <zt-dict v-model="dataForm.project.testLevel" :radio="true" dict="test_level"></zt-dict>
                      <!--                      <el-checkbox-group v-model="dataForm.checkList">-->
                      <!--                        <el-checkbox :label="0">配置项测试</el-checkbox>-->
                      <!--                        <el-checkbox :label="1">系统测试</el-checkbox>-->
                      <!--                      </el-checkbox-group>-->
                      <zt-dict v-model="dataForm.softwareTestOrder.testLevel" :radio="true" dict="test_level"></zt-dict>
                    </el-form-item>
                  </div>
                </div>
@@ -239,7 +213,7 @@
                  <div class="el-border-left" style="width: 98%;">
                    <el-form-item label="是否盖CNAS章" label-width="130px" style="padding-left:5%;margin-bottom:0">
                      <zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
                               dict="is_or_not"></zt-dict>
                               dict="other_require"></zt-dict>
                    </el-form-item>
                  </div>
                </div>
@@ -252,15 +226,10 @@
              <div class="" style="width: 100%;">
                <div class="el-flex " style="height: 40px">
                  <div style="width: 70%">
                    <span>{{ dataForm.write }}</span>
                    <span>{{ dataForm.softwareTestOrder.entrustSign }}</span>
                  </div>
                  <div class="el-flex">
                    <div style="width: 60px;text-align: center">{{ dataForm.year }}</div>
                    年
                    <div style="width: 40px;text-align: center">{{ dataForm.month }}</div>
                    月
                    <div style="width: 40px;text-align: center">{{ dataForm.day }}</div>
                    日
                    {{ dataForm.softwareTestOrder.entrustSignDate | filterTime('YYYY年MM月DD日') }}
                  </div>
                </div>
              </div>
@@ -277,7 +246,6 @@
                测试信息
              </div>
              <div class="DOldForm el-border-left">
                <!-- 单位名称 -->
                <el-form-item class="marginTopAndMarginBottom" label="测试日期" style="width: 49%">
                  <el-date-picker
                      v-model="dataForm.softwareTestOrder.testDate"
@@ -285,7 +253,6 @@
                      placeholder="测试日期">
                  </el-date-picker>
                </el-form-item>
                <!-- 联系人 -->
                <el-form-item class="marginTopAndMarginBottom" label="交付日期" style="width: 49%">
                  <el-date-picker
                      v-model="dataForm.softwareTestOrder.deliveryDate"
@@ -293,22 +260,12 @@
                      placeholder="交付日期">
                  </el-date-picker>
                </el-form-item>
                <!-- 详细地址 -->
                <el-form-item label="检测费用" style="width: 98%">
                  <el-input v-model="dataForm.softwareTestOrder.testCost" placeholder="请输入检测费用"></el-input>
                </el-form-item>
                <!--          <zt-form-item label="保密级别" prop="secretClass"  style="width: 25%">-->
                <!--            <zt-dict v-model="datadataForm.secretClass" dict="secret_class" placeholder="保密级别" style="width:200px"></zt-dict>-->
                <!--          </zt-form-item>-->
                <!-- 联系方式 -->
                <el-form-item class="el-border-bottom marginTopAndMarginBottom2" label="物品性质" style="width: 100%">
                  <zt-dict v-model="dataForm.softwareTestOrder.articleNature" :radio="true"
                           dict="article_nature"></zt-dict>
                  <!--                  <el-radio-group v-model="dataForm.criticalLevel">-->
                  <!--                    <el-radio :label="0">现场检测</el-radio>-->
                  <!--                    <el-radio :label="1">客户送样</el-radio>-->
                  <!--                    <el-radio :label="2">其他：{{dataForm.other}}</el-radio>-->
                  <!--                  </el-radio-group>-->
                </el-form-item>
                <div class="el-flex el-border-bottom" style="margin-top: -10px;">
                  <div class="DWidth DAlign DHold">
@@ -318,10 +275,6 @@
                    <el-form-item label="是否满足测试要求:" label-width="160px" style="margin-bottom: 0">
                      <zt-dict v-model="dataForm.softwareTestOrder.sampleStatus" :radio="true"
                               dict="is_satisfy"></zt-dict>
                      <!--                      <el-radio-group v-model="dataForm.checkList">-->
                      <!--                        <el-radio :label="0">是</el-radio>-->
                      <!--                        <el-radio :label="1">否</el-radio>-->
                      <!--                      </el-radio-group>-->
                    </el-form-item>
                  </div>
                </div>
@@ -330,10 +283,10 @@
                    交付物清单
                  </div>
                  <div style="width: calc(100% - 120px);padding: 5px">
                    <el-table class="el-software" height="230" border :data="dataForm.deliverableList"
                    <el-table class="el-software" height="100" border :data="dataForm.deliverableList"
                              stripe>
                      <el-table-column type="index" align="center" width="80" label="序号"/>
                      <el-table-column prop="dictLabel" min-width="300" label="名称"></el-table-column>
                      <el-table-column prop="name" min-width="300" label="名称"></el-table-column>
                      <el-table-column prop="identify" align="center" width="380" label="标识/版本"></el-table-column>
                    </el-table>
                  </div>
@@ -350,7 +303,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>
                <!-- 详细地址 -->
@@ -389,17 +342,17 @@
              <div class="" style="width: 100%;">
                <div class="el-flex" style="height: 40px">
                  <div style="width: 70%">
                    <span>{{ dataForm.write }}</span>
                    <span>{{ dataForm.contractSign }}</span>
                  </div>
                  <div class="el-flex">
                    {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY年MM月DD日') }}
                    {{ dataForm.softwareTestOrder.contractSignDate | filterTime('YYYY年MM月DD日') }}
                  </div>
                </div>
              </div>
            </div>
          </div>
        </div>
        <div class="el-flex">
        <div class="el-flex el-border-bottom">
          <div class="DPadding3 DAlign DHold">
            说明
          </div>
@@ -416,17 +369,27 @@
            </div>
          </div>
        </div>
        <div class="el-flex order-sc" style="height: 170px">
<!--          <div class="DPadding3 DAlign DHold">-->
<!--            委托单上传-->
<!--          </div>-->
            <el-form-item class="marginTopAndMarginBottom" style="width: 100%">
              <config-uploader busi-type="test_order" model-name="dataForm" :dataForm="dataForm"
                               v-model="dataForm.files"/>
            </el-form-item>
        </div>
      </div>

    </el-form>
    <template v-slot:footer>
      <zt-button v-if="dataForm.disabled" type="primary">打印</zt-button>
      <el-button v-if="dataForm.disabled" type="primary" @click="print()">打印</el-button>
    </template>
  </zt-dialog>
</template>

<script>

  import Cookies from 'js-cookie'
  import qs from 'qs'
export default {
  data() {
    return {
@@ -436,6 +399,7 @@
        id: null,
        projectId: null,
        softwareTestOrder: {
          code:'',
          optEnviron:'',
          programLang:'',
          testBasis:'',
@@ -451,6 +415,10 @@
          testCost:'',
          articleNature:'',
          sampleStatus:'',
          entrustSign:'',
          entrustSignDate:'',
          contractSign:'',
          contractSignDate:''
        },
        project: {
          code: '',
@@ -473,11 +441,21 @@
          softwareName: '',
          softwareType: '',
          tenantId: '',
          testLevel: ''
          testLevel: '',

        },
        testAgencyInfo: {
          agencyName:'',
          site:'',
          businContact:'',
          businComplaint:'',
          laborContact:'',
          labContactNum:'',
          postalCode:'',
          fax:''
        },
        deliverableList: [],
        measuredList: [],
        testAgencyInfo: {}
      }
    }
  },
@@ -495,6 +473,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,27 +483,65 @@
        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.softwareTestOrder){
          if(this.dataForm.softwareTestOrder.testType1){
            this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
            console.log(this.dataForm.softwareTestOrder.testType1)
          }
          if(this.dataForm.softwareTestOrder.testType2){
            this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
            console.log(this.dataForm.softwareTestOrder.testType2)
          }
        }
        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")
    },

    async print(){
      var params = qs.stringify({
        token: Cookies.get('token'),
        id:this.dataForm.id
      })
      let apiURL = `/project/SoftwareTestOrder/exportWord/`
      window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
    },
    // 表单提交
    async formSubmit() {
      console.log(this.dataForm, ' this.dataForm')
      if(this.dataForm.softwareTestOrder.testType1){
        this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
      }
      if(this.dataForm.softwareTestOrder.testType2){
        this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.join(',')
      }
      console.log(this.dataForm.softwareTestOrder.testType1)
      let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/SoftwareTestOrder/', this.dataForm)
      if (res.success) {
        await this.$tip.success()
        this.$refs.dialog.close()
        this.$emit('refreshDataList')
      }else{
        if(this.dataForm.softwareTestOrder.testType1){
          this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
        }
        if(this.dataForm.softwareTestOrder.testType2){
          this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
        }
      }
    }
  }
@@ -538,6 +555,7 @@

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

.zt .weiTuoDanAuto .el-form-item.el-form-item--default {
@@ -619,8 +637,17 @@
  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);
}
.order-sc > .el-form-item > .el-form-item__content {
  width:100%;
}
.test-type-line-height>.el-form-item>.el-form-item__content{
  line-height: 30px;
}
</style>