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

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

@@ -38,13 +38,13 @@
               </div>
               <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
 
-                <export-excel-safe :data="$parent.$parent.searchData"
+                <export-excel :data="$parent.$parent.searchData"
                                    :field="$parent.$parent.excelHeaders"
                                    :choose-col="true"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检结果明细'></export-excel-safe>
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检结果明细'></export-excel>
                 <!--                <export-excel :data="$parent.$parent.getCondition" -->
                 <!--                              :field="$parent.$parent.getfield"-->
-                <!--                              sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'-->
+                <!--                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'-->
                 <!--                              :choose-col="true"></export-excel>-->
                 <!--                <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="!$parent.$parent.audioshow">录音</button>-->
                 <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
@@ -230,6 +230,41 @@
                           :value-single="true">
                 </v-select>
               </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">客户评价</label>
+                <v-select class="select_list select"
+                          placeholder='客户评价' style="width: 60%"
+                          :value.sync="model.f_client_evaluation" v-model="model.f_client_evaluation"
+                          :options='$parent.$parent.evaluations'
+                          close-on-select clear-button
+                          condition="f_client_evaluation='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">首次通气开始</label>
+                <datepicker
+                  :value.sync="model.f_gas_start"
+                  placeholder='首次通气开始时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_gas_start"
+                  condition="f_uservent_date >='{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">首次通气结束</label>
+                <datepicker
+                  :value.sync="model.f_gas_end"
+                  placeholder='首次通气结束时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_gas_end"
+                  condition="f_uservent_date <=  '{} 23:59:59'">
+                </datepicker>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -268,6 +303,9 @@
               <th>
                 <nobr>客户地址</nobr>
               </th>
+              <th>
+                <nobr>首次通气时间</nobr>
+              </th>
               <th>
                 <nobr>安检状态</nobr>
               </th>
@@ -298,6 +336,9 @@
               <th>
                 <nobr>备注</nobr>
               </th>
+              <th>
+                <nobr>客户评价</nobr>
+              </th>
               <th>
                 <nobr>操作</nobr>
               </th>
@@ -315,6 +356,7 @@
             <td style="text-align: center">{{row.f_check_type}}</td>
 
             <td style="text-align: center">{{row.f_address}}</td>
+            <td style="text-align: center">{{row.f_uservent_date}}</td>
             <td style="text-align: center">{{row.f_entry_status}}</td>
             <td style="text-align: center">{{row.f_offsite_time}}</td>
             <td style="text-align: center">{{row.f_checker_name}}</td>
@@ -325,6 +367,7 @@
             <td style="text-align: center">{{row.f_remaining_gas_volume}}</td>
             <td style="text-align: center">{{row.f_remaining_amount}}</td>
             <td style="text-align: center">{{row.f_repair_approved_note}}</td>
+            <td style="text-align: center">{{row.f_client_evaluation}}</td>
             <td style="text-align: center">
               <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
 
@@ -388,7 +431,7 @@ let select = function* (self) {
 export default {
   title: '安检结果查看',
   data() {
-    let model = new PagedList('rs/sql/查找安检单', 20, {
+    let model = new PagedList('api/af-safecheck/sql/查找安检单', 20, {
       f_plan_id: 'this.f_plan_id',
       f_approved: 'this.f_approved',
       f_entry_status: 'this.f_entry',
@@ -433,6 +476,7 @@ export default {
         'f_check_type': '客户类型',
         'f_residential_area': '小区',
         'f_address': '客户地址',
+        'f_uservent_date': '首次通气时间',
         'f_entry_status': '安检状态',
         'f_offsite_time': '安检时间',
         'f_checker_name': '安检员',
@@ -444,6 +488,7 @@ export default {
         'f_remaining_amount': '剩余金额',
         'f_safecheck_type':'安检类型',
         'f_repair_approved_note': '备注',
+        'f_client_evaluation': '评价',
         'f_plan_name': '计划名称',
       },
       fun: this.$login.f,
@@ -461,6 +506,7 @@ export default {
       f_entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
       f_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
       showcheckmsg: false,
+      evaluations:[{label: '全部', value: ''},{label: '满意', value: '满意'},{label: '基本满意', value: '基本满意'},{label: '不满意', value: '不满意'}],
       checkInfo: {},
       orderDefault: "'f_offsite_time'",
       orderFields: {
@@ -474,7 +520,7 @@ export default {
     //获取省市区列表
     getPcd(val){
       this.pcds = [{label:'全部',value:''}]
-      new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
+      new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
         {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid in ${val}`}},
         {resolveMsg: null, rejectMsg: null}).then((pcdlist)=>{
         pcdlist.data.forEach((result)=>{
@@ -483,7 +529,7 @@ export default {
       })
     },
     getDepartment(){
-      new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+      new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
           items: '*',
           tablename: 't_user',
           condition: `rolestr like '%安检员%' and state = '在职'`,
@@ -534,7 +580,7 @@ export default {
       ////tag
       ////tag
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'name',
             tablename: 't_zone',
             condition: `parentid  in ${val}`,
@@ -560,7 +606,7 @@ export default {
       ////tag
       this.cbcs=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'f_book_name,f_book_slice_area,id',
             tablename: 't_meter_book',
             condition: `f_filiale_id  in ${val}`,

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

@@ -403,7 +403,7 @@ import co from 'co'
 //               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}`)
@@ -440,7 +440,7 @@ import co from 'co'
 //         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
@@ -479,7 +479,7 @@ import co from 'co'
 //       }
 //     }else{
 //       ////tag
-//       self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+//       self.$resetpost(`${self.Url}/api/af-safecheck/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
 //         ////tag
 //         if(res.data.length != 0){
 //           self.$parent.$parent.user = res.data[0]
@@ -575,7 +575,7 @@ export default {
     },
     // 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+"'"
     //     }
     //   })
@@ -634,7 +634,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -661,6 +660,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({
@@ -1166,7 +1166,7 @@ export default {
       ////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",
@@ -1176,7 +1176,7 @@ export default {
       }, {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": "有效",
@@ -1218,7 +1218,7 @@ export default {
       ////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",
@@ -1229,12 +1229,12 @@ export default {
       ////tag)
       ////tag
       let limit_times=1
-      let limit_value=3
+      let limit_value=5
       if(Vue.config.safecheck && Vue.config.safecheck.ApproveConfig.limit_times && Vue.config.safecheck.ApproveConfig.limit_value){
         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()}/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,
@@ -1285,7 +1285,7 @@ export default {
         ////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',

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

@@ -546,7 +546,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",
@@ -654,7 +654,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/fileSave`, {
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/fileSave`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -670,7 +670,7 @@
                 data.f_address = this.userinfo.addressinfo.f_address? this.userinfo.addressinfo.f_address : this.userinfo_old.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("修改用户地址信息成功！")
                 }).catch(error => {
                   this.$showMessage("修改用户地址信息！")
@@ -737,7 +737,7 @@
             this.userinfo_old.meterinfo[0].devicesinfo = this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
             //tag)
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/fileSave`, {
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/fileSave`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -855,7 +855,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",
@@ -891,7 +891,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",
@@ -982,7 +982,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",
@@ -1012,7 +1012,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",
@@ -1106,7 +1106,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",
@@ -1119,7 +1119,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})
@@ -1163,7 +1163,7 @@
       console.log(this.showBox)
       if (this.showBox) {
         // 获取调压箱
-        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
+        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {

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

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag