apply-clients 5.0.35-2 → 5.0.35-20

package/src/components/product/Process/ExplorationSelect.vue

@@ -94,7 +94,7 @@
                 <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:'集体报建'}]"
-                            condition="f_apply_type = '{}'" placeholder='报建类型'
+                            condition="f_apply_type = '{}'" placeholder='报建类型' :search="true"
                             v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
                   </v-select>
                 </div>
@@ -112,7 +112,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/components/product/Process/Processes/CustomerRecordMessage.vue

@@ -598,21 +598,18 @@
         if (!this.selectdata)
           return
         let data = {
-          tablename: 't_userinfo',
+          tablename: 't_userinfo u   left join t_user_address ua on u.f_userinfo_id=ua.f_userinfo_id',
           condition: 'f_process_id=' + '\'' + this.selectdata.f_process_id + '\''
         }
         let self = this
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+        let res = await http.load('POST', 'rs/sql/singleTableUserInfo', {data: data}, {
           resolveMsg: null,
           rejectMsg: '获取户档案信息失败'
         })
         self.model.rows = []
-
           self.model.rows = res.data
           self.params = res.data
-
-
       },
       impexcel() {
         this.importtype='1'

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

@@ -196,57 +196,57 @@
         filialeNameStr: null,
         filialeCodeStr: this.$login.f.f_orgids,
         userid: this.$login.f.id,
-        source:`tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
        // f_operate_start_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
        // f_operate_end_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
-        model: new PagedList('rs/sql/getApplyCharge', 30, { orderitem: '`id`'}),
-        modeluse: new PagedList('rs/sql/getApplyCharge', 999999, { orderitem: '`id`'}),
-        price: new PagedList('rs/sql/getChargeAll', 999999, { orderitem: '`f_charge_money`'}),
-        human:[],
-        filiale:[],
-        method:[],
-        correct:[
+        model: new PagedList('rs/sql/getApplyCharge', 30, {orderitem: '`id`'}),
+        modeluse: new PagedList('rs/sql/getApplyCharge', 999999, {orderitem: '`id`'}),
+        price: new PagedList('rs/sql/getChargeAll', 999999, {orderitem: '`f_charge_money`'}),
+        human: [],
+        filiale: [],
+        method: [],
+        correct: [
           {label: '是', value: '是'},
-          {label:'否', value: '否'}
+          {label: '否', value: '否'}
         ],
-        state:[
+        state: [
           {label: '有效', value: '有效'},
-          {label:'无效', value: '无效'}
+          {label: '无效', value: '无效'}
         ]
       }
     },
     ready () {
-      this.$refs.cp.$refs.cri.model.f_operate_start_date = Util.toStandardDateString() + ' 00:00:00'
-      this.$refs.cp.$refs.cri.model.f_operate_end_date = Util.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.model.f_operate_start_date = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.f_operate_end_date = Util.toStandardDateString() + ' 23:59:59'
       this.search()
       this.gethuman()
     },
     methods: {
-      clear(){
-        this.$refs.cp.$refs.cri.model = {}
+      clear () {
+        this.$refs.paged.$refs.criteria.model = {}
       },
-      getRes(obj) {
+      getRes (obj) {
         this.filialeNameStr = obj.res
         this.filialeCodeStr = obj.resids
         console.log(this.filialeNameStr)
         console.log(this.filialeCodeStr)
       },
-      showpager() {
+      showpager () {
         // this.$refs.cp.pager = true
         this.$dispatch('hiddenbtn')
       },
       search () {
-        let condition = "1=1 and r.f_filiale like '%"+this.$login.f.f_fengongsi+"%'"
+        let condition = "1=1 and r.f_filiale like '%" + this.$login.f.f_fengongsi + "%'"
         this.model.search(condition)
         this.modeluse.search(condition)
         this.price.search(condition)
       },
 
-      selfSearch(args) {
+      selfSearch (args) {
         args.condition = args.condition + ` and tbd.f_orgstr like '%${this.filialeCodeStr}%'`
         this.model.search(args.condition, args.model)
       },
-      cleaner() {
+      cleaner () {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
           this.$refs.paged.$refs.criteria.model[key] = ''
         })
@@ -256,14 +256,14 @@
         this.modeluse.search(this.$refs.paged.$refs.criteria.condition)
         this.price.search(this.$refs.paged.$refs.criteria.condition)
       },
-      gethuman(){
+      gethuman () {
         console.log('获取人员')
         this.$resetpost('rs/logic/getChargeList', {data: {condition: `1=1`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           // this.params.rows.splice(index, 1)
-          console.log('获取成功',res)
+          console.log('获取成功', res)
           let house = []
-          for (let row of res.data.human){
-            house.push({label: row.f_charge_collectors,value: row.f_charge_collectors})
+          for (let row of res.data.human) {
+            house.push({label: row.f_charge_collectors, value: row.f_charge_collectors})
           }
           this.human = house
           let house2 = []
@@ -277,9 +277,7 @@
           }
           this.method = house3
         })
-
-      },
-
+      }
     },
     computed: {
 

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/ServiceView.vue

@@ -13,7 +13,7 @@
         <div class="col-sm-12 form-group">
           <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']">

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,6 +389,11 @@
         if (sum == 1) {
           this.data = jsonData
           this.initializtion()
+          // 完成时间和完成人,部门，分公司
+          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
           this.showview = true
         } else if (sum == 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)

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/main.js

@@ -1,32 +1,32 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import {ldap} from 'ldap-clients'
-import {system} from 'system-clients'
-import {sale} from 'sale-client'
-import {material} from 'material-client'
-
-import apply from './apply'
-import applyAndroid from './applyAndroid'
-import 'lib-flexible/flexible.js'
-/*import vueBubble from 'vue-bubble'
-Vue.use(vueBubble)*/
-// import AndroidPlugin from './AndroidPlugin.js'
-import {systemphonegrid} from 'system-phone'
-// var Verificationfalg = false
-// system(Verificationfalg)
-all()
-system(false)
-apply()
-ldap()
-sale()
-material()
-
-applyAndroid()
-// Vue.use(AndroidPlugin)
-require('./bootstrap/less/bootstrap.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import {ldap} from 'ldap-clients'
+import {system} from 'system-clients'
+import {sale} from 'sale-client'
+import {material} from 'material-client'
+
+import apply from './apply'
+import applyAndroid from './ezhouAndroid'
+import 'lib-flexible/flexible.js'
+/*import vueBubble from 'vue-bubble'
+Vue.use(vueBubble)*/
+// import AndroidPlugin from './AndroidPlugin.js'
+import {systemphonegrid} from 'system-phone'
+// var Verificationfalg = false
+// system(Verificationfalg)
+all()
+system(false)
+apply()
+ldap()
+sale()
+material()
+
+applyAndroid()
+// Vue.use(AndroidPlugin)
+require('./bootstrap/less/bootstrap.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})

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)