apply-clients 3.5.5-10 → 3.5.5-101

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

@@ -559,6 +559,7 @@ export default {
       userinfo:{},
       userfiles:{},
       userfor:{},
+      f_gas_appliances:'',
       getfield: {
         'f_apply_num': '工程编号',
         'f_userinfo_code': '客户编号',
@@ -716,6 +717,12 @@ export default {
       this.userinfo = {}
       this.userfiles = {}
       this.userinfo = {}
+      this.userinfo = row
+      if (this.userinfo.f_apply_type == '居民用户报建' || this.userinfo.f_apply_type == '居民团体单户报建'){
+        this.f_gas_appliances = this.jsontostring(this.userinfo.f_gas_appliances)
+      }else {
+        this.f_gas_appliances = this.userinfo.f_gas_appliances
+      }
       let http = new HttpResetClass()
       let condition1 = ''
       if (row.f_sub_state === '完工') {
@@ -729,13 +736,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,8 +750,18 @@ export default {
           this.userfor.finishtime = res1.data[0].finishtime.substring(0, 10)
         })
       })
-      this.userinfo = row
     },
+    jsontostring (row) {
+      if (!isEmpty(row)) {
+        if (typeof row === 'string') {
+          return JSON.parse(row).join()
+        }
+        if (Array.isArray(row)) {
+          return row.join()
+        }
+      }
+      return ''
+    }
   },
   computed: {
     getCondition () {

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/InstallFunction.vue

@@ -1,188 +1,188 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div   :class="showData ? 'top' : 'auto'">
-        <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
-      </div>
-      <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='selectdata.title'>
-            <function-service-control  v-ref:service :selectdata="selectdata"></function-service-control>
-          </tab>
-          <tab header='附件'>
-            <apply-upload :blodid="selectdata.f_process_id"
-                          :isupload = "true"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="true"
-                          :issearch="true"
-                          :defname="selectdata.defname"
-            >
-            </apply-upload>
-          </tab>
-        </tabset>
-      </div>
-      <div>
-        <div v-if="showSuper" style="height: 89%">
-          <div class="col-sm-2" style="margin-top: 20px">
-            <supervisory-chart :selectdata="selectdata"></supervisory-chart>
-          </div>
-          <div class="col-sm-10" style="margin-top: 20px">
-            <tabset v-ref:tabs :close="false">
-              <tab :header='selectdata.defname'>
-                <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
-              </tab>
-              <tab header='附件'>
-                <apply-upload :blodid="selectdata.f_process_id"
-                              :isupload = "false"
-                              :isdelete="false"
-                              :isusetype="true"
-                              :isremark = "true"
-                              :takeimg="false"
-                              :issearch="true"
-                              :defname="selectdata.defname">
-                </apply-upload>
-              </tab>
-            </tabset>
-          </div>
-          <div style="height: 1%">
-
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建管理',
-    data () {
-      return {
-        selectdata: null,
-        showtotal: false, // 控制详情显示
-        showData: true,     // 控制列表数据
-        showSuper: false,
-
-        showDataList: true
-      }
-    },
-    created () {
-      this.getConfig()
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let data = {
-          workname: this.selectdata.processname
-        }
-        let res = await this.$resetpost(
-          'rs/logic/ApplyGetConfigs',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-
-        Vue.prototype.$workflow_vue = res.data
-      },
-      // 获取功能配置
-      async getConfig () {
-        let res = await this.$resetpost(
-          'rs/logic/ApplyGetFunction',
-          null,
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-        Vue.prototype.$function_vue = res.data
-      }
-    },
-    events: {
-      async 'apply' (val) {
-        this.selectdata = null
-        this.selectdata = val
-        this.showSuper= false
-        // 获取配置文件
-        await this.loadName()
-        this.$refs.query.$refs.cp.pager = false
-        this.showData = false
-        this.showtotal=false
-        this.showSuper = true
-      },
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-        let http = new HttpResetClass()
-        let data = {
-          condition: `u.id = ${servicedata.id}`,
-          data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.orgid
-          }
-        }
-
-        let res = await http.load('POST', 'rs/sql/checkuserfunction', {data:data}, {
-          resolveMsg: null,
-          rejectMsg: '数据更新失败！！！'
-        })
-
-        this.showtotal = false
-
-        this.selectdata = Object.assign({}, this.selectdata, res.data[0])
-
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      },
-      // 查询
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      },
-      'loadPage' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
-      },
-      // 点击功能操作
-      'func' (funcdata, row) {
-        this.selectdata = Object.assign({}, funcdata, row)
-
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-        // 关闭列表数据
-        this.showData = false
-
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      }
-    }
-  }
-</script>
-<style scoped>
-  /*清除浮动*/
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-  .head{
-    height: auto;
-    font-weight: bold;
-    color: #000000;
-    font-family: 微软雅黑;
-  }
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div   :class="showData ? 'top' : 'auto'">
+        <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
+      </div>
+      <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='selectdata.title'>
+            <function-service-control  v-ref:service :selectdata="selectdata"></function-service-control>
+          </tab>
+          <tab header='附件'>
+            <apply-upload :blodid="selectdata.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="true"
+                          :issearch="true"
+                          :defname="selectdata.defname"
+            >
+            </apply-upload>
+          </tab>
+        </tabset>
+      </div>
+      <div>
+        <div v-if="showSuper" style="height: 89%">
+          <div class="col-sm-2" style="margin-top: 20px">
+            <supervisory-chart :selectdata="selectdata"></supervisory-chart>
+          </div>
+          <div class="col-sm-10" style="margin-top: 20px">
+            <tabset v-ref:tabs :close="false">
+              <tab :header='selectdata.defname'>
+                <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
+              </tab>
+              <tab header='附件'>
+                <apply-upload :blodid="selectdata.f_process_id"
+                              :isupload = "false"
+                              :isdelete="false"
+                              :isusetype="true"
+                              :isremark = "true"
+                              :takeimg="false"
+                              :issearch="true"
+                              :defname="selectdata.defname">
+                </apply-upload>
+              </tab>
+            </tabset>
+          </div>
+          <div style="height: 1%">
+
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建管理',
+    data () {
+      return {
+        selectdata: null,
+        showtotal: false, // 控制详情显示
+        showData: true,     // 控制列表数据
+        showSuper: false,
+
+        showDataList: true
+      }
+    },
+    created () {
+      this.getConfig()
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let data = {
+          workname: this.selectdata.processname
+        }
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
+      },
+      // 获取功能配置
+      async getConfig () {
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetFunction',
+          null,
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+        Vue.prototype.$function_vue = res.data
+      }
+    },
+    events: {
+      async 'apply' (val) {
+        this.selectdata = null
+        this.selectdata = val
+        this.showSuper= false
+        // 获取配置文件
+        await this.loadName()
+        this.$refs.query.$refs.cp.pager = false
+        this.showData = false
+        this.showtotal=false
+        this.showSuper = true
+      },
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+        let http = new HttpResetClass()
+        let data = {
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
+        }
+
+        let res = await http.load('POST', 'rs/sql/checkuserfunction', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '数据更新失败！！！'
+        })
+
+        this.showtotal = false
+
+        this.selectdata = Object.assign({}, this.selectdata, res.data[0])
+
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+      },
+      // 查询
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      },
+      // 点击功能操作
+      'func' (funcdata, row) {
+        this.selectdata = Object.assign({}, funcdata, row)
+
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+        // 关闭列表数据
+        this.showData = false
+
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  /*清除浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+  .head{
+    height: auto;
+    font-weight: bold;
+    color: #000000;
+    font-family: 微软雅黑;
+  }
+</style>

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/qianneng/pc.js

@@ -1,29 +1,29 @@
-import Vue from 'vue'
-
-let specialComp = {
-  'service-control': (resolve) => { require(['./pc/ServiceControl'], resolve) },
-  'service-view': (resolve) => { require(['./pc/ServiceView'], resolve) },
-  'supervisory-list': (resolve) => { require(['./pc/SupervisoryList'], resolve) },
-  'add-material-science': (resolve) => { require(['./pc/addMaterialScience'], resolve) },
-  'installation-details': (resolve) => { require(['./pc/InstallationDetails'], resolve) },
-  'apply-address-userinfo-management': (resolve) => { require(['./pc/addressAndUserinfoManagement'], resolve) },
-  'apply-charge-management': (resolve) => { require(['./pc/chargeManagement'], resolve) },
-  'apply-print-activatecard': (resolve) => { require(['./pc/printactivatecard'], resolve) },
-  'function-service-control': (resolve) => { require(['./pc/FunctionServiceControl'], resolve) },
-  'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) },
-  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect'], resolve) },
-  'apply-batch-dispatch': (resolve) => { require(['./pc/Applybatchdispatch'], resolve) },
-  'installinfoselect': (resolve) => { require(['./pc/InstallInfoSelect'], resolve) },
-  'exploration-user': (resolve) => { require(['./pc/ExplorationUser'], resolve) },
-  'install-function': (resolve) => { require(['./pc/InstallFunction'], resolve) },
-  'apply-upload': (resolve) => { require(['./pc/ApplyUpload'], resolve) },
-  'apply-detail': (resolve) => { require(['./pc/Applydetail'], resolve) },
-  'supervisory-chart': (resolve) => { require(['./pc/SupervisoryhCart'], resolve) },
-  'apply-devices-management': (resolve) => { require(['./pc/devicesManagement'], resolve) },
-  'supplemental-agreement': (resolve) => { require(['./pc/supplementalAgreement'], resolve) },
-  'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList'], resolve) },
-  'apply-print-chargepc': (resolve) => { require(['./pc/printChargepc'], resolve) },
-  'stop-apply-list': (resolve) => { require(['./pc/StopApplyList'], resolve) },
-  'apply-material-detailed': (resolve) => { require(['./pc/ApplyMaterialDetailed.vue'], resolve) },
-}
-exports.specialComp = specialComp
+import Vue from 'vue'
+
+let specialComp = {
+  'service-control': (resolve) => { require(['./pc/ServiceControl'], resolve) },
+  'service-view': (resolve) => { require(['./pc/ServiceView'], resolve) },
+  'supervisory-list': (resolve) => { require(['./pc/SupervisoryList'], resolve) },
+  'add-material-science': (resolve) => { require(['./pc/addMaterialScience'], resolve) },
+  'installation-details': (resolve) => { require(['./pc/InstallationDetails'], resolve) },
+  'apply-address-userinfo-management': (resolve) => { require(['./pc/addressAndUserinfoManagement'], resolve) },
+  'apply-charge-management': (resolve) => { require(['./pc/chargeManagement'], resolve) },
+  'apply-print-activatecard': (resolve) => { require(['./pc/printactivatecard'], resolve) },
+  'function-service-control': (resolve) => { require(['./pc/FunctionServiceControl'], resolve) },
+  'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) },
+  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect'], resolve) },
+  'apply-batch-dispatch': (resolve) => { require(['./pc/Applybatchdispatch'], resolve) },
+  'installinfoselect': (resolve) => { require(['./pc/InstallInfoSelect'], resolve) },
+  'exploration-user': (resolve) => { require(['./pc/ExplorationUser'], resolve) },
+  'install-function': (resolve) => { require(['./pc/InstallFunction'], resolve) },
+  'apply-upload': (resolve) => { require(['./pc/ApplyUpload'], resolve) },
+  'apply-detail': (resolve) => { require(['./pc/Applydetail'], resolve) },
+  'supervisory-chart': (resolve) => { require(['./pc/SupervisoryhCart'], resolve) },
+  'apply-devices-management': (resolve) => { require(['./pc/devicesManagement'], resolve) },
+  'supplemental-agreement': (resolve) => { require(['./pc/supplementalAgreement'], resolve) },
+  'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList'], resolve) },
+  'apply-print-chargepc': (resolve) => { require(['./pc/printChargepc'], resolve) },
+  'stop-apply-list': (resolve) => { require(['./pc/StopApplyList'], resolve) },
+  'apply-material-detailed': (resolve) => { require(['./pc/ApplyMaterialDetailed.vue'], resolve) },
+}
+exports.specialComp = specialComp

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

@@ -1510,7 +1510,13 @@ events: {
   // ===========================================
   async 'button'() {
     if (this.show_data.button.before) {
-      await this[this.show_data.button.before]()
+      if (Array.isArray(this.show_data.button.before)) {
+        for (let i = 0; i < this.show_data.button.before.length; i++) {
+          await this[this.show_data.button.before[i]]()
+        }
+      } else {
+        await this[this.show_data.button.before]();
+      }
     }
     // 点击重置按钮就重置数据
     if (this.show_data.button.button_name === '重置') {