Merge branch 'master' into web-v2

src/views/emergencyManagement/smartLoT/sensor/index.vue

@@ -216,7 +216,7 @@ export default {
         gatewayId:[
           {required: true, message: '网关不能为空', trigger: 'blur'},
           { required: true, message: "网关不能为空", validator: this.spaceJudgment, trigger: "blur" },
-          { pattern:/^(192\.168(\.(\d|([1-9]\d)|(1\d{2})|(2[0-4]\d)|(25[0-5]))){2})$/, message: "请输入正确的网关", trigger: "blur" }
+          // { pattern:/^(192\.168(\.(\d|([1-9]\d)|(1\d{2})|(2[0-4]\d)|(25[0-5]))){2})$/, message: "请输入正确的网关", trigger: "blur" }
         ],
         senseData:[
           {required: true, message: '检测数据不能为空', trigger: 'blur'},

src/views/gasManage3_0/manage/infoRecord/infoRecord.vue

@@ -406,7 +406,7 @@ export default {
         },
 
         series: [{
-          name: '入库',
+          name: '申请',
           type: 'bar',
           barWidth: '14',
           itemStyle: {

src/views/gasManage_syd/manage/gasUseManage/gasUseManage.vue

@@ -118,6 +118,7 @@ export default {
     handleClick(index,row,doType){
       let _this=this;
       if(doType=='receive'){//领用
+
         this.dialogTitle='领用气瓶提示';
         this.dialogContent='您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。';
         this.subName='领用';
@@ -163,7 +164,10 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.form = {};
+      this.form = {
+        beforeUse:'',//领用
+        afterUse:'',//归还
+      };
       this.dialogVisible = false;
     },
     /*领用提交*/

src/views/gasManage_syd/manage/infoRecord/applyRecord.vue

@@ -172,7 +172,7 @@ export default {
               ids :ids
             }
             console.log("obj",obj)
-            self.download(`/airbottle/taskManage/export/`,obj, '申领记录导出-'+currentDate+'.xlsx')
+            self.download(`/airbottle/informationRecord/taskExport/`,obj, '申领记录导出-'+currentDate+'.xlsx')
           }).catch(() => {})
         }else {
           this.msgError('请选择要导出的数据')

src/views/gasManage_syd/manage/infoRecord/infoRecord.vue

@@ -413,7 +413,7 @@ export default {
         },
 
         series: [{
-          name: '入库',
+          name: '申请',
           type: 'bar',
           barWidth: '14',
           itemStyle: {

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

@@ -27,7 +27,7 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" prop="operator" width="114">
-          <template slot-scope="scope">
+          <template slot-scope="scope"  v-if="scope.row.closeLockVideo">
             <div class="button-box" style="display: flex">
               <p class="table-min-button"
                  style="margin:0!important;"

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/listPage.vue

@@ -130,11 +130,12 @@
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
-                        :min="null"
+                        :min="0"
                         :max="5000"
                         :precision="2"
                         :step="0.01"
                         v-model="minItem.tare"
+                        :disabled="listPropsData.chemicalUnit!='g'"
                         placeholder="请输入">
                       </el-input-number>
                       <p class="num-title-span">g</p>
@@ -190,11 +191,12 @@
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
-                        :min="null"
+                        :min="0"
                         :max="5000"
                         :precision="2"
                         :step="0.01"
                         v-model="bigItem.tare"
+                        :disabled="listPropsData.chemicalUnit!='g'"
                         placeholder="请输入">
                       </el-input-number>
                       <p class="num-title-span">g</p>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/IntelligentTerminal/index.vue

@@ -121,7 +121,7 @@
     <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="设备编号：" prop="hardwareNum">
-          <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>
+          <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="20" style="width:360px;"/>
         </el-form-item>
         <el-form-item label="实验室：" prop="subjectId">
           <el-select

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index.vue

@@ -121,7 +121,7 @@
     <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="门禁锁编号：" prop="hardwareNum">
-          <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>
+          <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="20" style="width:360px;"/>
         </el-form-item>
         <el-form-item label="实验室：" prop="subjectId">
           <el-select

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue

@@ -158,10 +158,10 @@
     <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="550px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="智能报警器名称：" prop="name">
-          <el-input v-model="form.name" placeholder="请输入智能报警器名称" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>
+          <el-input v-model="form.name" placeholder="请输入智能报警器名称"  maxlength="30" style="width:360px;"/><!--onkeyup="value=value.replace(/[^\w\.\/]/ig,'')"-->
         </el-form-item>
         <el-form-item label="智能报警器编号：" prop="hardwareNum">
-          <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>
+          <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="20" style="width:360px;"/>
         </el-form-item>
         <el-form-item label="实验室：" prop="subjectId">
           <el-select

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

@@ -128,11 +128,12 @@
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
-                        :min="null"
+                        :min="0"
                         :max="5000"
                         :precision="2"
                         :step="0.01"
                         v-model="minItem.tare"
+                        :disabled="selectioned.chemicalUnit!='g'"
                         placeholder="请输入">
                       </el-input-number>
                       <p class="num-title-span">g</p>
@@ -187,11 +188,12 @@
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
-                        :min="null"
+                        :min="0"
                         :max="5000"
                         :precision="2"
                         :step="0.01"
                         v-model="bigItem.tare"
+                        :disabled="selectioned.chemicalUnit!='g'"
                         placeholder="请输入">
                       </el-input-number>
                       <p class="num-title-span">g</p>

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

@@ -26,8 +26,8 @@
             {{scope.row.verify?scope.row.verify:'无'}}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" prop="operator" width="114">
-          <template slot-scope="scope">
+        <el-table-column label="操作" align="center" prop="operator" width="114" >
+          <template slot-scope="scope" v-if="scope.row.closeLockVideo">
             <div class="button-box">
               <p class="table-min-button"
                  style="margin:0!important;"