项目表

wente

2023-12-18 bdfbb741d767690ea05036a3116e63d06d6bb61b

 web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue

@@ -4,7 +4,7 @@
             label-width="120px" class="testCheckFormAuto">
      <div>
        <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: -5px">
          <span>{{dataForm.testCheckOrder.code || '编号自动生成'}}</span>
          <span>{{ dataForm.checkOrder.code || '编号自动生成' }}</span>
        </el-form-item>
      </div>
      <div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
@@ -16,20 +16,23 @@
            <el-input v-model="dataForm.project.softwareName" placeholder="项目名称"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="检查人" style="width: 49%">
            <el-input :disabled="stepMarker!=='csjcd_first'" v-model="dataForm.testCheckOrder.examiner" placeholder="检查人"></el-input>
            <el-input v-if="stepMarker=='csjcd_first'" v-model="dataForm.checkOrder.examiner"
                      placeholder="检查人"></el-input>
            <span v-else>{{ dataForm.checkOrder.examiner }}</span>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="检查时间" style="width: 49%">
            <el-date-picker
              :disabled="stepMarker!=='csjcd_first'"
              v-model="dataForm.testCheckOrder.examDate"
              v-if="stepMarker=='csjcd_first'"
              v-model="dataForm.checkOrder.examDate"
              type="date"
              placeholder="请选择检查时间">
            </el-date-picker>
            <span v-else>{{ dataForm.checkOrder.examDate }}</span>
          </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">{{subtitle}}</div>
            <div style="padding: 5px">检查项目:{{ subtitle }}</div>
            <div class="table-container">
              <el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border
                        :data="dataForm.checkOrderList"
@@ -40,18 +43,20 @@
                  </template>
                </el-table-column>
                <el-table-column prop="checkContent" min-width="180" label="主要检查内容">
<!--                  <template v-slot="{ row }">-->
<!--                    <el-input v-model="row.checkContent" placeholder="主要检查内容"></el-input>-->
<!--                  </template>-->
                  <!--                  <template v-slot="{ row }">-->
                  <!--                    <el-input v-model="row.checkContent" placeholder="主要检查内容"></el-input>-->
                  <!--                  </template>-->
                </el-table-column>
                <el-table-column prop="checkResult" align="center" width="180" label="检查结果">
                <el-table-column prop="checkResult" align="center" width="200" label="检查结果">
                  <template v-slot="{ row }">
                    <zt-dict v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict>
                    <zt-dict :disabled="stepMarker!=='csjcd_first'" v-model="row.checkResult" :dict="getDict"
                             :radio="true"></zt-dict>
                  </template>
                </el-table-column>
                <el-table-column prop="remark" label="备注" width="100" align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.remark" placeholder="备注"></el-input>
                    <el-input v-if="stepMarker=='csjcd_first'" v-model="row.remark" placeholder="备注"></el-input>
                    <span v-else>{{ row.remark }}</span>
                  </template>
                </el-table-column>
                <!--                <el-table-column fixed="right" prop="files" label="上传附件" width="300" align="center">
@@ -75,8 +80,9 @@
          </div>
          <div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <el-input type="textarea"
                        :rows="3" v-model="dataForm.testCheckOrder.problemDescription" placeholder="问题描述..."></el-input>
              <el-input v-if="stepMarker=='csjcd_first'" type="textarea"
                        :rows="3" v-model="dataForm.checkOrder.problemDescription" placeholder="问题描述..."></el-input>
              <span v-else>{{ dataForm.checkOrder.problemDescription }}</span>
            </el-form-item>
          </div>
        </div>
@@ -86,8 +92,9 @@
          </div>
          <div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <el-input type="textarea"
                        :rows="3" v-model="dataForm.testCheckOrder.problemProcess" placeholder="问题处理..."></el-input>
              <el-input v-if="stepMarker=='csjcd_wtcl'" type="textarea"
                        :rows="3" v-model="dataForm.checkOrder.problemProcess" placeholder="问题处理..."></el-input>
              <span v-else>{{ dataForm.checkOrder.problemProcess }}</span>
            </el-form-item>
          </div>
        </div>
@@ -97,7 +104,7 @@
          </div>
          <div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <span>{{dataForm.testCheckOrder.processor}}</span>
              <span>{{ dataForm.checkOrder.processor }}</span>
            </el-form-item>
          </div>
          <div style="width: 84px;text-align: center;font-weight: 600">
@@ -105,7 +112,7 @@
          </div>
          <div class="el-border-left acceptDate1" style="width: 40%;height: 40px;">
            <el-form-item label-width="150px" style="width: 100%;padding-left:20px;margin-bottom:0">
              <span>{{dataForm.testCheckOrder.verifier}}</span>
              <span>{{ dataForm.checkOrder.verifier }}</span>
            </el-form-item>
          </div>
        </div>
@@ -114,158 +121,193 @@
    <template v-slot:footer>
      <el-button v-if="dataForm.disabled" type="primary" @click="print()">打印</el-button>
    </template>
    <template v-slot:footer>
      <el-button v-if="dataForm.disabled" type="primary" @click="print()">打印</el-button>
    </template>
  </zt-dialog>
</template>

<script>
  export default {
    data() {
      return {
        stepMarker: '',
        configDetailRow: null,
        subtitle: '',
        pageName: {plan: '软件测试计划', explain: '软件测试说明', record: '软件测试记录', report: '软件测试报告'},
        dataForm: {
          id: '',
          projectId: '',
          project: {
            softwareIdentity: '',
            softwareName: '',
          },
          testCheckOrder: {
            code: '',
            examiner: '',
            examDate: '',
            problemDescription: '',
            problemProcess: '',
            processor: '',
            verifier: '',
          },
          checkOrderList: []
import qs from "qs";
import Cookies from "js-cookie";

export default {
  data() {
    return {
      pageCode: '',
      stepMarker: '',
      configDetailRow: null,
      subtitle: '',
      pageName: {
        plan: '软件测试计划', explain: '软件测试说明', record: '软件测试记录', report: '软件测试报告',
        contract: '合同评审阶段', require: '测试需求分析与策划'
      },
      dataForm: {
        id: '',
        projectId: '',
        project: {
          softwareIdentity: '',
          softwareName: '',
        },
        checkOrder: {
          code: '',
          examiner: '',
          examDate: '',
          problemDescription: '',
          problemProcess: '',
          processor: '',
          verifier: '',
        },
        checkOrderList: []
      }
    }
  },
  computed: {
    getDict() {
      if (this.pageCode && (this.pageCode === 'plan' || this.pageCode === 'explain' || this.pageCode === 'record' || this.pageCode === 'report')) {
          return 'tristate1'
        } else {
          return 'tristate2'
        }
      }
    },
    methods: {
      init(id, row) {
        this.configDetailRow = row
        if (row.checkId) {
  },
  methods: {
    init(id, row) {
      this.configDetailRow = row
      if (row.checkId) {
        console.log('配置项入库审核进来的 TestCheckOrder-AddOrUpdate.vue init row.checkId')
        if (row.checkId != -1) {
          this.dataForm.id = row.checkId
        } else if (id) {
          this.dataForm.id = id
        }
      } else if (id) {
        this.dataForm.id = id
      } else {
        this.dataForm.id = row.id
      }
      this.pageCode = row.pageCode
      this.subtitle = this.pageName[this.pageCode]

      if (row.projectId) {
        this.dataForm.projectId = row.projectId
      }
      if (this.configDetailRow) {
        if (!row.stepMarker) {
          this.stepMarker = 'csjcd_first'
          this.title = '发起测试检查单'
        } else {
          this.dataForm.id = row.id
          this.title = row.stepName
          this.stepMarker = row.stepMarker
        }
        this.pageCode = row.pageCode
        this.subtitle = this.pageName[this.pageCode]
      }
      //this.dataForm.disabled
      this.getInfo()

        if (row.projectId) {
          this.dataForm.projectId = row.projectId
        }
        console.log(id, row, this.subtitle, '软件测试计划检查单')
        if (this.configDetailRow) {
          if (!row.stepMarker) {
            this.stepMarker = 'csjcd_first'
            this.title = '发起测试检查单'
          } else {
            this.title = row.stepName
            this.stepMarker = row.stepMarker
      //console.log(this.dataForm.id, this.dataForm.projectId, this.stepMarker, 'this.dataForm.id, this.dataForm.projectId,this.stepMarker')
    },
    indexFormat(index) {
      return index += 1
    },
    // 获取信息
    async getInfo() {
      let params = {
        checkId: this.dataForm.id,
        projectId: this.dataForm.projectId,
        pageCode: this.pageCode
      }
      console.log(this.pageCode, "getInfo pageCode")
      let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/getDto`, {params: params})
      this.dataForm = {
        ...this.dataForm,
        ...res.data
      }
      console.log(this.dataForm, 'this.dataForm this.dataForm')
    },
    async print() {
      var params = qs.stringify({
        token: Cookies.get('token'),
        id: this.dataForm.id,
        pageCode: this.pageCode
      })
      let apiURL = `/testCheckOrder/TestCheckOrder/exportCheckOrder`
      window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
    },
    // 表单提交
    async formSubmit(submitType) {
      let isFlow = false
      if (submitType == 'tj') {
        for (let item of this.dataForm.checkOrderList) {
          if (!item.checkResult) {
            this.$alert("有未填写的数据")
            return
          } else if (item.checkResult == "2") {
            isFlow = true
          }
        }
        //this.dataForm.disabled
        this.getInfo()

        //console.log(this.dataForm.id, this.dataForm.projectId, this.stepMarker, 'this.dataForm.id, this.dataForm.projectId,this.stepMarker')
      },
      indexFormat(index) {
        return index += 1
      },
      // 获取信息
      async getInfo() {
        let params = {
          checkId: this.dataForm.id,
          projectId: this.dataForm.projectId,
          pageCode: this.pageCode
        if (submitType == 'tj' && !isFlow) {
          submitType == ''
        }
        console.log(this.pageCode, "getInfo pageCode")
        let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/getDto`, {params: params})
        this.dataForm = {
          ...this.dataForm,
          ...res.data
      }
      if (submitType == 'bl') {
        isFlow = true
      }
      if (submitType == 'tj' && isFlow || submitType == 'bl' && isFlow) {
        let flowInfo = {
          flowCode: 'csjcd',
          stepIdMark: this.stepMarker,
          submitType: submitType
        }
      },
      // 表单提交
      async formSubmit(submitType) {
        if (submitType == 'tj') {
          let isFlow = false
          for (let item of this.dataForm.checkOrderList) {
            if (!item.checkResult) {
              this.$alert("有未填写的数据")
              return
            } else if (item.checkResult == "2") {
              isFlow = true
            }
          }
          if (submitType == 'tj' && !isFlow) {
            submitType == ''
          }
        }
        if (submitType == 'tj' || submitType == 'bl' && isFlow) {
          let flowInfo = {
            flowCode: 'csjcd',
            stepIdMark: this.stepMarker,
            submitType: submitType
          }
          this.dataForm.flowInfoDto = flowInfo;
        }

        let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/testCheckOrder/TestCheckOrder/', this.dataForm)
        if (res.success) {
          await this.$tip.success()
          this.$refs.dialog.close()
          this.$emit('recall', res.data, this.configDetailRow)
        }
        this.dataForm.flowInfoDto = flowInfo;
      }
      console.log(this.dataForm, "this.dataForm formSubmit(submitType)")
      let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/testCheckOrder/TestCheckOrder/', this.dataForm)
      if (res.success) {
        await this.$tip.success()
        this.$refs.dialog.close()
        this.$emit('recall', res.data, this.configDetailRow)
        this.$emit('refreshDataList')
      }
    }
  }
}
</script>
<style>
  .el-flexCirculationDialog {
    display: flex;
    align-items: center
  }
.el-flexCirculationDialog {
  display: flex;
  align-items: center
}

  .testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
    width: 100%;
  }
.testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
  width: 100%;
}

  .testCheckFormAuto .acceptDate1 > .el-form-item > .el-form-item__content {
    width: 100%;
  }
.testCheckFormAuto .acceptDate1 > .el-form-item > .el-form-item__content {
  width: 100%;
}

  .testCheckFormAuto .marginTopAndMarginBottom {
    margin-top: 10px !important;
    margin-bottom: 0 !important;
  }
.testCheckFormAuto .marginTopAndMarginBottom {
  margin-top: 10px !important;
  margin-bottom: 0 !important;
}

  .testCheckFormAuto .marginTopAndMarginBottom2 {
    margin-top: -10px !important;
    margin-bottom: 10px !important;
  }
.testCheckFormAuto .marginTopAndMarginBottom2 {
  margin-top: -10px !important;
  margin-bottom: 10px !important;
}

  .testCheckFormAuto .marginTopAndMarginBottom3 {
    margin-top: 0 !important;
    margin-bottom: 10px !important;
  }
.testCheckFormAuto .marginTopAndMarginBottom3 {
  margin-top: 0 !important;
  margin-bottom: 10px !important;
}

  .testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
    line-height: 78px;
  }
.testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
  line-height: 78px;
}

  .testCheckContentWidth > .el-form-item > .el-form-item__content {
    width: calc(100% - 120px);
  }
.testCheckContentWidth > .el-form-item > .el-form-item__content {
  width: calc(100% - 120px);
}

  .testCheckFormAuto .el-radio {
    margin-right: 10px;
  }
.testCheckFormAuto .el-radio {
  margin-right: 10px;
}
</style>