apply-clients 3.3.19 → 3.3.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.19",
+  "version": "3.3.23",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -95,7 +95,7 @@
     "system-clients": "3.1.87",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.25",
+    "vue-client": "1.24.31",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/android/Process/AppServiceControl.vue

@@ -660,7 +660,10 @@ export default {
         null,
         {resolveMsg: null, rejectMsg: '删除失败！！！'}
       )
-
+      res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+        this.show_data
+      )
       this.breakControl()
     },
     async 'onetomanyupdate' (index, rowIndex) {
@@ -673,6 +676,10 @@ export default {
         `${this.$androidUtil.getProxyUrl()}/rs/entity/${this.show_data.onetomany[index].tables[0]}`,
         data
       )
+      res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+        this.show_data
+      )
       this.breakControl()
     },
     async 'onetomanyadd' (index) {
@@ -691,6 +698,10 @@ export default {
         `${this.$androidUtil.getProxyUrl()}/rs/entity/${this.show_data.onetomany[index].tables[0]}`,
         data
       )
+      res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+        this.show_data
+      )
       this.breakControl()
     },
     'onbutchange' (index) {

package/src/components/android/Supervisory/AppSupervisoryCart.vue

@@ -2,10 +2,6 @@
   <div style="padding: 10px">
     <div partial class="auto app-text panel" style="margin-bottom: 20px">
       <div class="panel-body panel-self">
-        <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">{{ selectdata.f_entry_name }}</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">{{ selectdata.f_user_name }}</p>

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -231,10 +231,7 @@ export default {
     async getChargeAll () {
       let http = new HttpResetClass()
       let data = {
-        condition: this.model.condition,
-        data: {
-          orgid: this.$login.f.orgid
-        }
+        condition: this.model.condition + ` and cr.f_orgid = '${this.curorgid[0]}'`
       }
       let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
 

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -153,6 +153,15 @@
       }
     },
     events: {
+      // 信息修改
+      async 'modifyUserInfo' () {
+        let res = await this.$resetpost(
+          `rs/logic/modifyUserInfo`,
+          this.show_data,
+          {resolveMsg: null, rejectMsg: '用户信息修改失败！！！'}
+        )
+        this.$dispatch('search')
+      },
       async 'stopApply' () {
 
         let data = {

package/src/components/product/Process/Processes/InstallationDetails.vue

@@ -22,7 +22,7 @@
                    href="/apply/download/excel/安装明细.xlsx" download>模板下载</a>
                 <export-excel :data="$parent.$parent.$parent.getCondition"
                               :field="$parent.$parent.$parent.getfield"
-                              sqlurl="rs/logic/exportfile"
+                              sqlurl="rs/logic/applyExportfile"
                               sql-name="getInstallableAddress"
                               template-name='可安装地址'
                               btn-name="导出可安装"

package/src/components/product/Process/Service/ServiceControl.vue

@@ -555,6 +555,30 @@ export default {
     }
   },
   events: {
+    async 'searchArea' (area, index) {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.show_data.f_street}' and f_residential_area like '%${area}%'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+      )
+
+      if (res.data.length === 0) {
+        return
+      }
+
+      this.setLabelOptions('集收单位', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
     // 选择气价
     'priceChange' (index) {
       if (isEmpty(this.show_data.stairPrice)) {
@@ -586,6 +610,7 @@ export default {
         {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
       )
       this.show_data.f_dev_id = res.data[0].id
+      this.show_data.f_dev_code = res.data[0].f_dev_code
       this.setLabelValue('法人名称', res.data[0].f_legal_person)
       this.setLabelValue('身份证', res.data[0].f_idnumber)
       this.setLabelValue('营业执照', res.data[0].f_license_num)
@@ -937,6 +962,8 @@ export default {
         this.addressInitialization()
         this.hideLabels('用户编号')
         this.electiveLabels('用户编号')
+        this.showLabels('片区', '地址类型')
+        this.requiredLabels('片区', '地址类型')
       }
       if (this.show_data.f_apply_source === '自动发起') {
         this.hideLabels('片区', '地址类型')
@@ -1003,6 +1030,7 @@ export default {
         }
       }
     },
+    selectSearch (val, index) {},
     'onblur' (index) {},
     'oninput' (index) {},
     'initializtionView' () {},
@@ -1025,6 +1053,11 @@ export default {
         {resolveMsg: null, rejectMsg: '删除失败！！！'}
       )
 
+      res = await this.$resetpost(
+        'rs/entity/t_apply',
+        this.show_data
+      )
+
       this.$dispatch('breakControl', this.show_data)
     },
     async 'onetomanyupdate' (index, rowIndex) {
@@ -1038,6 +1071,11 @@ export default {
         data
       )
 
+      res = await this.$resetpost(
+        'rs/entity/t_apply',
+        this.show_data
+      )
+
       this.$dispatch('breakControl', this.show_data)
     },
     async 'onetomanyadd' (index) {
@@ -1056,6 +1094,12 @@ export default {
         `rs/entity/${this.show_data.onetomany[index].tables[0]}`,
         data
       )
+
+      res = await this.$resetpost(
+        'rs/entity/t_apply',
+        this.show_data
+      )
+
       this.$dispatch('breakControl', this.show_data)
     },
     'onbutchange' (index) {

package/src/components/product/ServiceView.vue

@@ -84,6 +84,7 @@
                 class="select select_list"
                 @blur="onblur(index)"
                 @change="onchange(index)"
+                @select-search="selectSearch($arguments,index)"
                 :readonly="item.readonly"
                 :disable="item.disabled"
                 :value.sync="data.fields[index].value"
@@ -408,8 +409,6 @@ export default {
         this.$dispatch(this.data.fields[index].onchange, index)
       }
       this.$dispatch('onchange', index)
-
-
     },
     // 失去焦点触发，无论值是否发生变化
     onblur (index) {
@@ -430,6 +429,12 @@ export default {
       }
       this.$dispatch('oninput', index)
     },
+    selectSearch(event, index) {
+      if (this.data.fields[index].selectSearch) {
+        this.$dispatch(this.data.fields[index].selectSearch, event[0], index)
+      }
+      this.$dispatch('selectSearch', event[0], index)
+    },
     // 点击按钮组按钮
     async click_but (button) {
       this.disable_button = true

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -161,7 +161,7 @@
           let res = await http.load('POST', 'rs/search', {
             source: 'this.getInfo()',
             userid: this.selectdata.userid
-          }, {resolveMsg: null, rejectMsg: null})
+          }, {resolveMsg: null, rejectMsg: '处理人员获取失败！！！'})
           let user = res.data
           this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
           this.data.operator = this.selectdata.person
@@ -169,6 +169,20 @@
           this.data.parentname = user.deps
         }
 
+        // 未结束且是下发查看指定人员
+        if (this.selectdata.state !== '结束' && this.selectdata.actorexpression.indexOf('PI') === 0) {
+          let http = new HttpResetClass()
+          let res = await http.load('POST', 'rs/search', {
+            source: 'this',
+            userid: this.selectdata.actorexpression.substring(3, this.selectdata.actorexpression.length-1)
+          }, {resolveMsg: null, rejectMsg: '处理人员获取失败！！！'})
+          let user = res.data
+          this.data.operate_date = new Date().Format('yyyy-MM-dd')
+          this.data.operator = user.name
+          this.data.orgs = user.orgs
+          this.data.parentname = user.f_department_name
+        }
+
         // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
         let temp = JSON.parse(JSON.stringify(this.data))