heyang %!s(int64=2) %!d(string=hai) anos
pai
achega
4e59d62a90

+ 1 - 1
src/views/gasManage_syd/manage/gasManage/gasManageAdd.vue

@@ -130,7 +130,7 @@ export default {
           { required: true, message: "请输入气表压力,精确到小数点后一位", trigger: "change" }
         ],
         electronicTag: [
-          { required: true, message: "请选择电子标签", trigger: "change" }
+          { required: true, message: "请输入识别码", trigger: "change" }
         ],
 
         dateRange: [

+ 4 - 1
src/views/gasManage_syd/student/gasUseManage/gasUseManage.vue

@@ -52,7 +52,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button type="primary" @click="submitForm">领用</el-button>
+        <el-button type="primary" @click="submitForm">{{subName}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -72,6 +72,7 @@ export default {
       dialogTitle:'领用气瓶提示',
       dialogContent:'您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致,如不一致则需要在下方填写实际气压值。',
       dialogVisible:false,
+      subName:'领用',
       //页面状态
       pageType:1,
       loading:false,
@@ -113,6 +114,7 @@ export default {
         if(doType=='receive'){//领用
           this.dialogTitle='领用气瓶提示';
           this.dialogContent='您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致,如不一致则需要在下方填写实际气压值。';
+          this.subName='领用';
           this.dialogVisible=true;
 
           this.form.bottleName=row.airName;
@@ -126,6 +128,7 @@ export default {
         }else if(doType=='give'){//归还
           this.dialogTitle='归还气瓶提示';
           this.dialogContent='请输入当前气压值。';
+          this.subName='归还';
           this.dialogVisible=true;
           _this.form.storageId=row.id
           _this.form.afterUse='';