zc

src/api/studentApi/chemicalManagement/index.js

@@ -9,6 +9,15 @@ export function getListJoin(query) {
   })
 }
 
+//获取出库列表接口
+export function getListOut(query) {
+  return request({
+    url: '/chemical/hxpStock/listOutByUser',
+    method: 'get',
+    params: query
+  })
+}
+
 //获取使用记录列表接口
 export function getHxpUserecordList(query) {
   return request({

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue

@@ -26,7 +26,7 @@
             {{scope.row.verify?scope.row.verify:'无'}}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" prop="operator" width="190">
+        <el-table-column label="操作" align="center" prop="operator" width="114">
           <template slot-scope="scope">
             <div class="button-box" style="display: flex">
               <p class="table-min-button"
@@ -208,14 +208,14 @@
     methods: {
       //视频按钮
       lockVideo(row){
-        if(!row.joinVideo){
-          this.msgError('操作视频异常无法观看');
+        if(!row.closeLockVideo){
+          this.msgError('开关锁视频异常无法观看');
           return
         }
         let obj = {
-          url:row.joinVideo
+          url:row.closeLockVideo
         }
-        this.$set(this,'videoTitle','操作视频');
+        this.$set(this,'videoTitle','开关锁视频');
         this.$set(this,'videoData',obj);
         this.videoType = true;
       },

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue

@@ -196,7 +196,7 @@
       this.listDepartments();
       this.getNoauthList();
       this.getHxpClassifyattribute();
-      // this.getList();
+      this.getList();
     },
     methods: {
       //视频按钮

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue

@@ -127,6 +127,10 @@
     methods:{
       //视频按钮
       pageToggle(type,row){
+        if(!row.closeLockVideo){
+          this.msgError('操作视频异常无法观看');
+          return
+        }
         let obj = {
           type:type,
           url:row.unLockVideo

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

@@ -141,7 +141,7 @@
                 <div class="right-for-name-box" v-for="(minItem,minIndex) in item.actApplytaskNodeList" :key="minIndex">
                   <div class="right-for-name-box-min">
                     <img :src="minItem.applyUserList[0].avatar">
-                    <p>{{minItem.applyUserList[0].name}}</p>
+                    <p>{{minItem.applyUserList[0].id==userId?'我':minItem.applyUserList[0].name}}</p>
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_1.png" v-if="minItem.nodeStatus == 1&&minIndex!=item.actApplytaskNodeList.length-1">
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_2.png" v-if="!minItem.nodeStatus == 1&&minIndex!=item.actApplytaskNodeList.length-1">
                     <img class="position-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ytg.png" v-if="minItem.nodeStatus == 1">
@@ -154,7 +154,7 @@
                 <div class="right-for-name-box" v-for="(minItem,minIndex) in item.actApplytaskNodeList[0].applyUserList" :key="minIndex">
                   <div class="right-for-name-box-min">
                     <img :src="minItem.avatar">
-                    <p>{{minItem.name}}</p>
+                    <p>{{minItem.id==userId?'我':minItem.name}}</p>
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_1.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_2.png" v-if="item.actApplytaskNodeList[0].applyUserid != minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">
                     <img class="position-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ytg.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&item.actApplytaskNodeList[0].nodeStatus == 1">
@@ -292,7 +292,8 @@
         //属性列表
         optionsListTwo:[],
         //机柜页面传参
-        listPropsData:{}
+        listPropsData:{},
+        userId:"",
       }
     },
     created() {
@@ -307,6 +308,7 @@
         this.optionsListTwo = response.data;
       })
       this.hxpapplyAudit();
+      this.userId = localStorage.getItem('userId');
     },
     methods: {
       //同意审批

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

@@ -52,7 +52,8 @@
           </el-col>
         </el-form-item>
       </el-form>
-      <el-table  border :data="tableList" ref="multipleTable" @selection-change="handleSelectionChange" :row-key="getRowKeys">
+      <el-table  border :data="tableList" ref="multipleTable" @select-all="handleSelectionChange" @select="handleSelectionChange" :row-key="getRowKeys">
+
         <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
         <el-table-column label="ID" align="center" prop="chemicalNum" show-overflow-tooltip/>
         <el-table-column label="化学品名" align="center" prop="chemicalName" show-overflow-tooltip/>
@@ -192,10 +193,21 @@
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
-        this.selectedNum = selection.length;
-        this.userIds = selection.map(item => item.id)
-        this.$set(this,'multipleTableList',selection);
-        this.multiple = !selection.length
+        let self = this;
+        this.$refs.multipleTable.clearSelection();
+        let list = [];
+        for(let i=0;i<selection.length;i++){
+          if(i>19){
+            self.$refs.multipleTable.toggleRowSelection(selection[i],false);
+          }else{
+            list.push(selection[i])
+            self.$refs.multipleTable.toggleRowSelection(selection[i],true);
+          }
+        }
+        this.$set(this,'multipleTableList',list);
+        if (selection.length>20){
+          this.msgError("一次最多可申购20个化学品")
+        }
       },
       /*===记录勾选数据===
         需要再el-table 添加  :row-key="getRowKeys"

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

@@ -44,7 +44,7 @@
             >确定</p>
           </el-col>
         </el-form-item>
-        <el-form-item style="float: right;">
+        <el-form-item style="float: right;" v-if="!addPagePropsData.type">
           <el-col :span="1.5">
             <p class="reset-button-one"
                @click="backPage(0)"

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/operationRecord.vue

@@ -127,9 +127,13 @@
     methods:{
       //视频按钮
       pageToggle(type,row){
+        if(!row.closeLockVideo){
+          this.msgError('操作视频异常无法观看');
+          return
+        }
         let obj = {
           type:type,
-          url:row.unLockVideo
+          url:row.closeLockVideo
         }
         // if(type == 1){
         //   obj.url = row.unLockVideo;

src/views/medicUniversity-3_1/chemicalManagement/usageRecord/infoPage.vue

@@ -172,6 +172,7 @@
       lockVideo(type){
         let obj = {};
         if (type == 1){
+          //领用操作视频
           if(!this.infoData.outDetail.outVideo){
             this.msgError('操作视频异常无法观看');
             return
@@ -179,6 +180,7 @@
           this.$set(this,'videoTitle','操作视频');
           obj.url = this.infoData.outDetail.outVideo;
         } else if(type == 2){
+          //归还操作视频
           if(!this.infoData.returnDetail.returnVideo){
             this.msgError('操作视频异常无法观看');
             return
@@ -186,6 +188,7 @@
           this.$set(this,'videoTitle','操作视频');
           obj.url = this.infoData.returnDetail.returnVideo;
         } else if(type == 3){
+          //领用开关锁视频
           if(!this.infoData.outDetail.outLockVideo){
             this.msgError('开关锁视频异常无法观看');
             return
@@ -193,6 +196,7 @@
           this.$set(this,'videoTitle','开关锁视频');
           obj.url = this.infoData.outDetail.outLockVideo;
         } else if(type == 4){
+          //归还开关锁视频
           if(!this.infoData.returnDetail.returnLockVideo){
             this.msgError('开关锁视频异常无法观看');
             return

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

@@ -26,7 +26,7 @@
             {{scope.row.verify?scope.row.verify:'无'}}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" prop="operator" width="100">
+        <el-table-column label="操作" align="center" prop="operator" width="114">
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
@@ -65,7 +65,8 @@
 </template>
 
 <script>
-  import { classifyList,getNoauthList,getListOut } from "@/api/medicUniversity-3_1/index";
+  import { classifyList,getNoauthList } from "@/api/medicUniversity-3_1/index";
+  import { getListOut } from "@/api/studentApi/chemicalManagement/index";
   import { listDepartments } from "@/api/system/dept";
   import advancedSearch from "@/components/ZDcomponents/advancedSearch.vue"
   export default {
@@ -201,14 +202,14 @@
     methods: {
       //视频按钮
       lockVideo(row){
-        if(!row.joinVideo){
-          this.msgError('操作视频异常无法观看');
+        if(!row.closeLockVideo){
+          this.msgError('开关锁视频异常无法观看');
           return
         }
         let obj = {
-          url:row.joinVideo
+          url:row.closeLockVideo
         }
-        this.$set(this,'videoTitle','操作视频');
+        this.$set(this,'videoTitle','开关锁视频');
         this.$set(this,'videoData',obj);
         this.videoType = true;
       },

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

@@ -52,7 +52,7 @@
           </el-col>
         </el-form-item>
       </el-form>
-      <el-table  border :data="tableList" ref="multipleTable" @selection-change="handleSelectionChange" :row-key="getRowKeys">
+      <el-table  border :data="tableList" ref="multipleTable" @select-all="handleSelectionChange" @select="handleSelectionChange" :row-key="getRowKeys">
         <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
         <el-table-column label="ID" align="center" prop="chemicalNum" show-overflow-tooltip/>
         <el-table-column label="化学品名" align="center" prop="chemicalName" show-overflow-tooltip/>
@@ -193,10 +193,21 @@
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
-        this.selectedNum = selection.length;
-        this.userIds = selection.map(item => item.id)
-        this.$set(this,'multipleTableList',selection);
-        this.multiple = !selection.length
+        let self = this;
+        this.$refs.multipleTable.clearSelection();
+        let list = [];
+        for(let i=0;i<selection.length;i++){
+          if(i>19){
+            self.$refs.multipleTable.toggleRowSelection(selection[i],false);
+          }else{
+            list.push(selection[i])
+            self.$refs.multipleTable.toggleRowSelection(selection[i],true);
+          }
+        }
+        this.$set(this,'multipleTableList',list);
+        if (selection.length>20){
+          this.msgError("一次最多可申购20个化学品")
+        }
       },
       /*===记录勾选数据===
         需要再el-table 添加  :row-key="getRowKeys"

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

@@ -44,7 +44,7 @@
             >确定</p>
           </el-col>
         </el-form-item>
-        <el-form-item style="float: right;">
+        <el-form-item style="float: right;" v-if="!addPagePropsData.type">
           <el-col :span="1.5">
             <p class="reset-button-one"
                @click="backPage(0)"

src/views/studentViews/chemicalManagement/studentUsageRecord/infoPage.vue

@@ -166,6 +166,7 @@
       lockVideo(type){
         let obj = {};
         if (type == 1){
+          //领用操作视频
           if(!this.infoData.outDetail.outVideo){
             this.msgError('操作视频异常无法观看');
             return
@@ -173,6 +174,7 @@
           this.$set(this,'videoTitle','操作视频');
           obj.url = this.infoData.outDetail.outVideo;
         } else if(type == 2){
+          //归还操作视频
           if(!this.infoData.returnDetail.returnVideo){
             this.msgError('操作视频异常无法观看');
             return
@@ -180,6 +182,7 @@
           this.$set(this,'videoTitle','操作视频');
           obj.url = this.infoData.returnDetail.returnVideo;
         } else if(type == 3){
+          //领用开关锁视频
           if(!this.infoData.outDetail.outLockVideo){
             this.msgError('开关锁视频异常无法观看');
             return
@@ -187,6 +190,7 @@
           this.$set(this,'videoTitle','开关锁视频');
           obj.url = this.infoData.outDetail.outLockVideo;
         } else if(type == 4){
+          //归还开关锁视频
           if(!this.infoData.returnDetail.returnLockVideo){
             this.msgError('开关锁视频异常无法观看');
             return