dedsudiyu 2 yıl önce
ebeveyn
işleme
41d7d0e230

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

@@ -26,6 +26,16 @@
             {{scope.row.verify?scope.row.verify:'无'}}
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" prop="operator" width="190">
+          <template slot-scope="scope">
+            <div class="button-box" style="display: flex">
+              <p class="table-min-button"
+                 style="margin:0!important;"
+                 @click="lockVideo(scope.row)"
+              >开关锁视频</p>
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
       <div style="display: flex;height:32px;margin-top:15px;">
         <!--<p style="flex:4;"></p>-->
@@ -45,6 +55,12 @@
         </div>
       </div>
     </div>
+    <el-dialog title="操作视频" :visible.sync="videoType" v-if="videoType"
+               width="840px" append-to-body id="operationRecord-dialog-box">
+      <video style="width:800px;height:450px;" controls="" autoplay="" name="media" :poster="videoCover">
+        <source :src="videoData.url" type="video/mp4">
+      </video>
+    </el-dialog>
   </div>
 </template>
 
@@ -173,7 +189,9 @@
         single: true,
         // 非多个禁用
         multiple: true,
-
+        //视频操作
+        videoType:false,
+        videoData:{},
       };
     },
     created() {
@@ -187,6 +205,18 @@
       this.getList();
     },
     methods: {
+      //视频按钮
+      lockVideo(row){
+        if(!row.joinVideo){
+          this.msgError('操作视频异常无法观看');
+          return
+        }
+        let obj = {
+          url:row.joinVideo
+        }
+        this.$set(this,'videoData',obj);
+        this.videoType = true;
+      },
       //获取属性列表
       getHxpClassifyattribute(){
         this.getDicts("hxp_classifyattribute").then(response => {

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

@@ -27,13 +27,17 @@
             {{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="190">
           <template slot-scope="scope">
-            <div class="button-box">
+            <div class="button-box" style="display: flex">
               <p class="table-min-button"
                  style="margin:0!important;"
-                 @click="lockVideo(scope.row)"
+                 @click="lockVideo(1,scope.row)"
               >操作视频</p>
+              <p class="table-min-button"
+                 style="margin:0!important;"
+                 @click="lockVideo(2,scope.row)"
+              >开关锁视频</p>
             </div>
           </template>
         </el-table-column>
@@ -195,16 +199,28 @@
     },
     methods: {
       //视频按钮
-      lockVideo(row){
-        if(!row.joinVideo){
-          this.msgError('操作视频异常无法观看');
-          return
-        }
-        let obj = {
-          url:row.joinVideo
+      lockVideo(type,row){
+        if(type == 1){
+          if(!row.joinVideo){
+            this.msgError('操作视频异常无法观看');
+            return
+          }
+          let obj = {
+            url:row.joinVideo
+          }
+          this.$set(this,'videoData',obj);
+          this.videoType = true;
+        }else if(type == 2){
+          if(!row.joinVideo){
+            this.msgError('开关锁视频异常无法观看');
+            return
+          }
+          let obj = {
+            url:row.joinVideo
+          }
+          this.$set(this,'videoData',obj);
+          this.videoType = true;
         }
-        this.$set(this,'videoData',obj);
-        this.videoType = true;
       },
       //获取属性列表
       getHxpClassifyattribute(){

+ 4 - 1
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/addPage.vue

@@ -92,7 +92,8 @@
         <div>
           <el-form-item label="属性:" prop="classifyAttribute">
             <el-checkbox-group v-model="formData.classifyAttribute" style="margin-top:2px;">
-              <el-checkbox :label="item.dictLabel" v-for="item in optionsListTwo"></el-checkbox>
+              <el-checkbox v-for="item in optionsListTwo" :label="item.dictValue"
+                           :key="item.dictValue">{{item.dictLabel}}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
         </div>
@@ -226,6 +227,7 @@
         },
         formData:{
           // labelType:1,
+          classifyAttribute:[],
         },
         //化学品形态
         optionsList:[],
@@ -256,6 +258,7 @@
     methods: {
       //提交接口
       upData(){
+        let self = this;
         console.log('this.addPropsData',this.addPropsData);
         this.$refs["form"].validate(valid => {
           if (valid) {

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

@@ -93,6 +93,7 @@
             <p>领用</p>
             <p>{{infoData.collectTime}}</p>
             <p class="inquire-button-one" @click="lockVideo(1)">操作视频</p>
+            <p class="inquire-button-one" @click="lockVideo(3)">开关锁视频</p>
           </div>
           <div class="table-title-box-one">
             <p>领用时净重</p>
@@ -119,6 +120,7 @@
             <p>归还</p>
             <p>{{infoData.returnTime}}</p>
             <p class="inquire-button-one" @click="lockVideo(2)">操作视频</p>
+            <p class="inquire-button-one" @click="lockVideo(4)">开关锁视频</p>
           </div>
           <div class="table-title-box-two">
             <p>本次使用量</p>
@@ -180,6 +182,18 @@
             return
           }
           obj.url = this.infoData.returnDetail.returnVideo;
+        } else if(type == 3){
+          if(!this.infoData.outDetail.returnVideo){
+            this.msgError('开关锁视频异常无法观看');
+            return
+          }
+          obj.url = this.infoData.outDetail.returnVideo;
+        } else if(type == 4){
+          if(!this.infoData.returnDetail.returnVideo){
+            this.msgError('开关锁视频异常无法观看');
+            return
+          }
+          obj.url = this.infoData.returnDetail.returnVideo;
         }
         this.$set(this,'videoData',obj);
         this.videoType = true;
@@ -307,6 +321,11 @@
               line-height:40px;
               margin:20px 10px 0 0;
             }
+            p:nth-child(5){
+              width:100px;
+              line-height:40px;
+              margin:20px 10px 0 0;
+            }
           }
           .table-title-box-one{
             width:755px;

+ 31 - 1
src/views/studentViews/chemicalManagement/studentOutboundRecord/index.vue

@@ -26,6 +26,16 @@
             {{scope.row.verify?scope.row.verify:'无'}}
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" prop="operator" width="100">
+          <template slot-scope="scope">
+            <div class="button-box">
+              <p class="table-min-button"
+                 style="margin:0!important;"
+                 @click="lockVideo(scope.row)"
+              >开关锁视频</p>
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
       <div style="display: flex;height:32px;margin-top:15px;">
         <!--<p style="flex:4;"></p>-->
@@ -45,6 +55,12 @@
         </div>
       </div>
     </div>
+    <el-dialog title="操作视频" :visible.sync="videoType" v-if="videoType"
+               width="840px" append-to-body id="operationRecord-dialog-box">
+      <video style="width:800px;height:450px;" controls="" autoplay="" name="media" :poster="videoCover">
+        <source :src="videoData.url" type="video/mp4">
+      </video>
+    </el-dialog>
   </div>
 </template>
 
@@ -166,7 +182,9 @@
         single: true,
         // 非多个禁用
         multiple: true,
-
+        //视频操作
+        videoType:false,
+        videoData:{},
       };
     },
     created() {
@@ -180,6 +198,18 @@
       this.getList();
     },
     methods: {
+      //视频按钮
+      lockVideo(row){
+        if(!row.joinVideo){
+          this.msgError('操作视频异常无法观看');
+          return
+        }
+        let obj = {
+          url:row.joinVideo
+        }
+        this.$set(this,'videoData',obj);
+        this.videoType = true;
+      },
       //获取属性列表
       getHxpClassifyattribute(){
         this.getDicts("hxp_classifyattribute").then(response => {

+ 19 - 0
src/views/studentViews/chemicalManagement/studentUsageRecord/infoPage.vue

@@ -93,6 +93,7 @@
               <p>领用</p>
               <p>{{infoData.collectTime}}</p>
               <p class="inquire-button-one" @click="lockVideo(1)">操作视频</p>
+              <p class="inquire-button-one" @click="lockVideo(3)">开关锁视频</p>
             </div>
             <div class="table-title-box-one">
               <p>领用时净重</p>
@@ -115,6 +116,7 @@
               <p>归还</p>
               <p>{{infoData.returnTime}}</p>
               <p class="inquire-button-one" @click="lockVideo(2)">操作视频</p>
+              <p class="inquire-button-one" @click="lockVideo(4)">开关锁视频</p>
             </div>
             <div class="table-title-box-two">
               <p>本次使用量</p>
@@ -174,6 +176,18 @@
             return
           }
           obj.url = this.infoData.returnDetail.returnVideo;
+        } else if(type == 3){
+          if(!this.infoData.outDetail.returnVideo){
+            this.msgError('开关锁视频异常无法观看');
+            return
+          }
+          obj.url = this.infoData.outDetail.returnVideo;
+        } else if(type == 4){
+          if(!this.infoData.returnDetail.returnVideo){
+            this.msgError('开关锁视频异常无法观看');
+            return
+          }
+          obj.url = this.infoData.returnDetail.returnVideo;
         }
         this.$set(this,'videoData',obj);
         this.videoType = true;
@@ -301,6 +315,11 @@
               line-height:40px;
               margin:20px 10px 0 0;
             }
+            p:nth-child(5){
+              width:100px;
+              line-height:40px;
+              margin:20px 10px 0 0;
+            }
           }
           .table-title-box-one{
             width:755px;

+ 28 - 12
src/views/studentViews/chemicalManagement/studentWarehousingRecord/index.vue

@@ -27,13 +27,17 @@
             {{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="190">
           <template slot-scope="scope">
-            <div class="button-box">
+            <div class="button-box" style="display: flex">
               <p class="table-min-button"
                  style="margin:0!important;"
-                 @click="lockVideo(scope.row)"
+                 @click="lockVideo(1,scope.row)"
               >操作视频</p>
+              <p class="table-min-button"
+                 style="margin:0!important;"
+                 @click="lockVideo(2,scope.row)"
+              >开关锁视频</p>
             </div>
           </template>
         </el-table-column>
@@ -189,16 +193,28 @@
     },
     methods: {
       //视频按钮
-      lockVideo(row){
-        if(!row.joinVideo){
-          this.msgError('操作视频异常无法观看');
-          return
-        }
-        let obj = {
-          url:row.joinVideo
+      lockVideo(type,row){
+        if(type == 1){
+          if(!row.joinVideo){
+            this.msgError('操作视频异常无法观看');
+            return
+          }
+          let obj = {
+            url:row.joinVideo
+          }
+          this.$set(this,'videoData',obj);
+          this.videoType = true;
+        }else if(type == 2){
+          if(!row.joinVideo){
+            this.msgError('开关锁视频异常无法观看');
+            return
+          }
+          let obj = {
+            url:row.joinVideo
+          }
+          this.$set(this,'videoData',obj);
+          this.videoType = true;
         }
-        this.$set(this,'videoData',obj);
-        this.videoType = true;
       },
       //获取属性列表
       getHxpClassifyattribute(){