apply-clients 5.0.35-40 → 5.0.35-43

package/package.json

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

package/src/components/app_apply/OneToMany.vue

@@ -170,11 +170,13 @@ export default {
     },
     search(){
       const param = {
+        "items":"*",
         "tablename":this.item.tables[0],
-        "condition":`f_process_id='${this.item.f_process_id}'`
+        "condition":`f_process_id='${this.item.f_process_id}'`,
+        "orderitem":'id desc'
       }
       let http=new HttpResetClass()
-      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,{data:param}).then(res=>{
+      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data:param}).then(res=>{
         console.log(`前台本地报建代办工单查询结果data=>>>${JSON.stringify(res.data)}`)
         if(res.data){
           this.rows = res.data

package/src/components/app_apply/ezhou/ServiceView.vue

@@ -174,7 +174,7 @@
             </div>
           </div>
         </div>
-        <div class="form-group col-sm-11" v-show="isshow">
+        <div class="form-group col-sm-11" v-show="true">
           <label class="text-left font">用户签名</label>
           <div class="auto">
             <div class="panel">
@@ -481,6 +481,9 @@ export default {
           if (this.data.fields[i].type === 'datepicker' && !this.data.fields[i].value) {
             this.data.fields[i].value = new Date().Format("yyyy-MM-dd HH:mm:ss")
           }
+          if(this.data.f_user_type ==='非民用'){
+            this.data.fields[i].required = false
+          }
           if (this.data.fields[i].label==='气价名称'){
             console.log(this.data.fields[i].options)
             let data={
@@ -577,7 +580,7 @@ export default {
     // 点击按钮
     clicked(index, button) {
       console.log(`点击了按钮index:${index}+button:${JSON.stringify(button)}`);
-      if (this.data.title != '现场勘查' && this.data.title != '现场勘查定价' && button.button_name=='提交') {
+      if (button.button_name=='提交') {
         if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
           this.$showMessage("必须有现场照片")
           return;
@@ -593,12 +596,12 @@ export default {
       }
 
 
-      if ((this.data.title == '现场勘查' || this.data.title == '现场勘查定价') && button.button_name=='提交') {
-        if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
-          this.$showMessage("必须有现场照片")
-          return;
-        }
-      }
+      // if ((this.data.title == '现场勘查' || this.data.title == '现场勘查定价') && button.button_name=='提交') {
+      //   if (!this.model.f_overall_imgs || this.model.f_overall_imgs.length == 0){
+      //     this.$showMessage("必须有现场照片")
+      //     return;
+      //   }
+      // }
       if (this.kchege == 'true') {
         console.log(this.model.f_hege)
         if (this.model.f_hege != 'true') {
@@ -712,7 +715,7 @@ export default {
         // }
         // this.$set('data.fields[8].value', money)
         // this.$set('data.fields[9].value', money)
-        if (index == 10) {
+        if (index == 7) {
           console.log("1111111111" + value)
           if (value == '合格') {
             this.kchege = true

package/src/components/product/Common/PrintBill.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="auto form-horizontal" >
-    <modal :show.sync="show"  v-ref:modal large backdrop="false">
+    <modal  :show.sync="show"  v-ref:modal large backdrop="false">
       <header slot="modal-header" class="modal-header">
         <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
         <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
@@ -35,6 +35,7 @@
   import Vue from "vue";
 
   let getBillData = async function(self, val) {
+    debugger
     self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
     await self.bill.search(self.data.chargeid)
     // self.bill.condition=
@@ -54,7 +55,7 @@
         messShow: false
       }
     },
-    props: ['show', 'data', 'billData', 'billConfig','titleName'],
+    props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
     ready () {
       console.log('打票！！！！！！！！！！！！！！！！！')
 

package/src/components/product/Function/functions/InstallFee.vue

@@ -230,10 +230,15 @@
                                    @validate-bill="validateBill"></apply-validate-bill>
               <printbill :show="print" :data='model' :selfclean="selfclean" :bill-config='config' :bill-data='billData'
                          v-on:toggle="close" :selfsearch="load" @printok="printok" v-ref:printbill></printbill>
+              <printbill :show="printat" :data='model' :selfclean="selfclean" :bill-config='config' :bill-data='billDataantai'
+                         v-on:toggle="close" :selfsearch="load" @printok="printok" v-ref:printbill></printbill>
               <bjpaper-ticket-bill :show="paperticket" :data='ids' @toggle="closeticket"></bjpaper-ticket-bill>
               <printbill :show="delprint" :data='model' :selfclean="selfclean" :bill-config='config2'
                          :bill-data='billData' v-on:toggle="close" :selfsearch="load" @printok="printok"
                          v-ref:printbill></printbill>
+              <printbill :show="delprintat" :data='model' :selfclean="selfclean" :bill-config='config2'
+                         :bill-data='billDataantai' v-on:toggle="close" :selfsearch="load" @printok="printok"
+                         v-ref:printbill></printbill>
               <div class="row" style="text-align:right;">
                 <button :readonly="!validateOk" type="button" class="btn btn-success" style="" @click='confirm'>确认
                 </button>
@@ -389,12 +394,18 @@
         paymenttypes: this.$appdata.getParam('付款方式'),
         printstyle: this.$appdata.getParam('打印格式'),
         print: false,
+        printat: false,
         delprint: false,
+        delprintat:false,
         taxprint: false,
         billData: {
           url: 'rs/report/applyCharge_bill',
           bill: ''
         },
+        billDataantai: {
+          url: 'rs/report/applyChargeAT_bill',
+          bill: ''
+        },
         config: {
           hasPrint: true,  //默认打票
           hasBillManage: true,  //默认不启用发票管理
@@ -595,7 +606,9 @@
         console.log("关闭打印框")
         this.taxprint = false
         this.print = false
+        this.printat = false
         this.delprint = false
+        this.delprintat = false
         this.clean()
       },
       printok() {
@@ -792,12 +805,25 @@
 
                 this.model.f_bill_type = this.model.f_print[0]
                 this.model.f_bill_style = this.model.f_print[0]
-                this.print = true
+                debugger
+                console.log('打印this.model.f_print[0]',this.model.f_print[0])
+                debugger
+                if(this.model.f_payment_account==='欣泰'){
+                  this.print = true
+                }else{
+                  this.printat = true
+                }
+
 
                 console.log('f_bill_style' + this.model.f_bill_style)
 
               } else {
-                this.print = true
+                debugger
+                if(this.model.f_payment_account==='欣泰'){
+                  this.print = true
+                }else{
+                  this.printat = true
+                }
               }
             } else if (this.model.f_print[0] === '纸质普票') {
               this.param.f_print = this.model.f_print[0],
@@ -847,7 +873,6 @@
         this.model.rows[index].f_charge_money = -this.model.rows[index].f_charge_money;
         var val = this.model.rows[index];
         this.model.chargeid = val.id;
-
         this.delprint = false;
         this.charges = [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}],
           console.log(JSON.stringify(val))
@@ -867,12 +892,25 @@
               this.model.chargeid = res.data.charge_id;
               if (val.f_bill_style === '增值税电子发票') {
                 this.$showAlert('申请增值税电子发票冲正成功,请稍后到报建功能中【报建收费】中查看电子发票', 'success', 5000)
-                this.delprint = true;
+                if(this.model.f_payment_account==='欣泰'){
+                  this.delprint = true;
+                }else{
+                  this.delprintat = true
+                }
+
               } else {
                 this.$showAlert('冲正成功', 'success', 2000)
+                if(this.model.f_payment_account==='欣泰'){
+                  this.delprint = true;
+                }else{
+                  this.delprintat = true
+                }
+              }
+              if(this.model.f_payment_account==='欣泰'){
                 this.delprint = true;
+              }else{
+                this.delprintat = true
               }
-              this.delprint = true;
               this.load()
             } else {
               this.$showAlert('冲正失败', 'warning', 5000)