safecheck-client 4.0.0-6 → 4.0.0-61

package/src/filiale/xiangyuanzhongai/pc.js

@@ -3,6 +3,8 @@ import Vue from "vue";
 
 //手机特殊目录注册到该文件中
 let specialComp = {
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
+  "safe-defect-list-new":(resolve) => { require(['./pc/DefectListNew.vue'], resolve) }
 }
 exports.specialComp = specialComp
 

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

@@ -1357,7 +1357,7 @@
         }, { resolveMsg: null, rejectMsg: null })
         ////tag)
         ////tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "待审核",
@@ -1418,7 +1418,7 @@
           limit_times = Vue.config.safecheck.ApproveConfig.limit_times
           limit_value = Vue.config.safecheck.ApproveConfig.limit_value
         }
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             data: this.$parent.$parent.data,
             item: this.$parent.$parent.data.item,

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

@@ -1176,7 +1176,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: null})
       ////tag)
       ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
@@ -1234,7 +1234,7 @@ export default {
         limit_times = Vue.config.safecheck.ApproveConfig.limit_times
         limit_value = Vue.config.safecheck.ApproveConfig.limit_value
       }
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
           item:this.$parent.$parent.data.item,

package/src/filiale/yuansheng/android/AndroidDefectDeal.vue

@@ -435,7 +435,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         ////tag)
         ////tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",

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

@@ -1166,7 +1166,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: null})
       ////tag)
       ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
@@ -1218,7 +1218,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: null})
       ////tag)
       ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
           item:this.$parent.$parent.data.item,

package/src/filiale/yunchengminsheng/android/DailyworkloadQuery.vue

@@ -180,7 +180,7 @@
               </div>
               <div class="col-xs-8" >
                 <input class="search_input input-font"
-                       v-model=model.f_item_value condition="f_item_value like '%{}%'"  />
+                       v-model=model.f_meter_classify condition="f_meter_classify like '%{}%'"  />
               </div>
             </div>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
@@ -223,7 +223,7 @@
                 </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font"><b>气表品牌:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_item_value }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_meter_classify }}</p>
                 </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font"><b>用户类型:</b></p>

package/src/filiale/yunchengminsheng/android/PhoneSellInfo.vue

@@ -0,0 +1,113 @@
+<template >
+  <div class="panel panel-default auto repair-info-content">
+    <div class="panel-body">
+      <div class="panel panel-default well" v-for="row in model">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  购气量: {{row.f_pregas}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  购气金额: {{row.f_preamount}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收费状态: {{row.f_state}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  缴费方式: {{row.f_payment}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  购气时间: {{row.f_operate_date}}
+                </div>
+
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <p v-show="model.length == 0 ">此用户暂无购气记录</p>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  export default {
+    title: '查询用户',
+    data () {
+      return {
+        model: [],
+        show: false,
+        row: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      f_userinfo_id:''
+    },
+    methods: {
+      getmodel () {
+        let userinfoid
+        if(this.f_userinfo_id){
+          userinfoid = this.f_userinfo_id
+        }else{
+          userinfoid = this.user.f_userinfo_id
+          //tag
+        }
+        //tag
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas ', orderitem: 'f_operate_date desc', condition:`f_userinfo_id = '${userinfoid}' and f_state = '有效'`}}).then((row) => {
+          this.model = row.data
+        })
+      },
+      back(){
+
+      }
+    },
+    watch: {
+      'user' (val) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        if(this.user){
+          if (!(this.user.isNuN)) {
+            this.model= []
+            this.getmodel()
+          }
+        }
+      },
+      'f_userinfo_id'(){
+        if(this.f_userinfo_id){
+          this.model= []
+          this.getmodel()
+        }
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_id) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        this.getmodel()
+      }
+      if(this.f_userinfo_id){
+        this.getmodel()
+      }
+    }
+  }
+</script>
+<style>
+  .app-botton {
+    position:fixed;
+    background: #87b2dd;
+    color: #FFF;
+    padding: 8px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -10px;
+    height: 40px;
+  }
+</style>

package/src/filiale/yunchengminsheng/android/SafecheckOrderV.vue

@@ -1290,6 +1290,7 @@
             } else {
               this.rowCodata = codata
             }
+            this.rowCodata.f_upload_state='未传'
             let param = {
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
@@ -1390,6 +1391,7 @@
           } else {
             this.rowCodata = codata
           }
+          this.rowCodata.f_upload_state='未传'
           if (this.item.f_no_checkplan == '无计划安检' && value.data.length == 0 && this.item.f_no_checkplan != '打回') {
             this.$androidUtil.bzLogic('SafeSaveNoPaper', {
               f_check_item_id: this.data.f_check_item_id,

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

@@ -400,7 +400,7 @@
           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/android.js

@@ -7,6 +7,7 @@ let specialComp = {
   'paper-feedback': (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'safecheck-order-v' : (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
   'DailyworkloadQuery' : (resolve) => { require(['./android/DailyworkloadQuery'], resolve) },
+  'safe-phone-sell-info' : (resolve) => { require(['./android/PhoneSellInfo'], resolve) },
   'safecheck-devices' : (resolve) => { require(['./android/SafecheckDevices'], resolve) }
 }
 

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

@@ -462,7 +462,7 @@ let asyncReady = async function (self) {
 
 export default {
   title: '安检单',
-  props: ['f_plan_id', 'item', 'role'],
+  props: ['f_plan_id', 'item', 'role','gotoitem'],
   data() {
     return {
       f_approvedstart_time: '',
@@ -709,7 +709,8 @@ export default {
       }).then((res) => {
         if (res.data.code == 200) {
           this.loading = false;
-          this.$back()
+          this.$root.$emit('audit-status-changed')
+          this.$emit('showback')
         }
       })
     },
@@ -738,6 +739,7 @@ export default {
           this.loading = false;
           this.message = '';
           this.showModel = false;
+          this.$root.$emit('audit-status-changed')
           this.back();
         }
       })
@@ -1081,16 +1083,25 @@ export default {
     back() {
       if (this.role == 'inspect') {
         if (!this.isStrat) {
-          this.$back()
+          if(this.gotoitem){
+            this.$back()
+            return
+          }
+          this.$emit('showback')
           return
         } else {
           this.savePaper(true).then(() => {
-            this.$back()
+            this.$emit('showback')
             this.isStrat = false
           })
         }
       } else {
-        this.$back()
+        this.$root.$emit('audit-status-changed')
+        if(this.gotoitem){
+          this.$back()
+          return
+        }
+        this.$emit('showback')
       }
     },
     checkIsStart() {

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

@@ -1069,7 +1069,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         //tag)
         //tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1121,7 +1121,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         //tag)
         //tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "拉黑",
             "f_state": "有效",

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

@@ -1095,7 +1095,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         //tag)
         //tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1147,7 +1147,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         //tag)
         //tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "拉黑",
             "f_state": "有效",

package/src/safecheck-android.js

@@ -202,6 +202,7 @@ export default function (filiale) {
   // 安检用户信息查看
   Vue.component('safecheck-userinfo', (resolve) => { require(['./components/android/userinfo/SafecheckUserInfo'], resolve) })
   Vue.component('android-defect-deal', (resolve) => { require(['./components/android/AndroidDefectDeal'], resolve) })
+  Vue.component('android-defect-details', (resolve) => { require(['./components/android/AndroidDefectDetails.vue'], resolve) })
   Vue.component('android-defect-deal-before-safe', (resolve) => { require(['./components/android/AndroidDefectDealBeforeSafe'], resolve) })
   // 在线用户档案核对
    //Vue.component('user-safe-app', (resolve) => { require(['../examples/UserFiles/App'], resolve) })
@@ -296,6 +297,8 @@ export default function (filiale) {
   Vue.component('online-repair-safe', (resolve) => {require(['./components/android/OnlineRepairSafe'], resolve)})
   Vue.component('phone-other-info-v3', (resolve) => {require(['./components/android/PhoneotherInfov3'], resolve)})
   Vue.component('phone-other-info', (resolve) => {require(['./components/android/PhoneotherInfo'], resolve)})
+  Vue.component('seal-manage', (resolve) => { require(['./components/android/SealManage'], resolve) })
+  Vue.component('seal-bind', (resolve) => { require(['./components/android/SealBind'], resolve) })
   //特殊目录给这里加
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/android`).specialComp