Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web

yxh

3 小时以前 c75027743ea7c3ecc2d0885f01d11d2ad78679a3

 src/views/project/tallage/computingBill/index.vue

@@ -43,7 +43,7 @@
              <el-date-picker
                v-model="form.taxedtime"
                value-format="yyyy-MM-dd HH:mm:ss"
                type="datetime"
                type="datetime" format="yyyy-MM-dd HH:mm"
                :disabled="true"
                placeholder="选择时间"
              >
@@ -298,6 +298,7 @@
            <el-row :gutter="20">
              <!--用户数据-->
              <el-form
                class="opo-query-form"
                :model="patientqueryParams"
                ref="queryForm"
                size="small"