apply-clients 7.1.36-yuchuan-1 → 7.1.36-yuchuan-3

package/src/components/product/Report/ReportItems.vue

@@ -1,79 +1,85 @@
-<template>
-  <div class="flex-row">
-    <div class="baobiao">
-      <tab-button v-ref:list :active="0">
-        <tabs header="市场开发部月度报表">
-          <apply-stair-kaifa  v-ref:paperfeimain></apply-stair-kaifa>
-        </tabs>
-        <tabs header="每月安装收入明细表">
-          <apply-stair-anzhuang  v-ref:papermain></apply-stair-anzhuang>
-        </tabs>
-        <tabs header="用户管理部通气月报表">
-          <apply-stair-tongqi  v-ref:paperfeimain></apply-stair-tongqi>
-        </tabs>
-        <tabs header="用户管理部未通气月报表">
-          <apply-stair-wtongqi  v-ref:paperfeimain></apply-stair-wtongqi>
-        </tabs>
-      </tab-button>
-    </div>
-  </div>
-</template>
-<script>
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '报表明细',
-  data () {
-    return {
-      showRight: false,
-      type: null,
-      selectdata: null,
-      show: []
-    }
-  },
-  methods: {
-  },
-  events: {
-    'handleOrder' (type, row) {
-      this.showRight = false
-
-      this.type = type
-      this.selectdata = row
-
-      this.$nextTick(() => {
-        this.showRight = true
-      })
-    },
-    'search' () {
-      this.selectdata = null
-      this.showRight = false
-      this.type = null
-
-      this.$refs.query.$refs.cp.$refs.cri.search()
-    }
-  },
-  watch: {
-  }
-}
-</script>
-<style>
-.baobiao {
-  padding: 1%;
-  margin: 1%;
-  width: 99%;
-  height: auto;
-  background-color: #ffffff;
-  border-radius: 14px;
-  box-shadow: 0px 1px 10px 0px rgba(2, 56, 104, 0.13);
-}
-
-.baobiao-right {
-  padding:  1%;
-  margin: 1% 1% 1% 0;
-  width: 58%;
-  height: auto;
-  background-color: #ffffff;
-  box-shadow: 0px 1px 10px 0px rgba(2, 56, 104, 0.13);
-  border-radius: 14px;
-}
-</style>
+<template>
+  <div class="flex-row">
+    <div class="baobiao">
+      <tab-button v-ref:list :active="0">
+        <tabs header="市场开发部月度报表" v-if="gettRolesnames('市场部报装')">
+          <apply-stair-kaifa  v-ref:paperfeimain></apply-stair-kaifa>
+        </tabs>
+        <tabs header="每月安装收入明细表" v-if="gettRolesnames('营业厅报装')">
+          <apply-stair-anzhuang  v-ref:papermain></apply-stair-anzhuang>
+        </tabs>
+        <tabs header="用户管理部通气月报表" v-if="gettRolesnames('用户管理部报装')">
+          <apply-stair-tongqi  v-ref:paperfeimain></apply-stair-tongqi>
+        </tabs>
+        <tabs header="用户管理部未通气月报表" v-if="gettRolesnames('用户管理部报装')">
+          <apply-stair-wtongqi  v-ref:paperfeimain></apply-stair-wtongqi>
+        </tabs>
+        <tabs header="工程部安装户数月报表" v-if="gettRolesnames('工程部派工')">
+          <apply-gongchengbu  v-ref:paperfeimain></apply-gongchengbu>
+        </tabs>
+      </tab-button>
+    </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '报表明细',
+  data () {
+    return {
+      showRight: false,
+      type: null,
+      selectdata: null,
+      show: []
+    }
+  },
+  methods: {
+    gettRolesnames (str) {
+      return this.$login.f.rolesnames.includes(str)
+    }
+  },
+  events: {
+    'handleOrder' (type, row) {
+      this.showRight = false
+
+      this.type = type
+      this.selectdata = row
+
+      this.$nextTick(() => {
+        this.showRight = true
+      })
+    },
+    'search' () {
+      this.selectdata = null
+      this.showRight = false
+      this.type = null
+
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    }
+  },
+  watch: {
+  }
+}
+</script>
+<style>
+.baobiao {
+  padding: 1%;
+  margin: 1%;
+  width: 99%;
+  height: auto;
+  background-color: #ffffff;
+  border-radius: 14px;
+  box-shadow: 0px 1px 10px 0px rgba(2, 56, 104, 0.13);
+}
+
+.baobiao-right {
+  padding:  1%;
+  margin: 1% 1% 1% 0;
+  width: 58%;
+  height: auto;
+  background-color: #ffffff;
+  box-shadow: 0px 1px 10px 0px rgba(2, 56, 104, 0.13);
+  border-radius: 14px;
+}
+</style>

package/src/components/product/Report/apply-stair-kaifa.vue

@@ -77,7 +77,6 @@
 
 <script>
 import { DataModel } from 'vue-client'
-import co from 'co'
 export default {
   title: '市场开发部月度报表',
   props: ['data'],

package/src/components/product/Report/gongchengbu.vue

@@ -0,0 +1,199 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-2">
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+
+          </div>
+          <div class="span" style="float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice4' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice4'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' v-el:handcollect id='gasprice4' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">工程部安装户数月度报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{ model.model.startDate }}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              打印时间：{{ $parent.printTime }}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{ $parent.orgname }}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{ $parent.depname }}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{ $parent.operatorname }}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+        </table>
+        <table class='tableprint' style="margin: 0px auto">
+          <tbody>
+          <tr>
+            <td class="tdcenter report-primary" width="100" height="60" rowspan="2">类别\项目</td>
+            <td class="tdcenter report-primary" width="300" height="30" colspan="3">用户报装</td>
+          </tr>
+          <tr>
+            <td class="tdcenter report-primary" width="100" height="30">报建性质</td>
+            <td class="tdcenter report-primary" width="100" height="30">煤改用户</td>
+            <td class="tdcenter report-primary" width="100" height="30">普通用户</td>
+          </tr>
+          <tr>
+            <td class="tdcenter bg-info" width="100" height="60" rowspan="2">民用用户</td>
+            <td class="tdcenter bg-info" width="100" height="30">{{ model.data.minYong[0] ? model.data.minYong[0].f_apply_nature:'小区' }}</td>
+            <td class="tdcenter bg-info" width="100" height="30">
+              {{ model.data.minYong[0] ? model.data.minYong[0].meigai_hetong_housecount ? model.data.minYong[0].meigai_hetong_housecount : '0' :'0' }}
+            </td>
+            <td class="tdcenter bg-info" width="100" height="30">
+              {{ model.data.minYong[0] ? model.data.minYong[0].putong_hetong_housecount ? model.data.minYong[0].putong_hetong_housecount : '0' :'0' }}
+            </td>
+          </tr>
+          <tr>
+            <td class="tdcenter bg-info" width="100" height="30">{{ model.data.minYong[1] ? model.data.minYong[1].f_apply_nature:'散户' }}</td>
+            <td class="tdcenter bg-info" width="100" height="30">
+              {{ model.data.minYong[1] ? model.data.minYong[1].meigai_hetong_housecount ? model.data.minYong[1].meigai_hetong_housecount : '0' :'0' }}
+            </td>
+            <td class="tdcenter bg-info" width="100" height="30">
+              {{ model.data.minYong[1] ? model.data.minYong[1].putong_hetong_housecount ? model.data.minYong[1].putong_hetong_housecount : '0' :'0' }}
+            </td>
+          </tr>
+          <tr>
+            <td class="tdcenter bg-info" width="100" height="30">非居用户</td>
+            <td class="tdcenter bg-info" width="100" height="30">{{ model.data.feiMinYong[0] ? model.data.feiMinYong[0].f_apply_nature:'商业' }}</td>
+            <td class="tdcenter bg-info" width="100" height="30">
+              {{ model.data.feiMinYong[0] ? model.data.feiMinYong[0].meigai_hetong_housecount ? model.data.feiMinYong[0].meigai_hetong_housecount : '0' : '0' }}
+            </td>
+            <td class="tdcenter bg-info" width="100" height="30">
+              {{ model.data.feiMinYong[0] ? model.data.feiMinYong[0].putong_hetong_housecount ? model.data.feiMinYong[0].putong_hetong_housecount : '0' :'0' }}
+            </td>
+          </tr>
+          <tr>
+            <td class="tdcenter bg-info" width="100" height="30">合计</td>
+            <td class="tdcenter bg-info" width="100" height="30">0</td>
+            <td class="tdcenter bg-info" width="100" height="30">{{ $parent.sumMeiGai }}</td>
+            <td class="tdcenter bg-info" width="100" height="30">{{ $parent.sumPuTong }}</td>
+          </tr>
+          <tr>
+            <td class="tdcenter report-primary" width="100" height="30" colspan="2">设备名称</td>
+            <td class="tdcenter report-primary" width="100" height="30" colspan="1">设备数量</td>
+            <td class="tdcenter report-primary" width="100" height="30" colspan="1">设备吨位</td>
+          </tr>
+          <tr style="text-align: center;" v-for="i in model.data.sheBei.length">
+            <td class="tdcenter bg-info" width="100" height="30" colspan="2">{{$parent.model.data.sheBei[i].f_devices_type}}</td>
+            <td class="tdcenter bg-info" width="100" height="30" colspan="1">{{$parent.model.data.sheBei[i].f_devices_num}}</td>
+            <td class="tdcenter bg-info" width="100" height="30" colspan="1">{{$parent.model.data.sheBei[i].f_devices_tonnage}}</td>
+          </tr>
+          </tbody>
+          <tfoot>
+          </tfoot>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {DataModel} from 'vue-client'
+
+export default {
+  title: '工程部安装户数月度报表',
+  props: ['data'],
+  data() {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      f_inputtor: [],
+      f_user_type: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/logic/getGongCheng', {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+      reportStr: null,
+      spans: 0,
+      sumMeiGai: 0,
+      sumPuTong: 0
+    }
+  },
+  ready() {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+  },
+  methods: {
+    searchData() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch(args) {
+      let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    getRes(obj) {
+      this.orgname = obj.res[0]
+      // this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      for (let i = 0; i < val.minYong.length; i++) {
+        this.sumMeiGai += val.minYong[i].meigai_hetong_housecount
+        this.sumPuTong += val.minYong[i].putong_hetong_housecount
+      }
+      for (let i = 0; i < val.feiMinYong.length; i++) {
+        this.sumMeiGai += val.feiMinYong[i].meigai_hetong_housecount
+        this.sumPuTong += val.feiMinYong[i].putong_hetong_housecount
+      }
+      console.log('当前显示' + this.sumMeiGai + '传参' + this.sumPuTong)
+    }
+  },
+  computed: {}
+}
+</script>
+<style scoped>
+.noborder {
+  border: none;
+}
+</style>

package/src/components/product/ServiceView.vue

@@ -113,6 +113,18 @@
               </label>
             </div>
           </div>
+
+          <!--image-->
+          <div :style="item.style ? item.style :'height: 40px;margin-bottom: 4px'"
+               v-if="item.type==='image' && !item.hidden && (item.device === 'pc' || !item.device)"
+               :class="[item.required && item.value.length === 0 ? 'has-error' : '',item.bootstraped?item.bootstraped+' form-group':'col-sm-4 form-group']">
+            <label :style="item.label_style ? item.label_style : ''"
+                   :class="item.label_bootstraped ? item.label_bootstraped+' control-label-justify control-label' : 'control-label-justify control-label col-sm-6'">{{item.label}}</label>
+            <div :style="item.value_style ? item.value_style:''"
+                 :class="item.value_bootstraped ? item.value_bootstraped : 'col-sm-6'">
+              <img v-if="data.fields[index].value" :src="data.fields[index].value" :style="item.imgStyle ? item.imgStyle : ''">
+            </div>
+          </div>
         </div>
       </div>
 

package/src/components/product/Stop/StopApplyList.vue

@@ -1,22 +1,22 @@
 <template>
-  <div class="col-sm-12">
+  <!-- 中止报建 -->
     <criteria-paged :model="model" v-ref:cp>
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div novalidate 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>
+              <label class="font_normal_body"><strong>报建编号：</strong></label>
               <input type="text" style="width:60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="search"
                      condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">客户名称：</label>
+              <label class="font_normal_body"><strong>客户名称：</strong></label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
                      v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">电&emsp;&emsp;话：</label>
+              <label class="font_normal_body"><strong>电&emsp;&emsp;话：</strong></label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_phone"
                      v-on:keyup.enter="$parent.$parent.search()" condition="f_phone = '{}'" placeholder='电话'>
             </div>
@@ -33,7 +33,7 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">报建类型：</label>
+              <label class="font_normal_body"><strong>报建类型：</strong></label>
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
@@ -46,7 +46,7 @@
                 close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">办理环节：</label>
+              <label class="font_normal_body"><strong>办理环节：</strong></label>
               <v-select
                 v-model="model.defname"
                 placeholder='办理环节'
@@ -58,7 +58,7 @@
                 close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-3">
-              <label  for="startDate" class="font_normal_body">开始时间：</label>
+              <label  for="startDate" class="font_normal_body"><strong>开始时间：</strong></label>
               <datepicker id="startDate" placeholder="开始日期"
                           style="width: 60%!important;"
                           v-model="model.startDate"
@@ -69,7 +69,7 @@
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
-              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <label for="endDate" class="font_normal_body"><strong>结束时间：</strong></label>
               <datepicker id="endDate" placeholder="结束日期"
                           style="width: 60%!important;"
                           v-model="model.endDate"

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

@@ -92,6 +92,20 @@
               item.options = await this[item.ready]()
             }
           }
+          if (item.param) {
+            let temp = this.$appdata.getParam(item.label)
+
+            if (temp && temp.length > 0) {
+              item.options = temp
+            }
+
+            if (item.paramLabel) {
+              temp = this.$appdata.getParam(item.paramLabel)
+              if (temp && temp.length > 0) {
+                item.options = temp
+              }
+            }
+          }
         }
 
         // 控制组件