apply-clients 5.0.35-9 → 5.0.35-92

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

@@ -20,6 +20,7 @@
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
+  import Vue from "vue";
   export default {
     title: '报建监控控制层',
     props: ['selectdata'],
@@ -36,6 +37,45 @@
       },
       // json配置数据处理 比如下拉框的options
       async initializtion() {
+        // onetomany 数据获取
+        if (this.data.onetomany) {
+          console.log('判断是onetomany,this.data.onetomany的数据为=>' + JSON.stringify(this.data.onetomany))
+          for (let index = 0; index < this.data.onetomany.length; index++) {
+            let http = new HttpResetClass()
+            let data = {}
+            if (this.data.onetomany[index].tables[0] == 't_charge_record') {
+              data = {
+                tablename: this.data.onetomany[index].tables[0],
+                condition: `f_apply_num = '${this.selectdata.f_apply_num}'  and f_process_id='${this.selectdata.f_process_id}' and f_charging_status != '作废'`
+              }
+            } else {
+              data = {
+                tablename: this.data.onetomany[index].tables[0],
+                condition: `f_process_id='${this.selectdata.f_process_id}'`
+              }
+            }
+            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: 'onetomany查询失败'
+            })
+            // 初始化 onetomany
+            let rows = []
+            console.log('查询返回结果res.data=>' + JSON.stringify(res.data))
+            this.data.onetomany[index].rows = res.data
+            // console.log(JSON.stringify('this.data.onetomany[index].rows=>' + JSON.stringify(this.data.onetomany[index].rows)))
+
+            // 初始化onetomany中的fields
+            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
+              // 如果配置类型为select,优先从参数列表获取options
+              if (this.data.onetomany[index].fields[j].type === 'select') {
+                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                if (temp && temp.length > 0) {
+                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                }
+              }
+            }
+          }
+        }
         // selectdata 填充 data
         if (this.selectdata.f_survey_name) {
           let buyerinfos = []
@@ -93,11 +133,11 @@
           }
           this.data.fields[i].readonly = true
           this.data.fields[i].disabled = true
-            if(this.$login.r.find(value => value == '报建流程修改') && this.data.f_apply_type=='个人报建' && this.$login.r.includes('报建流程修改')){
+            if(this.$login.r.find(value => value == '报建流程修改') && this.$login.r.includes('报建流程修改')){
             this.data.fields[i].readonly = false
             this.data.fields[i].disabled = false
           }
-          if(this.$login.r.find(value => value == '集体报建流程修改') && this.data.f_apply_type=='集体报建' && this.$login.r.includes('报建流程修改')){
+          if(this.$login.r.find(value => value == '集体报建流程修改')  && this.$login.r.includes('报建流程修改')){
               this.data.fields[i].readonly = false
               this.data.fields[i].disabled = false
           }
@@ -117,7 +157,7 @@
           }
         }
         this.data.buttons = null
-        if( this.$login.r.find(value => value == '报建流程修改')  && this.data.f_apply_type=='个人报建' ){
+        if( this.$login.r.find(value => value == '报建流程修改')  ){
           // 仅留保存按钮
           this.data.buttons = [
             {
@@ -125,7 +165,7 @@
             }
           ]
         }
-        if(this.data.f_apply_type=='集体报建' && this.$login.r.includes('集体报建流程修改')){
+        if(this.$login.r.includes('集体报建流程修改')){
           // 仅留保存按钮
           this.data.buttons = [
             {
@@ -133,11 +173,6 @@
             }
           ]
         }
-        // 完成时间和完成人,部门，分公司
-        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 +428,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

@@ -1,6 +1,6 @@
 <template>
   <div class="d1">
-    <div class="left col-sm-12">
+    <div class="left col-sm-12" style="height:90%;">
       <criteria-paged :model="model" v-ref:cp>
         <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
           <form novalidate class="" partial>
@@ -53,7 +53,15 @@
                   </v-select>
                 </div>
               </div>
-
+              <div class="col-sm-2" >
+                <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_payment_account = '{}'" placeholder='支付账户'
+                            v-model="model.f_payment_account" :value.sync="model.f_payment_account" close-on-select>
+                  </v-select>
+                </div>
+              </div>
             </div>
             <div class="col-sm-12" style="margin-top:5px;">
               <div class="col-sm-2">
@@ -113,14 +121,14 @@
               <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>
                 </div>
               </div>
               <div class="col-sm-1" style="margin-left:20px;">
-                <button style="margin-left:5%;" class="btn btn-primary btn-sm width-80 button_spacing" type="button" @click="search(),$parent.$parent.close()">
+                <button style="margin-left:5%;" class="btn btn-primary btn-sm width-80 button_spacing" type="button" @click="search(),$parent.$parent.cleaner()">
                   <span class="glyphicon glyphicon-search"></span>查询
                 </button>
                 <button class="btn-primary btn btn-sm button_spacing" @click.prevent="$parent.$parent.clear()">清空</button>
@@ -164,6 +172,15 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
+              <th>
+                <nobr>应缴金额</nobr>
+              </th>
+              <th>
+                <nobr>已缴金额</nobr>
+              </th>
+              <th>
+                <nobr>未缴金额</nobr>
+              </th>
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -204,6 +221,15 @@
               <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_total_cost}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_cumulative_money}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_unaccounts_money}}</nobr>
+              </td>
               <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
@@ -212,6 +238,15 @@
         </data-grid>
       </criteria-paged>
     </div>
+    <div  class="flex" style="height: 10%;width: 100%;">
+      <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_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>
 </template>
 <script>
@@ -246,9 +281,18 @@
         model: new PagedList('rs/sql/supervisory', 20, {
           data: {
             id: `${this.$login.f.name}`,
-            fengongsi: `${this.$login.f.f_fengongsi}`
+            fengongsi: `${this.$login.f.f_fengongsi}`,
+            f_product_id :0
+          }
+        }),
+        modeluse: new PagedList('rs/sql/supervisory', 999999, {
+          data: {
+            id: `${this.$login.f.name}`,
+            fengongsi: `${this.$login.f.f_fengongsi}`,
+            f_product_id :0
           }
         }),
+        price: new PagedList('rs/sql/getChargeAllSum', 999999, {orderitem: '`f_total_cost`'}),
         condition: '',
         select: '',
         alloptions:[]
@@ -257,10 +301,26 @@
     ready() {
       this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-      this.$refs.cp.$refs.cri.search()
+      this.search()
       this.getConfig();
     },
     methods: {
+      search () {
+        let startDate = Util.toStandardDateString() + ' 00:00:00'
+        let endDate = Util.toStandardDateString() + ' 23:59:59'
+        this.$refs.cp.$refs.cri.search()
+      },
+      cleaner () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = ''
+        })
+        console.log('condition2:', this.$refs.cp.$refs.cri.condition)
+        let condition = this.$refs.cp.$refs.cri.condition
+        this.modeluse.search(condition)
+        let condition1 = condition
+        this.price.search(condition1)
+        this.$dispatch('close')
+      },
       clear(){
         Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
           this.$refs.cp.$refs.cri.model[key] = []
@@ -336,12 +396,12 @@
   }
 </script>
 <style>
-  label {
-    display: flex;
-    justify-content:center;
-    align-items:Center;
-    padding-top: 8px;
-  }
+  /*label {*/
+  /*  display: flex;*/
+  /*  justify-content:center;*/
+  /*  align-items:Center;*/
+  /*  padding-top: 8px;*/
+  /*}*/
   tr.title {
     background-color: #6666ff;
   }

package/src/components/product/applyReport/ApplyReport.vue

@@ -0,0 +1,205 @@
+<template>
+  <div class="d1 flex">
+    <div class="left col-sm-12">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
+          <form novalidate class="" partial>
+            <div class="row">
+                <button type="button" class="btn btn-success" @click='$parent.$parent.showQuery=!$parent.$parent.showQuery'>
+                  打印
+                </button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/saleExport" sql-name="checkuserReport" template-name='报装统计导出' :choose-col="true"></export-excel>
+                <button class="btn btn-primary btn-sm" type="button" @click="$parent.$parent.search(),$parent.$parent.showpager()" style="margin-left:10%">
+                  <span class="glyphicon glyphicon-search"></span>查询
+                </button>
+            </div>
+          </form>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid  class="list_area" is-fixed='false'>
+          <template partial='head'>
+            <tr>
+              <th colspan="7"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
+            </tr>
+            <tr>
+              <th colspan="1" rowspan="2">报装人员</th>
+              <th colspan="2">个人报建</th>
+              <th colspan="4">集体报建</th>
+            </tr>
+            <tr class="title">
+              <th>
+                <nobr>踏勘</nobr>
+              </th>
+              <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'>
+            <tr>
+              <td style="text-align: center;">
+                <nobr>{{row.username}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.gsurvey_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.gconstruction_unit}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.jsurvey_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.jconstruction_unit}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.checking_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.jgas_name}}</nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+      <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">{{total.rows[0].sumgname}}</span>次，安装合计：<span style="color: red">{{total.rows[0].sumgunit}}</span>次，
+             集体报建 勘踏合计：<span style="color: red">{{total.rows[0].sumname}}</span>次，安装合计：<span  style="color: red">{{total.rows[0].sumjunit}}</span>次，
+            验收合计：<span style="color: red">{{total.rows[0].sumgcname}}</span>次，
+            通气合计：<span  style="color: red">{{total.rows[0].sunjname}}</span>次
+          </p>
+        </div>
+      </div>
+    </div>
+    <modal  :show.sync="showQuery" v-ref:modal :large="true" :backdrop="false" title="打印预览">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="showQuery = !showQuery"><span>&times;</span></button>
+        <h4 class="modal-title">打印预览</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <print-report-order :purchase-records="purchaseRecords" :report="model.rows" v-ref:print></print-report-order>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="print()">打印</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+  import {
+    PagedList
+  } from 'vue-client'
+  import * as Util from '../../Util'
+
+  export default {
+    title: '报建统计报表',
+    data() {
+      return {
+        usertype: this.$appdata.getParam('用户类型'),
+        showbtn: false,
+        model: new PagedList('rs/sql/checkuserReport', 20, {
+          data: {
+            id: this.$login.f.id,
+            fengongsi: this.$login.f.f_fengongsi,
+          }
+        }),
+        condition: '',
+        showQuery:false,
+        total: new PagedList('rs/sql/checkuserReportTotal', 999999, {orderitem: '`sumname`'}),
+        showstopinfoflag:false,
+        stopremarks:"",
+        getfield: {
+          'username': '报装人员',
+          'gsurvey_name': '个体报建踏勘次数',
+          'gconstruction_unit': '个体报建安装次数',
+          'jsurvey_name': '集体报建踏勘次数',
+          'jconstruction_unit': '集体报建安装次数',
+          'checking_name': '集体报建验收次数',
+          'jgas_name': '集体报建通气次数'
+        }
+      }
+    },
+    ready() {
+      this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+      this.search()
+
+    },
+    methods: {
+      print () {
+        this.$refs.print.$refs.print.PrintTable()
+      },
+      stopinfoshow(index){
+        this.showstopinfoflag = true;
+        let remakrs = this.model.rows[index].f_stop_remarks;
+        console.log(JSON.stringify(remakrs))
+        console.log(remakrs)
+
+        this.stopremarks= remakrs;
+      },
+      clifun(row) {
+        this.$refs.cp.$refs.grid.model.rows = [row]
+        this.$refs.cp.pager = false
+        this.$dispatch('showbtn', row)
+      },
+      search () {
+        let condition = "1=1"
+        //  debugger
+        // let condition =  args.condition
+        debugger
+        this.model.search()
+        this.total.search()
+      },
+      showpager() {
+        this.$refs.cp.pager = true
+        this.$dispatch('hiddenbtn')
+      },
+      closestopinfo(){
+        this.showstopinfoflag = close;
+      }
+    },
+    computed: {
+      getCondition() {
+        return {condition: `1=1`}
+      }
+    }
+  }
+</script>
+<style scoped>
+  label {
+    display: flex;
+    justify-content:center;
+    align-items:Center;
+    padding-top: 8px;
+  }
+</style>

package/src/components/product/applyReport/PrintApplyReport.vue

@@ -0,0 +1,116 @@
+<template>
+  <style id="style">
+    td{
+      height: 30px;
+      padding: 0px;
+      text-align: center;
+    }
+    .cen{
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      width: 100%;
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+  </style>
+  <div id="print">
+    <table border="1">
+      <tr>
+        <th colspan="7"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
+      </tr>
+      <tr>
+        <th colspan="1" rowspan="2" class="cen">报装人员</th>
+        <th colspan="2" class="cen">个人报建</th>
+        <th colspan="4" class="cen">集体报建</th>
+      </tr>
+      <tr class="title">
+        <th class="cen">
+          <nobr>踏勘</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>安装</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>踏勘</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>安装</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>验收</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>通气</nobr>
+        </th>
+      </tr>
+      <tr v-for="item in report">
+        <td>{{item.username}}</td>
+        <td>{{ item.gsurvey_name }}</td>
+        <td>{{ item.gconstruction_unit }}</td>
+        <td>{{ item.jsurvey_name }}</td>
+        <td>{{ item.jconstruction_unit }}</td>
+        <td>{{ item.checking_name }}</td>
+        <td>{{ item.jgas_name }}</td>
+      </tr>
+      <tr v-for="item in supplement">
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
+  <print-element v-show="false" v-ref:print id='print' styleid='style'
+                 top='10' left='60' width='100%' height='100%'>
+  </print-element>
+</template>
+
+<script>
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+  export default {
+    title: '打印统计单',
+    props: ['report'],
+    data () {
+      return {}
+    },
+    ready () {
+    },
+    methods: {
+    },
+    computed: {
+      supplement () {
+        if (this.material.length < 10) {
+          return 10 - this.material.length
+        }
+        return 0
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/product/stopInfo/ApplyStopInfo.vue

@@ -230,7 +230,8 @@
                 model: new PagedList('rs/sql/checkuserStop', 20, {
                     data: {
                         id: this.$login.f.id,
-                        fengongsi: this.$login.f.f_fengongsi
+                        fengongsi: this.$login.f.f_fengongsi,
+                        f_product_id: 0
                     }
                 }),
                 condition: '',