safecheck-client 4.0.1-36 → 4.0.1-37

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.1-36",
+  "version": "4.0.1-37",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/filiale/xinkang/android/SafecheckUserInfo.vue

@@ -368,7 +368,7 @@ export default {
         title: '购气记录',
         safe: false
       })
-      this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
+      this.$parent.$parent.$goto('safe-phone-sell-info', {f_userinfo_id: f_userinfo_id})
     },
     cameraCallBack (prop, fileName) {
       if (prop == 'f_noanswers_path') {

package/src/filiale/yunchengminsheng/pc/PaperList.vue

@@ -216,7 +216,7 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"   v-show="$parent.$parent.safeAudit &&$parent.$parent.criteriaShow">
-                <label class="font_normal_body" title="参数管理：安检审核状态">审核状态</label>
+                <label class="font_normal_body" title="参数管理：安检单审核状态">审核状态</label>
                 <v-select class="select_list select"
                           placeholder='请选择' style="width: 60%"
                           :value.sync="model.f_approved" v-model="model.f_approved"
@@ -489,7 +489,7 @@ export default {
       },
       model: model,
       excelHeaders: {
-        //searchData:searchData,
+        //searchData:searchData
         'f_userinfo_code': '客户编号',
         'f_user_name': '客户姓名',
         'f_meternumber':'客户表号',
@@ -507,6 +507,8 @@ export default {
         'f_approved_by': '审核人',
         'f_approved': '审核状态',
         'f_approved_time': '审核时间',
+        'f_plan_name':'计划名称',
+        'f_meter_brand':'气表品牌',
         'f_leigou': '累购气量',
         'f_yiyong': '已用气量',
         'f_shengyu': '剩余气量',

package/src/safecheck-android.js

@@ -251,6 +251,10 @@ export default function (filiale) {
         require(['./components/android/PhoneSellInfo'], resolve)
     })
 
+    Vue.component('safe-phone-sell-info', (resolve) => {
+        require(['./components/android/PhoneSellInfo'], resolve)
+    })
+
   //中盛点火信息
   // Vue.component('ignition-information', (resolve) => { require(['./components/android/IgnitionInformation'], resolve) })
   // Vue.component('buy-records', (resolve) => { require(['./components/android/BuyRecords'], resolve) })