apply-clients 5.0.35-3 → 5.0.35-32

package/src/components/product/Process/Processes/Service/PaperTicketBill.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="auto form-horizontal" >
+    <modal :show.sync="show"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">发票号</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' >
+              <div  class="form-group col-sm-6">
+                <label class=" col-sm-2 control-label">发票代码:</label>
+                <input  type="text" class="form-control" v-model="model.f_bill_code" style="width:60%"
+                        placeholder="发票代码" disabled
+                >
+              </div>
+              <div  class="form-group col-sm-6">
+                <label class=" col-sm-2 control-label">发票号码:</label>
+                <input  type="text" class="form-control" v-model="model.f_bill_number" style="width:60%"
+                        placeholder="发票号码" disabled
+                >
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default"  @click='cancel()' >取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import { DataModel } from 'vue-client'
+  let getBillData = async function(self) {
+    if(self.data.eticketid){
+      let res=await self.$resetpost("rs/sql/applysingleTable",{data:{tablename:"t_eticket",condition:` id= ${self.data.eticketid}`}})
+      console.log("看看res",res)
+      self.model.f_bill_code=res.data[0].f_bill_code
+      self.model.f_bill_number=res.data[0].f_bill_number
+    }else{
+      let res=await self.$resetpost("rs/sql/applysingleTable",{data:{tablename:"t_eticket",condition:`  f_sell_id=${self.data.id}`}})
+      console.log("看看res",res)
+      self.model.f_bill_code=res.data[0].f_bill_code
+      self.model.f_bill_number=res.data[0].f_bill_number
+    }
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model:{
+          f_bill_code:'',
+          f_bill_number:''
+        }
+      }
+    },
+    props: ['show', 'data'],
+    ready () {
+    },
+    methods: {
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+            this.$emit('ready')
+          }).catch((error) => {
+            this.$emit('error', error)
+          })
+        }
+      }
+    },
+    events: {
+    }
+  }
+
+</script>
+<style >
+</style>

package/src/components/product/Process/Processes/Service/ServiceControl.vue

@@ -1439,24 +1439,28 @@
           this.$refs.service_show.data.fields[index].label === '人工费'
         ) {
           console.log('即将合成价格')
+          let a1 = 0
+          let b1 = 0
+          let c1 = 0
           let fee = 0
           for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
             // 控制设置级联
             // 源select所选的值 this.$refs.service_show.data.activitys.fields[index].value
             // xxx xx xxx
             if (this.$refs.service_show.data.fields[i].label === '工程安装费' && this.$refs.service_show.data.fields[i].value) {
-              fee += parseInt(this.$refs.service_show.data.fields[i].value)
+              a1 = this.$refs.service_show.data.fields[i].value
             }
             if (this.$refs.service_show.data.fields[i].label === '材料费' && this.$refs.service_show.data.fields[i].value) {
-              fee += parseInt(this.$refs.service_show.data.fields[i].value)
+               b1= this.$refs.service_show.data.fields[i].value
             }
             if (this.$refs.service_show.data.fields[i].label === '人工费' && this.$refs.service_show.data.fields[i].value) {
-              fee += parseInt(this.$refs.service_show.data.fields[i].value)
+              c1 = this.$refs.service_show.data.fields[i].value
             }
+            fee=parseFloat(parseFloat(a1) + parseFloat(b1)+parseFloat(c1)).toFixed(2)
             // 数据获取完毕时放入地址text
             for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
               if (this.$refs.service_show.data.fields[i].label === '费用合计'||this.$refs.service_show.data.fields[i].label === '未结总金额') {
-                this.$refs.service_show.data.fields[i].value = fee
+                this.$refs.service_show.data.fields[i].value =fee
                 console.log('修改fields[i].value后的值=>' + this.$refs.service_show.data.fields[i].value)
               }
             }

package/src/components/product/ServiceView.vue

@@ -10,13 +10,13 @@
     <!--</div>-->
     <validator name="v">
       <form class="form-horizontal">
-        <div class="col-sm-12 form-group">
+        <div class="col-sm-12 form-group form-group1">
           <div v-for="(index,item) in data.fields">
             <!--input-->
-            <div :style="item.style? item.style+';height: 34px;':'height: 34px;'"
+            <div :style="item.style+';height: 34px;'"
                  v-if="item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email'"
                  v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group form-group1']">
               <label :style="item.label_style? item.label_style:''+';width:85px;'"
                      :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':item.label_style?'':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <div :style="item.value_style? item.value_style:''"
@@ -36,7 +36,7 @@
             <!--时间datepicker-->
             <div :style="item.style? item.style+';height: 34px;':'height: 34px;'" v-if="item.type==='datepicker'"
                  v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group form-group1']">
               <label style="width:85px"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':'control-label control-label-justify col-sm-6'">{{item.label}}</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
@@ -94,7 +94,7 @@
 
             <!--select-->
             <div style="height: 34px" v-if="item.type==='select'" v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group ':'col-sm-4 form-group']">
               <label style="width:85px;"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label control-label-justify':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <input-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur="check_disable"
@@ -797,4 +797,7 @@
   tr {
     height: 34px;
   }
+  .form-group{
+    margin-top:20px;
+  }
 </style>

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -133,11 +133,7 @@
             }
           ]
         }
-        // 完成时间和完成人,部门，分公司
-        this.data.filiale = this.selectdata.f_filiale
-        this.data.f_parentname = this.selectdata.f_parentname
-        this.data.operate_date = this.selectdata.finishtime
-        this.data.operator = this.selectdata.sender
+
       }
     },
     events:{
@@ -393,7 +389,19 @@
         if (sum == 1) {
           this.data = jsonData
           this.initializtion()
-          this.showview = true
+          // 完成时间和完成人,部门，分公司
+          if(this.selectdata.defname =='完工'){ this.data.filiale = this.selectdata.f_filiale
+            this.data.f_parentname = this.selectdata.f_parentname
+            this.data.operate_date = this.selectdata.sendtime
+            this.data.operator = this.selectdata.sender
+            this.showview = true
+          }else{
+            this.data.f_parentname = this.selectdata.f_parentname
+            this.data.operate_date = this.selectdata.finishtime
+            this.data.operator = this.selectdata.person
+            this.showview = true
+          }
+
         } else if (sum == 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
         } else {

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -113,7 +113,7 @@
               <div class="col-sm-2" style="float: left">
                 <label class="col-sm-4 control-label">报装来源</label>
                 <div class="col-sm-8">
-                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'燃气系统',value:'燃气系统'},{label:'微信',value:'微信'}]"
+                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'燃气系统',value:'燃气系统'},{label:'微信',value:'微信'},{label:'住建局',value:'住建局'}]"
                             condition="f_apply_source = '{}'" placeholder='报装来源'
                             v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
                   </v-select>

package/src/ezhouAndroid.js

@@ -1,45 +1,44 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function () {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-/** ***************************报建模块*********************************/
-  // 报建 总入口
-  Vue.component('apply_app', (resolve) => { require(['./components/app_apply/ApplyApp'], resolve) })
-  //报建 待办流程页
-  Vue.component('placecontrolerapp', (resolve) => { require(['./components/app_apply/PlaceControler'], resolve) })
-  //报建 已办事项
-  Vue.component('applydownlist', (resolve) => { require(['./components/app_apply/ApplyDownList'], resolve) })
-  //报建 上传
-  Vue.component('applylistupload', (resolve) => { require(['./components/app_apply/ApplyListUpload'], resolve) })
-  //报建 待办事项
-  Vue.component('applytodolist', (resolve) => { require(['./components/app_apply/ApplyToDoList'], resolve) })
-  //报建 用户信息
-  Vue.component('apply-user-info', (resolve) => { require(['./components/app_apply/ApplyUserInfo'], resolve) })
-  //报建 报建流程信息
-  Vue.component('apply-info', (resolve) => { require(['./components/app_apply/ApplyInfo'], resolve) })
-  //报建 现场勘探
-  Vue.component('fieldexploration', (resolve) => { require(['./components/app_apply/FieldExploration'], resolve) })
-  //报建 竣工验收
-  Vue.component('acceptance', (resolve) => { require(['./components/app_apply/Acceptance'], resolve) })
-  //报建 通气点火
-  Vue.component('ventilation', (resolve) => { require(['./components/app_apply/Ventilation'], resolve) })
-
-  Vue.component('back-page', (resolve) => { require(['./components/app_apply/ToolsPage.vue'], resolve) })
-
-  // 业务tab(control层)页
-  Vue.component('service-control-app', (resolve) => { require(['./components/app_apply/ServiceControl'], resolve) })
-  // 公共业务显示(view层)页
-  Vue.component('service-view-app', (resolve) => { require(['./components/app_apply/ezhou/ServiceView'], resolve) })
-  Vue.component('minyong', (resolve) => { require(['./components/app_apply/ezhou/MinYong'], resolve) })
-  Vue.component('feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongV'], resolve) })
-  Vue.component('feiminyongvv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongVV'], resolve) })
-  // Vue.component('hetong-minyong', (resolve) => { require(['./components/app_apply/ezhou/HeTongMinYong'], resolve) })
-  // Vue.component('hetong-feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/HeTongFeiMinYongV'], resolve) })
-
-}
+import Vue from 'vue'
+import { all } from 'vue-client'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function () {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+/** ***************************报建模块*********************************/
+  // 报建 总入口
+  Vue.component('apply_app', (resolve) => { require(['./components/app_apply/ApplyApp'], resolve) })
+  // 报建 待办流程页
+  Vue.component('placecontrolerapp', (resolve) => { require(['./components/app_apply/PlaceControler'], resolve) })
+  // 报建 已办事项
+  Vue.component('applydownlist', (resolve) => { require(['./components/app_apply/ApplyDownList'], resolve) })
+  // 报建 上传
+  Vue.component('applylistupload', (resolve) => { require(['./components/app_apply/ApplyListUpload'], resolve) })
+  // 报建 待办事项
+  Vue.component('applytodolist', (resolve) => { require(['./components/app_apply/ApplyToDoList'], resolve) })
+  // 报建 用户信息
+  Vue.component('apply-user-info', (resolve) => { require(['./components/app_apply/ApplyUserInfo'], resolve) })
+  // 报建 报建流程信息
+  Vue.component('apply-info', (resolve) => { require(['./components/app_apply/ApplyInfo'], resolve) })
+  // 报建 现场勘探
+  Vue.component('fieldexploration', (resolve) => { require(['./components/app_apply/FieldExploration'], resolve) })
+  // 报建 竣工验收
+  Vue.component('acceptance', (resolve) => { require(['./components/app_apply/Acceptance'], resolve) })
+  // 报建 通气点火
+  Vue.component('ventilation', (resolve) => { require(['./components/app_apply/Ventilation'], resolve) })
+
+  Vue.component('back-page', (resolve) => { require(['./components/app_apply/ToolsPage.vue'], resolve) })
+
+  // 业务tab(control层)页
+  Vue.component('service-control-app', (resolve) => { require(['./components/app_apply/ServiceControl'], resolve) })
+  // 公共业务显示(view层)页
+  Vue.component('service-view-app', (resolve) => { require(['./components/app_apply/ezhou/ServiceView'], resolve) })
+  Vue.component('minyong', (resolve) => { require(['./components/app_apply/ezhou/MinYong'], resolve) })
+  Vue.component('feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongV'], resolve) })
+  Vue.component('feiminyongvv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongVV'], resolve) })
+  // Vue.component('hetong-minyong', (resolve) => { require(['./components/app_apply/ezhou/HeTongMinYong'], resolve) })
+  // Vue.component('hetong-feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/HeTongFeiMinYongV'], resolve) })
+}

package/src/index.js

@@ -1,8 +1,8 @@
-import apply from './apply'
-import applyAndroid from './applyAndroid'
-import ezhouAndroid from './ezhouAndroid'
-export {
-  apply,
-  applyAndroid,
-  ezhouAndroid
-}
+import apply from './apply'
+import applyAndroid from './applyAndroid'
+import ezhouAndroid from './ezhouAndroid'
+export {
+  apply,
+  applyAndroid,
+  ezhouAndroid
+}

package/src/main.js

@@ -7,7 +7,7 @@ import {sale} from 'sale-client'
 import {material} from 'material-client'
 
 import apply from './apply'
-import applyAndroid from './applyAndroid'
+import applyAndroid from './ezhouAndroid'
 import 'lib-flexible/flexible.js'
 /*import vueBubble from 'vue-bubble'
 Vue.use(vueBubble)*/

package/src/plugins/commonService.js

@@ -1,12 +1,15 @@
 import Vue from 'vue'
 
-let openEticketGen = async function (id, type, conf) {
+let openEticketGen = async function (param, type, conf) {
   // 组织数据
-  let getEticket = await Vue.resetpost('rs/logic/combineData', {id: id, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
+  let getEticket = await Vue.resetpost('rs/logic/bjcombineData', {param: param, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
   console.log('获取的电子票数据', getEticket)
-  // 请求电子票
-  await Vue.resetpost('rs/logic/openEticket', {id: getEticket.data, eticket: conf}, {resolveMsg: '开票成功', rejectMsg: '开具电子票出错, 请到票据管理重新开具'})
-}
+  try{
+    let url= await Vue.resetpost('rs/logic/bjopenEticket', {sell_id: param.id,eticket_id:getEticket.data.eticket_id,conf:conf},{resolveMsg: null, rejectMsg: null})
+    return url
+  }catch (e) {
+    Vue.showAlert(`电子发票开票失败,请在发票管理处重新开具`,'warning',3000)
+  }}
 
 let correctEticketGen = async function (id, type, conf) {
   let param = {
@@ -110,13 +113,14 @@ let commonService = {
     await Vue.resetpost('rs/logic/sale_reissueBill', {data: param}, {resolveMsg: null, rejectMsg: '更新发票号失败，请从右侧操作卡片进行补打！！'})
   },
 
-  async openEticket (sellId, chargeType) {
+  async openEticket (param, chargeType) {
     // 获取各分公司下的电子票配置文件
     // 从vues目录下获取电子票配置
     try {
       let conf = await commonService.getSelfConfig()
       console.log('看看配置文件', conf)
-      await openEticketGen(sellId, chargeType, conf)
+      let tecket =await openEticketGen(param, chargeType, conf)
+      return tecket
     } catch (error) {
       console.log('电子发票开票失败', JSON.stringify(error))
       Vue.showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)