apply-clients 3.3.110-208 → 3.3.110-211

package/package.json

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

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',
@@ -185,12 +186,14 @@
     },
     methods: {
       async getOnetoManyData () {
+        let http = new HttpResetClass()
         let data = {
           tablename: `t_material_apply`,
           condition: `f_process_id='${this.selectdata.f_process_id}'`
         }
-        let res = await this.$resetpost(
-          'rs/sql/singleTable',
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
           {data: data},
           {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
         )
@@ -234,7 +237,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 +263,17 @@
         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`,
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
           data
         )
         this.closeMaterials()
@@ -277,10 +282,9 @@
         this.$showMessage('您确定要删除这条记录吗？',['confirm']).then(res =>{
           if (res === 'confirm'){
             let http = new HttpResetClass()
-
             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: '删除失败！！！'}
             )
@@ -311,8 +315,10 @@
         data.f_material_unit = this.materials[0].f_material_unit
         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`,
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `${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(