safecheck-client 3.0.39-6 → 3.0.39-60

package/src/filiale/rongchuang/android/SafecheckDevices.vue

@@ -253,7 +253,7 @@ export default {
       page:{},
       selectindex:null,
       lives:[{label: '是', value: '是'},{label: '否', value: '否'}],
-      deals:[{label: '现场处理', value: '现场处理'},{label: '自行处理', value: '自行处理'}],
+      deals:[{label: '自行处理', value: '自行处理'},{label: '现场整改', value: '现场整改'}],
       f_live_dispose:'否',
       f_deal_dispose:'未处理',
       // 初始表底

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

@@ -30,7 +30,7 @@
               <div class="panel-body ">
                 <div class="row auto">
                   <div  class="col-xs-12 col-sm-12 col-md-12 flex-between" style="margin-top: 20px;">
-                    <div class="col-xs-3 col-sm-3 col-md-3" v-if="parentPage=='CurrentCreate'">
+                    <div class="col-xs-3 col-sm-3 col-md-3" v-if="parentPage=='CurrentCreate' || parentPage=='AddPlanItemYy'">
                       <button type="button" name="button" class="col-sm-3 btn btn-primary"  @click="save('temp')">
                         临时保存
                       </button>
@@ -160,6 +160,7 @@ import AppInstallationMaterial from './AppInstallationMaterial'
         data: {
           f_devices: [],
           f_defect_content:'',
+          f_repair_approved_note:'',
           f_recording1_path:'',
           f_visit_number:'',
           f_remark:''
@@ -1035,7 +1036,7 @@ import AppInstallationMaterial from './AppInstallationMaterial'
             alias: 'getUserinfomation',
             data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan in ('无计划安检','复检')"}
           })
-          if ((this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检')  && this.item.f_no_checkplan != '打回') {
+          if ((this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检' || this.item.f_no_checkplan == '预约安检')  && this.item.f_no_checkplan != '打回') {
             codata.f_devices = this.f_devices
             if (this.rowCodata && this.rowCodata.istoRepair=='转维修') {
               this.rowCodata = Object.assign({},this.rowCodata,codata)

package/src/filiale/rongchuang/android.js

@@ -9,6 +9,9 @@ let specialComp = {
   'checkpapermsg': (resolve) => { require(['./android/checkpapermsg'], resolve) },
   'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
   'switch-valve': (resolve) => { require(['./android/SwitchValve'], resolve) },
+  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo'], resolve) },
+  'add-plan-item-yy': (resolve) => { require(['./android/AddPlanItemYy'], resolve) },
+  'add-plan-item-vwm': (resolve) => { require(['./android/AddPlanItemVisitingWithoutMeeting'], resolve) },
 }
 
 exports.specialComp = specialComp

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

@@ -212,7 +212,12 @@ div {
                   </button-link>
                 </td>
               </tr>
-
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">备注:</td>
+                <td colspan="2" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+                  {{ data.f_repair_approved_note }}
+                </td>
+              </tr>
               </tbody>
             </table>
             <table class="table table-striped table-bordered" style="margin-top: 40px"
@@ -617,6 +622,13 @@ div {
                     </button-link>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">备注:</td>
+                  <td colspan="3"
+                      style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
+                    {{ paperdata.f_repair_approved_note }}
+                  </td>
+                </tr>
 
                 </tbody>
               </table>

package/src/filiale/rongchuang/pc/checkPlanList.vue

@@ -0,0 +1,398 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div partial>
+          <div class="row">
+            <label class="form-group font_normal_body"><b>计划信息</b></label>
+            <div class="form-group col-sm-1" v-show="false">
+              <!--隐藏条件-->
+              <input type="text" class="input_search" v-model="model.f_plan_id"
+                     style="width: 95%" placeholder="计划id" condition=" i.f_plan_id='{}'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_userinfo_code"
+                     style="width: 95%" placeholder="客户编号" condition="i.f_userinfo_code='{}'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_user_name"
+                     style="width: 95%" placeholder="客户名称" condition="i.f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_address"
+                     style="width: 95%" placeholder="客户地址" condition="i.f_address like '%{}%'">
+            </div>
+            <!--<div class="form-group col-sm-1" >
+              <v-select :width="'95%'"
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_state"
+                        v-model="$parent.$parent.f_state"
+                        :options='$parent.$parent.checkState'
+                        placeholder='安检状态'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>-->
+            <div class="form-group col-sm-3" >
+              <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
+              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
+<!--              <button class="button_search" style="margin-right: 10px"  @click="clear()">清除</button>-->
+              <export-excel-safe :data="$parent.$parent.exportParameter"
+                                 :field="$parent.$parent.exportExcelField"
+                                 style="margin-left: 0px"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                 :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'" :choose-col="true">
+              </export-excel-safe>
+            </div>
+            <div class="form-group col-sm-2 safe_p">
+              <label class="font_normal_body" :title="$parent.$parent.selectplan.f_plan_name">{{$parent.$parent.selectplan.f_plan_name?'当前选中 : '+$parent.$parent.selectplan.f_plan_name:''}}</label>
+            </div>
+            <div class="form-group col-sm-2" style="float: right">
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.showplanModal()">计划调整</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()" v-show="$parent.$parent.isdelete">移出计划</button>
+            </div>
+            <modal :show.sync="$parent.$parent.showCondtion" v-ref:modal :width="'50%'" :backdrop="false">
+              <div slot="modal-header" class="modal-header">
+                <h4 class="modal-title">
+                  计划内用户查询条件
+                </h4>
+              </div>
+              <div slot="modal-body" class="modal-body">
+                <div class="row">
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">是否已检:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_state"
+                      v-model="model.f_state"
+                      :options='$parent.$parent.checkState'
+                      @change="$parent.$parent.checkStateChange(model.f_state)"
+                      placeholder='请选择'
+                      condition="i.f_state='{}'"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检结果:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_check_state"
+                      v-model="model.f_check_state"
+                      :options='$parent.$parent.checkResults'
+                      placeholder='请选择'
+                      condition="i.f_last_check_state='{}'"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检起始:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      style="width:60%"
+                      :disabled-days-of-week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_startfile_time"
+                      v-model="model.f_startfile_time"
+                      condition="i.f_last_check_date >='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检截止:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      :disabled-days-of-week="[]"
+                      style="width:60%"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_endfile_time"
+                      v-model="model.f_endfile_time"
+                      condition="i.f_last_check_date  <='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">小区名称:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_residential_area"
+                      v-model="model.f_residential_area"
+                      :options='$parent.$parent.area'
+                      placeholder='请选择'
+                      condition="i.f_residential_area='{}'"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
+                </div>
+              </div>
+              <div slot="modal-footer" class="modal-footer" style="text-align: center">
+                <button class="button_search" style="margin-right: 15px" @click="search()">查询</button>
+                <button class="button_search" @click="$parent.$parent.cancel">取消</button>
+              </div>
+            </modal>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="table_sy">
+
+        <template partial='head'>
+          <tr>
+            <th><nobr><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.checkAll" @change="$parent.$parent.$parent.setCheckAll()"/> 全选</nobr></th>
+            <th><nobr>用户编号</nobr></th>
+            <th><nobr>用户名称</nobr></th>
+            <th><nobr>用户电话</nobr></th>
+            <th><nobr>用户类型</nobr></th>
+            <th><nobr>小区名称</nobr></th>
+            <th><nobr>安检状态</nobr></th>
+            <th><nobr>地址</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;white-space:nowrap;"><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.f_check_item_id)"  @change="$parent.$parent.$parent.setCheckes(row.f_check_item_id)" /></td>
+          <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_phone}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_type}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_state==='已检'?row.f_last_check_state:'未检'}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="showPlanModal" v-ref:modalp>
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          计划内用户调整
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <plan-chooser :f.sync="userlogin.orgid" v-ref:chooser></plan-chooser>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" style="margin-right: 15px" @click="dragtoOtherPlanIteem">确认</button>
+        <button class="button_search" @click="cancel">取消</button>
+      </div>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from "vue-client";
+  import Vue from "vue";
+
+  export default {
+    name: "PlanManage",
+    title: '计划管理',
+    data() {
+      return {
+        model:new PagedList('/rs/sql/planItem', 100, {}),
+        isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
+        a:'1',
+        opt:[{label:"测试",value:"测试"}],
+        showCondtion:false,
+        checkAll:false,
+        checkes:[],
+        checkResults:[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}],
+        checkState:[{label:'全部',value:''},{label:'未检',value:'未检'},{label:'已检',value:'已检'}],
+        showPlanModal:false,
+        exportExcelField: {
+          'f_userinfo_code':'用户编号',
+          'f_user_name':'用户名称',
+          'f_user_type':'用户类型',
+          'f_residential_area':'小区名称',
+          'f_state':'安检状态',
+          'f_address':'地址',
+          'f_user_phone':'用户电话',
+          'f_newfile_date':'建档日期'
+        },
+        area:[]
+      }
+    },
+    props:["selectplan","userlogin"],
+    ready(){
+  this.getarea()
+    },
+    computed:{
+      exportParameter(){
+        // excel 导出条件拼接
+        return {
+          condition: this.$refs.paged.model.condition,
+          groupName: this.groupNameForSql
+        }
+      }
+    },
+    methods:{
+      async getarea() {
+        this.area = []
+        let res = await new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`, {
+          data: {
+            items: "*",
+            tablename: "t_area",
+            orderitem: "id",
+            condition: `f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        res.data.forEach((result) => {
+          this.area.push({label: result.f_residential_area, value: result.f_residential_area})
+        })
+      },
+      clear(){
+        this.model.f_plan_id = '';
+        this.model.f_userinfo_code = '';
+        this.model.f_user_name = '';
+        this.model.f_address='';
+
+      },
+      //将某个计划下的一项拖到另一个计划
+      async dragtoOtherPlanIteem() {
+        //tag)
+
+        if (!this.$refs.modalp.$children[0].selectedRow.id) {
+          this.$showMessage("请选择需要调整到那个计划中！")
+          return
+        }
+        this.$parent.isSend=true
+        try{
+          let res=await new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItem", {
+            data:{
+              f_operator:this.userlogin.name,
+              f_plan_id:this.$refs.modalp.$children[0].selectedRow.id,
+              condition:this.model.condition,
+              switchCheckAll:true,
+              checkAll:this.checkAll,
+              param:this.checkes,
+              columnName: "i.id"
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          this.$parent.isSend=false
+          if(res.data.code==200){
+            this.$showMessage("更换安检计划成功！")
+            this.$parent.refreshPlan()
+          }else{
+            this.$showMessage("更换安检计划失败！")
+          }
+        }catch (e) {
+          this.$parent.isSend=false
+          this.$showMessage("更换安检计划失败！")
+        }
+      },
+      showplanModal(){
+        if(!this.selectplan || !this.selectplan.id){
+          this.$showMessage("请先打开一个计划再进行操作")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          this.$showMessage("请先在计划中勾选你要调整的用户！")
+          return
+        }
+        this.showPlanModal=true
+      },
+      showUserCondition(){
+        this.showCondtion=true
+      },
+      isChecked(v) {
+        // 如果全选，不在的按选中算，否则，在的按选中算
+        if (this.checkAll) {
+          return this.checkes.indexOf(v) == -1
+        } else {
+          return this.checkes.indexOf(v) != -1
+        }
+      },
+      setCheckAll() {
+        this.checkAll=this.checkAll?false:true;
+        // 全选改变后，清空选中数据
+        this.checkes = []
+      },
+      setCheckes(id) {
+        let index=this.checkes.indexOf(id)
+        if(index<0){
+          this.checkes.push(id)
+        }else{
+          this.checkes.splice(index,1)
+        }
+      },
+      cancel(){
+        this.showCondtion=false
+        this.showPlanModal=false
+      },
+      selfSearch (args) {
+        if(!this.selectplan.id){
+          this.$showMessage("请先选择一个计划！")
+          return
+        }
+        this.cancel()
+        this.checkes=[]
+        this.checkAll=false
+        args.condition+= ` and i.f_state!= '作废'`
+        this.model.search(args.condition, args.model, args.condValue)
+      },
+      checkStateChange(val){
+        if(val=='未检'){
+          this.checkResults=[]
+          this.$refs.paged.$refs.criteria.model.f_check_state=''
+        }else{
+          this.checkResults=[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}]
+        }
+      },
+      //修改计划项状态为作废
+      async delPlanItem() {
+        if(!this.selectplan || !this.selectplan.id){
+          this.$showMessage("请先打开一个计划再进行操作")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          this.$showMessage("请先在计划中勾选你要作废的用户！")
+          return
+        }
+        this.$showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
+          if(button=='confirm'){
+            let resu=new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItemState", {
+              data: {
+                f_operator:this.userlogin.name,
+                condition:this.model.condition,
+                switchCheckAll:true,
+                checkAll:this.checkAll,
+                param:this.checkes,
+                columnName: "i.id"
+              }
+            }, {resolveMsg: null, rejectMsg: null}).then((resu)=>{
+
+              //tag)
+              if(resu.data.code==200){
+                this.$showMessage("移除安检单成功! 成功移除:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
+                //this.checkes=[]
+                //this.checkAll=false
+                this.$parent.refresh()
+              }else{
+                this.$showMessage("取消安检计划失败!")
+              }
+            })
+          }
+        })
+      }
+    },
+    watch:{
+      'selectplan.id' (){
+        //tag
+        if(this.selectplan.id){
+          this.$refs.paged.$refs.criteria.model.f_plan_id=this.selectplan.id
+          this.$refs.paged.$refs.criteria.search()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .safe_p{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+</style>

package/src/filiale/rongchuang/pc.js

@@ -6,6 +6,7 @@ let specialComp = {
   // 计划管理用户
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
   'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
+  'check-plan-list': (resolve) => { require(['./pc/checkPlanList'], resolve) },
  //  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
   // 'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
 

package/src/filiale/siyang/android/PhoneInsurancePurchaseDetail.vue

@@ -210,7 +210,8 @@ export default {
       showmOrder:false,
       zfCode:false,
       isSubmitting: false, // 添加防重复提交标志
-      isSaveing:false    // 添加防重复提交标志
+      isSaveing:false,    // 添加防重复提交标志
+      isCheckingOrder: false,
     }
   },
   props: {
@@ -282,6 +283,10 @@ export default {
     closeModel(){
       this.showmOrder = false
       this.isSubmitting = false
+      if (this.orderInterval) {
+        clearTimeout(this.orderInterval)
+        this.orderInterval = null
+      }
     },
     commitBefore(){
       if (!this.model.f_money) {
@@ -333,29 +338,57 @@ export default {
     },
     async getOrderInformation() {
       console.log('查询订单信息！！！')
-      let http = new HttpResetClass()
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/microPayOrderStatus`, {
-        "filiale": "siyang",
-        "flag": "microPayRongHaoJsbc",
-        "f_out_trade_no": `${this.f_out_trade_no}`,
-        "posid": this.$androidUtil.getDeviceIEMI()
-      }, {
-        resolveMsg: null,
-        rejectMsg: '订单查询失败！！！'
-      })
-      // 支付成功
-      if (res.data.trade_state.includes('已支付')) {
-        this.orderinfo = res.data
-        clearTimeout(this.orderInterval)
-        this.$showMessage('支付成功！！！')
-        await this.commit()
-        this.clearQrCode()
-        this.closeModel()
-      }else{
-        //重新查询订单状态
-        this.orderInterval = setTimeout(() => {
-          this.getOrderInformation()
-        }, 3000)
+      // 添加标志位，防止重复执行
+      if (this.isCheckingOrder) {
+        return;
+      }
+      try {
+        this.isCheckingOrder = true;
+        let http = new HttpResetClass()
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/microPayOrderStatus`, {
+          "filiale": "siyang",
+          "flag": "microPayRongHaoJsbc",
+          "f_out_trade_no": `${this.f_out_trade_no}`,
+          "posid": this.$androidUtil.getDeviceIEMI()
+        }, {
+          resolveMsg: null,
+          rejectMsg: '订单查询失败！！！'
+        })
+        // 支付成功
+        if (res.data.trade_state.includes('已支付')) {
+          this.orderinfo = res.data
+          clearTimeout(this.orderInterval)
+          this.$showMessage('支付成功！！！')
+          await this.commit()
+          this.clearQrCode()
+          this.closeModel()
+        } else if (res.data.trade_state.includes("已退款")) {
+          this.$showMessage("已退款，请重新下单支付！！！");
+          this.clearQrCode();
+          this.closeModel()
+          if (this.orderInterval) {
+            clearTimeout(this.orderInterval);
+            this.orderInterval = null
+          }
+        }else{
+          this.isCheckingOrder = false
+          //重新查询订单状态
+          this.orderInterval = setTimeout(() => {
+            this.getOrderInformation()
+          }, 3000)
+        }
+      } catch (error) {
+        console.error("查询订单状态失败:", error);
+        if (this.orderInterval) {
+          clearTimeout(this.orderInterval);
+          this.orderInterval = null
+        }
+        this.isCheckingOrder = false; // 发生错误时重置标志位
+      } finally {
+        // 确保在非轮询状态下重置标志位
+        if (!this.orderInterval) {
+          this.isCheckingOrder = false;
+        }
       }
     },
     async openQrcode() {