safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/filiale/wensu/pc/checkUserList.vue

@@ -246,8 +246,8 @@
                     >
                     </v-select>
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">入户情况:</label>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检筛选:</label>
                     <v-select
                       class="select select_list"
                       :value.sync="model.f_hasHousehold"
@@ -259,7 +259,7 @@
                       value-single
                     >
                     </v-select>
-                  </div>-->
+                  </div>
 
                 </div>
               </div>
@@ -287,11 +287,11 @@
             <!--<div class="form-group col-sm-4 button-range" >
 
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel-safe   :data="$parent.$parent.exportParameter"
+              <export-excel   :data="$parent.$parent.exportParameter"
                                    :field="$parent.$parent.excelHeaders"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                    template-name='安检计划明细' :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
 
             </div>-->
           </div>
@@ -342,7 +342,7 @@
         title: '计划管理',
         data() {
           return {
-            model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
+            model:new PagedList('/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
               "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
               "f_usertype": "''",
               "month": "''",
@@ -358,7 +358,7 @@
             gasproperties:[],//用气性质
             meter_classifys:[],//气表类型
             entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
-            hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
+            hasHousehold:[{label:"全部",value:""},{label:"入户",value:"入户"},{label:"未入户",value:"未入户"}],
             yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
             sliceArea:[],
             meterbooks:[],
@@ -399,16 +399,20 @@
           selfSearch (args) {
             //tag)
             args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
-            /*if(args.model.f_hasHousehold=='已入户'){
-              args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
+            if(args.model.f_hasHousehold=='入户'){
+              args.condition +=` and ua.F_LAST_CHECK_STATE='入户'`
             }else if(args.model.f_hasHousehold=='未入户'){
-              args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
-            }*/
+              args.condition +=` and (ua.F_LAST_CHECK_STATE !='入户' or ua.F_LAST_CHECK_STATE is null)`
+            }
             if(this.uploadCodeCondition){
               args.condition +=` and ${this.uploadCodeCondition}`
             }
             if(args.model.f_last_check_state){
-              args.condition += ` and ua.f_last_check_state  = '${args.model.f_last_check_state}'`
+              if (args.model.f_last_check_state == '未检'){
+                args.condition += ` and (ua.f_last_check_date  is null or ua.f_last_check_date  is null) `
+              }else {
+                args.condition += ` and ua.f_last_check_state  = '${args.model.f_last_check_state}'`
+              }
             }
             if(args.model.f_start_time){
               args.condition += ` and ua.f_last_check_date >='${args.model.f_start_time} 00:00:00' `
@@ -443,7 +447,7 @@
           select_search(text){
             //tag
               let pcdText=text?` and f_residential_area like '%${text}%'`:''
-              new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+              new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
                 //tag)
                 if(res.data.length>0){
                   this.areaList=[]
@@ -460,7 +464,7 @@
             this.cbc=[]
             this.sliceArea=[]
             let http = new HttpResetClass()
-            let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
+            let getMeterReadingBooks = await http.load('POST','api/af-safecheck/logic/getMeterBooksData',
               {data: {f_orgid: "('"+this.userlogin.orgid+"')"}},
               {resolveMsg: null, rejectMsg: '获取失败！！！'})
             this.cbc = [{label: '全部', value: ''}]
@@ -548,7 +552,7 @@
               if(this.selectplan && this.selectplan.id){
                 this.$parent.isSend=true
                 try{
-                  let res=await new HttpResetClass().load("POST", "/rs/logic/AddCheckPlanItem", {
+                  let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/AddCheckPlanItem", {
                     data:{
                       f_operator:this.userlogin.name,
                       f_plan_id:this.selectplan.id,
@@ -587,7 +591,7 @@
           let data = {
             filepath: res.f_downloadpath
           }
-          new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
+          new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_GetUserInfoFromExcel', {data: data}, {
             resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
             rejectMsg: '导入失败'
           }).then((res) => {

package/src/filiale/wensu/pc.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'plan-manage': (resolve) => { require(['./pc/PlanManage'], resolve) },
   'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
   'check-detail': (resolve) => { require(['./pc/CheckDetail'], resolve) },
   'print-material-bill': (resolve) => { require(['./pc/PrintMaterialBill'], resolve) },

package/src/filiale/wenxi/android/AddPlanItem.vue

@@ -210,7 +210,7 @@
   export default {
     title: '安检员B',
     data () {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
         f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
       model.f_sign = ['']
       model.f_user_type = ''
@@ -249,7 +249,7 @@
       }
     },
     ready () {
-      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
       //   //tag)
       //   if(res.data.code == 200){
       //     this.model.myCycle = res.data.civil.value
@@ -282,7 +282,7 @@
       },
       getCheckTime(){
         //tag
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
+        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`,{data: {
             items: 'f_circle,f_start_time',
             tablename: 't_safe_circle',
             condition: `f_filialeid  = '${Vue.user.orgid}'`,
@@ -326,7 +326,7 @@
               info.f_state = '未检'
               info.f_no_checkplan = '无计划安检'
               //tag
-              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
                 //tag)
                 info['f_plan_meters'] = response.data
                 var pardate = {
@@ -345,7 +345,7 @@
           info.f_state = '未检'
           info.f_no_checkplan = '无计划安检'
           //tag
-          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
             //tag)
             info['f_plan_meters'] = response.data
             var pardate = {
@@ -362,7 +362,7 @@
       Mreadibook(){
         this.cbc=[]
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/getMeterBooksData`,
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getMeterBooksData`,
           {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
           {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
           this.cbc = [{label: '全部', value: ''}]

package/src/filiale/wenxi/android/AndroidDefectDealHY.vue

@@ -376,7 +376,7 @@
           f_dealer_name: '洁能'
         },
         f_filialeids: '',
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/AndroidDealWithHY`, 20, {
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/AndroidDealWithHY`, 20, {
           condition: 'this.condition',
           f_filialeids: `'${Vue.user.orgid}'`
         }),

package/src/filiale/wenxi/android/AndroidDefectDealWX.vue

@@ -297,7 +297,7 @@ export default {
         f_dealer_name:'洁能'
       },
       f_filialeids:'',
-      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/AndroidDealWithWX`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
+      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/AndroidDealWithWX`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
       criteriaShow: false,
 
     }

package/src/filiale/wenxi/android/AreaPlan.vue

@@ -353,7 +353,7 @@
     title: '安检计划项',
     data() {
       return {
-        model:Vue.android? new LocalPagedList('androidGetHasDone',5): new PagedList( 'AndroidRest/rs/sql/androidGetHasDone',5),
+        model:Vue.android? new LocalPagedList('androidGetHasDone',5): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetHasDone',5),
         showModal: false,
         param: null,
         criteriaShow: false,
@@ -417,7 +417,7 @@
         this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
       },
       inspect(row) {
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
         //tag)
         row['f_plan_meters'] = response.data
           var pardate = {

package/src/filiale/wenxi/android/CurrentCreate.vue

@@ -545,7 +545,7 @@ export default {
       check: '',
       plan: '',
       planid: '',
-      model: Vue.android ? new LocalPagedList('androidGetuserinfo', 20, {condition: 'this.condition'}) : new PagedList('AndroidRest/rs/sql/androidGetuserinfo', 20, {condition: 'this.condition'}),
+      model: Vue.android ? new LocalPagedList('androidGetuserinfo', 20, {condition: 'this.condition'}) : new PagedList('AndroidRest/api/af-safecheck/sql/androidGetuserinfo', 20, {condition: 'this.condition'}),
       showModal: false,
       showModal2: false,
       showModal3: false,
@@ -671,7 +671,7 @@ export default {
       this.check = ''
     },
     async okput() {
-      let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {
+      let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {
         data: {
           condition: `it.id='` + this.needid + `'`,
           f_plan_id: this.planid,
@@ -684,7 +684,7 @@ export default {
       await this.getNewOrder()
     },
     async manyokput() {
-      let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {
+      let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {
         data: {
           columnName: "it.id",
           condition: "1=1",
@@ -704,7 +704,7 @@ export default {
       if (!this.check) {
         condition = `f_plan_name like '%` + this.plan + `%'`
       }
-      let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {
+      let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {
         data: {
           condition: condition,
           f_filialeids: this.f_filialeids,
@@ -791,7 +791,7 @@ export default {
       var _this = this
       //tag
       if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检')) {
-        _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/wxFetchPlanUserfiles`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
+        _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/wxFetchPlanUserfiles`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
           if(response.data.length == 0){
             this.$showMessage("表档案信息有误！请联系管理员")
             return
@@ -860,7 +860,7 @@ export default {
       // if(this.$refs.paged.$refs.cri.model.f_flow_direction[0])
       //   condition += " and tm.f_flow_direction = '"+this.$refs.paged.$refs.cri.model.f_flow_direction[0]+"'"
       //tag
-      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检')) and ti.f_no_checkplan = '有计划安检'" + condition)
+      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检'))" + condition)
     },
     getNewOrder() {
       HostApp.__this__ = this

package/src/filiale/wenxi/android/DailyworkloadQuery.vue

@@ -268,7 +268,7 @@
         check:'',
         plan:'',
         planid:'',//http://ssl.odc.hk:8300
-        model:new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
+        model:new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
         criteriaShow: false,
         planoption:[],
         condition:'',

package/src/filiale/wenxi/android/PaperFeedback.vue

@@ -395,7 +395,7 @@
   //               if(items.f_is_defect == true || items.f_is_defect == 'true'){
   //                 checkResult = '有隐患'
   //                 //tag
-  //                 let res = yield self.$resetpost(`${self.Url}/rs/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
+  //                 let res = yield self.$resetpost(`${self.Url}/api/af-safecheck/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
   //                 //tag)
   //                 self.$set('detail.f_defect_id', res.data[0].id)
   //                 self.$set('detail.f_project',`${items.f_item_name}：${items.f_item_value}`)
@@ -432,7 +432,7 @@
   //         self.undo()
   //         self.$set('paper.f_SafeToRepair_id',res.data.f_service_id)
   //         //tag
-  //         self.$resetpost(`${self.Url}/rs/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
+  //         self.$resetpost(`${self.Url}/api/af-safecheck/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
   //           //tag
   //           if(ret.data.code ==200){
   //             //tag
@@ -473,7 +473,7 @@
         }
       } else {
         //tag
-        self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`, {data: {id: self.paper.f_userinfoid}}, {
+        self.$resetpost(`${self.Url}/api/af-safecheck/sql/safeCheckgetUserInfo`, {data: {id: self.paper.f_userinfoid}}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
@@ -579,7 +579,7 @@
       },
       // async isoverDate(){
       //   //tag
-      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
       //       condition:"f_plan_item_id='"+this.$parent.$parent.item.id+"'"
       //     }
       //   })
@@ -1143,7 +1143,7 @@
         ////tag)
         let http = new HttpResetClass()
         ////tag
-        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "version",
             tablename: "t_userinfo",
@@ -1153,7 +1153,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         ////tag)
         ////tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1192,7 +1192,7 @@
           return
         }
         let http = new HttpResetClass()
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "f_userfiles_id,version",
             tablename: "t_userfiles",
@@ -1247,7 +1247,7 @@
       //   }
       //   this.paper.f_blocking_cause = this.deletecause
       //   let http = new HttpResetClass()
-      //   let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/wxUpUserState`, {
+      //   let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/wxUpUserState`, {
       //     data: {
       //       "f_state": "正常",
       //       "f_userinfo_code": this.paper.f_userinfo_code,
@@ -1271,7 +1271,7 @@
       //   }
       //   this.paper.f_blocking_cause = this.cause
       //   let http = new HttpResetClass()
-      //   let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/wxUpUserState`, {
+      //   let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/wxUpUserState`, {
       //     data: {
       //       "f_state": "停用",
       //       "f_userinfo_code": this.paper.f_userinfo_code,
@@ -1302,7 +1302,7 @@
         }
         this.paper.f_blocking_cause = this.deletecause
         let http = new HttpResetClass()
-        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "version",
             tablename: "t_userinfo",
@@ -1310,7 +1310,7 @@
             orderitem: "f_userinfo_id"
           }
         }, {resolveMsg: null, rejectMsg: null})
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1348,7 +1348,7 @@
         }
         this.paper.f_blocking_cause = this.cause
         let http = new HttpResetClass()
-        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "version",
             tablename: "t_userinfo",
@@ -1356,7 +1356,7 @@
             orderitem: "f_userinfo_id"
           }
         }, {resolveMsg: null, rejectMsg: null})
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
           data: {
             data:this.$parent.$parent.data,
             item:this.$parent.$parent.data.item,
@@ -1406,7 +1406,7 @@
           //tag
           this.$parent.$parent.model.serviceacitivity[0].f_reciever = val.name
           let http1 = new HttpResetClass()
-          http1.load('POST', `${this.Url}/rs/sql/tel_singleTable_OrderBy`, {
+          http1.load('POST', `${this.Url}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
             data: {
               items: 'f_user_telephone',
               tablename: 't_user',
@@ -1489,7 +1489,7 @@
         if (val == true) {
           this.cause_time = ''
           this.showmodel = true
-          new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "f_othereason,f_operate_date",
               tablename: "t_disable",

package/src/filiale/wenxi/android/PhoneUpUserinfo.vue

@@ -396,7 +396,7 @@
         wid: "60%",
         devices_types: [],
         pipe_types: this.$appdata.getParam('管道类型'),
-        pipetypes: [{label: '有', value: '有'}, {label: '无', value: '无'}],
+        pipetypes:Vue.$appdata.getParam('管道类型'),
         wz_types: [],
         cityTypes: [{label: '市区', value: '市区'}, {label: '城镇', value: '城镇'}],
         aroundmeters: this.$appdata.getParam('左右表'),
@@ -541,7 +541,7 @@
         //tag
         if (this.selectStreet.id) {
           let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -630,7 +630,7 @@
             userinfoms.userfiles = []
             this.userinfo_old.meterinfo[0].devicesinfo = this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -645,7 +645,7 @@
                 let data = this.userinfo.addressinfo
                 data.f_address = this.userinfo_old.addressinfo.f_address ? this.userinfo_old.addressinfo.f_address : this.userinfo.addressinfo.f_address
                 data.f_operator = Vue.user.name
-                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {data: data}).then((res2) => {
+                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/address_updateuseraddress`, {data: data}).then((res2) => {
                   this.$showMessage("修改用户地址信息成功！")
                   this.excessive = false
                 }).catch(error => {
@@ -705,7 +705,7 @@
           this.selectArea = {id: ''}
           this.area = []
           let pcdText = ` and f_street_id=${this.selectStreet.id}`
-          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -741,7 +741,7 @@
           this.userinfo.addressinfo.f_slice_area = ''
           this.streets = []
           let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_street",
@@ -832,7 +832,7 @@
         if (this.selectStreet.id) {
           this.area = []
           let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -862,7 +862,7 @@
           //tag
           this.streets = []
           let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_street",
@@ -948,7 +948,7 @@
         this.excessive = true
         //Vue.user.orgid ${this.f_userinfo_id} 10101    ${Vue.user.orgid}
 
-        let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_pcd",
@@ -961,7 +961,7 @@
           this.pcds.push({label: result.f_pcd, value: result})
         })
         ////tag)
-        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
+        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_getFilesDetail`, {
           //f_userinfo_code:'12381344',
           f_userinfo_id: this.f_userinfo_id
         }, {resolveMsg: null, rejectMsg: null})

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

@@ -404,7 +404,7 @@
       },
       getImgGen() {
         let http = new HttpResetClass()
-        http.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+        http.load('POST', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
           data: {
             items: '*',
             tablename: 't_files',
@@ -495,6 +495,13 @@
         if (hasError)
           return hasError
       },
+      verifyvoice() {
+        if(this.data.f_recording1_path===''){
+          return '录音文件为空，请重新安检'
+        }else{
+          return ''
+        }
+      },
       verifyState() {
         if (Vue.android && this.data.f_entry_status == '未使用天然气' && this.data.f_nongasuser_path == Vue.nopic)
           return '未使用天然气则必须拍照'
@@ -594,7 +601,7 @@
       },
       //信息修改后回调函数,更新外层页面手机号,避免手机号一直校验失败
       updateUserCallBack(){
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_userinfo",orderitem:"1",condition:`f_userinfo_id = '${this.data.f_userinfoid}'`}}, {resolveMsg: null, rejectMsg: null}).then(resp=>{
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_userinfo",orderitem:"1",condition:`f_userinfo_id = '${this.data.f_userinfoid}'`}}, {resolveMsg: null, rejectMsg: null}).then(resp=>{
           this.data.f_user_phone = resp.data[0].f_user_phone
         })
       },
@@ -825,6 +832,13 @@
       },
       uploadCheckPaper() {
         this.saveNoclick()
+        var hasError = this.verifyvoice()
+        if(hasError!==''){
+          if (Vue.android) {
+            this.$showMessage(hasError)
+          }
+          return
+        }
         //tag
         //tag
         if (this.data.f_entry_status == '不营业'){
@@ -1578,7 +1592,7 @@
         return obj;
       },
       // async isoverDate(){
-      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
       //       condition:"f_plan_item_id='"+this.item.id+"'"
       //     }
       //   })