safecheck-client 4.0.0-1 → 4.0.0-100

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

@@ -254,9 +254,9 @@
               "累购金额":{"index":7,"type":"number","readonly":true},
               "已用气量":{"index":8,"type":"number","checkmust": false},//基表数
               "已用金额":{"index":8,"type":"number","checkmust": false},
-              "剩余气量":{"index":9,"type":"number","checkmust": false},//累购-已用
+              "剩余气量":{"index":9,"type":"number","checkmust": false,"readonly": true},//累购-已用
               //显示屏数  --实际剩余气量
-              "剩余金额":{"index":9,"type":"number","checkmust": false},
+              "剩余金额":{"index":9,"type":"number","checkmust": false,"readonly": true},
               "气量异常差值":{"index":10,"type":"number","readonly": true},
               "金额异常差值":{"index":10,"type":"number","readonly": true},
               "表箱号":{"index":11,"type":"string","readonly": true},
@@ -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/main.js

@@ -11,7 +11,7 @@ all()
 var Verificationfalg = false
 system(Verificationfalg)
 // system()
-safecheck()
+safecheck('jinhong')
 // safecheck('rizhao')
 require('./bootstrap/less/bootstrap.less')
 require('./expandcss.less')

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

package/src/safecheck.js

@@ -899,7 +899,9 @@ export default function (filiale) {
   Vue.component('add-plan-item-yy-change', (resolve) => {
     require(['./components/pc/AddPlanItemYyChange'], resolve)
   })
-
+  Vue.component('regional-safe-summary', (resolve) => {
+    require(['./components/paper/RegionalList'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
     for (let key in filialeComp) {