修改

jinlin

2023-12-12 0dff85a422669f41ef6d8e88fa24bf26ca164cbd

 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,12 +16,13 @@
            <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 :disabled="stepMarker!=='csjcd_first'" v-model="dataForm.checkOrder.examiner"
                      placeholder="检查人"></el-input>
          </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-model="dataForm.checkOrder.examDate"
              type="date"
              placeholder="请选择检查时间">
            </el-date-picker>
@@ -29,7 +30,7 @@
        </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,11 +41,11 @@
                  </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="150" label="检查结果">
                <el-table-column prop="checkResult" align="center" width="180" label="检查结果">
                  <template v-slot="{ row }">
                    <zt-dict v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict>
                  </template>
@@ -76,7 +77,7 @@
          <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>
                        :rows="3" v-model="dataForm.checkOrder.problemDescription" placeholder="问题描述..."></el-input>
            </el-form-item>
          </div>
        </div>
@@ -87,7 +88,7 @@
          <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>
                        :rows="3" v-model="dataForm.checkOrder.problemProcess" placeholder="问题处理..."></el-input>
            </el-form-item>
          </div>
        </div>
@@ -97,7 +98,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 +106,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,10 +115,16 @@
    <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>
  import qs from "qs";
  import Cookies from "js-cookie";

  export default {
    data() {
      return {
@@ -132,7 +139,7 @@
            softwareIdentity: '',
            softwareName: '',
          },
          testCheckOrder: {
          checkOrder: {
            code: '',
            examiner: '',
            examDate: '',
@@ -147,12 +154,19 @@
    },
    methods: {
      init(id, row) {
        console.log(row,'TestCheckOrder-AddOrUpdate.vue init row')
        this.configDetailRow = row
        if (row.checkId) {
          this.dataForm.id = row.checkId
          console.log('配置项入库审核进来的 TestCheckOrder-AddOrUpdate.vue init row.checkId')
          if (row.checkId != -1) {
            console.log('TestCheckOrder-AddOrUpdate.vue init row.checkId!=-1')
            this.dataForm.id = row.checkId
          }
        } else if (id) {
          console.log(this.dataForm,'从检查单进来的 TestCheckOrder-AddOrUpdate.vue init this.dataForm')
          this.dataForm.id = id
        } else {
          console.log(this.dataForm,'从检查单进来的 TestCheckOrder-AddOrUpdate.vue init this.dataForm')
          this.dataForm.id = row.id
        }
        this.pageCode = row.pageCode
@@ -192,11 +206,21 @@
          ...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') {
          let isFlow = false
          for (let item of this.dataForm.checkOrderList) {
            if (!item.checkResult) {
              this.$alert("有未填写的数据")
@@ -209,7 +233,7 @@
            submitType == ''
          }
        }
        if (submitType == 'tj' || submitType == 'bl' && isFlow) {
        if (submitType == 'tj' || submitType == 'bl') {
          let flowInfo = {
            flowCode: 'csjcd',
            stepIdMark: this.stepMarker,
@@ -217,7 +241,7 @@
          }
          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()