safecheck-client 3.0.34-6 → 3.0.34-61

package/src/filiale/baiyin/android.js

@@ -3,6 +3,7 @@ import Vue from "vue";
 
 // 手机特殊目录注册到该文件中
 let specialComp = {
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
   'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
 }
 

package/src/filiale/baiyin/pc/CheckSearchUser.vue

@@ -729,8 +729,8 @@ export default {
           args.condition += " and f_last_check_date <= '" + args.model.f_check_end + "'"
         }
       }*/
-      args.condition += " and f_filialeid in  " + (this.model.f_filialeids ? this.model.f_filialeids : `(${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)})`)
-      let con = ' f_filialeid in  ' + (this.model.f_filialeids ? this.model.f_filialeids : `(${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)})`)
+      args.condition += " and f_filialeid in  " + (this.model.f_filialeids ? this.model.f_filialeids : `('${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)}')`)
+      let con = ' f_filialeid in  ' + (this.model.f_filialeids ? this.model.f_filialeids : `('${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)}')`)
       con += args.model.f_userinfo_code ? ` and f_userinfo_code like '%${args.model.f_userinfo_code}%'`:''
       /*con += args.model.f_user_name ? ` and f_user_name like '%${args.model.f_user_name}%'` : ''
       con += args.model.f_residential_area ? ` and f_residential_area like '%${args.model.f_residential_area}%'` : ''

package/src/filiale/baiyin/pc/DefectListNew.vue

@@ -510,9 +510,9 @@ export default {
       this.solveModal.preData.defectImg1 = row.f_p1_path?'/rs/image/file/' + row.f_p1_path:''
       this.solveModal.preData.defectImg2 = row.f_p2_path?'/rs/image/file/' + row.f_p2_path:''
       this.solveModal.preData.defectImg3 = row.f_p3_path?'/rs/image/file/' + row.f_p3_path:''
-      this.solveModal.preData.repairedImg = '/rs/image/file/' + row.f_repair_path
-      this.solveModal.preData.repairedImg2 = row.f_repair2_path ? ('/rs/image/file/' + row.f_repair2_path) : ''
-      this.solveModal.preData.repairedImg3 = row.f_repair3_path ? ('/rs/image/file/' + row.f_repair3_path) : ''
+      this.solveModal.preData.repairedImg = '/rs/image/file/' + row.f_dealpath
+      this.solveModal.preData.repairedImg2 = row.f_other_dealpath1 ? ('/rs/image/file/' + row.f_other_dealpath1) : ''
+      this.solveModal.preData.repairedImg3 = row.f_other_dealpath2 ? ('/rs/image/file/' + row.f_other_dealpath2) : ''
       this.solveModal.preData.repairedImg4 = row.f_repair4_path ? ('/rs/image/file/' + row.f_repair4_path) : ''
       this.solveModal.uploadData.id = row.id
       this.solveModal.preData.type = type

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

@@ -163,7 +163,7 @@
                 </v-select>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">开户时间</label>
+                <label class="font_normal_body">建档时间</label>
                 <datepicker
                   :value.sync="model.f_check_gasstart"
                   placeholder='开始时间' style="width: 60%"
@@ -171,11 +171,11 @@
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_gasstart"
-                  condition="f_gas_date > ='{} 00:00:00'">
+                  condition="f_createfile_date > ='{} 00:00:00'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">开户时间</label>
+                <label class="font_normal_body">建档时间</label>
                 <datepicker
                   :value.sync="model.f_check_gasend"
                   placeholder='结束时间' style="width: 60%"
@@ -183,7 +183,7 @@
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_gasend"
-                  condition="f_gas_date <=  '{} 23:59:59'">
+                  condition="f_createfile_date <=  '{} 23:59:59'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.safeAudit && $parent.$parent.criteriaShow ">
@@ -333,7 +333,7 @@
                 <nobr>备注</nobr>
               </th>
               <th>
-                <nobr>开户时间</nobr>
+                <nobr>建档时间</nobr>
               </th>
               <th v-if="$parent.$parent.$parent.safeAudit">
                 <nobr>审核人</nobr>
@@ -374,7 +374,7 @@
             <td style="text-align: center">{{ row.f_offsite_time }}</td>
             <td style="text-align: center">{{ row.f_checker_name }}</td>
             <td style="text-align: center">{{ row.f_repair_approved_note }}</td>
-            <td style="text-align: center">{{ row.f_gas_date }}</td>
+            <td style="text-align: center">{{ row.f_createfile_date }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approved_by }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approvedstart_time }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approved_time }}</td>
@@ -502,7 +502,7 @@ export default {
           'f_checker_name': '安检员',
           'f_safecheck_type':'安检类型',
           'f_repair_approved_note': '备注',
-          'f_gas_date': '开户时间',
+          'f_createfile_date': '建档时间',
           'f_plan_name': '计划名称'
         },
         fun: this.$login.f,