Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front

src/views/price/models/addStation.vue

@@ -4,7 +4,7 @@
             <div class="d-flex flex-cln" style="height: 60vh;">
                 <div class="pd-16">
                     <el-form ref="queryFormRef" :model="queryParams" inline>
-                        <el-form-item label="企业名称">
+                        <el-form-item label="企业名称" prop="cpyName">
                             <el-input v-model="queryParams.cpyName" placeholder="请输入企业名称" clearable />
                         </el-form-item>
                         <el-form-item>

src/views/price/models/priceRepordCheck.vue

@@ -33,7 +33,7 @@
                 </template>
             </vxe-column>
             <!-- 操作 -->
-            <vxe-column title="操作" align="center" fixed="right" width="180">
+            <vxe-column title="操作" align="center" fixed="right" width="180" v-if="queryParams.auditStatus== '0'">
                 <template #default="{ row }">
                     <template v-if="row.auditStatus === '0'">
                         <el-button @click.stop="passRow(row)" text type="primary">通过</el-button>