dedsudiyu 2 年之前
父節點
當前提交
72394ba4e0

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

@@ -21,7 +21,7 @@
         <el-table-column label="出库净重" align="center" prop="outUsages" width="120"/>
         <el-table-column label="出库方式" align="center" prop="stockStatus" width="120"/>
         <el-table-column label="操作人" align="center" prop="operator" width="220" show-overflow-tooltip/>
-        <el-table-column label="身份验证" align="center" prop="verify" width="220" show-overflow-tooltip>
+        <el-table-column label="双人验证" align="center" prop="verify" width="220" show-overflow-tooltip>
           <template slot-scope="scope">
             {{scope.row.verify?scope.row.verify:'无'}}
           </template>

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

@@ -22,7 +22,7 @@
         <!--<el-table-column label="入库量" align="center" prop="usages" width="120"/>-->
         <el-table-column label="库存净重" align="center" prop="usages" width="120"/>
         <el-table-column label="操作人" align="center" prop="operator" width="220" show-overflow-tooltip/>
-        <el-table-column label="身份验证" align="center" prop="verify" width="220" show-overflow-tooltip>
+        <el-table-column label="双人验证" align="center" prop="verify" width="220" show-overflow-tooltip>
           <template slot-scope="scope">
             {{scope.row.verify?scope.row.verify:'无'}}
           </template>

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

@@ -65,7 +65,7 @@
           <p>位置</p>
           <p>学院库存</p>
           <p>实验室库存</p>
-          <p>化学品库存</p>
+          <p>化学品库存</p>
           <p>申购人剩余可存放量</p>
           <p>本次申购量</p>
           <p>操作</p>

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

@@ -51,6 +51,13 @@
             >返回</p>
           </el-col>
         </el-form-item>
+        <el-form-item style="float: right;" v-if="addPagePropsData.type">
+          <el-col :span="1.5">
+            <p class="reset-button-one"
+               @click="goPage(4)"
+            >取消</p>
+          </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">
@@ -124,6 +131,7 @@
         addPagePropsData:{},
         //勾选数据
         multipleTableList:[],
+        multipleTableListOne:[],
         //编辑参数
         editPropsData:{},
       }
@@ -152,11 +160,19 @@
             this.msgError("请勾选化学品")
             return
           }
+          this.$set(this,'multipleTableListOne',this.multipleTableList);
           this.pageType = 2;
         }else if(type == 3){
           console.log('data',data);
           this.$set(this,'addPagePropsData',JSON.parse(JSON.stringify(data)));
           this.pageType = 1;
+        }else if(type == 4){
+          this.$refs.multipleTable.clearSelection();
+          for(let o=0;o<self.multipleTableListOne.length;o++){
+            self.$refs.multipleTable.toggleRowSelection(self.multipleTableListOne[o],true);
+          }
+          this.$set(this,'multipleTableList',this.multipleTableListOne);
+          this.pageType = 2;
         }
       },
       //获取数据列表
@@ -208,39 +224,12 @@
           }
         }
         this.$set(this,'multipleTableList',list);
+        if(!this.addPagePropsData.type){
+          this.$set(this,'multipleTableListOne',list);
+        }
         if (selection.length>20){
           this.msgError("一次最多可申购20个化学品")
         }
-
-
-
-
-        // let list = JSON.parse(JSON.stringify(this.multipleTableList))
-        // for(let i=0;i<selection.length;i++){
-        //   let num = 0;
-        //   for(let o=0;o<list.length;o++){
-        //     if(selection[i].id == list[o].id){
-        //       num++
-        //     }
-        //   }
-        //   if(num == 0){
-        //     list.push(selection[i])
-        //   }
-        // }
-        // if(list.length<=20){
-        //   this.selectedNum = selection.length;
-        //   this.userIds = selection.map(item => item.id)
-        //   this.$set(this,'multipleTableList',selection);
-        //   this.multiple = !selection.length
-        // }else{
-        //   this.$refs.multipleTable.clearSelection();
-        //   setTimeout(function(){
-        //     for(let i=0;i<20;i++){
-        //       self.$refs.multipleTable.toggleRowSelection(self.multipleTableList[i],true);
-        //     }
-        //   },50);
-        //   this.msgError("一次最多可申购20个化学品")
-        // }
       },
       /*===记录勾选数据===
         需要再el-table 添加  :row-key="getRowKeys"

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/usageRecord/index.vue

@@ -29,7 +29,7 @@
             <template slot-scope="scope"><span :class="scope.row.useStatus == '使用中'?'table-color-1':(scope.row.useStatus == '超时未归还'?'table-color-2':'')">{{scope.row.useStatus}}</span></template>
           </el-table-column>
           <el-table-column label="操作人" align="center" prop="operator" width="220" show-overflow-tooltip/>
-          <!--<el-table-column label="身份验证" align="center" prop="verify" width="220" show-overflow-tooltip>-->
+          <!--<el-table-column label="双人验证" align="center" prop="verify" width="220" show-overflow-tooltip>-->
           <!--<template slot-scope="scope">-->
           <!--{{scope.row.verify?scope.row.verify:'无'}}-->
           <!--</template>-->

+ 2 - 2
src/views/studentViews/chemicalManagement/studentOutboundRecord/index.vue

@@ -20,8 +20,8 @@
         <el-table-column label="化学品柜位置" align="center" prop="posi" width="280" show-overflow-tooltip/>
         <el-table-column label="出库净重" align="center" prop="outUsages" width="120"/>
         <el-table-column label="出库方式" align="center" prop="stockStatus" width="120"/>
-        <el-table-column label="操作人" align="center" prop="operator" width="220" show-overflow-tooltip/>
-        <el-table-column label="身份验证" align="center" prop="verify" width="220" show-overflow-tooltip>
+        <!--<el-table-column label="操作人" align="center" prop="operator" width="220" show-overflow-tooltip/>-->
+        <el-table-column label="双人验证" align="center" prop="verify" width="220" show-overflow-tooltip>
           <template slot-scope="scope">
             {{scope.row.verify?scope.row.verify:'无'}}
           </template>

+ 19 - 30
src/views/studentViews/chemicalManagement/studentPurchaseRequisition/listPage.vue

@@ -51,6 +51,13 @@
             >返回</p>
           </el-col>
         </el-form-item>
+        <el-form-item style="float: right;" v-if="addPagePropsData.type">
+          <el-col :span="1.5">
+            <p class="reset-button-one"
+               @click="goPage(4)"
+            >取消</p>
+          </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">
@@ -124,6 +131,7 @@
         addPagePropsData:{},
         //勾选数据
         multipleTableList:[],
+        multipleTableListOne:[],
         //编辑参数
         editPropsData:{},
       }
@@ -152,10 +160,18 @@
             this.msgError("请勾选化学品")
             return
           }
+          this.$set(this,'multipleTableListOne',this.multipleTableList);
           this.pageType = 2;
         }else if(type == 3){
           this.$set(this,'addPagePropsData',JSON.parse(JSON.stringify(data)));
           this.pageType = 1;
+        }else if(type == 4){
+          this.$refs.multipleTable.clearSelection();
+          for(let o=0;o<self.multipleTableListOne.length;o++){
+            self.$refs.multipleTable.toggleRowSelection(self.multipleTableListOne[o],true);
+          }
+          this.$set(this,'multipleTableList',this.multipleTableListOne);
+          this.pageType = 2;
         }
       },
       //获取数据列表
@@ -207,39 +223,12 @@
           }
         }
         this.$set(this,'multipleTableList',list);
+        if(!this.addPagePropsData.type){
+          this.$set(this,'multipleTableListOne',list);
+        }
         if (selection.length>20){
           this.msgError("一次最多可申购20个化学品")
         }
-
-
-        // let list = JSON.parse(JSON.stringify(this.multipleTableList))
-        // console.log('selection',selection)
-        // console.log('list',list)
-        // for(let i=0;i<selection.length;i++){
-        //   let num = 0;
-        //   for(let o=0;o<list.length;o++){
-        //     if(selection[i].id == list[o].id){
-        //       num++
-        //     }
-        //   }
-        //   if(num == 0){
-        //     list.push(selection[i])
-        //   }
-        // }
-        // if(list.length<=20){
-        //   this.selectedNum = selection.length;
-        //   this.userIds = selection.map(item => item.id)
-        //   this.$set(this,'multipleTableList',selection);
-        //   this.multiple = !selection.length
-        // }else{
-        //   this.$refs.multipleTable.clearSelection();
-        //   setTimeout(function(){
-        //     for(let i=0;i<20;i++){
-        //       self.$refs.multipleTable.toggleRowSelection(self.multipleTableList[i],true);
-        //     }
-        //   },50);
-        //   this.msgError("一次最多可申购20个化学品")
-        // }
       },
       /*===记录勾选数据===
         需要再el-table 添加  :row-key="getRowKeys"