apply-clients 3.3.2-80-test → 3.3.2-81-test

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

@@ -8,8 +8,6 @@
           <th class="textNoLineBreak">材料型号</th>
           <th class="textNoLineBreak">材料单位</th>
           <th class="textNoLineBreak">材料数量</th>
-          <th class="textNoLineBreak">材料单价</th>
-          <th class="textNoLineBreak">总金额</th>
           <th class="textNoLineBreak">
             <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
             </button>
@@ -33,12 +31,6 @@
           <td style="text-align: center;">
             <nobr>{{row.f_material_number}}</nobr>
           </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_material_price}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_material_price*row.f_material_number}}</nobr>
-          </td>
           <td style="text-align: center;">
             <button type="button" class="button_search button_spacing"
                     @click="$parent.$parent.updateMaterial($index,row)">修改
@@ -115,21 +107,39 @@
             <label class="col-sm-4 control-label">材料数量：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
-                     placeholder="材料数量"
+                     placeholder="设备数量"
                      v-model="item.f_material_number"
                      :value="item.f_material_number"
-                     @change="ChangeMoney()"
               />
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">材料单价：</label>
+            <label class="col-sm-4 control-label">材料编号：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料编号"
+                     v-model="item.f_bjq_sid"
+                     :value="item.f_bjq_sid"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">材料标识：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style=""
-                     placeholder="材料单价"
-                     v-model="item.price"
-                     :value.sync="item.price"
-                     @change="ChangeMoney()"
+                     placeholder="材料标识"
+                     v-model="item.f_material_code"
+                     :value.sync="item.f_material_code"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">用户编号：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style=""
+                     placeholder="用户编号"
+                     v-model="item.f_userinfo_code"
+                     :value.sync="item.f_userinfo_code"
               />
             </div>
           </div>
@@ -140,9 +150,8 @@
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <template v-if="mark !== 1">
-          <span class="modal-title me-3">累计金额:{{totalmoney}}</span>
           <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="pushMaterial()">添加材料</button>
-          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterialBefore()"
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterial()"
                   :disabled="!$v.valid">确认添加
           </button>
           <button type="button" class="btn btn-primary" v-if="title==='修改'" @click="updateConfirm()"
@@ -151,37 +160,6 @@
         </template>
       </footer>
     </modal>
-    <modal v-if="showCharge" :show.sync="showCharge" v-ref:modal :large="true" :backdrop="false" title="收费明细">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-        <h4 class="modal-title">材料收费</h4>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div class="form-group row vertical-center">
-          <label class="col-xs-4 control-label">付款方式：</label>
-          <div class="col-xs-8">
-            <input-select class="select select_list"
-                          v-model="f_payment_method"
-                          :value.sync="f_payment_method"
-                          :options='paymentMethod'
-                          @change="paymentMethodChange"
-                          :value-single="true"
-                          close-on-select ></input-select>
-          </div>
-        </div>
-        <div class="text-center" v-if="f_payment_method=='二维码'">
-          <p><b>收费金额：{{ totalmoney }}￥</b></p>
-          <div id="qrcode" class="qrcode" v-ref:qrcode></div>
-          <p>
-            等待支付，剩余&ensp;<span style="color: #ff791a">{{timeLeft}}</span>&ensp;秒
-          </p>
-          <button type="button" @click="closeQRCode">取消支付</button>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button  v-if="f_payment_method!='二维码'"  id="savebut" type="button" class="btn btn-primary" @click.prevent="addMaterial()">确认</button>
-      </footer>
-    </modal>
   </div>
 </template>
 <script>
@@ -199,15 +177,9 @@ export default {
       onetomany: {
         rows: []
       },
-      timeLeft: 120,
-      paymentInterval: null,
-      orderInterval: null,
-      order: null,
+      totalPrice:0,
       title: '新增',
-      showCharge: false,
       showMaterialModal: false,
-      totalmoney:0,
-      f_payment_method:'',
       materials: [
         {
           material: '',
@@ -217,7 +189,6 @@ export default {
           f_material_number: '',
           f_bjq_sid: '',
           f_material_code: '',
-          price:0,
           f_userinfo_code:''
         }
       ],
@@ -225,67 +196,13 @@ export default {
       row: {},
       bjqChecklag:[],
       fmaterialname:{},
-      filiale:"",
-      paymentMethod:[
-        {
-          value: '现金',
-          label: '现金'
-        },
-        {
-          value: '二维码',
-          label: '二维码'
-        }
-      ],
       isShow:[false]
     }
   },
   ready() {
     this.getOnetoManyData()
-    if (Vue.user.orgid == '10101') {
-      console.log('zhoukou')
-      this.filiale = 'zhoukou'
-    }else if (Vue.user.orgid == '35520') {
-      console.log('xiangcheng')
-      this.filiale = 'xiangcheng'
-    }else if (Vue.user.orgid == '35532') {
-      console.log('luyi')
-      this.filiale = 'luyi'
-    }else if (Vue.user.orgid == '35538') {
-      console.log('dancheng')
-      this.filiale = 'dancheng'
-    }else if (Vue.user.orgid == '35526') {
-      console.log('xihua')
-      this.filiale = 'xihua'
-    }else {
-      this.$showMessage('分公司异常，请联系管理员！')
-    }
   },
   methods: {
-    closeQRCode(){
-      this.clearQrCode()
-      this.f_payment_method=''
-      this.showCharge =false
-      clearInterval(this.paymentInterval)
-      clearInterval(this.orderInterval)
-
-    },
-    closeModal(){
-      this.showCharge= false
-      this.f_payment_method=''
-      clearInterval(this.paymentInterval)
-      clearInterval(this.orderInterval)
-    },
-    ChangeMoney() {
-      this.totalmoney = 0
-      for (let i = 0; i < this.materials.length; i++) {
-        const number = Number(this.materials[i].f_material_number) || 0
-        const price = Number(this.materials[i].price) || 0
-        this.totalmoney += this.accMul(number, price) // 复用高精度乘法
-        this.materials[i].f_userinfo_code = this.selectdata.f_userinfo_code || ''
-      }
-      // 保留2位小数，避免金额显示异常
-      this.totalmoney = Number(this.totalmoney.toFixed(2))
-    },
     async getOnetoManyData () {
       let http = new HttpResetClass()
       let data = {
@@ -299,6 +216,10 @@ export default {
         {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
       )
       this.onetomany.rows = res.data
+      this.totalPrice = 0
+      for (let i = 0; i < this.onetomany.rows.length; i++) {
+        this.totalPrice=this.totalPrice+(parseFloat(this.onetomany.rows[i].f_material_price)*parseFloat(this.onetomany.rows[i].f_material_number))
+      }
     },
     async openMaterialModal() {
       this.getMateralNames()
@@ -312,7 +233,6 @@ export default {
           f_material_number: '',
           f_bjq_sid: '',
           f_material_code: '',
-          price:0,
           f_userinfo_code: ''
         }
       ],
@@ -332,7 +252,6 @@ export default {
         f_material_number: '',
         f_bjq_sid: '',
         f_material_code: '',
-        price:0,
         f_userinfo_code: ''
       })
       this.isShow.push(false)
@@ -367,102 +286,19 @@ export default {
       this.materials[index].f_material_number = material.f_material_number
       this.materials[index].f_material_code = material.f_material_code
       this.materials[index].f_userinfo_code = material.f_userinfo_code
-      this.materials[index].price = material.price
       if (material.f_material_name === "报警器-汉威") {
         this.isShow[index] = true
       } else {
         this.isShow[index] = false
       }
-    },
-    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)
+      this.isShow.splice(0, 1, this.isShow[0])
     },
     // 新增材料
-    async paymentMethodChange() {
-      if (this.f_payment_method == '二维码') {
-        let http = new HttpResetClass()
-        let data = {
-          money: this.accMul(this.totalmoney, 100),
-          attach: {
-            "f_type": '报建材料收费',
-            "f_user": Vue.user.id
-          },
-          str: "",
-          config: this.filiale,
-          f_revenue: "productV3"
-        }
-        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ICBCGetCode`, data, {
-          resolveMsg: null,
-          rejectMsg: '订单生成失败！！！'
-        })
-        console.log('=================================')
-        console.log(JSON.stringify(res.data))
-        this.order = res.data
-        this.qrcode()
-        this.paymentInterval = setInterval(() => {
-          this.timeLeft = this.timeLeft - 1
-          if (this.timeLeft <= 0) {
-            this.$showMessage('支付超时，请重新发起支付')
-            this.closeQRCode() // 调用已有的取消支付方法
-          }
-        }, 1000)
-        this.orderInterval = setInterval(() => {
-          this.getOrderInformation()
-        },3000)
-      }
-    },
-    async addMaterialBefore() {
-      this.timeLeft= 120
-      this.showCharge= true
-    },
-    // 获取订单信息
-    async getOrderInformation () {
-      let http = new HttpResetClass()
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
-        data: {
-          items: "id",
-          tablename: "t_weixinreturnxml",
-          condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_bill_state = 1 `,
-          orderitem: "id"
-        }
-      }, {
-        resolveMsg: null,
-        rejectMsg: '订单查询失败！！！'
-      })
-      if (res.data.length > 0) {
-        this.$showMessage('支付成功！！！')
-        clearTimeout(this.paymentInterval)
-        clearTimeout(this.orderInterval)
-        this.timeLeft = 10
-        // 清除二维码
-        this.clearQrCode()
-        this.addMaterial()
-      }
-    },
-    qrcode () {
-      let qrcode = new QRCode('qrcode',{
-        text: this.order.url, // 设置二维码内容或跳转地址
-        width: 200, // 设置宽度，单位像素
-        height: 200, // 设置高度，单位像素
-        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/Hs
-      })
-    },
-    clearQrCode () {
-      document.getElementById('qrcode').innerHTML = ''
-    },
     async addMaterial() {
       this.title = '新增'
       let data = {
         f_process_id: this.selectdata.f_process_id,
+        f_userinfo_code: this.selectdata.f_userinfo_code,
         f_operator_id: Vue.user.id,
         f_operator: Vue.user.name,
         f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
@@ -483,28 +319,14 @@ export default {
         `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
         data
       )
-      this.closeMaterials()
-    },
-    async addMaterialAfter() {
-      let data = {
-        f_out_trade_no:this.order.f_out_trade_no
+      await this.getOnetoManyData()
+      if(this.selectdata.f_apply_type='改管报建'){
+        this.$dispatch('addMaterial',  this.totalPrice)
       }
-      //报警器流程 设备编号检验
-      await this.bjqCheck()
-      if (this.bjqChecklag.length > 0) {
-        return
-      }
-
-      let http = new HttpResetClass()
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/logic/SaveMaterialsAfter`,
-        data
-      )
       this.closeMaterials()
     },
     async deleteMaterial(row) {
-
+      debugger
       var show1 =  window.confirm('您确定要删除这条记录吗?')
       if(show1 != true){
         this.closeMaterials()
@@ -516,9 +338,14 @@ export default {
           {data: row},
           {resolveMsg: null, rejectMsg: '材料删除失败！！！'}
         )
+        await this.getOnetoManyData()
+        if(this.selectdata.f_apply_type='改管报建'){
+          this.$dispatch('addMaterial',  this.totalPrice)
+        }
         this.closeMaterials()
       }
-    },
+    }
+    ,
     async updateMaterial(index, row) {
       this.title = '修改'
       this.row = row
@@ -532,8 +359,7 @@ export default {
           f_material_number: row.f_material_number,
           f_material_code: row.f_material_code,
           f_bjq_sid: row.f_bjq_sid,
-          f_userinfo_code: row.f_userinfo_code,
-          price:row.f_material_price
+          f_userinfo_code: row.f_userinfo_code
         }
       ]
       this.showMaterialModal = true
@@ -547,7 +373,7 @@ export default {
       data.f_material_code = this.materials[0].f_material_code
       data.f_bjq_sid = this.materials[0].f_bjq_sid
       data.f_userinfo_code=this.materials[0].f_userinfo_code
-      data.f_material_price = this.materials[0].price
+
       //报警器流程 设备编号检验
       await this.bjqCheck()
       if (this.bjqChecklag.length > 0){
@@ -569,7 +395,6 @@ export default {
     closeMaterials() {
       this.getOnetoManyData()
       this.showMaterialModal = false
-      this.showCharge= false
     },
     async bjqCheck(){
       //报警器设备型号校验
@@ -600,15 +425,9 @@ export default {
         }
       }
     }
-  },
-  beforeDestroy() {
-    clearInterval(this.paymentInterval)
-    clearInterval(this.orderInterval)
-    this.clearQrCode() // 清理二维码DOM
   }
 }
 
-
 </script>
 
 <style scoped>