Explorar o código

报告借用归还权限添加,库存页面调整

wangqiang hai 1 ano
pai
achega
0e359096d6

+ 1 - 1
src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -206,7 +206,7 @@
 				  <!--借用撤回-->
 				  <el-button v-if="hasPermission('cwProjectReportArchive:edit') && scope.row.status === '5' && scope.row.borrowType === '2' && (scope.row.borrowUserId === $store.state.user.id)" text type="primary" @click="rebackBorrow(scope.row)">撤回借用申请</el-button>
 				  <!--借用归还-->
-				  <el-button v-if="hasPermission('cwProjectReportArchive:edit') && scope.row.status === '5' && scope.row.borrowType === '5'" text type="primary" @click="retureBorrow(scope.row)">归还报告</el-button>
+				  <el-button v-if="hasPermission('cwProjectReportArchive:reture') && scope.row.status === '5' && scope.row.borrowType === '5'" text type="primary" @click="retureBorrow(scope.row)">归还报告</el-button>
 <!--              审核-->
               <el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" text type="primary"  @click="examine(scope.row)">审核</el-button>
 <!--              被驳回后当前申请人重新调整-->

+ 2 - 2
src/views/materialManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -44,7 +44,7 @@
 				></vxe-button>
 			</template>
 		</vxe-toolbar>
-      <div style="height: calc(100% - 70px)">
+      <div style="height: calc(100% - 90px)">
         <vxe-table
           :key="tableKey"
           border="inner"
@@ -80,7 +80,7 @@
           <vxe-column min-width="160" align="center" title="剩余量" field="tradeNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="单位" field="company"></vxe-column>
           <vxe-column min-width="160" align="center" fixed="right" title="提醒数量" field="warnNum" :edit-render="{}">
-            <template #default="scope">
+            <template #edit="scope">
               <vxe-input v-model="scope.row.warnNum" type="float" min="0" @blur="changeWarnNum(scope.row)" :controls="false"></vxe-input>
             </template>
           </vxe-column>