apply-clients 3.5.5-8 → 3.5.5-80

package/src/filiale/jinhuang/pc/addressAndUserinfoManagement.vue

@@ -30,6 +30,7 @@
                       @click="$parent.$parent.$parent.showFileModal()">导入</button>
               <a type="button" class="btn btn-info head-but"
                  href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>
+              <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.$parent.add('民用')">添加地址</button>
             </th>
           </tr>
         </template>
@@ -99,13 +100,39 @@
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
   </modal>
+
+  <!-- 添加民用弹窗 -->
+  <modal :show.sync="showUserAddress" large backdrop="false" :width="900">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeUserAddress"><span>&times;</span></button>
+      <h4 class="modal-title">添加民用地址</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <user-address
+        :f_filialeids="selectdata.f_filialeid || this.$login.f.orgid"
+        :usertype="false"
+        :onedata="'more'"
+        :row="{}"
+        :operation="'add'"
+        :selectdata="selectdata"
+        :user="this.$login.f"
+        @cancel="closeUserAddress"
+        @confirm="closeUserAddress"
+      ></user-address>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="display: none"></footer>
+  </modal>
 </template>
 <script>
   import {PagedList} from 'vue-client'
   import {HttpResetClass} from 'vue-client'
+  import UserAddress from 'address-client/src/components/UserAddress.vue'
 
   export default {
     title: '地址管理',
+    components: {
+      UserAddress
+    },
     props: {
       selectdata: {
         type: Object
@@ -124,13 +151,23 @@
             f_process_id: this.selectdata.f_process_id
           }
         }),
-        showWork: false
+        showWork: false,
+        showUserAddress: false
       }
     },
     ready () {
       this.search()
     },
     methods: {
+      //添加方法
+      add(val){
+        if(val === '民用') {
+          this.showUserAddress = true
+        }
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add',val)
+        this.showrightchange = false;
+      },
       showFileModal() {
         this.showFile = !this.showFile
       },
@@ -144,6 +181,9 @@
         // 将选的文件清空
         this.$refs.file.$el.querySelector('input').value = ''
         this.search()
+      },
+      closeUserAddress() {
+        this.showUserAddress = false
       }
     },
     events: {

package/src/filiale/jinhuang/pc.js

@@ -3,6 +3,9 @@ import Vue from 'vue'
 let specialComp = {
   'apply-charge-management-new': (resolve) => { require(['./pc/chargeManagementNew'], resolve) },
   'apply-address-userinfo-management': (resolve) => { require(['./pc/addressAndUserinfoManagement'], resolve) },
+  'add-material-science': (resolve) => { require(['./pc/addMaterialScience'], resolve) },
+  'contract-list': (resolve) => { require(['./pc/ContractList.vue'], resolve) },
+  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect'], resolve) },
   'service-control': (resolve) => { require(['./pc/ServiceControl.vue'], resolve) }
 }
 exports.specialComp = specialComp

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

@@ -343,24 +343,24 @@
           </button>
         </footer>
       </modal>
-<!--      <modal :show.sync="showmaterial"  backdrop="false" style="overflow: scroll;height: 100%">-->
-<!--        <header slot="modal-header" class="modal-header text-center">-->
-<!--          <button type="button" class="close" @click="showmaterial = false"><span>&times;</span></button>-->
-<!--          <h4 class="modal-title">材料收费列表</h4>-->
-<!--        </header>-->
-<!--        <article slot="modal-body">-->
-<!--          <charges-list v-if="showmaterial" :selectdata = "selectdata"></charges-list>-->
-<!--        </article>-->
-<!--        <footer slot="modal-footer"></footer>-->
-<!--      </modal>-->
-      <!--</form>-->
+      <modal :show.sync="showmaterial"  backdrop="false" style="overflow: scroll;height: 100%">
+        <header slot="modal-header" class="modal-header text-center">
+          <button type="button" class="close" @click="showmaterial = false"><span>&times;</span></button>
+          <h4 class="modal-title">材料收费列表</h4>
+        </header>
+        <article slot="modal-body">
+          <charges-list v-if="showmaterial" :selectdata = "selectdata"></charges-list>
+        </article>
+        <footer slot="modal-footer"></footer>
+      </modal>
+      </form>
     </validator>
   </div>
 </template>
 <script>
 import Vue from 'vue'
 import {isEmpty} from "../../../components/Util";
-// import chargesList from "telephone-clients/src/filiale/qianneng/android/chargesList";
+import chargesList from "telephone-clients/src/filiale/qianneng/android/chargesList";
 // Date格式化
 Date.prototype.Format = function (fmt) {
   var o = {
@@ -413,7 +413,7 @@ export default {
 
   },
   components: {
-    // 'charges-list': chargesList
+     'charges-list': chargesList
   },
   created () {
     // 初始化数据

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

@@ -15,7 +15,7 @@
                 <label class="font_normal_body">操&ensp;作&ensp;人：</label>
                 <input type="text" style="width: 60%" class="input_search" placeholder='操作人' v-model="model.f_operator"
                        v-on:keyup.enter="$parent.$parent.search()"
-                       condition="a.f_operator like '%{}%'">
+                       condition="toh.f_operator like '%{}%'">
               </div>
               <div class="form-group col-sm-3 button-range">
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>

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

@@ -348,7 +348,7 @@
               </tr>
               <tr>
                 <td class="input-center" :style="stylecss">用气设备:</td>
-                <td class="input-center" colspan="2" :style="stylecss">{{f_gas_appliances}}</td>
+                <td class="input-center" colspan="2" :style="stylecss">{{userinfo.f_gas_appliances}}</td>
                 <td class="input-center" :style="stylecss">防盗卡号:</td>
                 <td class="input-center" colspan="2" :style="stylecss"></td>
               </tr>
@@ -455,7 +455,7 @@
               </tr>
               <tr>
                 <td class="input-center" :style="stylecss">用气设备:</td>
-                <td class="input-center" colspan="2" :style="stylecss">{{f_gas_appliances}}</td>
+                <td class="input-center" colspan="2" :style="stylecss">{{userinfo.f_gas_appliances}}</td>
                 <td class="input-center" :style="stylecss">防盗卡号:</td>
                 <td class="input-center" colspan="2" :style="stylecss"></td>
               </tr>
@@ -716,6 +716,10 @@ export default {
       this.userinfo = {}
       this.userfiles = {}
       this.userinfo = {}
+      this.userinfo = row
+      if (this.userinfo.f_apply_type == '居民用户报建' || this.userinfo.f_apply_type == '居民团体单户报建'){
+        this.userinfo.f_gas_appliances = this.jsontostring(this.userinfo.f_gas_appliances)
+      }
       let http = new HttpResetClass()
       let condition1 = ''
       if (row.f_sub_state === '完工') {
@@ -729,13 +733,13 @@ export default {
      await http.load('POST', 'rs/sql/getUserFilesAndDevicesAmount', {data: data}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then(res => {
+      }).then(async res => {
         this.userfiles = res.data[0]
         data = {
           tablename: 'activityins',
           condition: `id = (select max(id) from activityins where processid = '${row.f_process_id}' and defname = '合同签订')  `
         }
-        http.load('POST', 'rs/sql/apply_singleTable', {data: data}, {
+        await http.load('POST', 'rs/sql/apply_singleTable', {data: data}, {
           resolveMsg: null,
           rejectMsg: null
         }).then(res1 => {
@@ -743,7 +747,6 @@ export default {
           this.userfor.finishtime = res1.data[0].finishtime.substring(0, 10)
         })
       })
-      this.userinfo = row
     },
   },
   computed: {

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

@@ -167,7 +167,7 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
-          ===       <label for="ventilateEndDat' and  f_back_reason  is not  null\'''abel>
+                <label for="ventilateEndDate" class="font_normal_body">结束时间：</label>
                 <datepicker id="ventilateEndDate" placeholder="通气验收结束日期"
                             style="width: 60%!important;"
                             v-model="model.ventilateEndDate"

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

@@ -564,14 +564,21 @@
       // 搜索楼号
       async 'searchbuilding' (index) {
         this.setLabelValue('楼号/组', null)
+        this.selectdata.f_residential_area = this.getLableValue('小区')
+        this.selectdata.f_street = this.getLableValue('街道/乡镇')
+        if (isEmpty(this.selectdata.f_residential_area)){
+          return
+        }
         let data = {
-          tablename: 't_building',
-          condition: `f_filialeid = '${this.$login.f.orgid}' and f_residential_area like '%${this.selectdata.f_residential_area}%'`
+          items:'b.f_building',
+          orderitem: 'b.id',
+          tablename: 't_building b left join t_area a on b.f_residential_area_id = a.id',
+          condition: `b.f_filialeid = '${this.$login.f.orgid}' and b.f_residential_area like '%${this.selectdata.f_residential_area}' and a.f_street = '${this.selectdata.f_street}'`
         }
         let http = new HttpResetClass()
         let res = await http.load(
           'POST',
-          `rs/sql/apply_singleTable`,
+          `rs/sql/tel_singleTable_OrderBy`,
           {data: data},
           {resolveMsg: null, rejectMsg: '楼号查询失败！！！'}
         )

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

@@ -1123,14 +1123,19 @@
       // 搜索楼号
       async 'searchbuilding' (index) {
         this.setLabelValue('楼号/组', null)
+        if (isEmpty(this.show_data.f_residential_area)){
+          return
+        }
         let data = {
-          tablename: 't_building',
-          condition: `f_filialeid = '${this.$login.f.orgid}' and f_residential_area like '%${this.show_data.f_residential_area}%'`
+          items:'b.f_building',
+          orderitem: 'b.id',
+          tablename: 't_building b left join t_area a on b.f_residential_area_id = a.id',
+          condition: `b.f_filialeid = '${this.$login.f.orgid}' and b.f_residential_area like '%${this.show_data.f_residential_area}%' and a.f_street = '${this.show_data.f_street}'`
         }
         let http = new HttpResetClass()
         let res = await http.load(
           'POST',
-          `rs/sql/apply_singleTable`,
+          `rs/sql/tel_singleTable_OrderBy`,
           {data: data},
           {resolveMsg: null, rejectMsg: '楼号查询失败！！！'}
         )

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

@@ -1820,7 +1820,8 @@ events: {
   // 失去焦点出触发事件
   'onchange' (index) {
     if (this.show_data.defname === '报装申请' || this.show_data.defname === '信息确认') {
-      this.show_data.f_user_name = this.show_data.f_user_name.trim()
+      let f_user_name = this.getLableValue('用户名称')
+      this.setLabelValue("用户名称", f_user_name.trim())
       if (
         this.show_data.fields[index].label === '区/县' ||
         this.show_data.fields[index].label === '街道/乡镇' ||

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="col-sm-12 col-xs-12 form-group app-btn">
-      <button v-show="Vue.user.f_role_name.includes('报建收费')" class="btn btn-info" @click.prevent="showCharge = true">收费</button>
+    <div class="col-sm-12 col-xs-12 form-group app-btn" v-if="showadd">
+      <button  class="btn btn-info" @click.prevent="showCharge = true">收费</button>
     </div>
     <div class="col-sm-12 col-xs-12">
       <list :model="model" partial='list'>
@@ -452,10 +452,14 @@ export default {
         }
         if (flag){
           let show_data = this.selectdata
-          show_data.user = this.$login.f
+          show_data.user = Vue.user
           show_data.start_activity ='报装申请'
           show_data.xmlfilename =this.selectdata.f_apply_type
-          show_data.button = {button_name:'提交'}
+          if (((show_data.f_apply_type == '民用散户报建流程' || show_data.f_apply_type == '民用预留户报建流程') && show_data.defname == '工程审批') || this.show_data.defname === '工程决算'){
+            show_data.button = {button_name:'跳过'}
+          }else {
+            show_data.button = {button_name:'提交'}
+          }
           await this.$resetpost(
             `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyProductService`,
             {data: show_data},
@@ -484,6 +488,9 @@ export default {
   events: {
   },
   computed: {
+    showadd() {
+      return Vue.user.f_role_name.includes('报建收费')
+    },
     paymentMethod() {
       return this.$appdata.getParam("付款方式")
     },

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

@@ -8,7 +8,7 @@
           <th>付款比例</th>
           <th>应收金额</th>
           <th>
-            <button type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button>
+            <button v-if="Vue.user.f_role_name.includes('付款预设-新增')" type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button>
           </th>
         </tr>
       </template>
@@ -28,8 +28,8 @@
           </td>
           <td style="text-align: center;">
             <nobr><font>
-              <button type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
-              <button type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
+              <button v-if="Vue.user.f_role_name.includes('付款预设-修改')" type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
+              <button  v-if="Vue.user.f_role_name.includes('付款预设-删除')" type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
             </font></nobr>
           </td>
         </tr>

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

@@ -40,13 +40,12 @@
                 width="100%"
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
-                condition="u.f_apply_type like '%{}%'"
+                condition="u.f_apply_type in {}"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
-                :value-single="true"
-                @change="$parent.$parent.applyTypeChange()"
-                close-on-select ></v-select>
+                :multiple="true"
+                 ></v-select>
             </div>
           </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
@@ -111,6 +110,70 @@
               </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="startDate" placeholder="计划通气开始日期"
+                          style="width: 100%!important;"
+                          v-model="model.jihuastart"
+                          :value.sync="model.jihuastart"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="u.f_reconnaissance_time >= '{}'">
+              </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="startDate" placeholder="计划通气结束日期"
+                          style="width: 100%!important;"
+                          v-model="model.jihuaend"
+                          :value.sync="model.jihuaend"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="u.f_reconnaissance_time <= '{}'">
+              </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="startDate" placeholder="预计通气开始时间"
+                          style="width: 100%!important;"
+                          v-model="model.yujistart"
+                          :value.sync="model.yujistart"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="u.f_yjgase_time >= '{}'">
+              </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="startDate" placeholder="预计通气结束时间"
+                          style="width: 100%!important;"
+                          v-model="model.yujiend"
+                          :value.sync="model.yujiend"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="u.f_yjgase_time <= '{}'">
+              </datepicker>
+            </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_cumulative_payment_money condition="u.f_cumulative_payment_money >= '{}'" />
+            </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_cumulative_payment_money2 condition="u.f_cumulative_payment_money <= '{}'" />
+            </div>
+          </div>
 <!--          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">稍后处理：</label>
             <div class="col-xs-8" >
@@ -157,6 +220,10 @@
               <p class="col-xs-3 text-left font"><b>客户编号：</b></p>
               <p :class="[ row.defname =='通气点火' && (row.f_apply_nature=='热水器' || row.f_apply_nature=='壁挂炉') ? 'redy' : (row.f_apply_nature=='热水器' || row.f_apply_nature=='壁挂炉' ? 'pred': (row.defname =='通气点火' ? 'p1':''))]" class="col-xs-9 text-left input-font">{{ row.f_userinfo_code }}</p>
             </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>合同编号：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_contract_number}}</p>
+            </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>合同金额：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_contract_money}}</p>
@@ -295,7 +362,7 @@ export default {
       // applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'}],
       criteriaShow: false,
      //  applytype: [{label: '全部', value: ''}, {label:'团购转散户',value:'团购转散户'} ], // 所有报建类型
-      defnames: [{label: '全部', value: ''}],
+      defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
       applyNatures: [{label: '全部', value: ''}], // 报建性质
       laterList: [
         {label: '全部', value: ''},

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

@@ -183,6 +183,31 @@ export default {
 
   },
   methods: {
+   async getdefaultmaterial() {
+     this.material = []
+      let datarow = {
+        workname: 'materials'
+      }
+      let http = new HttpResetClass()
+      let row = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetConfigs`,
+        {data: datarow},
+        {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'})
+      let material = row.data[this.selectdata.f_apply_type]
+      if (!isEmpty(material)&& material.length>0){
+        for (let i = 0; i < material.length; i++){
+          this.material.push({
+            f_material_name: material[i].f_material_name,
+            f_material_style: material[i].f_material_style,
+            f_overlength_unitprice:"0",
+            f_overlength_number:"0",
+            f_discounts_money_detail:"0",
+            f_actual_materials_detail:"0"
+          })
+        }
+      }
+    },
     delete_material(i) {
       console.log('删除项====', i)
       this.material.splice(i, 1)
@@ -269,6 +294,7 @@ export default {
         }
         // 所有型号
         this.newmaterialnameandtype =materialNumbers
+        this.getdefaultmaterial()
       }).catch((e) => {
         console.log("933", e)
       })
@@ -637,7 +663,10 @@ export default {
         this.material.forEach((row) => {
           if (row.f_material_price != 0) {
             if(row.f_material_name.name=="自闭阀"){
-              str="自闭阀"
+              str=this.$appdata.getSingleValue(`报建自闭阀收费类型`)
+            }
+            if(row.f_material_name.name=="燃具管(连接管)"){
+              str=this.$appdata.getSingleValue(`报建燃具管收费类型`)
             }
             otherdetail.push({
               f_brand_spec: [`${str}`],