apply-clients 3.5.4-7 → 3.5.4-72

package/src/filiale/qianneng/android/AppExplorationUser.vue

@@ -9,12 +9,24 @@
               <input class="" v-model=model.f_user_name condition="u.f_user_name like '%{}%'" />
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">客户编号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_userinfo_code condition="u.f_userinfo_code like '%{}%'" />
+            </div>
+          </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">联系电话：</label>
             <div class="col-xs-8" >
               <input class="" v-model=model.f_phone condition="u.f_phone like '%{}%'" />
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">入户证号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_entry_number condition="u.f_entry_number like '%{}%'" />
+            </div>
+          </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">工程编号：</label>
             <div class="col-xs-8" >
@@ -90,6 +102,32 @@
               <input class="" v-model=model.f_igniter_people condition="f_igniter_people like '%{}%'" />
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">验收预约时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 100%!important;"
+                          v-model="model.startDate1"
+                          :value.sync="model.startDate1"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="u.f_start_build >= '{}'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">验收预约时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 100%!important;"
+                          v-model="model.endDate1"
+                          :value.sync="model.endDate1"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="f_start_build <= '{}'">
+              </datepicker>
+            </div>
+          </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">开始时间：</label>
             <div class="col-xs-8" >

package/src/filiale/qianneng/android/AppInstallationDetails.vue

@@ -201,28 +201,37 @@
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">安装日期：</label>
             <div class="col-xs-8">
-              <input class="form-control input_view" style=""
+<!--              <input class="form-control input_view" style=""
                      v-model="item.f_install_date"
                      :value.sync="installdate(item.f_install_date)"
                      placeholder="安装日期"
-                     />
-<!--              <datepicker-->
-<!--                placeholder="安装日期"-->
-<!--                :value.sync="item.f_install_date"-->
-<!--                v-model="item.f_install_date"-->
-<!--                format="yyyy-MM-dd HH:mm:ss"-->
-<!--                :show-reset-button="reset">-->
-<!--              </datepicker>-->
+                     />-->
+              <datepicker
+                placeholder="安装日期"
+                :value.sync="item.f_install_date"
+                v-model="item.f_install_date"
+                format="yyyy-MM-dd"
+                :default="true"
+                :show-reset-button="reset">
+              </datepicker>
             </div>
           </div>
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">生产日期：</label>
             <div class="col-xs-8">
-              <input class="form-control input_view" style=""
+<!--              <input class="form-control input_view" style=""
                      v-model="item.f_factory_date"
                      :value.sync="installdate(item.f_factory_date)"
                      placeholder="生产日期"
-              />
+              />-->
+              <datepicker
+                placeholder="安装日期"
+                :value.sync="item.f_factory_date"
+                v-model="item.f_factory_date"
+                format="yyyy-MM-dd"
+                :default="true"
+                :show-reset-button="reset">
+              </datepicker>
             </div>
           </div>
         </div>

package/src/filiale/qianneng/android.js

@@ -8,7 +8,8 @@ let specialComp = {
   'app-sign': (resolve) => { require(['./android/AppSign'], resolve) },
   'app-take-pic': (resolve) => { require(['./android/AppTakePic'], resolve) },
   'app-installation-details': (resolve) => { require(['./android/AppInstallationDetails'], resolve) },
-  'app-apply-devices-management': (resolve) => { require(['./android/AppDevicesManagement'], resolve) }
+  'app-apply-devices-management': (resolve) => { require(['./android/AppDevicesManagement'], resolve) },
+  'app-charge-management': (resolve) => { require(['./android/AppChargeManagement'], resolve) }
 
 }
 exports.specialComp = specialComp

package/src/filiale/qianneng/pc/ApplyUpload.vue

@@ -174,22 +174,23 @@ export default {
         }
         let temp = getFile.data[i].f_downloadpath
         let URL = temp.substring(3)
-        getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
+        getFile.data[i].f_downloadURL = "https://" + location.host + "/" + URL
       }
+      console.log('下载->>>',getFile.data,location.host)
       for (var i = 0; i < getFile.data.length; i++) {
-        if(getFile.data[i].f_downloadpath.includes('http:')){
+        if(getFile.data[i].f_downloadpath.includes('https:')){
           let temp = getFile.data[i].f_downloadpath
           getFile.data[i].f_downloadURL = temp
-          console.log('打印',i)
         }else{
           let temp = getFile.data[i].f_downloadpath
           let URL = temp.substring(3)
-          getFile.data[i].f_downloadURL ="http://" +  location.host + "/" + URL
+          getFile.data[i].f_downloadURL ="https://" +  location.host + "/" + URL
         }
 
       }
       this.fileInfoData = []
       this.fileInfoData = getFile.data
+      console.log('下载->>>',this.fileInfoData)
     },
     // 打开高拍仪
     upload () {

package/src/filiale/qianneng/pc/Applybatchdispatch.vue

@@ -129,6 +129,11 @@
                   :value-single="true"
                   close-on-select ></v-select>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">备注：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_apply_remarks"
+                       condition="f_apply_remarks like '%{}%'" placeholder='备注'>
+              </div>
             </div>
           </div>
         </criteria>
@@ -289,7 +294,7 @@
                 <td class="input-center" :style="stylecss">联系人:</td>
                 <td class="input-center" :style="stylecss">{{userinfo.f_contact}}</td>
               </tr>
-              <tr style="height: 80px;">
+              <tr style="height: 60px;">
                 <td class="input-center" :style="stylecss">工程备注:</td>
                 <td class="input-center" colspan="3" :style="'font-weight: bolder;'+stylecss">{{userinfo.f_apply_remarks}}</td>
                 <td class="input-center" :style="stylecss">联系人电话:</td>
@@ -305,9 +310,9 @@
               </tr>
               <tr>
                 <td class="input-center" :style="stylecss">用气设备:</td>
-                <td class="input-center" colspan="3" :style="stylecss">{{f_gas_appliances}}</td>
+                <td class="input-center" colspan="2" :style="stylecss">{{f_gas_appliances}}</td>
                 <td class="input-center" :style="stylecss">防盗卡号:</td>
-                <td class="input-center" :style="stylecss"></td>
+                <td class="input-center" colspan="2" :style="stylecss"></td>
               </tr>
               <tr>
                 <td class="input-center" :style="stylecss">派工人员:</td>
@@ -398,7 +403,7 @@
                 <td class="input-center" :style="stylecss">联系人电话:</td>
                 <td class="input-center" :style="stylecss">{{userinfo.f_standby_phone}}</td>
               </tr>
-              <tr style="height: 80px;">
+              <tr style="height: 60px;">
                 <td class="input-center" :style="stylecss">工程备注:</td>
                 <td class="input-center" colspan="5" :style="'font-weight: bolder;'+stylecss">{{userinfo.f_apply_remarks}}</td>
               </tr>
@@ -412,9 +417,9 @@
               </tr>
               <tr>
                 <td class="input-center" :style="stylecss">用气设备:</td>
-                <td class="input-center" colspan="3" :style="stylecss">{{f_gas_appliances}}</td>
+                <td class="input-center" colspan="2" :style="stylecss">{{f_gas_appliances}}</td>
                 <td class="input-center" :style="stylecss">防盗卡号:</td>
-                <td class="input-center" :style="stylecss"></td>
+                <td class="input-center" colspan="2" :style="stylecss"></td>
               </tr>
               <tr>
                 <td class="input-center" :style="stylecss">派工人员:</td>

package/src/filiale/qianneng/pc/Applydetail.vue

@@ -40,7 +40,6 @@
               <div class="form-group col-sm-3 button-range">
                 <button class="button_search button_spacing" @click="search" v-el:cx>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-                <button class="button_clear button_spacing"  @click="$parent.$parent.gettest()">测试</button>
                 <export-excel :data="$parent.$parent.getCondition"
                               :field="$parent.$parent.getfield"
                               sqlurl="rs/logic/applyExportfile"
@@ -360,10 +359,6 @@ export default {
       }
       this.$refs.cp.$refs.cri.model.orgid = val[0]
       this.curorgid[0] = val[0]
-    },
-    gettest () {
-      let http = new HttpResetClass()
-      http.load('post', 'rs/logic/test', {}, {resolveMsg: null, rejectMsg: null})
     }
   },
   computed: {

package/src/filiale/qianneng/pc/InstallFunction.vue

@@ -10,14 +10,14 @@
             <function-service-control  v-ref:service :selectdata="selectdata"></function-service-control>
           </tab>
           <tab header='附件'>
-            <apply-upload :blodid="show_data.f_process_id"
+            <apply-upload :blodid="selectdata.f_process_id"
                           :isupload = "true"
                           :isdelete="true"
                           :isusetype="true"
                           :isremark = "true"
                           :takeimg="true"
                           :issearch="true"
-                          :defname="show_data.defname"
+                          :defname="selectdata.defname"
             >
             </apply-upload>
           </tab>

package/src/filiale/qianneng/pc/InstallationDetails.vue

@@ -167,11 +167,18 @@
         <div class="form-group col-sm-6">
           <label class="col-sm-4 control-label">调压箱编号：</label>
           <div class="col-sm-8">
-            <input class="form-control input_view" style=""
+            <input-select
+              class="select select_list"
+              :value.sync="item.f_adjustable_id"
+              v-model="item.f_adjustable_id"
+              :options="adjustables"
+              :disable="mark === 1"
+              :valueSingle="true"></input-select>
+<!--            <input class="form-control input_view" style=""
                    v-model="item.f_adjustable_id"
                    placeholder="调压箱编号"
                    :readonly="mark === 1"
-                   />
+                   />-->
           </div>
         </div>
         <div class="form-group col-sm-6">
@@ -262,7 +269,7 @@
                 :value.sync="item.f_install_date"
                 v-model="item.f_install_date"
                 :default="true"
-                :format="'yyyy-MM-dd HH:mm:ss'"
+                :format="'yyyy-MM-dd'"
                 :disabled="mark === 1"
                 :show-reset-button="reset">
               </datepicker>
@@ -275,7 +282,8 @@
               placeholder="生产日期"
               :value.sync="item.f_factory_date"
               v-model="item.f_factory_date"
-              :format="'yyyy-MM-dd HH:mm:ss'"
+              :format="'yyyy-MM-dd'"
+              :default="true"
               :disabled="mark === 1"
               :show-reset-button="reset">
             </datepicker>
@@ -520,6 +528,26 @@ export default {
         condition: condition
       }
     },
+    // 调压箱初始化
+    adjustables () {
+      let data = {
+        tablename: 't_adjustablebox',
+        condition: `f_filialeid = '${this.$login.f.orgid}' and f_adjustable_state = '正常'`
+      }
+      let arr = []
+      new HttpResetClass().load('POST', 'rs/sql/apply_singleTable', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        res.data.forEach((item) => {
+          let temp = {}
+          temp.label = `[${item.f_adjustable_id}]-${item.f_adjustable_name}`
+          temp.value = item.f_adjustable_id
+          arr.push(temp)
+        })
+        return arr
+      })
+    },
     // 安装人
     installperson() {
       return function (f_install_person) {

package/src/filiale/qianneng/pc/ServiceControl.vue

@@ -1010,6 +1010,7 @@
       // 选择客户档案信息
       'selectUserinfo' (row) {
         this.setLabelValue('客户编号', row.f_userinfo_code)
+        this.setLabelValue('入户证号', row.f_entry_number)
         this.setLabelValue('客户名称', row.f_user_name)
         this.setLabelValue('客户电话', row.f_user_phone)
         this.setLabelValue('证件类型', row.f_credentials)

package/src/filiale/qianneng/pc/printactivatecard.vue

@@ -44,7 +44,7 @@
         <td class="input-center" :style="stylecss">联系人:</td>
         <td class="input-center" :style="stylecss">{{userinfo.f_contact}}</td>
       </tr>
-      <tr style="height: 80px;">
+      <tr style="height: 60px;">
         <td class="input-center" :style="stylecss">工程备注:</td>
         <td class="input-center" colspan="3" :style="'font-weight: bolder;'+stylecss">{{userinfo.f_apply_remarks}}</td>
         <td class="input-center" :style="stylecss">联系人电话:</td>
@@ -60,9 +60,9 @@
       </tr>
       <tr>
         <td class="input-center" :style="stylecss">用气设备:</td>
-        <td class="input-center" colspan="3" :style="stylecss">{{f_gas_appliances}}</td>
+        <td class="input-center" colspan="2" :style="stylecss">{{f_gas_appliances}}</td>
         <td class="input-center" :style="stylecss">防盗卡号:</td>
-        <td class="input-center" :style="stylecss"></td>
+        <td class="input-center" colspan="2" :style="stylecss"></td>
       </tr>
       <tr>
         <td class="input-center" :style="stylecss">派工人员:</td>
@@ -153,7 +153,7 @@
         <td class="input-center" :style="stylecss">联系人电话:</td>
         <td class="input-center" :style="stylecss">{{userinfo.f_standby_phone}}</td>
       </tr>
-      <tr style="height: 80px;">
+      <tr style="height: 60px;">
         <td class="input-center" :style="stylecss">工程备注:</td>
         <td class="input-center" colspan="5" :style="'font-weight: bolder;'+stylecss">{{userinfo.f_apply_remarks}}</td>
       </tr>
@@ -167,9 +167,9 @@
       </tr>
       <tr>
         <td class="input-center" :style="stylecss">用气设备:</td>
-        <td class="input-center" colspan="3" :style="stylecss">{{f_gas_appliances}}</td>
+        <td class="input-center" colspan="2" :style="stylecss">{{f_gas_appliances}}</td>
         <td class="input-center" :style="stylecss">防盗卡号:</td>
-        <td class="input-center" :style="stylecss"></td>
+        <td class="input-center" colspan="2" :style="stylecss"></td>
       </tr>
       <tr>
         <td class="input-center" :style="stylecss">派工人员:</td>