apply-clients 3.3.110-207 → 3.3.110-210

package/package.json

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

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

@@ -226,8 +226,8 @@ export default {
           {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
         )
         console.log('打印查询的内容',restp1)
-        restp1.data[0].processname = '散户报建流程'
-        restp1.data[0].defname = '报装缴费'
+        // restp1.data[0].processname = '散户报建流程'
+        // restp1.data[0].defname = '报装缴费'
         this.$dispatch('gotoson',restp1.data[0])
         this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self',restp1.data[0])
       }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
@@ -246,8 +246,8 @@ export default {
           {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
         )
         console.log('打印查询的内容',restp2)
-        restp2.data[0].processname = '散户报建流程'
-        restp2.data[0].defname  = '工程派工'
+        // restp2.data[0].processname = '散户报建流程'
+        // restp2.data[0].defname  = '工程派工'
         this.$dispatch('gotoson',restp2.data[0])
         this.$goto('app-service-control', {selectdata: restp2.data[0]}, 'self',restp2.data[0])
       }

package/src/components/android/Process/Processes/AppAddMaterialScience.vue

@@ -150,6 +150,7 @@
 </template>
 
 <script>
+  import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
   export default {
     name: 'addMaterialScience',
@@ -190,7 +191,7 @@
           condition: `f_process_id='${this.selectdata.f_process_id}'`
         }
         let res = await this.$resetpost(
-          'rs/sql/singleTable',
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
           {data: data},
           {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
         )
@@ -234,7 +235,7 @@
         let http = new HttpResetClass()
         let res = await http.load(
           'POST',
-          `rs/sql/getStockMaterial`,
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/getStockMaterial`,
           {data: data},
           {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
         )
@@ -260,15 +261,15 @@
         this.title = '新增'
         let data = {
           f_process_id : this.selectdata.f_process_id,
-          f_operator_id: this.$login.f.id,
-          f_operator: this.$login.f.name,
+          f_operator_id: Vue.user.id,
+          f_operator: Vue.user.name,
           f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
-          f_orgid: this.$login.f.f_orgids,
-          f_orgname: this.$login.f.f_fengongsi,
+          f_orgid: Vue.user.orgid,
+          f_orgname: Vue.user.orgs,
           materials:this.materials
         }
         let res = await this.$resetpost(
-          `rs/logic/saveMaterials`,
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
           data
         )
         this.closeMaterials()
@@ -280,7 +281,7 @@
 
             let res = http.load(
               'DELETE',
-              `rs/entity/t_material_apply/${row.id}`,
+              `${this.$androidUtil.getProxyUrl()}/rs/entity/t_material_apply/${row.id}`,
               null,
               {resolveMsg: null, rejectMsg: '删除失败！！！'}
             )
@@ -312,7 +313,7 @@
         data.f_material_number = this.materials[0].f_material_number
         data.f_material_code = this.materials[0].f_material_code
         let res = await this.$resetpost(
-          `rs/entity/t_material_apply`,
+          `${this.$androidUtil.getProxyUrl()}/rs/entity/t_material_apply`,
           data
         )
         this.closeMaterials()

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

@@ -257,14 +257,15 @@
       },
       // 新增材料
       async addMaterial () {
+        console.log("登录信息：",this.$login.f)
         this.title = '新增'
         let data = {
           f_process_id : this.selectdata.f_process_id,
           f_operator_id: this.$login.f.id,
           f_operator: this.$login.f.name,
           f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
-          f_orgid: this.$login.f.f_orgids,
-          f_orgname: this.$login.f.f_fengongsi,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
           materials:this.materials
         }
         let res = await this.$resetpost(