safecheck-client 3.0.35-4 → 3.0.35-41

package/src/components/Util/SafecheckUpload.vue

@@ -172,6 +172,10 @@ export default {
         }
         let temp = getFile.data[i].f_downloadpath
         let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+        if (temp.startsWith('E:')){
+          URL = `rs/image/file/${getFile.data[i].f_filename}`
+        }
+        console.log(URL)
         getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
       }
       this.fileInfoData = []

package/src/components/android/CheckPlanDown.vue

@@ -86,7 +86,7 @@ export default {
   title: '共享计划下载',
   data () {
     return {
-      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`}),
+      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`,checkerid:`'${Vue.user.id}'`}),
       checkPlanInfo: [],
       localcheckPlanInfo:[]
     }

package/src/components/android/CivilCurrentCreate.vue

@@ -104,6 +104,16 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_area_period" class="font text-left">区/期：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_area_period" class="search_input input-font"
+                       v-model=model.f_area_period condition="f_area_period like '%{}%'" />
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -253,26 +263,26 @@
             <div class="panel" style="padding: 10px 10px 5px 10px;">
               <div class="panel-body panel-self">
 
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
-                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>
-                  <p class="panel-title col-xs-2 text-left input-font" style="width: 5%;float:right">
-                    <input type="checkbox" @click="$parent.$parent.$parent.setPlanParam(row.id, $event)"/>
-                  </p>
-                </div>
+<!--                <div class="col-xs-12">-->
+<!--                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>-->
+<!--                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>-->
+<!--                  <p class="panel-title col-xs-2 text-left input-font" style="width: 5%;float:right">-->
+<!--                    <input type="checkbox" @click="$parent.$parent.$parent.setPlanParam(row.id, $event)"/>-->
+<!--                  </p>-->
+<!--                </div>-->
                 <div class="col-xs-12">
                   <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_user_name }}</p>
                 </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>用户类型:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_user_type }}
-                  </p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>计划名称:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_plan_name }}</p>
-                </div>
+<!--                <div class="col-xs-6">-->
+<!--                  <p class="panel-title col-xs-5 text-left font"><b>用户类型:</b></p>-->
+<!--                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_user_type }}-->
+<!--                  </p>-->
+<!--                </div>-->
+<!--                <div class="col-xs-6">-->
+<!--                  <p class="panel-title col-xs-5 text-left font"><b>计划名称:</b></p>-->
+<!--                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_plan_name }}</p>-->
+<!--                </div>-->
                 <!--                <div class="col-xs-6">-->
                 <!--                  <p class="panel-title col-xs-5 text-left font"><b>小区名称:</b></p>-->
                 <!--                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_residential_area }}</p>-->
@@ -289,7 +299,12 @@
                     <img src="../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_zuhu_phone)'></img>
                   </p>
                 </div>
-
+                <div class="col-xs-12">
+                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>临时联系电话:</b></p>
+                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_rent_phone }}
+                    <img src="../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_rent_phone)'></img>
+                  </p>
+                </div>
                 <div class="col-xs-12">
                   <p class="panel-title text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
                   <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_address }}</p>
@@ -311,30 +326,30 @@
                 <!--<p class="panel-title col-xs-4 text-left font">上次安检状态</p>-->
                 <!--<p class="panel-title col-xs-8 text-left input-font">{{ row.f_last_check_state }}</p>-->
                 <!--</div>-->
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_state == '已检'?'临时保存':row.f_state }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>上传状态:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_upload_state }}</p>
-                </div>
-                <div class="col-xs-12" v-if="row.f_prearranged_date !=null">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>预约时间:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_prearranged_date }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>安检类型:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_safecheck_type }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font"><b>预约日期:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_prearranged_date }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font"><b>备注:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_remark }}</p>
-                </div>
+<!--                <div class="col-xs-6">-->
+<!--                  <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>-->
+<!--                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_state == '已检'?'临时保存':row.f_state }}</p>-->
+<!--                </div>-->
+<!--                <div class="col-xs-6">-->
+<!--                  <p class="panel-title col-xs-5 text-left font"><b>上传状态:</b></p>-->
+<!--                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_upload_state }}</p>-->
+<!--                </div>-->
+<!--                <div class="col-xs-12" v-if="row.f_prearranged_date !=null">-->
+<!--                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>预约时间:</b></p>-->
+<!--                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_prearranged_date }}</p>-->
+<!--                </div>-->
+<!--                <div class="col-xs-6">-->
+<!--                  <p class="panel-title col-xs-5 text-left font"><b>安检类型:</b></p>-->
+<!--                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_safecheck_type }}</p>-->
+<!--                </div>-->
+<!--                <div class="col-xs-12">-->
+<!--                  <p class="panel-title col-xs-5 text-left font"><b>预约日期:</b></p>-->
+<!--                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_prearranged_date }}</p>-->
+<!--                </div>-->
+<!--                <div class="col-xs-12">-->
+<!--                  <p class="panel-title col-xs-5 text-left font"><b>备注:</b></p>-->
+<!--                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_remark }}</p>-->
+<!--                </div>-->
                 <!--<div class="col-xs-12">-->
                 <!--<p class="panel-title col-xs-5 text-left font"><b>送气期限:</b></p>-->
                 <!--<p class="panel-title col-xs-7 text-left input-font">{{timeSet(row.f_issue_time)}}</p>-->

package/src/components/android/NoCivilCurrentCreate.vue

@@ -104,6 +104,16 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_area_period" class="font text-left">区/期：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_area_period" class="search_input input-font"
+                       v-model=model.f_area_period condition="f_area_period like '%{}%'" />
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">

package/src/components/android/PhoneUpUserinfo.vue

@@ -641,7 +641,11 @@
             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`, {
+            let url = 'rs/logic/filemanage_fileSave'
+            if(Vue.isv4){
+              url ='api/af-revenue/logic/openapi/filemanage_fileSave'
+            }
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url}`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -657,7 +661,11 @@
                 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) => {
+                let url1 = 'rs/logic/address_updateuseraddress'
+                if(Vue.isv4){
+                  url1 ='api/af-revenue/logic/openapi/address_updateuseraddress'
+                }
+                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url1}`, {data: data}).then((res2) => {
                   this.$showMessage("修改用户地址信息成功！")
                 }).catch(error => {
                   this.$showMessage("修改用户地址信息！")
@@ -708,7 +716,11 @@
             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/filemanage_fileSave`, {
+            let url = 'rs/logic/filemanage_fileSave'
+            if(Vue.isv4){
+              url ='api/af-revenue/logic/openapi/filemanage_fileSave'
+            }
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url}`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -1091,8 +1103,11 @@
         pcdlist.data.forEach((result) => {
           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 url = 'rs/logic/filemanage_getFilesDetail'
+        if(Vue.isv4){
+          url ='api/af-revenue/logic/openapi/filemanage_getFilesDetail'
+        }
+        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/${url}`, {
           //f_userinfo_code:'12381344',
           f_userinfo_id: this.f_userinfo_id
         }, {resolveMsg: null, rejectMsg: null})
@@ -1136,7 +1151,11 @@
       console.log(this.showBox)
       if (this.showBox) {
         // 获取调压箱
-        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
+        let url = 'rs/sql/adjustableboxQuery'
+        if(Vue.isv4){
+          url ='api/af-revenue/sql/adjustableboxQuery'
+        }
+        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/${url}`, {data: {condition: '1 = 1'}}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {