Merge remote-tracking branch 'origin/master'

zhaowei

7 天以前 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946

 src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue

@@ -19,12 +19,12 @@
                      <a-input v-model="model.repairCode" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="customSpan">
                  <a-col :span="12">
                    <a-form-model-item label="故障类型">
                      <j-dict-select-tag dict-code="fault_type"  v-model="model.faultType" disabled/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="customSpan">
                  <a-col :span="12">
                    <a-form-model-item label="报修人">
                      <a-input v-model="model.reportPerson" readOnly/>
                    </a-form-model-item>
@@ -39,7 +39,7 @@
                      <a-input v-model="model.actualEndTime" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="customSpan">
                  <a-col :span="24">
                    <a-form-model-item label="故障现象">
                      <a-textarea :rows="5" v-model="model.faultPhenomenon" readOnly/>
                    </a-form-model-item>