apply-clients 3.4.25 → 3.4.27

package/package.json

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

package/src/filiale/guangxi/android/Process/Processes/AppAddMaterialScience.vue

@@ -118,6 +118,7 @@
                      placeholder="设备数量"
                      v-model="item.f_material_number"
                      :value="item.f_material_number"
+                     @change="sumMaterialmoney(i)"
               />
             </div>
           </div>
@@ -231,6 +232,9 @@
       this.getOnetoManyData()
     },
     methods: {
+      sumMaterialmoney(i){
+
+      },
       async getOnetoManyData () {
         let http = new HttpResetClass()
         let data = {
@@ -293,7 +297,7 @@
 
         this.meterialOptions = res.data.map(item => {
           return {
-            'label': `${item.f_material_name}--${item.f_material_unit}--${item.f_material_price}`,
+            'label': `${item.f_material_name}`,
             'value': item
           }
         })

package/src/filiale/guangxi/pc/ApplyCharge/chargeManagement.vue

@@ -511,17 +511,31 @@ export default {
         resolveMsg: null,
         rejectMsg: '缴费失败！！！'
       })
-      debugger
-      if(res.data.jiekouresult =='0000' && this.charge.f_is_invoice=='是'){
-        // let self={}
-        // self.row={}
-        // self.invoice_is_pax='征税'
-        // self.row.id=res.recordid
-        // this.eticket_show = true
-        // await this.$refs.eticketbill.openETicket([res.data.id],self.row,'是',self.invoice_is_pax,'报建收费')
-        this.$showMessage("开票成功，请前往发票管理查看！")
-      }else{
-        this.$showMessage("开票失败，请联系管理人员查看！")
+      if(this.charge.f_is_invoice=='是' && res.data.recordid !=null && res.data.recordid !=''){
+        let data1 = {
+          id : [
+            res.data.recordid
+          ],
+          f_charge_type : '报建收费',
+          f_operatorid : data.user.id,
+          f_operator : data.user.name,
+          f_depid : data.user.depids,
+          f_depname : data.user.deps,
+          f_orgname : data.user.orgs,
+          f_orgid : data.user.orgid
+        }
+        let res1 = await http.load('POST', 'rs/gxinvoice/OpenEticket', {data:data1}, {
+          resolveMsg: null,
+          rejectMsg: '开票失败！！！'
+        })
+        console.log('打印 res1',res1)
+        if(res1.data.code=='0000'){
+             this.$showMessage("开票成功，请前往发票管理查看！")
+        }else if(res1.data.code=='0011'){
+          this.$showMessage("开票超时，请前往发票记录页面重新查询!")
+        }else{
+             this.$showMessage("开票失败，请联系管理人员查看！")
+        }
       }
       this.selectdata = res.data
 

package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue

@@ -127,6 +127,7 @@
                      placeholder="设备数量"
                      v-model="item.f_material_number"
                      :value="item.f_material_number"
+                     @change="sumMaterialmoney(i)"
               />
             </div>
           </div>
@@ -209,6 +210,11 @@
       this.getOnetoManyData()
     },
     methods: {
+      sumMaterialmoney(index){
+        debugger
+        this.materials[index].f_material_money = this.materials[index].f_material_price * this.materials[index].f_material_number
+        console.log('打印',this.materials[index].f_material_money)
+      },
       async getOnetoManyData () {
         let data = {
           tablename: `t_material_detail`,
@@ -273,7 +279,7 @@
 
         this.meterialOptions = res.data.map(item => {
           return {
-            'label': `${item.f_material_name}--${item.f_material_unit}--${item.f_material_price}`,
+            'label': `${item.f_material_name}`,
             'value': item
           }
         })

package/src/main.js

@@ -8,7 +8,7 @@ import {material} from 'material-client'
 
 import apply from './apply'
 
-import applyAndroid from './applyAndroid'
+// import applyAndroid from './applyAndroid'
 
 all()
 apply('guangxi')