apply-clients 3.5.5-7 → 3.5.5-71

package/src/filiale/yangchunboneng/android/AppServiceControl.vue

@@ -168,18 +168,18 @@ export default {
           }
           console.log("item.ready"+item.ready)
           if (item.ready) {
-              console.log(item.ready)
-              item.options = await this[item.ready]()
+            console.log(item.ready)
+            item.options = await this[item.ready]()
 
-            }
-            if (!isEmpty(item.role)){
-              console.log('获取对应角色的人员信息',item.role)
-              item.options = await this.getDesignerPeople(item.role)
-              item.optionsid = await this.getDesignerPeopleid(item.role)
-            }
-            if (item.multiple && !isEmpty(this.selectdata[item.field])){
-              this.selectdata[item.field] = JSON.parse(this.selectdata[item.field])
-              item.value = JSON.parse(item.value)
+          }
+          if (!isEmpty(item.role)){
+            console.log('获取对应角色的人员信息',item.role)
+            item.options = await this.getDesignerPeople(item.role)
+            item.optionsid = await this.getDesignerPeopleid(item.role)
+          }
+          if (item.multiple && !isEmpty(this.selectdata[item.field])){
+            this.selectdata[item.field] = JSON.parse(this.selectdata[item.field])
+            item.value = JSON.parse(item.value)
           }
         }
 
@@ -192,7 +192,7 @@ export default {
           }
         }
 
-          this.selectdata[item.field] = item.value
+        this.selectdata[item.field] = item.value
       }
 
       // 控制组件
@@ -498,7 +498,7 @@ export default {
 
       let data = {
         tablename: 't_area',
-        // condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}'`
+        // condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
         condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
       }
       let http = new HttpResetClass()
@@ -550,11 +550,11 @@ export default {
       let f_address_type = this.getLableValue('地址类型')
 
       if (f_address_type === '民用市区') {
-        // data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
+        // data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
         data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
       }
       if (f_address_type === '民用乡镇') {
-        // data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
+        // data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
         data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
       }
 
@@ -687,7 +687,7 @@ export default {
       }else{
         res = await this.$showMessage('增容改管下单后将不能修改用户信息，请确认用户信息地址等是否正确，如不完善可在档案中进行修正！！！')
       }
-     if (res == 'confirm') {
+      if (res == 'confirm') {
         return
       }
       throw '用户信息确认！！！'
@@ -921,10 +921,10 @@ export default {
 
       let http = new HttpResetClass()
       let res = await http.load(
-              'POST',
-              `${this.$androidUtil.getProxyUrl()}/rs/search`,
-              {data: data},
-              {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/search`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
       )
 
       return res.data.map(item => {
@@ -934,6 +934,42 @@ export default {
         }
       })
     },
+    async getStreet() {
+      let data = {
+        tablename: 't_street',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_iscity in ('市区','乡镇')`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+      )
+      return res.data.map(item => {
+        return {
+          label: item.f_street,
+          value: item.f_street
+        }
+      })
+    },
+    async streetChangeNew() {
+      if (isEmpty(this.show_data.f_street)) {
+        return
+      }
+      //设置区县和地址类型
+      let data = {
+        tablename: 't_street',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+      )
+    },
     // 获取区县
     async getPcd () {
       let data = {
@@ -942,10 +978,10 @@ export default {
       }
       let http = new HttpResetClass()
       let res = await http.load(
-              'POST',
-              `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
-              {data: data},
-              {resolveMsg: null, rejectMsg: '区县查询失败！！！'}
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '区县查询失败！！！'}
       )
 
       return res.data.map(item => {
@@ -1246,8 +1282,21 @@ export default {
       if (((this.show_data.defname === '工程审批' && (this.show_data.f_apply_type === '民用散户报建流程'|| this.show_data.f_apply_type === '民用预留户报建流程'))|| (this.show_data.defname === '工程决算')) && this.show_data.button.button_name === '提交' && this.show_data.f_payment_ratio == "100%"){
         this.show_data.button.button_name = '跳过'
       }
-      if (this.show_data.defname === '通气申请' && this.show_data.f_apply_type === '启封通气'&& this.show_data.button.button_name === '提交' && this.show_data.f_apply_source !== '线下发起' && this.show_data.f_apply_nature !== '预留户'){
-        this.show_data.button.button_name = '跳过'
+      if (this.show_data.defname === '通气申请' && this.show_data.f_apply_type === '启封通气'&& this.show_data.button.button_name === '提交' && this.show_data.f_apply_source == '自动发起' ){
+        let data = {
+          tablename: 't_apply',
+          condition: `f_process_id = '${this.show_data.f_parent_process_id}'`
+        }
+        let res = await this.$resetpost(
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: null}
+        )
+        if (res.data.length>0){
+          if (res.data[0].f_payment_ratio == "100%"){
+            this.show_data.button.button_name = '跳过'
+          }
+        }
       }
       if(this.show_data.defname === '工程派工' && this.show_data.button.button_name === '提交'){
         this.show_data.f_budget_peoples = []
@@ -1294,7 +1343,7 @@ export default {
         }
         await http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,{data: data},{rejectMsg:null,resolveMsg:null}).then( res=>{
           if (res.data.length == 0){
-            http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data: {condition:` f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: Vue.user.id,orgid: Vue.user.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
+            http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/supervisory`,{data: {condition:` u.f_process_id= '${this.show_data.f_parent_process_id}'`, data: {id: Vue.user.id,orgid: Vue.user.orgid}}},{resolveMsg:null,rejectMsg:null}).then(row=>{
               const show_data = row.data[0]
               show_data.user = Vue.user
               show_data.start_activity ='报装申请'
@@ -1388,10 +1437,10 @@ export default {
       }
       let http = new HttpResetClass()
       let res = await http.load(
-              'POST',
-              `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
-              {data: data},
-              {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
       this.setLabelOptions('小区', res.data.map(item => {
@@ -1401,6 +1450,69 @@ export default {
         }
       }))
     },
+    // 街道失去焦点
+    async 'streetChangeNew' (index) {
+      if (isEmpty(this.show_data.f_street)) {
+        return
+      }
+      //设置区县和地址类型
+      let data = {
+        tablename: 't_street',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+      )
+      if(res.data[0].f_iscity==="市区"){
+        this.setLabelValue('地址类型',"民用市区")
+      }else if(res.data[0].f_iscity==="乡镇"){
+        this.setLabelValue('地址类型',"民用乡镇")
+      }else{
+        this.setLabelValue('地址类型', "特殊地址")
+      }
+      this.setLabelValue('区/县',res.data[0].f_pcd)
+      //获取小区
+      let data2 = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
+      }
+      let http2 = new HttpResetClass()
+      let res2 = await http2.load(
+        'POST',
+        `rs/sql/apply_singleTable`,
+        {data: data2},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+      )
+
+      this.setLabelOptions('小区', res2.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
+    async 'AreaChangeNew' (index) {
+      if (isEmpty(this.show_data.f_residential_area)) {
+        return
+      }
+      //设置区县和地址类型
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_residential_area= '${this.show_data.f_residential_area}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+      )
+      this.setLabelValue('片区',res.data[0].f_slice_area)
+    },
     // 选择报建项目
     'selectApply' (row) {
       this.setLabelValue('工程名称', row.f_entry_name)
@@ -1455,10 +1567,10 @@ export default {
 
       let http = new HttpResetClass()
       let res = await http.load(
-              'POST',
-              `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
-              {data: data},
-              {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
       )
 
       this.setLabelOptions('街道/乡镇', res.data.map(item => {
@@ -1546,6 +1658,68 @@ export default {
         }
       }
     },
+
+    'addressTypeChangeNew' (index) {
+      let f_address_type = this.show_data.fields[index].value
+      for (const item of this.show_data.fields) {
+        if (f_address_type === '民用市区') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '小区' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+            item.value = null
+          }
+        }
+        if (f_address_type === '民用乡镇') {
+          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '小区' || item.label === '门牌号') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '楼层') {
+            item.hidden = true
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = true
+            item.value = null
+          }
+        }
+        if (f_address_type === '特殊地址') {
+          if (item.label === '区/县' || item.label === '街道/乡镇') {
+            item.hidden = false
+            item.required = true
+            item.value = null
+          }
+          if (item.label === '小区') {
+            item.hidden = false
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+            item.hidden = true
+            item.required = false
+            item.value = null
+          }
+          if (item.label === '地址') {
+            item.readonly = false
+            item.value = null
+          }
+        }
+      }
+    },
     // 搜索小区
     async 'searchArea' (area, index) {
       let data = {
@@ -1554,10 +1728,10 @@ export default {
       }
       let http = new HttpResetClass()
       let res = await http.load(
-              'POST',
-              `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
-              {data: data},
-              {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
       if (res.data.length === 0) {
@@ -1579,10 +1753,10 @@ export default {
       }
       let http = new HttpResetClass()
       let res = await http.load(
-              'POST',
-              `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
-              {data: data},
-              {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
       if (res.data.length === 0) {

package/src/filiale/yangchunboneng/android/MaterIialOne.vue

@@ -70,6 +70,8 @@
   </div>
 </template>
 <script>
+import {isEmpty} from "../../../components/Util";
+
 export  default {
   props:["index",'item','materialnameandcode','typenumbers','newmaterialnameandcode','newmaterialnameandtype'],
   data(){
@@ -109,7 +111,25 @@ export  default {
       this.$emit('delete_material',i)
     }
   },
-  ready(){
+  ready () {
+    if (this.item.f_material_name && this.item.f_material_style) {
+      let f_material_name = ''
+      this.newmaterialnameandcode.filter((item) => {
+        if (item.label == this.item.f_material_name) {
+          f_material_name = item.value
+        }
+      })
+      this.item.f_material_name = f_material_name
+      this.changeMaterialName(f_material_name)
+      let f_typenumber = ''
+      this.materialnameandtype.filter((item) => {
+        if (item.label == this.item.f_material_style) {
+          f_typenumber = item.value
+        }
+      })
+      this.item.f_typenumber = f_typenumber
+      this.changeType(f_typenumber)
+    }
     console.log(this.item)
   }
 }

package/src/filiale/yangchunboneng/android.js

@@ -1,20 +1,21 @@
-const Vue = require('vue')
-let specialComp = {
-  'app-exploration-user': (resolve) => { require(['./android/AppExplorationUser'], resolve) },
-  'app-add-material-science': (resolve) => { require(['./android/AppAddMaterialScience'], resolve) },
-  'app-apply-devices-management': (resolve) => { require(['./android/AppDevicesManagement'], resolve) },
-  'app-charge-management': (resolve) => { require(['./android/AppChargeManagement'], resolve) },
-  'app-other-charge-management': (resolve) => { require(['./android/AppOtherChargeManagement'], resolve) },
-  'app-chargesList': (resolve) => { require(['./android/chargesList'], resolve) },
-  'app-installation-details': (resolve) => { require(['./android/AppInstallationDetails'], resolve) },
-  'app-service-control': (resolve) => { require(['./android/AppServiceControl'], resolve) },
-  'app-super-service-control': (resolve) => { require(['./android/AppSuperServiceControl'], resolve) },
-  'app-take-pic': (resolve) => { require(['./android/AppTakePic'], resolve) },
-  'appinstallation-material': (resolve) => { require(['./android/AppInstallationMaterial'], resolve) },
-  'apply-material-one': (resolve) => { require(['./android/MaterIialOne'], resolve) },
-  'app-supervisory-cart': (resolve) => { require(['./android/AppSupervisoryCart'], resolve) },
-  'app-contract-charge': (resolve) => { require(['./android/AppContractCharge'], resolve) },
-  'app-upload': (resolve) => { require(['./android/AppUpload'], resolve) }
-
-}
-exports.specialComp = specialComp
+const Vue = require('vue')
+let specialComp = {
+  'app-exploration-user': (resolve) => { require(['./android/AppExplorationUser'], resolve) },
+  'app-add-material-science': (resolve) => { require(['./android/AppAddMaterialScience'], resolve) },
+  'app-apply-devices-management': (resolve) => { require(['./android/AppDevicesManagement'], resolve) },
+  'app-charge-management': (resolve) => { require(['./android/AppChargeManagement'], resolve) },
+  'app-other-charge-management': (resolve) => { require(['./android/AppOtherChargeManagement'], resolve) },
+  'app-chargesList': (resolve) => { require(['./android/chargesList'], resolve) },
+  'app-installation-details': (resolve) => { require(['./android/AppInstallationDetails'], resolve) },
+  'app-service-control': (resolve) => { require(['./android/AppServiceControl'], resolve) },
+  'app-super-service-control': (resolve) => { require(['./android/AppSuperServiceControl'], resolve) },
+  'app-take-pic': (resolve) => { require(['./android/AppTakePic'], resolve) },
+  'appinstallation-material': (resolve) => { require(['./android/AppInstallationMaterial'], resolve) },
+  'apply-material-one': (resolve) => { require(['./android/MaterIialOne'], resolve) },
+  'app-supervisory-cart': (resolve) => { require(['./android/AppSupervisoryCart'], resolve) },
+  'app-contract-charge': (resolve) => { require(['./android/AppContractCharge'], resolve) },
+  'app-upload': (resolve) => { require(['./android/AppUpload'], resolve) },
+  'app-process-supervisory': (resolve) => { require(['./android/AppProcessSupervisory'], resolve) }
+
+}
+exports.specialComp = specialComp

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

@@ -37,7 +37,7 @@
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-              <export-excel :data="$parent.$parent.getCondition"
+              <export-excel v-if="$parent.$parent.projectImport" :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             sqlurl="rs/logic/applyExportfile"
                             sql-name="getApplyCharge"
@@ -250,6 +250,28 @@
                           condition="cr.f_confirm_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-3">
+              <label  class="font_normal_body">实际时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.f_shiji_date"
+                          :value.sync="model.f_shiji_date"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="cr.f_actual_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label  class="font_normal_body">实际时间：</label>
+              <datepicker id="startDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.f_shiji_enddate"
+                          :value.sync="model.f_shiji_enddate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="cr.f_actual_date <= '{}'">
+              </datepicker>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用气性质：</label>
               <v-select
@@ -270,6 +292,7 @@
           <tr>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">工程编号</th>
+            <th style="white-space: nowrap;">用户编号</th>
             <th style="white-space: nowrap;">合同编号</th>
             <th style="white-space: nowrap;">合同金额</th>
             <th style="white-space: nowrap;">报建类型</th>
@@ -304,6 +327,9 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_userinfo_code}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>
@@ -429,9 +455,7 @@ export default {
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
       chargeStatus: [
         {label: '全部', value: ''},
-        {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'},
-        {label: '退款', value: '退款'}
+        ...this.$appdata.getParam('报建-缴费状态')
       ],
       confirms: [
         {label: '全部', value: ''},
@@ -452,6 +476,7 @@ export default {
         'f_contract_money': '合同金额',
         'f_apply_type': '报建类型',
         'f_apply_nature': '报建性质',
+        'f_userinfo_code': '用户编号',
         'f_user_name': '用户名称',
         'f_phone': '用户电话',
         'f_address': '用户地址',
@@ -608,6 +633,9 @@ export default {
       return {
         condition: this.model.condition
       }
+    },
+    projectImport () {
+      return this.$login.r.includes('收费明细-导出')
     }
   }
 }