Merge remote-tracking branch 'origin/master'

zhaowei

23 小时以前 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946

Merge remote-tracking branch 'origin/master'

 src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue

@@ -40,27 +40,27 @@
          </a-col>
          <a-col :span="customSpan">
            <a-form-model-item label="故障现象">
              <a-textarea placeholder="请输入故障现象" v-model="model.faultPhenomenon"/>
              <a-textarea :rows="3" placeholder="请输入故障现象" v-model="model.faultPhenomenon"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="customSpan">
            <a-form-model-item label="故障原因">
              <a-textarea placeholder="请输入故障原因" v-model="model.faultReason"/>
              <a-textarea :rows="3" placeholder="请输入故障原因" v-model="model.faultReason"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="customSpan">
            <a-form-model-item label="故障分析">
              <a-textarea placeholder="请输入故障分析" v-model="model.faultAnalysis"/>
              <a-textarea :rows="3" placeholder="请输入故障分析" v-model="model.faultAnalysis"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="customSpan">
            <a-form-model-item label="排故过程">
              <a-textarea placeholder="请输入排故过程" v-model="model.faultProcess"/>
              <a-textarea :rows="3" placeholder="请输入排故过程" v-model="model.faultProcess"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="customSpan">
            <a-form-model-item label="预防措施">
              <a-textarea placeholder="请输入预防措施" v-model="model.faultPrevent"/>
              <a-textarea :rows="3" placeholder="请输入预防措施" v-model="model.faultPrevent"/>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -88,10 +88,10 @@
        title: '操作',
        visible: false,
        model: {},
        customSpan: 12,
        customSpan: 8,
        labelCol: {
          xs: { span: 24 },
          sm: { span: 6 }
          sm: { span: 8 }
        },
        wrapperCol: {
          xs: { span: 24 },

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

@@ -41,27 +41,27 @@
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="故障现象">
                      <a-textarea v-model="model.faultPhenomenon" readOnly/>
                      <a-textarea :rows="5" v-model="model.faultPhenomenon" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="故障原因">
                      <a-textarea v-model="model.faultReason" readOnly/>
                      <a-textarea :rows="5" v-model="model.faultReason" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="故障分析">
                      <a-textarea v-model="model.faultAnalysis" readOnly/>
                      <a-textarea :rows="5" v-model="model.faultAnalysis" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="排故过程">
                      <a-textarea v-model="model.faultProcess" readOnly/>
                      <a-textarea :rows="5" v-model="model.faultProcess" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="预防措施">
                      <a-textarea v-model="model.faultPrevent" readOnly/>
                      <a-textarea :rows="5" v-model="model.faultPrevent" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>