apply-clients 3.5.5-7 → 3.5.5-70

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/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

@@ -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},