apply-clients 3.3.110-219 → 3.3.110-222

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.110-219",
+  "version": "3.3.110-222",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

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

@@ -268,11 +268,11 @@ export default {
       }),
       showModal: false,
       applyType: '',  // 报建类型
-      applyTypes:this.$appdata.getParam("手机报建类型"),
-      // applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'},{label:'团购报建',value:'团购报建'},{label:'改管报建',value:'改管报建'},{label:'增容报建',value:'增容报建'},{label:'退款报建',value:'退款报建'},{label:'团购转散户',value:'团购转散户'},{label:'报警器报建',value:'报警器报建'},{label:'工商业报警器报建',value:'工商业报警器报建'}],
+      // applyTypes:this.$appdata.getParam("手机报建类型"),
+      applyTypes:[{label:'散户报建',value:'散户报建'},{label:'工商户报建',value:'工商户报建'},{label:'团购报建',value:'团购报建'},{label:'改管报建',value:'改管报建'},{label:'增容报建',value:'增容报建'},{label:'退款报建',value:'退款报建'},{label:'团购转散户',value:'团购转散户'},{label:'报警器报建',value:'报警器报建'},{label:'工商业报警器报建',value:'工商业报警器报建'}],
       criteriaShow: false,
     //  applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-      applytype: [{label: '全部', value: ''},  ...this.$appdata.getParam('报建类型') || [] ], // 所有报建类型
+      applytype: [{label: '全部', value: ''}, {label:'团购转散户',value:'团购转散户'} ], // 所有报建类型
       defnames: [{label: '全部', value: ''}],
       applyNatures: [{label: '全部', value: ''}], // 报建性质
       laterList: [
@@ -328,7 +328,7 @@ export default {
       this.$refs.cp.$refs.cri.search()
     },
     searchCondition (args) {
-      //args.condition += `and act.defname in ${this.appDefnames}`
+      args.condition =  args.condition + `and (f_apply_type !='团购转散户报建' and act.defname!='信息确认' )`
       this.model.search(args.condition, args.model)
     },
     click (row) {

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

@@ -192,7 +192,7 @@ export default {
         let http = new HttpResetClass()
         let restpz = await http.load(
           'POST',
-          `rs/sql/checkuser`,
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,
           {data: dataz},
           {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
         )
@@ -652,12 +652,13 @@ 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 = '${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}'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
-        `rs/sql/singleTable`,
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
         {data: data},
         {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
       )
@@ -676,21 +677,24 @@ export default {
 
       let data = {
         tablename: 't_street',
-        condition: `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
+        // condition: `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
       }
       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 = '${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 = '市区'`
       }
       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 = '${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 = '乡镇'`
       }
 
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
-        `rs/sql/singleTable`,
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
         {data: data},
         {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
       )
@@ -943,27 +947,6 @@ export default {
         }
       })
     },
-    async getDesignerPeople () {
-      let data = {
-        source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
-        userid: Vue.user.id
-      }
-
-      let http = new HttpResetClass()
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/search`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: '设计人员查询失败！！！'}
-      )
-
-      return res.data.map(item => {
-        return {
-          label: item.name,
-          value: item.id
-        }
-      })
-    },
     // 获取片区
     async getSliceArea () {
       let data = {
@@ -1250,27 +1233,6 @@ export default {
         }
       }
     },
-    async getDesignerPeople () {
-      let data = {
-        source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
-        userid: this.$login.f.id
-      }
-
-      let http = new HttpResetClass()
-      let res = await http.load(
-        'POST',
-        `rs/search`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: '设计人员查询失败！！！'}
-      )
-
-      return res.data.map(item => {
-        return {
-          label: item.name,
-          value: item.id
-        }
-      })
-    },
     // 申请节点初始化
     'applyReadyEvent' () {
       this.addressInitialization()
@@ -1278,21 +1240,6 @@ export default {
       this.pcdChange()
       this.streetChange()
     },
-    // 合同金额失去焦点
-    async 'contractMoneyChange' (index) {
-      let data = {
-        operator: '+',
-        num1: this.show_data.f_contract_money || 0,
-        num2: this.getLableValue('追加金额') || 0
-      }
-      let res = await this.$resetpost(
-              `${this.$androidUtil.getProxyUrl()}/rs/logic/compute`,
-              {data: data},
-              {resolveMsg: null, rejectMsg: '金额计算失败！！！'}
-      )
-
-      this.setLabelValue('应交金额', res.data)
-    },
     // 街道失去焦点
     async 'streetChange' (index) {
       if (isEmpty(this.show_data.f_street)) {