heyang

src/views/comprehensive/personnel/student/addPage.vue

@@ -81,14 +81,14 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="联系方式：" prop="phonenumber">
+          <el-form-item label="手机号码：" prop="phonenumber">
             <el-input
               :disabled="editType"
               style="width:218px;"
               maxlength="11"
               onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
               v-model="form.phonenumber"
-              placeholder="请输入联系方式"
+              placeholder="请输入手机号码"
               clearable
               size="small"
             />
@@ -297,8 +297,8 @@
           deptId: [{ required: true, message: "请选择所在学院", trigger: "blur" }],
           majorId: [{ required: true, message: "请选择专业", trigger: "blur" }],
           phonenumber: [
-            { required: true, message: "请输入联系方式", trigger: "blur" },
-            { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入手机号码", trigger: "blur" },
+            { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
         textType:false,

src/views/comprehensive/personnel/student/index.vue

@@ -8,7 +8,7 @@
           <el-input
             maxLength="20"
             v-model="queryParams.searchValue"
-            placeholder="姓名/学号/导师/联系方式"
+            placeholder="姓名/学号/导师/手机号码"
             clearable
             size="small"
             style="width: 240px"
@@ -101,7 +101,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="联系方式" align="left" prop="phonenumber" show-overflow-tooltip width="162"/>
+        <el-table-column label="手机号码" align="left" prop="phonenumber" show-overflow-tooltip width="162"/>
         <el-table-column label="学院" align="left" prop="deptName" show-overflow-tooltip width="200"/>
         <el-table-column label="专业" align="left" prop="major" show-overflow-tooltip width="180"/>
         <el-table-column label="学生类别" align="left" prop="education" show-overflow-tooltip width="149"/>
@@ -304,7 +304,7 @@ export default {
         { key: 1, label: `用户名称`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `联系方式`, visible: true },
+        { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],

src/views/comprehensive/personnel/teacher/addPage.vue

@@ -78,14 +78,14 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="联系方式：" prop="phonenumber">
+          <el-form-item label="手机号码：" prop="phonenumber">
             <el-input
               :disabled="editType"
               style="width:218px;"
               maxlength="25"
               onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
               v-model="form.phonenumber"
-              placeholder="请输入联系方式"
+              placeholder="请输入手机号码"
               clearable
               size="small"
             />
@@ -453,8 +453,8 @@
             { required: true, message: "请输入模板名称", validator: this.spaceJudgment, trigger: "blur" }],
           deptIds: [{ required: true, message: "请选择指定部门", trigger: "blur" }],
           phonenumber: [
-            { required: true, message: "请输入联系方式", trigger: "blur" },
-            { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入手机号码", trigger: "blur" },
+            { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
         textType:false,

src/views/comprehensive/personnel/teacher/addPageOne.vue

@@ -79,14 +79,14 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="联系方式：" prop="phonenumber">
+        <el-form-item label="手机号码：" prop="phonenumber">
           <el-input
             :disabled="editType"
             style="width:218px;"
             maxlength="25"
             onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
             v-model="form.phonenumber"
-            placeholder="请输入联系方式"
+            placeholder="请输入手机号码"
             clearable
             size="small"
           />
@@ -454,8 +454,8 @@
             { required: true, message: "请输入模板名称", validator: this.spaceJudgment, trigger: "blur" }],
           deptIds: [{ required: true, message: "请选择指定部门", trigger: "blur" }],
           phonenumber: [
-            { required: true, message: "请输入联系方式", trigger: "blur" },
-            { required: true, message: "请输入联系方式", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入手机号码", trigger: "blur" },
+            { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
         textType:false,

src/views/comprehensive/personnel/teacher/index.vue

@@ -182,7 +182,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="联系方式" align="left" prop="phonenumber" width="130" show-overflow-tooltip/>
+              <el-table-column label="手机号码" align="left" prop="phonenumber" width="130" show-overflow-tooltip/>
               <el-table-column label="所在部门" align="left" prop="deptName" width="110" show-overflow-tooltip/>
               <el-table-column label="身份" align="left" prop="positionName" width="110" show-overflow-tooltip/>
               <el-table-column label="创建时间" align="left" prop="createTimeStr" show-overflow-tooltip/>
@@ -458,7 +458,7 @@
           { key: 1, label: `用户名称`, visible: true },
           { key: 2, label: `用户昵称`, visible: true },
           { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `联系方式`, visible: true },
+          { key: 4, label: `手机号码`, visible: true },
           { key: 5, label: `状态`, visible: true },
           { key: 6, label: `创建时间`, visible: true }
         ],

src/views/comprehensive/personnel/teacher/indexOne.vue

@@ -60,7 +60,7 @@
               <el-input
                 maxLength="20"
                 v-model="queryParams.searchValue"
-                placeholder="姓名/工号/联系方式"
+                placeholder="姓名/工号/手机号码"
                 clearable
                 style="width: 180px"
               />
@@ -181,7 +181,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="联系方式" align="left" prop="phonenumber" width="130" show-overflow-tooltip/>
+              <el-table-column label="手机号码" align="left" prop="phonenumber" width="130" show-overflow-tooltip/>
               <el-table-column label="所在部门" align="left" prop="deptName" width="110" show-overflow-tooltip/>
               <el-table-column label="身份" align="left" prop="positionName" width="110" show-overflow-tooltip/>
               <el-table-column label="创建时间" align="left" prop="createTimeStr" show-overflow-tooltip/>
@@ -457,7 +457,7 @@
           { key: 1, label: `用户名称`, visible: true },
           { key: 2, label: `用户昵称`, visible: true },
           { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `联系方式`, visible: true },
+          { key: 4, label: `手机号码`, visible: true },
           { key: 5, label: `状态`, visible: true },
           { key: 6, label: `创建时间`, visible: true }
         ],

src/views/comprehensive/personnel/teacher/userListOne.vue

@@ -48,7 +48,7 @@
           <el-table-column label="序号"  width="50" align="center"  type="index"/>
           <el-table-column label="姓名" align="left" prop="nickName" />
           <el-table-column label="工号" align="left" prop="userName" />
-          <el-table-column label="联系方式" align="left" prop="phonenumber" />
+          <el-table-column label="手机号码" align="left" prop="phonenumber" />
           <el-table-column label="所在部门" align="left" prop="deptName" />
           <el-table-column label="检查身份" align="left" prop="isCheck" >
             <template slot-scope="scope">

src/views/gasManage_syd/manage/gasManage/gasManage.vue

@@ -90,7 +90,7 @@
     <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
       <el-form ref="form" :model="form" label-width="80px">
         <div style="margin-bottom: 20px">{{dialogContent}}</div>
-        <el-input  v-model="form.pressure" placeholder="请输入气表实际压力，精确到小数点后一位" />
+        <el-input oninput="value=value.replace(/[^1-9]{0,1}(\d*(?:\.\d{0,1})?).*$/g, '$1')"  v-model="form.pressure" placeholder="请输入气表实际压力，精确到小数点后一位" />
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>

src/views/gasManage_syd/manage/gasManage/gasManageAdd.vue

@@ -34,7 +34,7 @@
           <el-input  style="width: 300px" v-model="form.airComponent"  placeholder="请输入气体组分" maxlength="50" />
         </el-form-item>
         <el-form-item label="气表压力" prop="gasPressure" >
-          <el-input  style="width: 300px" v-model="form.gasPressure"  placeholder="请输入气表压力，精确到小数点后一位" maxlength="8" />
+          <el-input  style="width: 300px" v-model="form.gasPressure"   oninput="value=value.replace(/[^1-9]{0,1}(\d*(?:\.\d{0,1})?).*$/g, '$1')"  placeholder="请输入气表压力，精确到小数点后一位" maxlength="8" />
         </el-form-item>
         <el-form-item label="检验有效期" prop="dateRange" >
           <el-date-picker

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

@@ -24,12 +24,12 @@
             <div class="button-box">
               <p class="table-min-button"
                  v-if="activeName==1"
-                 v-hasPermi="['bottle:useRecord:add']"
+                 v-hasPermi="['bottle:useRecordAdmin:add']"
                  @click="handleClick('',scope.row,'receive')"
               >领用</p>
               <p class="table-min-button"
                  v-if="activeName==2"
-                 v-hasPermi="['bottle:useRecord:edit']"
+                 v-hasPermi="['bottle:useRecordAdmin:edit']"
                  @click="handleClick('',scope.row,'give')"
               >归还</p>
             </div>
@@ -49,8 +49,8 @@
     <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <div style="margin-bottom: 20px">{{dialogContent}}</div>
-        <el-input v-if="activeName==1" v-model="form.beforeUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
-        <el-input v-if="activeName==2" v-model="form.afterUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
+        <el-input v-show="activeName==1"  v-model="form.beforeUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
+        <el-input v-show="activeName==2" v-model="form.afterUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
@@ -98,6 +98,7 @@ export default {
         beforeUse:'',//领用
         afterUse:'',//归还
       },
+      currentPressure:'',
       rules:{
         txt:[
           {required: true, message: '请输入播放文字', trigger: 'blur'},
@@ -122,14 +123,15 @@ export default {
         this.subName='领用';
         this.dialogVisible=true;
 
+
         this.form.bottleName=row.airName;
         this.form.isSurplus=1;
         this.form.subjectName=row.subjectName;
         this.form.subjectId=row.subjectId;
         this.form.storageId=row.id;
-        if(!this.form.beforeUse){
-          this.form.beforeUse=row.currentPressure
-        }
+
+        this.form.beforeUse='';
+        this.currentPressure=row.currentPressure;
 
       }else if(doType=='give'){//归还
         this.dialogTitle='归还气瓶提示';
@@ -137,6 +139,7 @@ export default {
         this.subName='归还';
         this.dialogVisible=true;
         _this.form.storageId=row.id
+        _this.form.afterUse='';
         /* this.$confirm('请确认已将气瓶放置在气瓶存放点，您是否确认归还?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -170,6 +173,9 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if(_this.activeName==1){//领用
+            if(!this.form.beforeUse){
+              this.form.beforeUse=_this.currentPressure
+            }
             useRecord(this.form).then( response => {
               let res=response.data;
               if(response.code==200){

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

@@ -34,6 +34,7 @@
         <div class="select_border">
           <el-form :model="queryParams" ref="queryForm" :inline="true">
             <el-select v-model="queryParams.category" placeholder="请选择">
+              <el-option label="全部气体" value=""></el-option>
               <el-option :label="item.dictLabel" :value="item.dictLabel" v-for="(item,index) in materialTypeList" :key="index"></el-option>
             </el-select>
           </el-form>
@@ -47,6 +48,7 @@
           <div class="select_border">
             <el-form :model="queryParams2" ref="queryForm" :inline="true">
               <el-select v-model="queryParams2.category" placeholder="请选择">
+                <el-option label="全部气体" value=""></el-option>
                 <el-option :label="item.dictLabel" :value="item.dictLabel" v-for="(item,index) in materialTypeList" :key="index"></el-option>
               </el-select>
             </el-form>
@@ -58,6 +60,7 @@
           <div class="select_border">
             <el-form :model="queryParams3" ref="queryForm" :inline="true">
               <el-select v-model="queryParams3.category" placeholder="请选择">
+                <el-option label="全部气体" value=""></el-option>
                 <el-option :label="item.dictLabel" :value="item.dictLabel" v-for="(item,index) in materialTypeList" :key="index"></el-option>
               </el-select>
             </el-form>
@@ -115,17 +118,17 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize:20,
-        category:'气瓶',
+        category:'',
       },
       queryParams2: {
         pageNum: 1,
         pageSize:20,
-        category:'气瓶',
+        category:'',
       },
       queryParams3: {
         pageNum: 1,
         pageSize:20,
-        category:'气瓶',
+        category:'',
       },
       materialTypeList:[],
     };
@@ -320,7 +323,7 @@ export default {
         title: {
           left:'2%',
           top:12,
-          text: '气瓶申请统计',
+          text: '用气申请统计',
           textStyle: {
             color: "#333333",
             fontSize:16,

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

@@ -6,13 +6,13 @@
         <el-form-item label="关键字" prop="name">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="操作人/联系方式/实验地点"
+            placeholder="操作人/联系方式"
             clearable
             maxLength="30"
             size="small"
           />
         </el-form-item>
-        <el-form-item label="申请时间" prop="dateRange">
+        <el-form-item label="出库时间" prop="dateRange">
           <el-date-picker
             :clearable="false"
             v-model="dateRange"

src/views/gasManage_syd/manage/useGasCheck/useGasCheckDetail.vue

@@ -31,7 +31,7 @@
           <el-table-column label="审核时间" align="left" prop="auditTime"></el-table-column>
           <el-table-column label="审核操作" align="left" prop="auditStatus">
             <template slot-scope="scope">
-              <p :class="scope.row.auditStatus == 0?'color_warn':(scope.row.auditStatus == 1?'color_14AE10':(scope.row.auditStatus == 2?'color_red':''))">{{scope.row.auditStatus == 0?'待审核':(scope.row.auditStatus == 1?'通过':(scope.row.auditStatus == 2?'驳回':''))}}</p>
+              <p :class="scope.row.auditStatus == 0?'color_warn':(scope.row.auditStatus == 1?'color_14AE10':(scope.row.auditStatus == 2?'color_red':''))">{{scope.row.auditStatus == 0?'待审核':(scope.row.auditStatus == 1?'已通过':(scope.row.auditStatus == 2?'未通过':''))}}</p>
             </template>
           </el-table-column>
           <el-table-column label="审核说明" align="left" prop="remark"></el-table-column>

src/views/gasManage_syd/student/gasUseManage/gasUseManage.vue

@@ -47,8 +47,8 @@
     <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <div style="margin-bottom: 20px;color: #333;">{{dialogContent}}</div>
-        <el-input v-if="activeName==1" v-model="form.beforeUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
-        <el-input v-if="activeName==2" v-model="form.afterUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
+        <el-input v-show="activeName==1" v-model="form.beforeUse" oninput="value=value.replace(/[^1-9]{0,1}(\d*(?:\.\d{0,1})?).*$/g, '$1')" placeholder="请输入气表实际压力，精确到小数点后一位" />
+        <el-input v-show="activeName==2" v-model="form.afterUse" oninput="value=value.replace(/[^1-9]{0,1}(\d*(?:\.\d{0,1})?).*$/g, '$1')" placeholder="请输入气表实际压力，精确到小数点后一位" />
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
@@ -91,6 +91,7 @@ export default {
         beforeUse:'',//领用
         afterUse:'',//归还
       },
+      currentPressure:'',
       rules:{
         txt:[
           {required: true, message: '请输入播放文字', trigger: 'blur'},
@@ -119,15 +120,15 @@ export default {
           this.form.subjectName=row.subjectName;
           this.form.subjectId=row.subjectId;
           this.form.storageId=row.id;
-          if(!this.form.beforeUse){
-            this.form.beforeUse=row.currentPressure
-          }
 
+          this.form.beforeUse='';
+          this.currentPressure=row.currentPressure;
         }else if(doType=='give'){//归还
           this.dialogTitle='归还气瓶提示';
           this.dialogContent='请输入当前气压值。';
           this.dialogVisible=true;
           _this.form.storageId=row.id
+          _this.form.afterUse='';
           /* this.$confirm('请确认已将气瓶放置在气瓶存放点，您是否确认归还?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -161,6 +162,9 @@ export default {
         this.$refs["form"].validate(valid => {
           if (valid) {
             if(_this.activeName==1){//领用
+              if(!this.form.beforeUse){
+                this.form.beforeUse=_this.currentPressure
+              }
               useRecord(this.form).then( response => {
                 let res=response.data;
                 if(response.code==200){

src/views/gasManage_syd/student/useGas/useGas.vue

@@ -9,6 +9,7 @@
       <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true">
         <el-form-item label="状态" prop="zgType" label-width="80px">
           <el-select v-model="queryParams.leadAuditStaus" placeholder="请选择" clearable size="small">
+            <el-option label="全部" value="" />
             <el-option label="待审核" value="0" />
             <el-option label="已通过" value="1" />
             <el-option label="未通过" value="2" />
@@ -29,7 +30,7 @@
         </el-table-column>
         <el-table-column label="状态" align="left" prop="leadAuditStaus">
           <template slot-scope="scope">
-            <p :class="scope.row.leadAuditStaus == 0?'color_warn':(scope.row.leadAuditStaus == 1?'color_14AE10':(scope.row.leadAuditStaus == 2?'color_red':''))">{{scope.row.leadAuditStaus == 0?'待审核':(scope.row.leadAuditStaus == 1?'通过':(scope.row.leadAuditStaus == 2?'驳回':''))}}</p>
+            <p :class="scope.row.leadAuditStaus == 0?'color_warn':(scope.row.leadAuditStaus == 1?'color_14AE10':(scope.row.leadAuditStaus == 2?'color_red':''))">{{scope.row.leadAuditStaus == 0?'待审核':(scope.row.leadAuditStaus == 1?'已通过':(scope.row.leadAuditStaus == 2?'未通过':''))}}</p>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">

src/views/gasManage_syd/student/useGas/useGasAdd.vue

@@ -41,10 +41,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="气体用途" prop="gasUse" >
-            <el-input  style="width: 300px" v-model="form.gasUse"  placeholder="请输入气体用途" maxlength="50" />
+            <el-input  style="width: 300px" v-model="form.gasUse"   placeholder="请输入气体用途" maxlength="100" />
           </el-form-item>
           <el-form-item label="安全措施" prop="safetyPrecautions" >
-            <el-input  style="width: 300px" v-model="form.safetyPrecautions"  placeholder="请输入安全措施" maxlength="50" />
+            <el-input  style="width: 300px" v-model="form.safetyPrecautions"  placeholder="请输入安全措施" maxlength="100" />
           </el-form-item>
           <el-form-item label="用气申请表" prop="applyCertificate" >
             <el-upload
@@ -148,12 +148,10 @@ export default {
           { required: true, message: "请选择使用气体", trigger: "blur" }
         ],
         gasUse: [
-          { required: true, message: "请输入气体用途", trigger: "blur" },
-          { required: true, message: "请输入气体用途", validator: this.spaceJudgment, trigger: "blur" }
+          { required: true, message: "请输入气体用途", trigger: "blur" }
         ],
         safetyPrecautions: [
-          { required: true, message: "请输入安全措施", trigger: "change" },
-          { required: true, message: "请输入安全措施", validator: this.spaceJudgment, trigger: "blur" }
+          { required: true, message: "请输入安全措施", trigger: "change" }
         ],
         applyCertificate: [
           { required: true, message: "请上传用气申请表", trigger: "change" }

src/views/gasManage_syd/student/useGas/useGasDetail.vue

@@ -23,7 +23,7 @@
           <el-table-column label="审核时间" align="left" prop="auditTime"></el-table-column>
           <el-table-column label="审核操作" align="left" prop="auditStatus">
             <template slot-scope="scope">
-              <p :class="scope.row.auditStatus == 0?'color_warn':(scope.row.auditStatus == 1?'color_14AE10':(scope.row.auditStatus == 2?'color_red':''))">{{scope.row.auditStatus == 0?'待审核':(scope.row.auditStatus == 1?'通过':(scope.row.auditStatus == 2?'驳回':''))}}</p>
+              <p :class="scope.row.auditStatus == 0?'color_warn':(scope.row.auditStatus == 1?'color_14AE10':(scope.row.auditStatus == 2?'color_red':''))">{{scope.row.auditStatus == 0?'待审核':(scope.row.auditStatus == 1?'已通过':(scope.row.auditStatus == 2?'未通过':''))}}</p>
             </template>
           </el-table-column>
           <el-table-column label="审核说明" align="left" prop="remark"></el-table-column>