safecheck-client 3.0.30-9 → 3.0.30-90

package/src/filiale/wuhai/pc/NewCheckpaper.vue

@@ -464,19 +464,20 @@ export default {
         "燃气表": {
           "checkmust": true,
           "index": 1,
-          "items": {
+          "items":{
             //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
-            "基表编号": {"index": 1, "type": "string", "readonly": true},
-            "气表型号": {"index": 2, "type": "string", "readonly": true},
-            "气表品牌": {"index": 3, "type": "string", "readonly": true},
-            "进气方向":{"index":4,"type":"selector","options":[{"data":"左表","isdefault":false},{"data":"右表","isdefault":false}],"checkmust": true,"readonly": true},
-            // "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
-            "上期表读数": {"index": 5, "type": "number", "readonly": true, isshow: false},
-            "累购气量": {"index": 6, "type": "number", "readonly": true},
-            "已用气量": {"index": 7, "type": "number", "checkmust": true},//基表数
-            "剩余气量": {"index": 8, "type": "number", "checkmust": true},//累购-已用
-            //显示屏数  --实际剩余气量
-            "气量异常差值": {"index": 9, "type": "number", "readonly": true, isshow: false}
+            "基表编号":{"index":1,"type":"string","readonly":true},
+            "气表型号":{"index":2,"type":"string","readonly":true},
+            "气表品牌":{"index":3,"type":"string","readonly":true},
+            "进气方向":{"index":4,"type":"selector","options":[{"data":"左表","isdefault":false},{"data":"右表","isdefault":false}],"checkmust": true},
+            "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
+            "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
+            "累购气量":{"index":7,"type":"number","readonly":true},
+            "已用气量":{"index":8,"type":"number","checkmust": false},//基表数
+            "剩余气量":{"index":9,"type":"number","checkmust": false},//累购-已用
+            "气量异常差值":{"index":10,"type":"number","readonly": true,isshow:true},
+            "表箱号":{"index":11,"type":"string","readonly": true},
+            "户累购金额":{"index":12,"type":"number","readonly":true}
           }
           // 注意，配置项的index必须与上面的固定配置保持'顺序'
         }
@@ -486,19 +487,20 @@ export default {
         "燃气表": {
           "checkmust": true,
           "index": 1,
-          "items": {
+          "items":{
             //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
-            "基表编号": {"index": 1, "type": "string", "readonly": true},
-            "气表型号": {"index": 2, "type": "string", "readonly": true},
-            "气表品牌": {"index": 3, "type": "string", "readonly": true},
-            "进气方向":{"index":4,"type":"selector","options":[{"data":"左表","isdefault":false},{"data":"右表","isdefault":false}],"checkmust": true,"readonly": true},
-            // "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
-            "上期表读数": {"index": 5, "type": "number", "readonly": true, isshow: false},
-            "累购金额": {"index": 6, "type": "number", "readonly": true},
-            "已用金额": {"index": 7, "type": "number", "checkmust": true},
-            //显示屏数  --实际剩余气量
-            "剩余金额": {"index": 8, "type": "number", "checkmust": true},
-            "金额异常差值": {"index": 9, "type": "number", "readonly": true, isshow: false}
+            "基表编号":{"index":1,"type":"string","readonly":true},
+            "气表型号":{"index":2,"type":"string","readonly":true},
+            "气表品牌":{"index":3,"type":"string","readonly":true},
+            "进气方向":{"index":4,"type":"selector","options":[{"data":"左表","isdefault":false},{"data":"右表","isdefault":false}],"checkmust": true},
+            "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
+            "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
+            "累购金额":{"index":7,"type":"number","readonly":true},
+            "已用金额":{"index":8,"type":"number","checkmust": false},
+            "剩余金额":{"index":9,"type":"number","checkmust": false},
+            "金额异常差值":{"index":10,"type":"number","readonly": true,isshow:true},
+            "表箱号":{"index":11,"type":"string","readonly": true},
+            "户累购金额":{"index":12,"type":"number","readonly":true}
           }
         }
       },

package/src/filiale/yangchunboneng/android/PaperFeedback.vue

@@ -132,6 +132,7 @@
     </div>
     <div class="row">
       <label for="readsafe" class="text-left font">蓝牙状态:{{blueState}}</label>
+      <button type="button" @click="initBlueState()">重新连接</button>
     </div>
     <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__">
       <div class="form-group col-md-12 col-sm-12 col-xs-12">
@@ -608,6 +609,25 @@
       Radio
     },
     methods: {
+      initBlueState(){
+        let state = HostApp.getBluetoothState()
+        if (state && state.state == 3){
+          this.blueState = '连接完成'
+        }else {
+          if (state && state.state == -1){
+            this.$showMessage('蓝牙连接未打开，打开后重新尝试')
+            return
+          }
+          this.blueState = '连接失败，请重试'
+          this.$androidUtil.print(JSON.stringify([{ type: 4, value: 2, unit: 'line' }]))
+          let state2 = HostApp.getBluetoothState()
+          if (state2 && state2.state == 3){
+            this.blueState = '连接完成'
+          }else {
+            this.blueState = '连接失败，请重试'
+          }
+        }
+      },
       timeSet(val) {
         //////tag
         if (!val) {

package/src/filiale/yangchunboneng/pc/CheckBookDetails.vue

@@ -42,6 +42,16 @@
             <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
                    style="width: 60%" v-validate:f_check_book_name='{ required: true }'>
           </div>
+          <div class="form-group col-sm-6"  style="margin-top: 20px">
+            <label class="font_normal_body">上次执行日期</label>
+            <datepicker
+              :value.sync="checkBook.f_last_run_date"
+              style="width: 60%"
+              :format="'yyyy-MM-dd'"
+              v-model="checkBook.f_last_run_date"
+            >
+            </datepicker>
+          </div>
           <div class="form-group col-sm-6"  style="margin-top: 20px">
             <label class="font_normal_body">执行日期</label>
             <datepicker
@@ -170,6 +180,15 @@ export default {
       http.load('POST', 'rs/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
         {resolveMsg: '保存片区信息成功', rejectMsg: '保存片区信息失败'}).then(res => {
         if (res.data.code === 200) {
+          let dataplan ={
+             id:res.data.id,
+             f_check_book_name: this.checkBook.f_check_book_name,
+             f_checker_name:this.checkBook.f_checker_name,
+             f_checker_id:this.checkBook.f_checker_id,
+             f_create_person: this.$login.f.name,
+             f_orgid: this.$login.f.orgid
+          }
+          http.load('POST', 'rs/logic/CreatorBookplan', {data:dataplan},{resolveMsg: null, rejectMsg: null})
           this.$showMessage('保存片区信息成功',['confirm']).then(res=>{
             if (res==='confirm'){
               bus.$emit('fresh-main')