safecheck-client 4.0.0-10 → 4.0.0-101

package/src/components/android/Insurance/PhoneInsurancePurchase.vue

@@ -41,7 +41,7 @@
               </div>
               <div class="col-xs-7">
                 <input type="text" class="form-control" v-model="model.f_address" placeholder="请输入客户地址"
-                       condition="f_address like '%{}%'" />
+                       condition="ads.f_address like '%{}%'" />
               </div>
             </div>
             <div class="row text-center app-row">

package/src/components/android/Insurance/PhoneInsurancePurchaseDetail.vue

@@ -165,14 +165,15 @@ export default {
   ready() {
     new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
       data: {
-          items: '*',
-          tablename: 't_userinfo',
-          condition: `f_userinfo_id  = '${this.model.f_userinfo_id}'`,
+        items: 'tu.*,uf.f_userfiles_id',
+        tablename: 't_userinfo tu left join t_userfiles uf on tu.f_userinfo_id = uf.f_userinfo_id',
+        condition: `tu.f_userinfo_id  = '${this.model.f_userinfo_id}' and uf.f_table_state in ('停用','正常')`,
         orderitem: '1'
       }
     }).then(response => {
       this.model = Object.assign({}, this.model, response.data[0])
       this.model.f_last_insexpiration_date = response.data[0].f_ins_stop_date
+      this.model.f_total_ins_charge = response.data[0].f_total_ins_charge || 0
     })
     this.model.f_money = ''
     this.model.f_fee_type = ''
@@ -202,10 +203,9 @@ export default {
       }
         let commit_data = this.model
         commit_data.f_buy_date = this.create_date
-        commit_data.f_total_ins_charge = ''
         commit_data.f_operatorid = Vue.user.id
         commit_data.f_operator = Vue.user.name
-        commit_data.f_operate_date = Util.toStandardDateString()
+        commit_data.f_operate_date = Util.toStandardTimeString()
         commit_data.f_state = '有效'
         commit_data.f_orgid = Vue.user.orgid
         commit_data.f_orgname = Vue.user.orgs

package/src/components/android/NewCheckpaperAndroid.vue

@@ -53,11 +53,11 @@ div {
 
 <template>
   <div class="basic-main" style="height: 100%">
-<!--    <div class="page-header app-header auto" style="padding: 15px;margin-right: 10px;right: 0%;height: 7%">-->
-<!--      <div @click="back()">-->
-<!--        <img src="../../assets/back.png" style="margin: 0px"/>-->
-<!--      </div>-->
-<!--    </div>-->
+    <!--    <div class="page-header app-header auto" style="padding: 15px;margin-right: 10px;right: 0%;height: 7%">-->
+    <!--      <div @click="back()">-->
+    <!--        <img src="../../assets/back.png" style="margin: 0px"/>-->
+    <!--      </div>-->
+    <!--    </div>-->
     <work-busy :is-busy="loading"></work-busy>
     <div class="container-fluid" style="overflow: scroll">
       <div class="row">
@@ -219,7 +219,7 @@ div {
                   <div class="container" style="max-width: 550px;background: #FFFFFF">
                     <div class="img" v-for="img in paperdata.f_overall_imgs">
                       <img-self :src="getimg(img.f_overall_path)" style="float: left" width="150"
-                                     height="200"></img-self>
+                                height="200"></img-self>
                     </div>
                   </div>
 
@@ -348,27 +348,27 @@ div {
         <div class="row">
           <div class="col-md-6">
             <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3" width="282"
-                           height="400"></img-self>
+                      height="400"></img-self>
           </div>
           <div class="col-md-6">
             <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path" :src="showimg5" width="282"
-                           height="400"></img-self>
+                      height="400"></img-self>
           </div>
           <div class="col-md-6">
             <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path" :src="showimg6" width="282"
-                           height="400"></img-self>
+                      height="400"></img-self>
           </div>
           <div class="col-md-6">
             <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path" :src="showimg4" width="282"
-                           height="400"></img-self>
+                      height="400"></img-self>
           </div>
           <div class="col-md-6">
             <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path" :src="showimg7" width="282"
-                           height="400"></img-self>
+                      height="400"></img-self>
           </div>
           <div class="col-md-6">
             <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path" :src="showimg8" width="282"
-                           height="400"></img-self>
+                      height="400"></img-self>
           </div>
         </div>
       </div>
@@ -402,11 +402,11 @@ let asyncReady = async function (self) {
     //tag
     //tag)
     if (res.data.length === 0) {
-      self.$showMessage("该公司无组织目录，无法获取配置文件，将使用默认配置文件")
+      // self.$showMessage("该公司无组织目录，无法获取配置文件，将使用默认配置文件")
       return
     }
     if (!res.data[0].f_dir) {
-      self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
+      // self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
     } else {
       //this.f_dir=res.data[0].f_dir
       try {
@@ -429,7 +429,7 @@ let asyncReady = async function (self) {
         })*/
 
       } catch (e) {
-        self.$showMessage("获取配置文件失败" + e)
+        // self.$showMessage("获取配置文件失败" + e)
       }
     }
   } catch (error) {
@@ -667,7 +667,7 @@ export default {
               }
               if(!this.config[this.data[device][item].f_device_type].items[items.f_item_name]){
                 // console.log('this.config[this.data[device][item].f_device_type]', this.config[this.data[device][item].f_device_type])
-                  // console.log('this.deviceconfig2', this.deviceconfig2)
+                // console.log('this.deviceconfig2', this.deviceconfig2)
                 for(let dev in this.deviceconfig2){
                   if(this.deviceconfig2[dev].checkname==this.data[device][item].f_device_type){
                     let no_inArr = true
@@ -765,11 +765,18 @@ export default {
       //tag
 
       //tag)
-      if (!this.item.f_safecheck_type) {
+      if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度普检']) {
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
-      } else {
-        if (Vue.config.safecheck.DevicesConfig != undefined)
-          this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
+      }else if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度安检']){
+        this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度安检'][this.item.f_check_type]])
+      }else if (Vue.config.safecheck.SafecheckType && Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]){
+        this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
+      }else {
+        if(this.item.f_check_type == '民用'){
+          this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+        }else {
+          this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
+        }
       }
       //遍历安检项配置
       for (let i in this.config) {
@@ -1248,7 +1255,7 @@ export default {
         } else if (this.role == 'androidview') {
           id = this.item.f_paper_id
         }
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/path_getCheckPaper`, {data: {id: id}}).then((respanse) => {
             //tag
             if (respanse.data.length != 0) {
               // 包含 其它 特殊处理的数组

package/src/components/android/PaperFeedback.vue

@@ -97,7 +97,7 @@
       </div>
     </div>
     <div class="form-group col-sm-12 col-xs-12 col-md-12 " :class="style__">
-      <input type="checkbox" v-model="paper.f_read_instructions"/><label class="text-left font">我已阅读须知内容</label>
+      &ensp;&ensp;<input type="checkbox" v-model="paper.f_read_instructions" style="transform: scale(1.5);"/><label class="text-left font">我已阅读须知内容</label>
 
     </div>
     <div class="form-group col-sm-12 col-xs-12 col-md-12 " :class="style__">
@@ -1219,6 +1219,8 @@ export default {
         this.paper.f_blacklist = "否"
         this.$showMessage("取消该用户限制购气成功！")
       } else {
+        this.showmodelthree = false
+        this.deleteenabled = true
         this.$showMessage("网络异常，请稍后再试！")
       }
     },
@@ -1249,7 +1251,7 @@ export default {
         limit_value = Vue.config.safecheck.ApproveConfig.limit_value
         limit_amount = Vue.config.safecheck.ApproveConfig.limit_amount
       }
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
           item:this.$parent.$parent.data.item,
@@ -1273,21 +1275,21 @@ export default {
           "f_limit_amount":limit_amount,
           'f_limit_type':'气量'
         }
-      }, {resolveMsg: null, rejectMsg: null})
-
-      ////tag)
-      if (res2.data.code == 200) {
+      }, {resolveMsg: null, rejectMsg: null}).then(res2=>{
         this.showmodel = false
         this.enabled = true
         this.paper.f_blacklist = "是"
         this.$showMessage("将该用户限制购气成功！")
-      } else if (res2.data.msg == '数据增加重复') {
-        this.showmodel = false
-        this.enabled = true
-        this.$showMessage("该用户已被限制购气，请勿重复提交！")
-      } else {
-        this.$showMessage("网络异常，请稍后再试！")
-      }
+      }).catch(error=>{
+        if (error.status== 601){
+          this.showmodel = false
+          this.enabled = true
+          this.paper.f_blacklist = "是"
+          this.$showMessage("该用户已被限制购气，请勿重复提交！")
+        }else {
+          this.$showMessage("网络异常，请稍后再试！")
+        }
+      })
     },
     cancel() {
       this.backlistisselect = false

package/src/components/android/PaperFeedbackTemp.vue

@@ -1143,7 +1143,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": "有效",
@@ -1201,7 +1201,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,