Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

5 天以前 14395f28e3cf84802a6b76a8ab8a5c9b082dfd35

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -35,7 +35,7 @@
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item :label="props.approveType == 5 ? '采购说明：' : '审批事由：'" prop="approveReason">
            <el-form-item :label="props.approveType == 5 ? '采购合同号：' : '审批事由：'" prop="approveReason">
              <el-input v-model="form.approveReason" placeholder="请输入" clearable type="textarea" />
            </el-form-item>
          </el-col>