Changes

jinlin

2023-11-15 de02e2ab7f6b63ce92f712bf81de829c97289ca8

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

@@ -105,13 +105,13 @@
                    <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 type="index" align="center"  width="80" label="序号"/>
                      <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="标识/版本">
                      <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" v-model="scope.row.identify" placeholder="标识/版本"></el-input>
@@ -188,15 +188,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>
@@ -207,10 +199,6 @@
                  <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>-->
                    </el-form-item>
                  </div>
                </div>
@@ -281,7 +269,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"
@@ -289,7 +276,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"
@@ -297,22 +283,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">
@@ -322,10 +298,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>
@@ -334,7 +306,7 @@
                    交付物清单
                  </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="name" min-width="300" label="名称"></el-table-column>
@@ -526,6 +498,11 @@
          ...this.dataForm,
          ...res.data
        }
        if(this.dataForm.softwareTestOrder){
          this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
          this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
          console.log(this.dataForm.softwareTestOrder.testType1)
        }
        if(this.dataForm.project === null){
          this.dataForm.project={}
        }
@@ -545,11 +522,17 @@
    // 表单提交
    async formSubmit() {
      console.log(this.dataForm, ' this.dataForm')
      this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
      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{
        this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
        this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
      }
    }
  }