telephone-clients 3.0.104-10 → 3.0.104-100

package/src/filiale/qianneng/android/AppInstallationMaterial.vue

@@ -3,11 +3,11 @@
   <div>
     <div style="height: auto;width: 100%;margin: 30px 0" v-if="showQrCode">
       <div partial>
-        <div class=""  align="center">
+        <div class="" align="center">
           <div style="margin-bottom:10px "><img src="../../../assets/scanCode.png">请扫描下方二维码进行付款</div>
           <div class="row app-row">
             <div class="col-xs-12">
-              <label class="font text-left">订单编号:{{order.body.tradeNo}}</label>
+              <label class="font text-left">订单编号:{{ order.body.tradeNo }}</label>
             </div>
             <!--          <div class="col-xs-8">
                         <input type="text" class ="search_input input-font" v-model="order.body.tradeNo" />
@@ -23,9 +23,9 @@
                   </div>-->
           <!--<div @click="callBack('支付成功')">返回</div>-->
         </div>
-        <div class="" align="center" >
+        <div class="" align="center">
           <div class="QR-code" v-if="payType=='二维码支付'">
-            <img src="../../../assets/qrcode_no.png" v-show="isTimeout" style="width: 266px;height: 266px" />
+            <img src="../../../assets/qrcode_no.png" v-show="isTimeout" style="width: 266px;height: 266px"/>
             <div id="qrcode" style="margin-top: 25px;width: 266px;height: 266px"></div>
           </div>
         </div>
@@ -34,8 +34,9 @@
     <div v-show="!showQrCode">
       <material-one v-for="(i, item) in material " :index="$index" :item="item"
                     :materialnameandcode="materialnameandcode"
-                    :newmaterialnameandcode = "newmaterialnameandcode"
-                    :typenumbers="materialtypenumber" @number_chenge="getChangePayNumber" @delete_material="delete_material"></material-one>
+                    :newmaterialnameandcode="newmaterialnameandcode"
+                    :typenumbers="materialtypenumber" @number_chenge="getChangePayNumber"
+                    @delete_material="delete_material"></material-one>
       <div style="padding: 10px;display: flex;justify-content: space-around;">
         <button type="button" class="btn btn-primary" @click="addUserFile">添加</button>
       </div>
@@ -102,7 +103,9 @@
               </div>-->
       </div>
       <div style="padding: 10px;display: flex;justify-content: space-around;">
-        <button type="button"  name="button" class="btn btn-primary btn-sm" style="float: right;margin-right:10px;" @click="beforeSaveCharge()">保存</button>
+        <button type="button" name="button" class="btn btn-primary btn-sm" style="float: right;margin-right:10px;"
+                @click="beforeSaveCharge()">保存
+        </button>
         <button type="button" class="btn btn-primary" @click="cancel">取消</button>
       </div>
     </div>
@@ -110,547 +113,858 @@
 </template>
 
 <script>
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-import QRCode from 'qrcodejs2'
-import {isEmpty} from '../../../components/Util'
-export default {
-  title: '材料添加',
-  props: {
-    selectdata: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      materialname:[],
-      materialTYPE:[],
-      materialnameandcode:[],
-      newmaterialnameandcode:[],
-      materialtypenumber:[],
-      category: {},
-      //支付方式
-      payType: '',
-      //支付总额
-      payNumber: 0,
-      newPayNumber: 0,
-      //支付方式选择框
-      payTypes: [{label: '现金', value: '现金'}, {label: '二维码支付', value: '二维码支付'}],
-      materialImges: [],
-      showFile: false,
-      material: [],
-      positions: this.$appdata.getParam('品名及规格'), // 获取材料名称
-      charge: {
-        payment_terms: [{f_payment_term: '', f_charge_money: '', f_amount_words: '', f_payment_method: ''}]
-      }, // 收费内容
-      showCharge: false, // 收费显示
-      timeLeft: 300, // 收费时间
-      title1: '', // 二维码标题
-      showQrCode: false, // 二维码显示
-      order: {}, // 订单信息
-      f_cost_sum: 0, // 总收费
-      othercharge_id:'',
-      button_state:false,
-      summarize:[]//材料收费方式汇总
-    }
-  },
-  ready() {
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  import QRCode from 'qrcodejs2'
+  import {isEmpty} from '../../../components/Util'
 
-    //this.search()
-    this.getAllMaterial()
-    // this.getmaterial()
-    // this.getmaterialTYPE()
-
-  },
-  methods: {
-    delete_material(i){
-      console.log('删除项====', i)
-      this.material.splice(i, 1)
-      this.getChangePayNumber()
+  export default {
+    title: '材料添加',
+    props: {
+      selectdata: {
+        type: Object
+      }
     },
-    async beforeSaveCharge(){
-      console.log("977666")
-      if( this.material.length==0){
-        return this.$showMessage(`请先添加消耗的材料！`)
+    data() {
+      return {
+        materialname: [],
+        materialTYPE: [],
+        materialnameandcode: [],
+        newmaterialnameandcode: [],
+        materialtypenumber: [],
+        category: {},
+        //支付方式
+        payType: '',
+        //支付总额
+        payNumber: 0,
+        newPayNumber: 0,
+        //支付方式选择框
+        payTypes: [{label: '现金', value: '现金'}, {label: '二维码支付', value: '二维码支付'}],
+        materialImges: [],
+        showFile: false,
+        material: [],
+        positions: this.$appdata.getParam('品名及规格'), // 获取材料名称
+        charge: {
+          payment_terms: [{f_payment_term: '', f_charge_money: '', f_amount_words: '', f_payment_method: ''}]
+        }, // 收费内容
+        showCharge: false, // 收费显示
+        timeLeft: 300, // 收费时间
+        title1: '', // 二维码标题
+        showQrCode: false, // 二维码显示
+        order: {}, // 订单信息
+        f_cost_sum: 0, // 总收费
+        othercharge_id: '',
+        button_state: false,
+        summarize: []//材料收费方式汇总
       }
-      for (let index = 0; index < this.material.length; index++) {
-        const item = this.material[index]
-        if(!item.f_material_name){
-          this.$showMessage(`请选择材料${index+1}的材料名称`)
-          return;
+    },
+    ready() {
+
+      //this.search()
+      this.getAllMaterial()
+      // this.getmaterial()
+      // this.getmaterialTYPE()
+
+    },
+    methods: {
+      delete_material(i) {
+        console.log('删除项====', i)
+        this.material.splice(i, 1)
+        this.getChangePayNumber()
+      },
+      async beforeSaveCharge() {
+        console.log("977666")
+        if (this.material.length == 0) {
+          return this.$showMessage(`请先添加消耗的材料！`)
         }
-        if(!item.f_typenumber){
-          this.$showMessage(`请选择材料${index+1}的型号`)
-          return;
+        for (let index = 0; index < this.material.length; index++) {
+          const item = this.material[index]
+          if (!item.f_material_name) {
+            this.$showMessage(`请选择材料${index + 1}的材料名称`)
+            return;
+          }
+          if (!item.f_typenumber) {
+            this.$showMessage(`请选择材料${index + 1}的型号`)
+            return;
+          }
+          if (!item.f_material_price) {
+            this.$showMessage(`请填写材料${index + 1}的单价`)
+            return;
+          }
+          if (!item.f_material_number || item.f_material_number == 0) {
+            this.$showMessage(`请填写材料${index + 1}的数量`)
+            return;
+          }
         }
-        if(!item.f_material_price){
-          this.$showMessage(`请填写材料${index+1}的单价`)
+        /*if(this.materialImges.length===0){
+          this.$showMessage(`至少有一张材料照片`)
           return;
-        }
-        if(!item.f_material_number || item.f_material_number==0){
-          this.$showMessage(`请填写材料${index+1}的数量`)
+        }*/
+        if (!this.payType) {
+          this.$showMessage(`请选择缴费方式`)
           return;
         }
-      }
-      /*if(this.materialImges.length===0){
-        this.$showMessage(`至少有一张材料照片`)
-        return;
-      }*/
-      if(!this.payType){
-        this.$showMessage(`请选择缴费方式`)
-        return;
-      }
-      this.button_state=true
-      try {
-        if(this.payType.indexOf('现金')!=-1){
-          await this.saveUserFile('save')
-        }else{
-          await this.openQrCode()
+        this.button_state = true
+        try {
+          if (this.payType.indexOf('现金') != -1) {
+            await this.saveUserFile('save')
+          } else {
+            await this.openQrCode()
+          }
+          this.button_state = false
+        } catch (e) {
+          this.$showMessage(`材料收费失败！请检查网络`)
+          this.button_state = false
         }
-        this.button_state=false
-      }catch (e) {
-        this.$showMessage(`材料收费失败！请检查网络`)
-        this.button_state=false
-      }
-    },
-    cancel(){
-      this.$emit('aftersave')
-    },
-    getAllMaterial(){
-      new HttpResetClass().load('POST',this.$androidUtil.getProxyUrl() +`/rs/sql/tel_singleTable_OrderBy?pageNo=1&pageSize=99999`, {data: {
-          items: '*',
-          tablename: 't_material_info',
-          condition: `org_id = '${Vue.user.orgid}'`,
-          orderitem: 'id desc'
-        }},{resolveMsg:null,rejectMsg:null}).then(res=>{
-        const typeNames= res.data.filter((item)=>item.type === '分类')
-        const materialNames = res.data.filter((item)=>item.type === '品名')
-        const materialNumbers = res.data.filter((item)=>item.type === '型号')
-        console.log(typeNames,materialNames,materialNumbers)
-        const newMaterialNames  = materialNames.map((item)=>{
-          const typeName = typeNames.filter((res)=>{
-            return res.id==item.parent_id
+      },
+      cancel() {
+        this.$emit('aftersave')
+      },
+      getAllMaterial() {
+        new HttpResetClass().load('POST', this.$androidUtil.getProxyUrl() + `/rs/sql/tel_singleTable_OrderBy?pageNo=1&pageSize=99999`, {
+          data: {
+            items: '*',
+            tablename: 't_material_info',
+            condition: `org_id = '${Vue.user.orgid}'`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          const typeNames = res.data.filter((item) => item.type === '分类')
+          const materialNames = res.data.filter((item) => item.type === '品名')
+          const materialNumbers = res.data.filter((item) => item.type === '型号')
+          console.log(typeNames, materialNames, materialNumbers)
+          const newMaterialNames = materialNames.map((item) => {
+            const typeName = typeNames.filter((res) => {
+              return res.id == item.parent_id
+            })
+            return {
+              id: item.id,
+              typeName: typeName[0],
+              materialName: item
+            }
           })
-          return {
-            id:item.id,
-            typeName:typeName[0],
-            materialName:item
+          console.log("988", newMaterialNames)
+          this.materialtypenumber = this.sortArrayByCodeAscending(materialNumbers)
+          const aMaterialnameandcode = []
+          for (const item of this.materialtypenumber) {
+            const newMaterialName = newMaterialNames.filter((res) => {
+              return res.id == item.parent_id
+            })
+            if (newMaterialName && newMaterialName.length > 0) {
+              aMaterialnameandcode.push({
+                label: `[${item.code}]${newMaterialName[0]['materialName']['name']}`,
+                value: {
+                  typeName: newMaterialName[0]['typeName'],
+                  materialName: newMaterialName[0]['materialName'],
+                  materialNumber: item
+                }
+              })
+            }
           }
-        })
-        console.log("988",newMaterialNames)
-        this.materialtypenumber = this.sortArrayByCodeAscending(materialNumbers)
-        const aMaterialnameandcode = []
-        for (const item of this.materialtypenumber) {
-          const newMaterialName = newMaterialNames.filter((res)=>{
-            return res.id == item.parent_id
+          this.materialnameandcode = aMaterialnameandcode
+          console.log('this.newmaterialnameandcode=', JSON.stringify(this.newmaterialnameandcode))
+          this.newmaterialnameandcode = this.materialnameandcode.map((item) => {
+            return {
+              label: item.label,
+              value: item.label
+            }
           })
-          if (newMaterialName && newMaterialName.length > 0){
-            aMaterialnameandcode.push({
-              label:`[${item.code}]${newMaterialName[0]['materialName']['name']}`,
-              value:{
-                typeName:newMaterialName[0]['typeName'],
-                materialName:newMaterialName[0]['materialName'],
-                materialNumber:item
-              }
+        }).catch((e) => {
+          console.log("933", e)
+        })
+      },
+      sortArrayByCodeAscending(dataArray) {
+        // Convert the "code" property to a number for sorting
+        dataArray.forEach(item => {
+          item.newCode = parseFloat(item.code);
+        });
+
+        // Sort the array based on the "code" property
+        dataArray.sort((a, b) => a.newCode - b.newCode);
+
+        return dataArray;
+      },
+      getChangePayNumber() {
+        this.payNumber = 0
+        this.summarize = []
+        for (let i = 0; i < this.material.length; i++) {
+          this.material[i].f_fee = this.material[i].f_material_price * this.material[i].f_material_number
+          this.payNumber += Number(this.material[i].f_fee)
+          // let res=this.checkSummarize(this.material[i].material_type)
+          /* if(res.has){
+            this.summarize[res.idx].amount+= 1
+            this.summarize[res.idx].money+= Number(this.material[i].f_fee)
+          }else{
+            this.summarize.push({material_type:this.material[i].material_type,amount:1,money:this.material[i].f_fee})
+          } */
+        }
+        console.log('this.summarize------------', this.summarize)
+      },
+      checkSummarize(name) {
+        let result = {idx: null, has: false}
+        this.summarize.forEach((item, idx) => {
+          if (item.material_type == name) {
+            result.idx = idx
+            result.has = true
+          }
+        })
+        console.log('result', result)
+        return result
+      },
+      getsutitle(val) {
+        return val
+      },
+      loadOptions(index) {
+        // const data = {
+        //   tablename: 't_material_info',
+        //   condition: "1 = 1 and code = '" + this.material[index].f_material_code + "'"
+        // }
+        // this.$resetpost(this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data}, {
+        //   resolveMsg: null,
+        //   rejectMsg: '获取数据失败'
+        // }).then((res) => {
+        //   for (let material of res.data) {
+        //     switch (material.type) {
+        //       case '分类' :
+        //         this.$set('material[' + index + '].f_typename', material.name)
+        //         break
+        //       case '品名' :
+        //         this.$set('material[' + index + '].f_material_name', material.name)
+        //         break
+        //       case '型号' :
+        //         this.$set('material[' + index + '].f_typenumber', material.name)
+        //         this.$set('material[' + index + '].unit', material.unit)
+        //         this.$set('material[' + index + '].f_material_price', material.price)
+        //         break
+        //     }
+        //   }
+        //   this.$set('material', JSON.parse(JSON.stringify(this.material)))
+        // })
+        const data = {
+          code: this.material[index].f_material_code
+        }
+        this.$resetpost(this.$androidUtil.getProxyUrl() + '/rs/sql/getMaterialByCode', {data}, {
+          resolveMsg: null,
+          rejectMsg: '获取数据失败'
+        }).then((res) => {
+          for (let material of res.data) {
+            this.$set('material[' + index + '].f_typename', material.f_typename)
+            this.$set('material[' + index + '].f_material_name', material.f_material_name)
+            this.$set('material[' + index + '].f_typenumber', material.f_typenumber)
+            this.$set('material[' + index + '].unit', material.unit)
+            this.$set('material[' + index + '].f_material_price', material.f_material_price)
+          }
+          this.$set('material', JSON.parse(JSON.stringify(this.material)))
+        })
+
+      },
+      // 删除未保存的材料信息
+      async deleteUserFile(index) {
+        this.material.splice(index, 1)
+      },
+      // 追加材料信息
+      addUserFile() {
+        this.material.push({
+          f_material_name: "",
+          unit: "",
+          f_material_price: "",
+          f_typenumber: "",
+          f_typename: "",
+          material_type: ""
+        })
+      },
+      getmaterialTYPE() {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_material_service',
+          condition: `1=1`
+        }
+        http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '获取数据失败'
+        }).then(res => {
+          console.log("XXX", res.data.length)
+          for (let i = 0; i < res.data.length; i++) {
+
+            this.materialTYPE.push({
+              label: res.data[i].f_typenumber,
+              value: res.data[i].f_typenumber
             })
           }
+          if (this.materialTYPE.length <= 0) {
+            this.materialTYPE = [{}]
+          }
+          this.materialtypenumber = Array.from(new Set(this.materialTYPE.map(item => item.label)))
+            .map(label => {
+              return this.materialTYPE.find(item => item.label === label);
+            })
+          console.log("XXX", this.materialtypenumber)
+        })
+        return this.materialtypenumber
+      },
+      getmaterial() {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_material_service',
+          condition: `1=1`
         }
-        this.materialnameandcode = aMaterialnameandcode
-        console.log('this.newmaterialnameandcode=', JSON.stringify(this.newmaterialnameandcode))
-        this.newmaterialnameandcode = this.materialnameandcode.map((item)=>{
-          return {
-            label:item.label,
-            value:item.label
+        http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '获取数据失败'
+        }).then(res => {
+          console.log("XXX", res.data.length)
+          for (var i = 0; i < res.data.length; i++) {
+
+            this.materialname.push({
+                label: '[' + res.data[i].f_material_code + ']' + res.data[i].f_material_name,
+                value: res.data[i].f_material_name
+              }
+            )
+          }
+          if (this.materialname.length <= 0) {
+            this.materialname = [{}]
+          }
+          this.materialnameandcode = Array.from(new Set(this.materialname.map(item => item.label)))
+            .map(label => {
+              return this.materialname.find(item => item.label === label);
+            })
+          this.materialname = this.materialname.map(item => {
+            item.label = item.label.replace(/null/g, "空")
+            return item;
+          });
+          console.log("XXX", this.materialnameandcode)
+        })
+        return this.materialnameandcode
+      },
+      search() {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_material_service',
+          condition: `f_process_id = '${this.selectdata.f_process_id}'`
+        }
+        http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '获取数据失败'
+        }).then(res => {
+          this.material = res.data
+          if (this.material.length <= 0) {
+            this.addUserFile()
+          } else {
+            this.getAllMaterialImg()
+            this.getChangePayNumber()
           }
         })
-      }).catch((e)=>{
-        console.log("933",e)
-      })
-    },
-    sortArrayByCodeAscending(dataArray) {
-      // Convert the "code" property to a number for sorting
-      dataArray.forEach(item => {
-        item.newCode = parseFloat(item.code);
-      });
 
-      // Sort the array based on the "code" property
-      dataArray.sort((a, b) => a.newCode - b.newCode);
 
-      return dataArray;
-    },
-    getChangePayNumber() {
-      this.payNumber = 0
-      this.summarize = []
-      for (let i = 0; i < this.material.length; i++) {
-        this.material[i].f_fee= this.material[i].f_material_price*this.material[i].f_material_number
-        this.payNumber += Number(this.material[i].f_fee)
-        // let res=this.checkSummarize(this.material[i].material_type)
-        /* if(res.has){
-          this.summarize[res.idx].amount+= 1
-          this.summarize[res.idx].money+= Number(this.material[i].f_fee)
-        }else{
-          this.summarize.push({material_type:this.material[i].material_type,amount:1,money:this.material[i].f_fee})
-        } */
-      }
-      console.log('this.summarize------------', this.summarize)
-    },
-    checkSummarize(name){
-      let result={idx:null,has:false}
-      this.summarize.forEach((item,idx)=> {
-        if(item.material_type==name){
-          result.idx=idx
-          result.has=true
+      },
+      getAllMaterialImg() {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_material_img',
+          condition: `f_process_id = '${this.selectdata.f_process_id}'`
         }
-      })
-      console.log('result', result)
-      return result
-    },
-    getsutitle(val) {
-      return val
-    },
-    loadOptions(index) {
-      // const data = {
-      //   tablename: 't_material_info',
-      //   condition: "1 = 1 and code = '" + this.material[index].f_material_code + "'"
-      // }
-      // this.$resetpost(this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data}, {
-      //   resolveMsg: null,
-      //   rejectMsg: '获取数据失败'
-      // }).then((res) => {
-      //   for (let material of res.data) {
-      //     switch (material.type) {
-      //       case '分类' :
-      //         this.$set('material[' + index + '].f_typename', material.name)
-      //         break
-      //       case '品名' :
-      //         this.$set('material[' + index + '].f_material_name', material.name)
-      //         break
-      //       case '型号' :
-      //         this.$set('material[' + index + '].f_typenumber', material.name)
-      //         this.$set('material[' + index + '].unit', material.unit)
-      //         this.$set('material[' + index + '].f_material_price', material.price)
-      //         break
-      //     }
-      //   }
-      //   this.$set('material', JSON.parse(JSON.stringify(this.material)))
-      // })
-      const data = {
-        code: this.material[index].f_material_code
-      }
-      this.$resetpost(this.$androidUtil.getProxyUrl() + '/rs/sql/getMaterialByCode', {data}, {
-        resolveMsg: null,
-        rejectMsg: '获取数据失败'
-      }).then((res) => {
-        for (let material of res.data) {
-          this.$set('material[' + index + '].f_typename', material.f_typename)
-          this.$set('material[' + index + '].f_material_name', material.f_material_name)
-          this.$set('material[' + index + '].f_typenumber', material.f_typenumber)
-          this.$set('material[' + index + '].unit', material.unit)
-          this.$set('material[' + index + '].f_material_price', material.f_material_price)
+        http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '获取数据失败'
+        }).then(result => {
+          let tempArr = []
+          let tempArrary = []
+          result = result.data
+          for (let i = 0; i < result.length; i++) {
+
+            if (!tempArr.includes(result[i].f_path)) {
+              let temp = {}
+              temp.id = result[i].id
+              temp.android_file = result[i].f_path
+              temp.imgpath = ''
+              temp.path = 'http://newimg/storage/emulated/0/Download/safecheck/' + result[i].f_path
+              tempArr.push(result[i].f_path)
+              tempArrary.push(temp)
+            }
+          }
+          this.materialImges = tempArrary
+        })
+      },
+      // 获取品名规格
+      setTypename(i, val) {
+        let ac = this.$appdata.getParam(val)
+        this.$set('material[' + i + '].typeNameList', ac)
+        this.$set('material[' + i + '].typeNumberList', [])
+        this.$set('material[' + i + '].f_typenumber', null)
+        this.$set('material[' + i + '].f_material_price', 0)
+      },
+      // 获取类型
+      setTypenumber(i, val) {
+        let ac = this.$appdata.getParam(val)
+        this.$set('material[' + i + '].typeNumberList', ac)
+        this.$set('material[' + i + '].f_material_price', 0)
+      },
+      // 获取单价
+      setmaterialprice(i, val) {
+        var num
+        if (val == null) {
+          num = 0
+        }
+        num = this.$appdata.getSingleValue(val)
+        this.$set('material[' + i + '].f_material_price', num)
+      },
+      // 金额计算
+      smallnum(val, val1) {
+        let num = Number(val) * Number(val1)
+        return num
+      },
+      getCheckMessage() {
+        let tempArr = this.material
+        if (!tempArr.length > 0) {
+          return '请选择材料后上传'
         }
-        this.$set('material', JSON.parse(JSON.stringify(this.material)))
-      })
+        for (let i = 0; i < tempArr.length; i++) {
+          if (tempArr[i].f_process_id) {
+            continue
+          }
 
-    },
-    // 删除未保存的材料信息
-    async deleteUserFile(index) {
-      this.material.splice(index, 1)
-    },
-    // 追加材料信息
-    addUserFile() {
-      this.material.push({
-        f_material_name:"",
-        unit:"",
-        f_material_price:"",
-        f_typenumber:"",
-        f_typename:"",
-        material_type:""
-      })
-    },
-    getmaterialTYPE(){
-      let http = new HttpResetClass()
-      let data = {
-        tablename: 't_material_service',
-        condition: `1=1`
-      }
-      http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '获取数据失败'
-      }).then(res => {
-        console.log("XXX",res.data.length)
-        for (let i = 0; i < res.data.length; i++){
+          if (!tempArr[i].f_material_price) {
+            return '请输入材料单价'
+          }
+          if (!tempArr[i].f_material_number) {
+            return '请输入材料数量'
+          }
+        }
+        /* if (this.materialImges.length == 0) {
+          return '材料清单需拍照'
+        } */
+        return null
 
-          this.materialTYPE.push({
-            label: res.data[i].f_typenumber,
-            value: res.data[i].f_typenumber})
-        }if (this.materialTYPE.length <= 0) {
-          this.materialTYPE = [{}]
+      },
+      /*async saveUserFile1() {
+        let message = this.getCheckMessage()
+        if (message) {
+          this.$showMessage(message)
+          return
         }
-        this.materialtypenumber =  Array.from(new Set(this.materialTYPE.map(item => item.label)))
-          .map(label => {
-            return this.materialTYPE.find(item => item.label === label);
-          })
-        console.log("XXX",this.materialtypenumber)
-      })
-      return this.materialtypenumber
-    },
-    getmaterial(){
-      let http = new HttpResetClass()
-      let data = {
-        tablename: 't_material_service',
-        condition: `1=1`
-      }
-      http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '获取数据失败'
-      }).then(res => {
-        console.log("XXX",res.data.length)
-        for (var i = 0; i < res.data.length; i++) {
+        let imgs = []
+        for (let i = 0; i < this.materialImges.length; i++) {
+          let it = {}
+          if (this.materialImges[i].id) {
+            it = {
+              f_path: this.materialImges[i].path,
+              id: this.materialImges[i].id,
+              f_process_id: this.selectdata.f_process_id
+            }
+          } else {
+            it = {
+              f_path: this.materialImges[i].path,
+              f_process_id: this.selectdata.f_process_id
+            }
+          }
+          imgs.push(it)
+        }
+        for (let i = 0; i < this.material.length; i++) {
+          this.material[i].f_process_id = this.selectdata.f_process_id
+          if (isEmpty(this.material[i].f_state)) {
+            this.material[i].f_state = '未收费'
+          }
+        }
+        let data = {
+          model: this.material,
+          imgs: imgs,
+          f_process_id: this.selectdata.f_process_id
+        }
+        console.log('------------------',data)
+        new HttpResetClass().load('POST',this.$androidUtil.getProxyUrl() +`/rs/logic/saveMaterialService`, data,{resolveMsg:null,rejectMsg:null}).then(res=>{
+          console.log(res)
+          this.model.rows=res.data
+        }).catch((e)=>{
+          console.log("933",e)
+        })
+        /!* console.log('------------------',data)
+        HostApp.__this__ = this
+        HostApp.logicWithHint({
+          // logic别名，key必须为logic
+          'logic': 'saveMaterialServiceAndroid',
+          // 回调执行方法名，key必须为callback
+          'callback': 'javascript:HostApp.__this__.uploadCallback1()',
+          // logic执行需要的业务参数
+          'data': data,
+          // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
+          // 执行回调方法传入key为backresult
+          // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
+          'backresult': 1
+        }) *!/
+      },*/
+      uploadCallback1(result) {
 
-          this.materialname.push({
-            label: '['+res.data[i].f_material_code +']'+res.data[i].f_material_name,
-            value: res.data[i].f_material_name}
-          )
-        }if (this.materialname.length<= 0) {
-          this.materialname = [{}]
+        if (result.state == 'ok' && JSON.parse(result.result).code == 200) {
+          this.$showMessage('材料保存成功!!!')
+        } else {
+          this.$showMessage(JSON.parse(result.result).msg)
         }
-        this.materialnameandcode = Array.from(new Set(this.materialname.map(item => item.label)))
-          .map(label => {
-            return this.materialname.find(item => item.label === label);
+      },
+      async saveUserFile(type) {
+        for (let i = 0; i < this.material.length; i++) {
+          this.material[i].f_process_id = this.selectdata.f_process_id
+          this.material[i].f_department = Vue.user.f_department_name
+          this.material[i].f_fee = this.material[i].f_material_price * this.material[i].f_material_number
+          if (isEmpty(this.material[i].f_state)) {
+            this.material[i].f_state = null
+          }
+        }
+        await this.saveOrder(type)
+      },
+      async saveOrder(type) {
+        console.log('this.material', this.material)
+        let otherdetail = []
+        if (this.payNumber == 0) {
+          otherdetail.push({
+            f_brand_spec: ['维修'],
+            f_typename: ['材料费'],
+            f_typenumber: [],
+            f_unitprice: 0,
+            f_number: this.material.length
           })
-        this.materialname = this.materialname.map(item => {
-          item.label = item.label.replace(/null/g, "空")
-          return item;
-        });
-        console.log("XXX",this.materialnameandcode)
-      })
-      return this.materialnameandcode
-    },
-    search() {
-      let http = new HttpResetClass()
-      let data = {
-        tablename: 't_material_service',
-        condition: `f_process_id = '${this.selectdata.f_process_id}'`
-      }
-      http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '获取数据失败'
-      }).then(res => {
-        this.material = res.data
-        if (this.material.length <= 0) {
-          this.addUserFile()
         } else {
-          this.getAllMaterialImg()
-          this.getChangePayNumber()
+          this.material.forEach((row) => {
+            if (row.f_material_price != 0) {
+              otherdetail.push({
+                f_brand_spec: ['维修'],
+                f_typename: [`${row.material_type ? row.material_type : '材料费'}`],
+                f_typenumber: [],
+                f_unitprice: row.f_material_price,
+                f_number: row.f_material_number
+              })
+            }
+          })
+        }
+
+        let param = {
+          model: this.material,
+          operator_type: type,
+          othercharge_id: this.othercharge_id,
+          f_process_id: this.selectdata.f_process_id,
+          other: {
+            "record_userinfo": this.selectdata.model.f_userinfo_id,
+            //"f_userfiles_id": '',
+            //"f_user_id": '',
+            "f_user_name": this.selectdata.model.f_user_name,
+            "f_address": this.selectdata.model.f_address,
+            "f_user_type": this.selectdata.model.f_user_type,
+            "f_gasproperties": "",
+            "f_collection": this.payNumber,
+            "f_comments": `${Vue.user.name}进行维修材料收费，收费方式-${this.payType} ${this.order.body && this.order.body.tradeNo ? '。支付订单号:' + this.order.body.tradeNo : ''}`,
+            "f_payment": this.payType,
+            "f_voucher_number": this.selectdata.f_process_id,
+            "f_bill_style": "普通收据",
+            "f_userinfo_id": this.selectdata.model.f_userinfo_id,
+            "f_service_person": Vue.user.name,
+            "f_operat_type": "维修收费",
+            "f_describe": "",
+            "f_serial_id": this.order.body ? this.order.body.tradeNo : null,
+            "f_state": type == 'create' ? '无效' : '有效',
+            "f_operator": Vue.user.name,
+            "f_operatorid": Vue.user.id,
+            "f_orgid": Vue.user.orgid,
+            "f_orgname": Vue.user.orgs,
+            "f_depid": Vue.user.depids,
+            "f_depname": Vue.user.f_department_name,
+            "t_userfees": "",
+            "f_fee_type": "维修费用",
+            "f_fee_time": "12",
+            "otherdetail": otherdetail
+          }
         }
-      })
+        console.log("要保存了666-------data2", param)
+        let res = await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterialService`, param, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        console.log('res.data', res.data)
+        if (res.data.code == 200) {
+          if (type === 'create') {
+            // this.$showMessage('收费记录创建成功!!!')
+            this.othercharge_id = res.data.othercharge_id
+            // this.$emit('aftersave')
+          } else {
+            this.$showMessage('材料保存成功!!!')
+            this.$emit('aftersave')
+          }
 
+        } else {
+          this.$showMessage(res.data.msg)
+        }
+      },
+      uploadCallback(result) {
+        if (result.state == 'ok' && JSON.parse(result.result).code == 200) {
+          this.$showMessage('材料保存成功!!!')
+        } else {
+          this.$showMessage(JSON.parse(result.result).msg)
+        }
+      },
+      // 关闭对话框
+      closeModal() {
+        this.showCharge = false
+        this.charge = {
+          payment_terms: [{
+            f_payment_term: '',
+            f_charge_money: '',
+            f_amount_words: '',
+            f_payment_method: this.charge.f_payment_method
+          }]
+        }
+      },
+      // 金额转大写
+      handleInput(index) {
+        // 通过正则过滤小数点后两位
+        console.log('-----------------------')
+        this.charge.payment_terms[index].f_charge_money = (this.charge.payment_terms[index].f_charge_money.match(/^\d*(\.?\d{0,2})/g)[0]) || null
+        this.charge.payment_terms[index].f_amount_words = this.smalltoBIG(this.charge.payment_terms[index].f_charge_money)
+      },
+      // 金额转大写
+      smalltoBIG(n) {
+        let fraction = ['角', '分'];
+        let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+        let unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']];
+        let head = n < 0 ? '欠' : '';
+        n = Math.abs(n);
 
+        let s = '';
 
-    },
-    getAllMaterialImg() {
-      let http = new HttpResetClass()
-      let data = {
-        tablename: 't_material_img',
-        condition: `f_process_id = '${this.selectdata.f_process_id}'`
-      }
-      http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '获取数据失败'
-      }).then(result => {
-        let tempArr = []
-        let tempArrary = []
-        result = result.data
-        for (let i = 0; i < result.length; i++) {
+        for (var i = 0; i < fraction.length; i++) {
+          s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+        }
+        s = s || '整';
+        n = Math.floor(n);
 
-          if (!tempArr.includes(result[i].f_path)) {
-            let temp = {}
-            temp.id = result[i].id
-            temp.android_file = result[i].f_path
-            temp.imgpath = ''
-            temp.path = 'http://newimg/storage/emulated/0/Download/safecheck/' + result[i].f_path
-            tempArr.push(result[i].f_path)
-            tempArrary.push(temp)
+        for (var i = 0; i < unit[0].length && n > 0; i++) {
+          let p = '';
+          for (var j = 0; j < unit[1].length && n > 0; j++) {
+            p = digit[n % 10] + unit[1][j] + p;
+            n = Math.floor(n / 10);
           }
+          s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s;
         }
-        this.materialImges = tempArrary
-      })
-    },
-    // 获取品名规格
-    setTypename(i, val) {
-      let ac = this.$appdata.getParam(val)
-      this.$set('material[' + i + '].typeNameList', ac)
-      this.$set('material[' + i + '].typeNumberList', [])
-      this.$set('material[' + i + '].f_typenumber', null)
-      this.$set('material[' + i + '].f_material_price', 0)
-    },
-    // 获取类型
-    setTypenumber(i, val) {
-      let ac = this.$appdata.getParam(val)
-      this.$set('material[' + i + '].typeNumberList', ac)
-      this.$set('material[' + i + '].f_material_price', 0)
-    },
-    // 获取单价
-    setmaterialprice(i, val) {
-      var num
-      if (val == null) {
-        num = 0
-      }
-      num = this.$appdata.getSingleValue(val)
-      this.$set('material[' + i + '].f_material_price', num)
-    },
-    // 金额计算
-    smallnum(val, val1) {
-      let num = Number(val) * Number(val1)
-      return num
-    },
-    getCheckMessage() {
-      let tempArr = this.material
-      if (!tempArr.length > 0) {
-        return '请选择材料后上传'
-      }
-      for (let i = 0; i < tempArr.length; i++) {
-        if (tempArr[i].f_process_id) {
-          continue
+        return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
+      },
+      moneyChange(index) {
+        console.log(`当前下标----${index}`)
+        if (isEmpty(this.charge.payment_terms[index].f_charge_money) || Number(this.charge.payment_terms[index].f_charge_money) === 0) {
+          this.$showMessage('单笔收费不能为0元！！！', 'warning', 3000)
+          this.charge.payment_terms[index].f_charge_money = null
+          return
         }
+      },
+      async TimeQrCode() {
+        this.qrcodeTimer = setTimeout(() => {
+          // 关闭二维码
+          this.clearQrCode()
+          // 将定时器清除
+          this.qrcodeTimer = null;
+          clearInterval(this.orderInterval)
+        }, 60 * 1000)
 
-        if (!tempArr[i].f_material_price) {
-          return '请输入材料单价'
+      },
+      generateRandomString(length) {
+        let result = new Date().getTime().toString()
+        const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+        const charactersLength = characters.length;
+        for (let i = 0; i < length; i++) {
+          result += characters.charAt(Math.floor(Math.random() * charactersLength));
         }
-        if (!tempArr[i].f_material_number) {
-          return '请输入材料数量'
+        return result.substring(0, 30);
+      },
+      // 打开二维码
+      async openQrCode() {
+        const merchantMsg = Vue.config.telephone.ApproveConfig.merchantMsg
+        if (!merchantMsg){
+          this.$showMessage('未配备商户号,请联系管理员！')
+          return
         }
-      }
-      /* if (this.materialImges.length == 0) {
-        return '材料清单需拍照'
-      } */
-      return null
+        const outTradeNo = this.generateRandomString(30)
+        // 下订单
+        let http = new HttpResetClass()
+        const val = {
+          "body": "燃气费",
+          "detail": "燃气费",
+          "totalAmount": (this.payNumber * 100).toString(),
+          "merchantMsg": merchantMsg,//商户id
+          "outTradeNo": outTradeNo,//随机数30位
+          "service": "nativePay",//死值
+          "tradeType": "wechat_jsapi"//死值
+        }
+        try {
+          let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/bank/rs/logic/BC_10001`, {data: val}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })
+          if (res.data.status === 200) {
+            console.log("调用结果", res.data, res.data.body.url)
+            try {
+              this.order = res.data
+              this.othercharge_id = ''
+              await this.saveOrder('create')
+              if (this.othercharge_id) {
+                this.isTimeout = false
+                this.showQrCode = true
+                console.log(this.order)
+                this.$nextTick(() => {
+                  this.qrcode(res.data.body.url)
+                })
+                if (this.order.body.tradeNo) {
+                  this.timer1 = window.setInterval(this.getOrderInformation, 3000)
+                }
+              } else {
+                this.$showMessage('创建订单失败！')
+              }
+            } catch (e) {
+              this.$showMessage('创建订单失败！')
+            }
+          } else {
+            this.$showMessage('获取二维码失败！')
+          }
 
-    },
-    /*async saveUserFile1() {
-      let message = this.getCheckMessage()
-      if (message) {
-        this.$showMessage(message)
-        return
-      }
-      let imgs = []
-      for (let i = 0; i < this.materialImges.length; i++) {
-        let it = {}
-        if (this.materialImges[i].id) {
-          it = {
-            f_path: this.materialImges[i].path,
-            id: this.materialImges[i].id,
-            f_process_id: this.selectdata.f_process_id
+        } catch (e) {
+          this.$showMessage('获取二维码失败，请检查网络！')
+        }
+      },
+      qrcode(url) {
+        new QRCode('qrcode', {
+          text: url, // 设置二维码内容或跳转地址
+          width: 266, // 设置宽度，单位像素
+          height: 266, // 设置高度，单位像素
+          correctLevel: QRCode.CorrectLevel.L //容错率，L/M/Hs
+        })
+      },
+      // 获取订单信息
+      async getOrderInformation() {
+        const merchantMsg = Vue.config.telephone.ApproveConfig.merchantMsg
+        // 查询订单信息
+        console.log('查询订单信息！！！', this.order)
+        try {
+          let http = new HttpResetClass()
+          let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/bank/rs/logic/BC_10003`, {
+            data: {
+              "service": "queryOrder",
+              "outTradeNo": this.order.body.outTradeNo,
+              "merchantMsg": merchantMsg,
+              "tradeNo": ""
+            }
+          }, {
+            resolveMsg: null,
+            rejectMsg: null
+          })
+          // 支付成功
+          this.orderstatus = res.data
+          console.log('查询结果=======', res.data)
+          if (res.data.status == '200') {
+            window.clearInterval(this.timer1)
+            console.log('支付成功', this.orderstatus)
+            this.saveUserFile('update')
+            this.order = {}
           }
-        } else {
-          it = {
-            f_path: this.materialImges[i].path,
-            f_process_id: this.selectdata.f_process_id
+        } catch (e) {
+          window.clearInterval(this.timer1)
+          this.$showMessage('创建订单失败！')
+          this.order = {}
+        }
+      },
+      getPaymentTerm() {
+        let term = ''
+        this.charge.payment_terms.forEach((row) => {
+          term += `${row.f_payment_term} `
+        })
+        return term
+      },
+      closeQRCode() {
+        clearTimeout(this.paymentInterval)
+        clearTimeout(this.orderInterval)
+        this.timeLeft = 300
+        this.closeOrder()
+        // 清除二维码
+        this.clearQrCode()
+        this.showQrCode = false
+      },
+      clearQrCode() {
+        document.getElementById('qrcode').innerHTML = ''
+      },
+      /* async closeOrder() {
+         let data = {
+           "flag": "JsApiWeiNan",
+           "f_filiale": "weinanchengtou",
+           "f_out_trade_no": this.order.f_out_trade_no,// 商户单号
+           "isClose": "是",
+           "f_sys_trace": this.order.f_sys_trace // 交易流水号
+         }
+         let http = new HttpResetClass()
+         let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/microPayOrderStatus`, data, {
+           resolveMsg: null,
+           rejectMsg: '关闭失败！！！'
+         })
+       },*/
+      async update() {
+        let http = new HttpResetClass()
+        for (let i = 0; i < this.material.length; i++) {
+          if (this.material[i].f_state == '未收费') {
+            this.material[i].f_state = '已收费'
           }
         }
-        imgs.push(it)
-      }
-      for (let i = 0; i < this.material.length; i++) {
-        this.material[i].f_process_id = this.selectdata.f_process_id
-        if (isEmpty(this.material[i].f_state)) {
-          this.material[i].f_state = '未收费'
+        let data = {
+          model: this.material
         }
-      }
-      let data = {
-        model: this.material,
-        imgs: imgs,
-        f_process_id: this.selectdata.f_process_id
-      }
-      console.log('------------------',data)
-      new HttpResetClass().load('POST',this.$androidUtil.getProxyUrl() +`/rs/logic/saveMaterialService`, data,{resolveMsg:null,rejectMsg:null}).then(res=>{
-        console.log(res)
-        this.model.rows=res.data
-      }).catch((e)=>{
-        console.log("933",e)
-      })
-      /!* console.log('------------------',data)
-      HostApp.__this__ = this
-      HostApp.logicWithHint({
-        // logic别名，key必须为logic
-        'logic': 'saveMaterialServiceAndroid',
-        // 回调执行方法名，key必须为callback
-        'callback': 'javascript:HostApp.__this__.uploadCallback1()',
-        // logic执行需要的业务参数
-        'data': data,
-        // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
-        // 执行回调方法传入key为backresult
-        // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
-        'backresult': 1
-      }) *!/
-    },*/
-    uploadCallback1(result) {
-
-      if (result.state == 'ok' && JSON.parse(result.result).code == 200) {
-        this.$showMessage('材料保存成功!!!')
-      } else {
-        this.$showMessage(JSON.parse(result.result).msg)
-      }
-    },
-    async saveUserFile(type) {
-      for (let i = 0; i < this.material.length; i++) {
-        this.material[i].f_process_id = this.selectdata.f_process_id
-        this.material[i].f_department = Vue.user.f_department_name
-        this.material[i].f_fee = this.material[i].f_material_price * this.material[i].f_material_number
-        if (isEmpty(this.material[i].f_state)) {
-          this.material[i].f_state = null
+        let res = await http.load('post', this.$androidUtil.getProxyUrl() + '/rs/logic/saveweinanmaterial', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '保存失败'
+        })
+        this.search()
+      },
+      async saveother() {
+        let http = new HttpResetClass()
+        let data1 = {
+          tablename: 't_material_service',
+          condition: `f_process_id = '${this.selectdata.f_process_id}' and f_state = '未收费'`
         }
-      }
-      await this.saveOrder(type)
-    },
-    async saveOrder(type){
-      console.log('this.material', this.material)
-      let otherdetail=[]
-      if(this.payNumber == 0){
-        otherdetail.push({
-          f_brand_spec:['维修'],
-          f_typename:['材料费'],
-          f_typenumber:[],
-          f_unitprice:0,
-          f_number:this.material.length
+        let res1 = await http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data1}, {
+          resolveMsg: null,
+          rejectMsg: '获取数据失败'
         })
-      }else{
-        this.material.forEach((row)=>{
-          if(row.f_material_price != 0){
-            otherdetail.push({
-              f_brand_spec:['维修'],
-              f_typename:[`${row.material_type?row.material_type:'材料费'}`],
-              f_typenumber:[],
-              f_unitprice:row.f_material_price,
-              f_number:row.f_material_number
-            })
-          }
+        let data = {
+          tablename: 't_userfiles',
+          condition: `f_userinfo_id = '${this.selectdata.model.f_userinfo_id}'`
+        }
+        let res = await http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '获取数据失败'
         })
-      }
+        let otherdetails = []
+        for (let i = 0; i < res1.data.length; i++) {
+          otherdetails.push(
+            {
+              "f_brand_spec": [res1.data[i].f_material_name],
+              "f_unitprice": res1.data[i].f_material_price,
+              "f_typename": [res1.data[i].f_typename],
+              "f_typenumber": [res1.data[i].f_typenumber],
+              "f_number": res1.data[i].f_material_number
+            }
+          )
+        }
 
-      let param = {
-        model: this.material,
-        operator_type:type,
-        othercharge_id:this.othercharge_id,
-        f_process_id: this.selectdata.f_process_id,
-        other:{
+        console.log("查询的用户信息", otherdetails)
+        let data2 = {
           "record_userinfo": this.selectdata.model.f_userinfo_id,
-          //"f_userfiles_id": '',
-          //"f_user_id": '',
+          "f_userfiles_id": res.data[0].f_userfiles_id,
+          "f_user_id": res.data[0].f_user_id,
           "f_user_name": this.selectdata.model.f_user_name,
           "f_address": this.selectdata.model.f_address,
           "f_user_type": this.selectdata.model.f_user_type,
           "f_gasproperties": "",
-          "f_collection": this.payNumber,
-          "f_comments": `${Vue.user.name}进行维修材料收费，收费方式-${this.payType} ${this.order.body && this.order.body.tradeNo?'。支付订单号:'+this.order.body.tradeNo:''}`,
-          "f_payment": this.payType,
-          "f_voucher_number": this.selectdata.f_process_id,
+          "f_collection": this.f_cost_sum,
+          "f_comments": "",
+          "f_payment": this.charge.f_payment_method,
+          "f_voucher_number": "",
           "f_bill_style": "普通收据",
           "f_userinfo_id": this.selectdata.model.f_userinfo_id,
           "f_service_person": Vue.user.name,
-          "f_operat_type": "维修收费",
+          "f_operat_type": "其他收费",
           "f_describe": "",
-          "f_serial_id":this.order.body?this.order.body.tradeNo:null,
-          "f_state": type=='create'?'无效':'有效',
+          "f_state": "有效",
           "f_operator": Vue.user.name,
           "f_operatorid": Vue.user.id,
           "f_orgid": Vue.user.orgid,
@@ -658,375 +972,96 @@ export default {
           "f_depid": Vue.user.depids,
           "f_depname": Vue.user.f_department_name,
           "t_userfees": "",
-          "f_fee_type": "维修费用",
+          "f_fee_type": "其他费用",
           "f_fee_time": "12",
-          "otherdetail": otherdetail
-        }
-      }
-      console.log("要保存了666-------data2",param)
-      let res=await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterialService`, param, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
-      console.log('res.data',res.data)
-      if(res.data.code==200){
-        if(type==='create'){
-          // this.$showMessage('收费记录创建成功!!!')
-          this.othercharge_id=res.data.othercharge_id
-          // this.$emit('aftersave')
-        }else{
-          this.$showMessage('材料保存成功!!!')
-          this.$emit('aftersave')
-        }
-
-      }else{
-        this.$showMessage(res.data.msg)
-      }
-    },
-    uploadCallback(result) {
-      if (result.state == 'ok' && JSON.parse(result.result).code == 200) {
-        this.$showMessage('材料保存成功!!!')
-      } else {
-        this.$showMessage(JSON.parse(result.result).msg)
-      }
-    },
-    // 关闭对话框
-    closeModal() {
-      this.showCharge = false
-      this.charge = {
-        payment_terms: [{
-          f_payment_term: '',
-          f_charge_money: '',
-          f_amount_words: '',
-          f_payment_method: this.charge.f_payment_method
-        }]
-      }
-    },
-    // 金额转大写
-    handleInput(index) {
-      // 通过正则过滤小数点后两位
-      console.log('-----------------------')
-      this.charge.payment_terms[index].f_charge_money = (this.charge.payment_terms[index].f_charge_money.match(/^\d*(\.?\d{0,2})/g)[0]) || null
-      this.charge.payment_terms[index].f_amount_words = this.smalltoBIG(this.charge.payment_terms[index].f_charge_money)
-    },
-    // 金额转大写
-    smalltoBIG(n) {
-      let fraction = ['角', '分'];
-      let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-      let unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']];
-      let head = n < 0 ? '欠' : '';
-      n = Math.abs(n);
-
-      let s = '';
-
-      for (var i = 0; i < fraction.length; i++) {
-        s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
-      }
-      s = s || '整';
-      n = Math.floor(n);
-
-      for (var i = 0; i < unit[0].length && n > 0; i++) {
-        let p = '';
-        for (var j = 0; j < unit[1].length && n > 0; j++) {
-          p = digit[n % 10] + unit[1][j] + p;
-          n = Math.floor(n / 10);
+          "otherdetail": otherdetails
         }
-        s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s;
-      }
-      return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
-    },
-    moneyChange(index) {
-      console.log(`当前下标----${index}`)
-      if (isEmpty(this.charge.payment_terms[index].f_charge_money) || Number(this.charge.payment_terms[index].f_charge_money) === 0) {
-        this.$showMessage('单笔收费不能为0元！！！', 'warning', 3000)
-        this.charge.payment_terms[index].f_charge_money = null
-        return
-      }
-
-    },
-    async   TimeQrCode(){ this.qrcodeTimer = setTimeout(() => {
-      // 关闭二维码
-      this.clearQrCode()
-      // 将定时器清除
-      this.qrcodeTimer = null;
-      clearInterval(this.orderInterval)
-    }, 60 * 1000)
 
-    },
-    // 打开二维码
-    // 打开二维码
-    async openQrCode() {
-      // 下订单
-      let http = new HttpResetClass()
-      const val ={
-        "body":"燃气费",
-        "detail":"燃气费",
-        "totalAmount":(this.payNumber * 100).toString()
-      }
-      try {
-        let res=await http.load('POST', `${this.$androidUtil.getProxyUrl()}/bank/rs/logic/BC_10001`,{data: val}, {resolveMsg: null,rejectMsg: null})
-        if(res.data.status===200){
-          console.log("调用结果",res.data,res.data.body.url)
-          try {
-            this.order = res.data
-            this.othercharge_id=''
-            await this.saveOrder('create')
-            if(this.othercharge_id){
-              this.isTimeout = false
-              this.showQrCode = true
-              console.log(this.order)
-              this.$nextTick(()=>{
-                this.qrcode(res.data.body.url)
-              })
-              if (this.order.body.tradeNo) {
-                this.timer1 = window.setInterval (this.getOrderInformation,3000)
-              }
-            }else{
-              this.$showMessage('创建订单失败！')
-            }
-          }catch (e) {
-            this.$showMessage('创建订单失败！')
-          }
-        }else{
-          this.$showMessage('获取二维码失败！')
-        }
-
-      }catch (e) {
-        this.$showMessage('获取二维码失败，请检查网络！')
-      }
-    },
-    qrcode(url) {
-      new QRCode('qrcode', {
-        text: url, // 设置二维码内容或跳转地址
-        width: 266, // 设置宽度，单位像素
-        height: 266, // 设置高度，单位像素
-        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/Hs
-      })
-    },
-    // 获取订单信息
-    async getOrderInformation() {
-      // 查询订单信息
-      console.log('查询订单信息！！！',this.order)
-      try {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/sale_othercharge_logic`, {data: data2}, {
+          resolveMsg: null,
+          rejectMsg: '保存数据失败'
+        })
+      },
+      async shoufei() {
         let http = new HttpResetClass()
-        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/bank/rs/logic/BC_10003`, {
-          data: {
-            "outTradeNo":this.order.body.tradeNo,
-            "mchNo":'D2023011010100739'
-          }
-        }, {
+        let data = {
+          tablename: 't_material_service',
+          condition: `f_process_id = '${this.selectdata.f_process_id}' and f_state = '未收费'`
+        }
+        let res = await http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
           resolveMsg: null,
-          rejectMsg: null
+          rejectMsg: '获取数据失败'
         })
-        // 支付成功
-        this.orderstatus = res.data
-        console.log('查询结果=======',res.data)
-        if (res.data.status =='200') {
-          window.clearInterval(this.timer1)
-          console.log('支付成功',this.orderstatus)
-          this.saveUserFile('update')
-          this.order={}
+        if (res.data.length <= 0) {
+          this.$showMessage('请先添加未收费的材料！！！')
+          return
         }
-      }catch (e) {
-        window.clearInterval(this.timer1)
-        this.$showMessage('创建订单失败！')
-        this.order={}
-      }
-    },
-    getPaymentTerm() {
-      let term = ''
-      this.charge.payment_terms.forEach((row) => {
-        term += `${row.f_payment_term} `
-      })
-      return term
-    },
-    closeQRCode() {
-      clearTimeout(this.paymentInterval)
-      clearTimeout(this.orderInterval)
-      this.timeLeft = 300
-      this.closeOrder()
-      // 清除二维码
-      this.clearQrCode()
-      this.showQrCode = false
-    },
-    clearQrCode() {
-      document.getElementById('qrcode').innerHTML = ''
-    },
-    /* async closeOrder() {
-       let data = {
-         "flag": "JsApiWeiNan",
-         "f_filiale": "weinanchengtou",
-         "f_out_trade_no": this.order.f_out_trade_no,// 商户单号
-         "isClose": "是",
-         "f_sys_trace": this.order.f_sys_trace // 交易流水号
-       }
-       let http = new HttpResetClass()
-       let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/microPayOrderStatus`, data, {
-         resolveMsg: null,
-         rejectMsg: '关闭失败！！！'
-       })
-     },*/
-    async update() {
-      let http = new HttpResetClass()
-      for (let i = 0; i < this.material.length; i++) {
-        if (this.material[i].f_state == '未收费') {
-          this.material[i].f_state = '已收费'
+        this.f_cost_sum = 0
+        for (let i = 0; i < res.data.length; i++) {
+          this.f_cost_sum += Number(res.data[i].f_fee)
         }
-      }
-      let data = {
-        model: this.material
-      }
-      let res = await http.load('post', this.$androidUtil.getProxyUrl() + '/rs/logic/saveweinanmaterial', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '保存失败'
-      })
-      this.search()
-    },
-    async saveother() {
-      let http = new HttpResetClass()
-      let data1 = {
-        tablename: 't_material_service',
-        condition: `f_process_id = '${this.selectdata.f_process_id}' and f_state = '未收费'`
-      }
-      let res1 = await http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data1}, {
-        resolveMsg: null,
-        rejectMsg: '获取数据失败'
-      })
-      let data = {
-        tablename: 't_userfiles',
-        condition: `f_userinfo_id = '${this.selectdata.model.f_userinfo_id}'`
-      }
-      let res = await http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '获取数据失败'
-      })
-      let otherdetails = []
-      for (let i = 0; i < res1.data.length; i++) {
-        otherdetails.push(
-          {
-            "f_brand_spec": [res1.data[i].f_material_name],
-            "f_unitprice": res1.data[i].f_material_price,
-            "f_typename": [res1.data[i].f_typename],
-            "f_typenumber": [res1.data[i].f_typenumber],
-            "f_number": res1.data[i].f_material_number
-          }
-        )
-      }
-
-      console.log("查询的用户信息", otherdetails)
-      let data2 = {
-        "record_userinfo": this.selectdata.model.f_userinfo_id,
-        "f_userfiles_id": res.data[0].f_userfiles_id,
-        "f_user_id": res.data[0].f_user_id,
-        "f_user_name": this.selectdata.model.f_user_name,
-        "f_address": this.selectdata.model.f_address,
-        "f_user_type": this.selectdata.model.f_user_type,
-        "f_gasproperties": "",
-        "f_collection": this.f_cost_sum,
-        "f_comments": "",
-        "f_payment": this.charge.f_payment_method,
-        "f_voucher_number": "",
-        "f_bill_style": "普通收据",
-        "f_userinfo_id": this.selectdata.model.f_userinfo_id,
-        "f_service_person": Vue.user.name,
-        "f_operat_type": "其他收费",
-        "f_describe": "",
-        "f_state": "有效",
-        "f_operator": Vue.user.name,
-        "f_operatorid": Vue.user.id,
-        "f_orgid": Vue.user.orgid,
-        "f_orgname": Vue.user.orgs,
-        "f_depid": Vue.user.depids,
-        "f_depname": Vue.user.f_department_name,
-        "t_userfees": "",
-        "f_fee_type": "其他费用",
-        "f_fee_time": "12",
-        "otherdetail": otherdetails
-      }
-
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/sale_othercharge_logic`, {data: data2}, {
-        resolveMsg: null,
-        rejectMsg: '保存数据失败'
-      })
+        this.showCharge = true
+        this.charge.payment_terms[0].f_charge_money = this.f_cost_sum
+      },
+      accMul(arg1, arg2) {
+        let m = 0, s1 = arg1.toString(), s2 = arg2.toString();
+        try {
+          m += s1.split(".")[1].length
+        } catch (e) {
+        }
+        try {
+          m += s2.split(".")[1].length
+        } catch (e) {
+        }
+        return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
+      },
     },
-    async shoufei() {
-      let http = new HttpResetClass()
-      let data = {
-        tablename: 't_material_service',
-        condition: `f_process_id = '${this.selectdata.f_process_id}' and f_state = '未收费'`
-      }
-      let res = await http.load('post', this.$androidUtil.getProxyUrl() + '/rs/sql/tel_singleTable', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '获取数据失败'
-      })
-      if (res.data.length <= 0) {
-        this.$showMessage('请先添加未收费的材料！！！')
-        return
-      }
-      this.f_cost_sum = 0
-      for (let i = 0; i < res.data.length; i++) {
-        this.f_cost_sum += Number(res.data[i].f_fee)
-      }
-      this.showCharge = true
-      this.charge.payment_terms[0].f_charge_money = this.f_cost_sum
+    beforeDestroy() {
+      console.log('销毁了-----111', this.timer1)
+      window.clearInterval(this.timer1)
     },
-    accMul(arg1, arg2) {
-      let m = 0, s1 = arg1.toString(), s2 = arg2.toString();
-      try {
-        m += s1.split(".")[1].length
-      } catch (e) {
-      }
-      try {
-        m += s2.split(".")[1].length
-      } catch (e) {
+    events: {},
+    computed: {
+      paymentMethod() {
+        return this.$appdata.getParam("付款方式")
+      },
+      paymentTerm() {
+        return this.$appdata.getParam("收费项目")
       }
-      return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
     },
-  },
-  beforeDestroy(){
-    console.log('销毁了-----111',this.timer1)
-    window.clearInterval(this.timer1)
-  },
-  events: {},
-  computed: {
-    paymentMethod() {
-      return this.$appdata.getParam("付款方式")
-    },
-    paymentTerm() {
-      return this.$appdata.getParam("收费项目")
-    }
-  },
-  watch: {}
-}
+    watch: {}
+  }
 </script>
 <style lang="less" scoped>
-.head-but {
-  margin-left: 5px;
-  height: 34px;
-  /*background-color: #6aa6e2;*/
-  border-radius: 4px;
-  font-family: PingFang;
-  color: #ffffff;
-}
+  .head-but {
+    margin-left: 5px;
+    height: 34px;
+    /*background-color: #6aa6e2;*/
+    border-radius: 4px;
+    font-family: PingFang;
+    color: #ffffff;
+  }
+
+  /*清除model中的浮动*/
+  .clearfix:after, .clearfix:before {
+    display: table;
+  }
+
+  .clearfix:after {
+    clear: both;
+  }
 
-/*清除model中的浮动*/
-.clearfix:after, .clearfix:before {
-  display: table;
-}
+  .lab_sty {
+    margin-bottom: 0;
+    display: flex;
+    flex-direction: row-reverse;
+    align-items: center;
+  }
 
-.clearfix:after {
-  clear: both;
-}
-.lab_sty{
-  margin-bottom: 0;
-  display: flex;
-  flex-direction: row-reverse;
-  align-items: center;
-}
-.row_sty{
-  display: flex;
-  align-items: center;
-  margin: 5px;
-}
+  .row_sty {
+    display: flex;
+    align-items: center;
+    margin: 5px;
+  }
 
 </style>