Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-06 ddd818f74d59c1fdeeed29714d660d7e49200c04

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue

@@ -102,7 +102,7 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
        <!-- <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item
              :labelCol="{span:4}"
@@ -114,13 +114,13 @@
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择判定结果'"
                :triggerChange="true"
                dictCode="judgment_result"
                dictCode="technology_status"
                v-decorator="['judgmentResult', validatorRules.judgmentResult]"
              />

            </a-form-item>
          </a-col>
        </a-row>
        </a-row> -->

        <a-row :gutter="24">
          <a-col :span="24">
@@ -143,7 +143,7 @@
    </a-spin>
  </a-modal>
</template>
 

<script>
import { getAction, postAction, postFileAction } from '@/api/manage'
import Vue from 'vue'
@@ -258,7 +258,7 @@
      that.model = Object.assign({}, record);
      that.fileList = [];
      that.$nextTick(() => {
        that.form.setFieldsValue({ num: record.num, fileType: record.type, judgmentResult: record.judgmentResult, remark: record.remark });
        that.form.setFieldsValue({ num: record.num, fileType: record.type, name: record.name, remark: record.remark });
      });
      that.uploadId = ''
      //获取当前文件对应附件