safecheck-client 4.0.0-3 → 4.0.0-30

package/src/filiale/meihekou/android.js

@@ -0,0 +1,14 @@
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
+
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/meihekou/pc.js

@@ -0,0 +1,12 @@
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+
+}
+exports.specialComp = specialComp
+
+
+
+

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/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/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() {