apply-clients 7.1.33 → 7.1.36

package/src/components/android/newPackage/projectPrice.vue

@@ -0,0 +1,218 @@
+<template>
+  <div style="width: 100%">
+        <div partial style="padding: 10px">
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">客户名称：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_user_name />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">电&emsp;&emsp;话：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_phone />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">工程编号：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_apply_num />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">合同编号：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_contract_number />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">报建类型：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_apply_type />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">客户编号：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_userinfo_code />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">办理环节：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].defname />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">地&emsp;&emsp;址：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_address />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">施工备注：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_construction_remarks />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">报建日期：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.data[0].f_apply_date />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">工程报价：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.f_price_number />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label class="font text-left">报价意见：</label>
+            </div>
+            <div class="col-xs-8">
+              <input class="search_input input-font" v-model=model.f_price_idea />
+            </div>
+          </div>
+          <div class="row app-row">
+            <button class="btn btn-default button_spacing" style="min-width:100px;"
+                    @click="click(row)">保存</button>
+            <button class="btn btn-default button_spacing" style="min-width:100px;"
+                    @click="click(row)">提交</button>
+          </div>
+        </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import {PagedList, HttpResetClass} from 'vue-client'
+
+export default {
+  title: '工程报价',
+  data () {
+    return {
+      model: null,
+      criteriaShow: false
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    // 查询
+    async search () {
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/supervisory`, {
+          data: {
+            condition: '1=1',
+            data: {
+              id: Vue.user.id,
+              f_filiale: Vue.user.f_fengongsi
+              // id: this.$login.f.id,
+              // f_filiale: this.$login.f.f_fengongsi
+            }
+          }
+        }, {
+          resolveMsg: null,
+          rejectMsg: `查询失败`
+        })
+      this.model = res
+      console.log('当前数据', this.model)
+      console.log('当前数据', this.model.data[0].f_user_name)
+    },
+    click (row) {
+      let _this = this
+      this.$dispatch('gotoson', {
+        _this: _this,
+        title: '详情信息',
+        safe: true
+      })
+      this.$goto('detailed-data', {selectdata: row}, 'self', _this.search)
+    }
+  },
+  events: {},
+  watch: {}
+}
+</script>
+<style scoped>
+.app-row {
+  height: auto;
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+
+.search_input {
+  border: 0;
+  outline: none;
+}
+
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.app-text {
+  font-size: 12px;
+}
+
+.panel-self {
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+
+.font {
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.button_shrink_top {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_top.png")
+}
+.button_shrink_bottom {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_bottom.png")
+}
+</style>

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -4,31 +4,19 @@
         <div class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">项目名称：</label>
-              <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_entry_name like '%{}%'" placeholder='项目名'>
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_apply_num"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_apply_num like '%{}%'" placeholder='报建编号'>
             </div>
             <div class="form-group col-sm-3">
-              <label  for="startDate" class="font_normal_body">开始时间：</label>
-              <datepicker id="startDate" placeholder="开始日期"
-                          style="width: 60%!important;"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="cr.f_charge_date >= '{}'">
-              </datepicker>
+              <label class="font_normal_body">用户名称：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_user_name like '%{}%'" placeholder='用户名称'>
             </div>
             <div class="form-group col-sm-3">
-              <label for="endDate" class="font_normal_body">结束时间：</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          style="width: 60%!important;"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="cr.f_charge_date <= '{}'">
-              </datepicker>
+              <label class="font_normal_body">电&emsp;&emsp;话：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_phone like '%{}%'" placeholder='电话'>
             </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
@@ -48,18 +36,6 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">报建编号：</label>
-              <input type="text" style="width: 60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="a.f_apply_num = '{}'">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">合同编号：</label>
-              <input type="text" style="width: 60%" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="a.f_contract_number = '{}'">
-            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建类型：</label>
               <v-select
@@ -102,6 +78,28 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label  for="startDate" class="font_normal_body">开始时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+                          condition="cr.f_charge_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+                          condition="cr.f_charge_date <= '{}'">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>
@@ -110,16 +108,19 @@
           <tr>
             <th>序号</th>
             <th>报建编号</th>
-            <th>项目名称</th>
+            <th>用户名称</th>
+            <th>电话</th>
             <th>合同编号</th>
             <th>报建类型</th>
-            <th>缴费编码</th>
+            <th>报建性质</th>
             <th>收费金额</th>
             <th>付款方式</th>
             <th>收费人员</th>
             <th>收费日期</th>
-            <th>状态</th>
-            <th>地址</th>
+            <th>缴费状态</th>
+            <th>票据类型</th>
+            <th>票据状态</th>
+            <th>操作</th>
           </tr>
         </template>
         <template partial='body'>
@@ -131,7 +132,10 @@
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_apply_entry_name}}</font></nobr>
+              <nobr><font>{{row.f_user_name}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_phone}}</font></nobr>
             </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
@@ -140,7 +144,7 @@
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_number}}</font></nobr>
+              <nobr><font>{{row.f_apply_nature}}</font></nobr>
             </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_money}}</font></nobr>
@@ -155,29 +159,56 @@
               <nobr><font>{{row.f_charge_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charging_status}}</font></nobr>
+              <nobr><font>{{row.f_charge_status}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_bill_style}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_address}}</font></nobr>
+              <nobr><font>{{row.f_bill_state}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr v-if="row.f_charge_status !== '退款'">
+                <button
+                  type="button" name="button" class="btn btn-link"
+                  v-if="row.f_bill_state !== '开票成功'"
+                  @click="$parent.$parent.$parent.openBill(row)"
+                >开票</button>
+
+                <button
+                  type="button" name="button" class="btn btn-link"
+                  v-else
+                  @click="$parent.$parent.$parent.showPrintModal(row)"
+                >查看发票</button>
+              </nobr>
             </td>
           </tr>
         </template>
       </data-grid>
     </criteria-paged>
+
+    <modal v-if="showPrint" :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="showPrint = !showPrint"><span>&times;</span></button>
+        <h4 class="modal-title">票据信息</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <iframe width="100%" height="500px" :src="charge.f_bill_url" v-if="charge.f_bill_url"></iframe>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
 </template>
 
 <script>
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
+import {isEmpty} from '../../Util'
 export default {
   title: '报建收费列表',
   data () {
     return {
-      model: new PagedList('rs/sql/getApplyCharge', 30, {
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }, {
+      model: new PagedList('rs/sql/getApplyCharge', 30, null, {
         f_charge_money: 0
       }),
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
@@ -188,22 +219,23 @@ export default {
         {label: '作废', value: '作废'}
       ],
       criteriaShow: false,
-      chargeAll: {
-        count: 0,
-        sum: 0
-      },
       getfield: {
         'f_apply_num': '报建编号',
-        'f_entry_name': '项目名称',
+        'f_user_name': '用户名称',
+        'f_phone': '电话',
         'f_contract_number': '合同编号',
         'f_apply_type': '报建类型',
+        'f_apply_nature': '报建性质',
         'f_charge_money': '收费金额',
         'f_payment_method': '付款方式',
         'f_charge_collectors': '收费人员',
         'f_charge_date': '收费日期',
-        'f_charging_status': '状态',
-        'f_address': '地址'
-      }
+        'f_charge_status': '缴费状态',
+        'f_bill_style': '票据类型',
+        'f_bill_state': '票据状态'
+      },
+      charge: null,
+      showPrint: false
     }
   },
   ready () {
@@ -219,19 +251,66 @@ export default {
     // 查询
     search () {
       this.$refs.cp.$refs.cri.search()
-      this.getChargeAll()
     },
-    async getChargeAll () {
+    // 查看发票
+    showPrintModal(row) {
+      this.charge = row
+
+      this.showPrint = true
+    },
+    // 开票
+    async openBill (charge) {
+      this.charge = charge
+      let data = null
+      let res = null
+
       let http = new HttpResetClass()
-      let data = {
-        condition: this.model.condition,
-        data: {
-          orgid: this.$login.f.orgid
+
+      if (isEmpty(this.charge.f_bill_id)) {
+        data = {
+          id: this.charge.id,
+          charge_type: '报装收费'
         }
+        res = await http.load('POST', 'rs/logic/bjEticketCharge', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '开票失败！！！'
+        })
+        this.charge.f_bill_id = res.data
       }
-      let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
 
-      this.chargeAll = res.data[0]
+      data = {
+        id: this.charge.f_bill_id,
+        f_sell_id: this.charge.id
+      }
+      try {
+        res = await http.load('POST', 'rs/logic/bjOpenEticket', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '开票失败！！！'
+        })
+
+        // res.data.f_bill_url = 'https://dlj.51fapiao.cn/dlj/v7/de4c9b985021111ef1c722c2914e34d9273291'
+
+        if (res.data.f_bill_state !== '开票成功') {
+          throw '开票失败！！！'
+        }
+        this.charge.f_bill_state = res.data.f_bill_state
+        this.charge.f_bill_url = res.data.f_bill_url
+
+        this.showPrint = true
+      } catch (e) {
+        console.error(e)
+        this.charge.f_bill_state = '开票失败'
+
+        data = {
+          id: this.charge.id
+        }
+        res = await http.load('POST', 'rs/logic/updateChargeBill', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '收费信息更新失败！！！'
+        })
+
+        throw e
+      }
     }
   },
   computed: {

package/src/components/product/ApplyCharge/ApplyChargeSearch.vue

@@ -5,8 +5,8 @@
         <apply-charge-list v-ref:query ></apply-charge-list>
       </div>
       <p class="bg-info text-center" style="font-size: 20px;height: 5%">合计收费记录共
-        <span style="color: red">{{$refs.query.chargeAll.count}}</span>笔，
-        合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
+        <span style="color: red">{{$refs.query.model.count}}</span>笔，
+        合计金额<span style="color: red">{{$refs.query.model.sums.f_charge_money}}</span>元
       </p>
     </div>
   </div>