apply-clients 5.0.35-ezhou-2 → 5.0.35-ezhou-4

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

@@ -26,6 +26,10 @@
             <label class = "col-sm-5 control-label">用户类型:</label>
             <span class = "col-sm-7">{{model.f_user_type}}</span>
           </div>
+          <div class="row">
+            <label class = "col-sm-5 control-label">支付账户:</label>
+            <span class = "col-sm-7">{{model.f_payment_account}}</span>
+          </div>
           <div class="row">
             <label class = "col-sm-5 control-label">申请户数:</label>
             <span class = "col-sm-7">{{model.f_user_type}}</span>
@@ -96,7 +100,8 @@
           f_user_type: '无',
           f_house_type: '无',
           f_residential_area: '无',
-          f_apply_remarks: '无'
+          f_apply_remarks: '无',
+          f_payment_account: '无'
         }
       }
     },

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

@@ -113,10 +113,19 @@
                 </div>
               </div>
 
+              <!-- <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="$parent.$parent.alloption"
+                            condition="f_apply_source = '{}'" placeholder='报装来源'
+                            v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
+                  </v-select>
+                </div>
+              </div> -->
               <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:'微信'},{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>
@@ -124,7 +133,6 @@
               </div>
 
 
-
             </div>
             <div class="col-sm-12 " style="margin-top:5px">
               <div class="col-sm-2">
@@ -160,6 +168,9 @@
               <th>
                 <nobr>当前状态</nobr>
               </th>
+              <th>
+                <nobr>工程编号</nobr>
+              </th>
               <th>
                 <nobr>报建编号</nobr>
               </th>
@@ -212,6 +223,9 @@
               <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]"   style="text-align: center;">
                 <nobr><font>{{row.f_sub_state!='完工' ? '未完工' :'完工'}}</font></nobr>
               </td>
+              <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"   style="text-align: center;">
+                <nobr><font>{{row.f_project_number}}</font></nobr>
+              </td>
               <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"   style="text-align: center;">
                 <nobr><font>{{row.f_apply_num}}</font></nobr>
               </td>
@@ -316,7 +330,8 @@
         model: new PagedList('rs/sql/checkuser', 20, {
           data: {
             id: this.$login.f.id,
-            fengongsi: this.$login.f.f_fengongsi
+            fengongsi: this.$login.f.f_fengongsi,
+            f_product_id: 0
           }
         }),
         fapplytype: this.$appdata.getParam('用户类型'),
@@ -328,6 +343,7 @@
         select: '',
         alloptions:[],
         showFile:false,
+        alloption:[],
         button_name:"查询",
         showstopinfoflag:false,
         stopremarks:"",
@@ -342,6 +358,7 @@
       console.log("开始判断")
     },
     async ready() {
+      this.eachFind();
       this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
       await this.getConfig()
@@ -352,7 +369,6 @@
       let self = this
       //判断用户是否有权限
       this.checkUserOperator();
-
     },
     methods: {
       //清空 查询条件项
@@ -388,11 +404,9 @@
         param.push({label:"全部",value:""})
         str.activitys.forEach(function(item){
           let title = item.title;
-          console.log(title)
           param.push({label:title,value:title});
         })
         this.alloptions = param;
-
       },
       generateUUID() {
         var d = new Date().getTime()
@@ -426,18 +440,35 @@
 
       },
       async addactive(modify) {
+        // 动态获取报装来源
+        // let ces = [];
+        // http.load('POST', 'rs/sql/findParameter').then((res) => {
+        //       console.log("这是报装来源:" + res.name)
+        // res.forEach(function(res){
+        //   ces.push({label:res.name,value:res.name});
+        //     })
+        //     this.alloption = ces;
+        // })
         this.button_name ="返回"
+        var workflow_xmlfilename='鄂州报建流程'
+        if(this.$login.f.filialenames === '迪泰天然气' && modify==='集体报装申请'){
+         workflow_xmlfilename = '鄂州报建流程迪泰'
+        }else{
+          workflow_xmlfilename = '鄂州报建流程'
+        }
         //await this.getConfig()
         this.$workflow_vue.start_activity = modify
         let http = new HttpResetClass()
-        let res = await http.load('POST','rs/logic/ApplyGetProcessID',{data:{filename:this.$workflow_vue.workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
+        let res = await http.load('POST','rs/logic/ApplyGetProcessID',{data:{filename:workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
         this.$refs.cp.pager = false
+        debugger
         let val = {
           defname: this.$workflow_vue.start_activity,
           f_process_id: res.data.f_process_id,
           f_apply_date: Util.toStandardTimeString(),
           f_apply_num: this.generateUUID(),
-          f_apply_operator_telephone: this.$login.f.f_fgsdianhua
+          f_apply_operator_telephone: this.$login.f.f_fgsdianhua,
+          f_product_id: res.data.f_product_id
         }
         // // 如果是改装,将modify装入val
         // if(modify){
@@ -594,10 +625,12 @@
         }
         if(hourfals!=0){
           this.speckText('请注意：第：'+overNumString1+'数据一小时后过期')
+          this.$showMessage("请注意：第:" + overNumString1 + "数据一小时后过期")
         }
         if (flagNum1!=1){
           console.log(overNumString1);
           this.speckText('请注意：第：'+overNumString1+'数据即将过期')
+          this.$showMessage("请注意：第:" + overNumString1 + "数据即将过期")
         }
         if(dbflag !=1){
           this.speckText('请注意: 您有'+dbflag-1+'条数据被督办')

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

@@ -103,6 +103,25 @@
                 </div>
                 </div>
 
+              <div class="form-group col-sm-2">
+                <label class="col-sm-4 control-label linehhh">报装类型</label>
+                <div class="col-sm-8">
+                  <v-select :value.sync="model.f_work_type" v-model="model.f_work_type"
+                            :options='$parent.$parent.worktype'  width="100%"
+                            close-on-select condition="a.f_work_type = '{}'">
+                  </v-select>
+                </div>
+              </div>
+
+              <div class="form-group col-sm-2">
+                <label class="col-sm-4 control-label linehhh">用户类型</label>
+                <div class="col-sm-8">
+                  <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                            :options='$parent.$parent.usertype'  width="100%"
+                            close-on-select condition="a.f_user_type = '{}'">
+                  </v-select>
+                </div>
+              </div>
 
               <div class="form-group">
                 <button class="btn btn-primary" @click="search(),$parent.$parent.showpager()">
@@ -130,14 +149,14 @@
                 <th><nobr>总应缴金额</nobr></th>
                 <th><nobr>已交金额</nobr></th>
                 <th><nobr>未交金额</nobr></th>
-<!--                <th><nobr>发票冲正</nobr></th>-->
+                <th><nobr>操作</nobr></th>
               </tr>
             </template>
             <template partial='body'>
               <td style="text-align: center;">{{$index+1}}</td>
               <td style="text-align: center;">{{row.f_charge_money}}</td>
-              <td style="text-align: center;">{{row.f_charge_user}}</td>
-              <td style="text-align: center;">{{row.f_charge_address}}</td>
+              <td style="text-align: center;">{{row.f_user_name}}</td>
+              <td style="text-align: center;">{{row.f_address}}</td>
 <!--              <td style="text-align: center;">{{// row.f_charge_item}}</td>-->
               <td style="text-align: center;">{{row.f_charge_collectors}}</td>
               <td style="text-align: center;">{{row.f_charging_status}}</td>
@@ -151,7 +170,9 @@
               <td style="text-align: center;">{{row.f_total_cost}}</td>
               <td style="text-align: center;">{{row.app_f_cumulative_money}}</td>
               <td style="text-align: center;">{{row.f_unaccounts_money}}</td>
-<!--              <td style="text-align: center;">{{row.f_is_correct}}</td>-->
+              <td style="text-align: center;">
+                <button class="btn-primary btn btn-sm" @click.prevent="$parent.$parent.$parent.update_way(row)">修改</button>
+              </td>
             </template>
           </data-grid>
         </criteria-paged>
@@ -159,19 +180,45 @@
       <div  class="flex" style="height: 10%">
         <div novalidate class="form-inline auto" partial>
           <p class="bg-info text-center" style="padding: 8px;font-size: 20px">合计收费记录共
-            <span style="color: red">{{modeluse.rows.length}}</span>笔，合计金额<span style="color: red">{{price.rows[0].f_charge_money}}</span>元
+            <span style="color: red">{{modeluse.rows.length}}</span>笔，
+            收款金额合计<span style="color: red">{{price.rows[0].f_charge_money}}</span>元，
+            <!--合计应缴总金额<span style="color: red">{{price.rows[0].f_total_cost}}</span>元，
+            已缴<span style="color: red">{{price.rows[0].f_cumulative_money}}</span>元，未缴<span  style="color: red">{{price.rows[0].f_unaccounts_money}}</span>元-->
           </p>
         </div>
       </div>
     </div>
+    <!--修改弹出框-->
+    <modal :show.sync="updateControl" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeUpdate()"><span>&times;</span></button>
+        <h4 class="modal-title">修改</h4>
+      </header>
+      <article slot="modal-body" class="modal-body" >
+        <div class="from-group"  style="width: 100%">
+          <label  style="width: 15%;float: left">票据类型</label>
+          <v-select :value.sync="selectItem.f_bill_style" v-model="selectItem.f_bill_style"
+                    :options='billstyle' placeholder='请选择' style="width: 80%;float: left"
+                    close-on-select >
+          </v-select>
+        </div>
+      </article>
+
 
+      <footer slot="modal-footer" class="modal-footer">
+        <div class="from-group" style="width: 100%;float: left">
+          <button v-show="updateControl" type="button" class="btn btn-default" @click='closeUpdate'>取消</button>
+          <button v-show="updateControl" type="button" class="btn btn-success" @click='confirm'>确认</button>
+        </div>
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
   import * as Util from '../../../../Util'
 
   import { PagedList } from 'vue-client'
-
+  import {HttpResetClass} from 'vue-client'
   Date.prototype.Format = function (fmt) {
     var o = {
       "M+": this.getMonth() + 1, //月份
@@ -196,57 +243,99 @@
         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: this.$appdata.getParam('付款方式'),
+        usertype:[
+          {label: '民用', value: '民用'},
+          {label: '非民用', value: '非民用'}
+        ],
+        worktype:[
+          {label: '新报装', value: '新报装'},
+          {label: '改管', value: '改管'}
+        ],
+        correct: [
           {label: '是', value: '是'},
-          {label:'否', value: '否'}
+          {label: '否', value: '否'}
         ],
-        state:[
+        state: [
           {label: '有效', value: '有效'},
-          {label:'无效', value: '无效'}
-        ]
+          {label: '无效', value: '无效'}
+        ],
+        selectItem: {},
+        billstyle: this.$appdata.getParam('发票类型'),
+        updateControl: false,
+        billID: 0
       }
     },
     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+"%'"
+       search () {
+         let condition = "1=1 and r.f_filiale like '%" + this.$login.f.f_fengongsi + "%'"
+        //  debugger
+        // let condition =  args.condition
+      debugger
         this.model.search(condition)
         this.modeluse.search(condition)
-        this.price.search(condition)
+        let condition1 = condition
+        this.price.search(condition1)
       },
-
-      selfSearch(args) {
-        args.condition = args.condition + ` and tbd.f_orgstr like '%${this.filialeCodeStr}%'`
+      update_way (row) {
+        console.log('进入修改方法')
+        this.selectItem = {}
+        this.billID = row.id
+        this.updateControl = true
+      },
+      closeUpdate () {
+        this.updateControl = false
+      },
+      confirm () {
+        let data = {
+          f_bill_style: this.selectItem.f_bill_style[0],
+          id: this.billID
+        }
+        console.log('数据：' + JSON.stringify(this.selectItem))
+        this.$resetpost('rs/entity/t_charge_record', data).then((res) => {
+          console.log('返回值：' + JSON.stringify(res.data))
+          if (res.data.id > 0) {
+            // this.$showMessage('修改成功!')
+            this.closeUpdate()
+            this.search()
+          }
+        })
+      },
+      selfSearch (args) {
+        args.condition = args.condition + ` and a.f_filialeids like '%${this.filialeCodeStr}%'`
+        console.log('condition:', args.condition)
         this.model.search(args.condition, args.model)
+        this.modeluse.search(args.condition, args.model)
+        this.price.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,19 +345,19 @@
         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 = []
           for (let row of res.data.f){
-            house2.push({label: row.f_filiale,value: row.f_filiale})
+            house2.push({label: row.r.f_filiale,value: row.r.f_filiale})
           }
           this.filiale = house2
           let house3 = []
@@ -277,9 +366,7 @@
           }
           this.method = house3
         })
-
-      },
-
+      }
     },
     computed: {
 

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

@@ -8,7 +8,7 @@
 
         <validator name='v'>
           <form class="form-horizontal  select-overspread">
-            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' >
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill2' >
               <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%"