zc

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/index.vue

@@ -113,15 +113,15 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button" v-hasPermi="['chemical:hxpapply:query']"
-                 v-show="scope.row.approvalStatus == 2 || scope.row.approvalStatus == 3" style="margin-right:10px;" @click="pageToggle(5,scope.row)">编辑</p>
+                 v-show="(scope.row.approvalStatus == 2 || scope.row.approvalStatus == 3) && scope.row.myDataType" style="margin-right:10px;" @click="pageToggle(5,scope.row)">编辑</p>
               <p class="table-min-button" v-hasPermi="['chemical:revokeApplytask:edit']"
-                 v-show="scope.row.approvalStatus == 1 && !scope.row.lsName" style="margin-right:10px;" @click="approvalRevoke(scope.row)">撤销</p>
+                 v-show="scope.row.myDataType && !scope.row.lsName && scope.row.approvalStatus == 0" style="margin-right:10px;" @click="approvalRevoke(scope.row)">撤销</p>
               <p class="table-min-button" v-hasPermi="['chemical:hxpapplyaudit:query']"
                  v-show="scope.row.approvalType == 1" style="margin-right:10px;" @click="pageToggle(6,scope.row)">审批</p>
               <p class="table-min-button" v-hasPermi="['chemical:hxpapply:query']"
                  style="margin-right:10px;" @click="pageToggle(7,scope.row)">审批单</p>
               <p class="table-min-button" v-hasPermi="['chemical:hxpapply:remove']"
-                 v-show="scope.row.approvalStatus == 2 || scope.row.approvalStatus == 3" @click="delHxpapply(scope.row)">删除</p>
+                 v-show="(scope.row.approvalStatus == 2 || scope.row.approvalStatus == 3) && scope.row.myDataType" @click="delHxpapply(scope.row)">删除</p>
             </div>
           </template>
         </el-table-column>
@@ -338,6 +338,9 @@
           let userId = localStorage.getItem('userId')
           this.total = response.total;
           for(let i=0;i<response.rows.length;i++){
+            if(response.rows[i].userId == userId){
+              response.rows[i].myDataType = true;
+            }
             response.rows[i].lsName = "";
             response.rows[i].dqName = "";
             for(let o=0;o<response.rows[i].historyUserList.length;o++){

src/views/studentViews/chemicalManagement/studentChemicalInfo/addPage.vue

@@ -1,6 +1,6 @@
 <!--化学品存放-->
 <template>
-  <div class="addPage">
+  <div class="addPage studentChemicalInfo-add-page">
     <div class="addPage-min">
       <el-form :model="queryParamsData" ref="queryForm" :inline="true" label-width="68px">
         <el-form-item label="关键字" prop="searchValue">
@@ -692,4 +692,11 @@
       }
     }
   }
+  .studentChemicalInfo-add-page{
+    .el-table__header-wrapper{
+      .el-checkbox{
+        display: none;
+      }
+    }
+  }
 </style>

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/index.vue

@@ -96,7 +96,7 @@
             <template slot-scope="scope">
               <div class="button-box">
                 <p class="table-min-button" v-show="scope.row.approvalStatus == 2 || scope.row.approvalStatus == 3" style="margin-right:10px;" @click="pageToggle(5,scope.row)">编辑</p>
-                <p class="table-min-button" v-show="scope.row.approvalStatus == 1 && !scope.row.lsName" style="margin-right:10px;" @click="approvalRevoke(scope.row)">撤销</p>
+                <p class="table-min-button" v-show="scope.row.approvalStatus == 0 && !scope.row.lsName" style="margin-right:10px;" @click="approvalRevoke(scope.row)">撤销</p>
                 <p class="table-min-button" style="margin-right:10px;" @click="pageToggle(7,scope.row)">审批单</p>
                 <p class="table-min-button" v-show="scope.row.approvalStatus == 2 || scope.row.approvalStatus == 3" @click="delHxpapply(scope.row)">删除</p>
               </div>