修改

jinlin

2023-12-13 6566e04fee5932942d44dfe17934807a076568ec

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

@@ -16,16 +16,18 @@
            <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.checkOrder.examiner"
            <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-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);">
@@ -47,12 +49,13 @@
                </el-table-column>
                <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>
                    <zt-dict :disabled="stepMarker!=='csjcd_first'" v-model="row.checkResult" dict="tristate1" :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">
@@ -76,8 +79,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"
              <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>
@@ -87,8 +91,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"
              <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>
@@ -233,7 +238,10 @@
            submitType == ''
          }
        }
        if (submitType == 'tj' || submitType == 'bl') {
        if (submitType == 'bl') {
          isFlow = true
        }
        if (submitType == 'tj' && isFlow || submitType == 'bl' && isFlow) {
          let flowInfo = {
            flowCode: 'csjcd',
            stepIdMark: this.stepMarker,
@@ -247,6 +255,7 @@
          await this.$tip.success()
          this.$refs.dialog.close()
          this.$emit('recall', res.data, this.configDetailRow)
          this.$emit('refreshDataList')
        }
      }
    }