apply-clients 7.1.36-yuchuan-11 → 7.1.36-yuchuan-14

package/src/components/product/ApplyMap/ApplyMapCom.vue

@@ -1,82 +1,82 @@
-<template>
-  <div style="background-color: #ffffff;padding: 10px;">
-    <template v-if="this.selectdata.defname === '报装申请'|| this.selectdata.defname === '报建受理'|| this.selectdata.defname ==='现场勘察'">
-      <apply-input-search
-        :markmapdata="markmapdata" v-ref:pick
-        @locationclick="locationclick"
-      ></apply-input-search>
-    </template>
-    <template v-else>
-      <amap-location
-        :isshowsearch="false"
-        :mylocationinfo="false"
-        :isshowmapmodel="false"
-        :islocation="false"
-        mapmodel="dragMarker"
-        :labelmarksarray="labelmarksarray"
-      ></amap-location>
-    </template>
-  </div>
-</template>
-<script>
-export default {
-  title: '地图',
-  props: {
-    selectdata: {
-      type: Object
-    }
-  },
-  data () {
-    return {
-    }
-  },
-  ready () {
-    console.log('-----------------------进入地图-------------------------')
-  },
-  methods: {
-    locationclick (res) {
-      console.log('=======选点回调=======')
-      console.log(res)
-
-      this.$dispatch('locationclick', res)
-    }
-  },
-  events: {
-  },
-  computed: {
-    markmapdata () {
-      if (!this.selectdata.f_lng || !this.selectdata.f_lat) {
-        return null
-      }
-      return {
-        name: `${this.selectdata.f_user_name}`,
-        address: `${this.selectdata.f_order_address}`,
-        location: {
-          Q: this.selectdata.f_lat,
-          R: this.selectdata.f_lng,
-          lat: this.selectdata.f_lat,
-          lng: this.selectdata.f_lng
-        }
-      }
-    },
-    labelmarksarray () {
-      return [{
-        data: {
-          data: this.selectdata,
-          label: `<div style="background: #fff;border-radius: 5px;height: 100px;padding: 5px">
-                  <h5>${this.selectdata.f_user_name}</h5>
-                  <h5>${this.selectdata.f_phone}</h5>
-                  <h5>${this.selectdata.f_order_address}</h5>
-                </div>`
-        },
-        position: [this.selectdata.f_lng, this.selectdata.f_lat],
-        isclearmarker: false
-      }]
-    }
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped>
-</style>
+<template>
+  <div style="background-color: #ffffff;padding: 10px;">
+    <template v-if="this.selectdata.defname === '报装申请'|| this.selectdata.defname === '报建受理'|| this.selectdata.defname ==='现场勘察'">
+      <apply-input-search
+        :markmapdata="markmapdata" v-ref:pick
+        @locationclick="locationclick"
+      ></apply-input-search>
+    </template>
+    <template v-else>
+      <apply-amap-location
+        :isshowsearch="false"
+        :mylocationinfo="false"
+        :isshowmapmodel="false"
+        :islocation="false"
+        mapmodel="dragMarker"
+        :labelmarksarray="labelmarksarray"
+      ></apply-amap-location>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  title: '地图',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data () {
+    return {
+    }
+  },
+  ready () {
+    console.log('-----------------------进入地图-------------------------')
+  },
+  methods: {
+    locationclick (res) {
+      console.log('=======选点回调=======')
+      console.log(res)
+
+      this.$dispatch('locationclick', res)
+    }
+  },
+  events: {
+  },
+  computed: {
+    markmapdata () {
+      if (!this.selectdata.f_lng || !this.selectdata.f_lat) {
+        return null
+      }
+      return {
+        name: `${this.selectdata.f_user_name}`,
+        address: `${this.selectdata.f_order_address}`,
+        location: {
+          Q: this.selectdata.f_lat,
+          R: this.selectdata.f_lng,
+          lat: this.selectdata.f_lat,
+          lng: this.selectdata.f_lng
+        }
+      }
+    },
+    labelmarksarray () {
+      return [{
+        data: {
+          data: this.selectdata,
+          label: `<div style="background: #fff;border-radius: 5px;height: 100px;padding: 5px">
+                  <h5>${this.selectdata.f_user_name}</h5>
+                  <h5>${this.selectdata.f_phone}</h5>
+                  <h5>${this.selectdata.f_order_address}</h5>
+                </div>`
+        },
+        position: [this.selectdata.f_lng, this.selectdata.f_lat],
+        isclearmarker: false
+      }]
+    }
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+</style>

package/src/components/product/Function/InstallInfoSelect.vue

@@ -299,7 +299,7 @@
 
         let str = personexpression.substring(2, personexpression.length-1)
 
-        if (mark === 'D' && this.$login.f.f_parentname.includes(str)) {
+        if (mark === 'D' && this.$login.f.f_department_name.includes(str)) {
           return true
         }
         if (mark === 'R' && this.$login.f.rolesnames.includes(str)) {

package/src/components/product/InsuranceApply/InsuranceReport.vue

@@ -0,0 +1,189 @@
+<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'"
+                          condition="f_operate_date > '{}'"
+                          :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'"
+                          condition="f_operate_date < '{}'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div><br>
+            <div class="col-sm-2" style="margin-top: -24px">
+                <label class="font_normal_body" for="f_insurance_company">保险公司：</label>
+                <v-select
+                  placeholder='请选择'
+                  v-model="model.f_insurance_company"
+                  condition="f_insurance_company = '{}'"
+                  @change="$parent.$parent.changeCompany"
+                  :value.sync="model.f_insurance_company"
+                  :options="$parent.$parent.applyCompany"
+                  :value-single="true"
+                  style="margin-left:-12px"
+                  close-on-select></v-select>
+            </div>
+            <div class="col-sm-2" style="margin-top: -24px">
+              <label class="font_normal_body" for="f_insurance_company">保险类型：</label>
+              <v-select
+                placeholder='请选择'
+                v-model="model.f_insurance_type"
+                condition="f_insurance_type = '{}'"
+                :value.sync="model.f_insurance_type"
+                :options="$parent.$parent.applyType"
+                :value-single="true"
+                style="margin-left:-12px"
+                close-on-select></v-select>
+            </div>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice1' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice1'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice1' 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;">
+              开始时间：{{ $refs.criteria.model.startDate }}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ $refs.criteria.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>
+          <tr>
+            <td :colspan='$parent.spans' class="norder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <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/apply/report/apply-insurance-yuchuan', {
+        startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid', f_insurance_company: 'this.model.f_insurance_company' ,
+        f_insurance_type: 'this.model.f_insurance_type'
+      }),
+      reportStr: null,
+      spans: 0,
+      applyCompany: [],
+      applyType: []
+    }
+  },
+  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'
+    this.searchData()
+    this.applyCompany = this.$appdata.getParam('保险公司')
+  },
+  created () {
+    this.$nextTick(() => {
+      this.$watch(this.$refs.paged.$refs.criteria.model.f_insurance_company, function () {
+        console.log(123)
+      })
+    })
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch(args) {
+      console.log(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
+    },
+    changeCompany () {
+      this.$refs.paged.$refs.criteria.model.f_insurance_type = ''
+      if (this.$refs.paged.$refs.criteria.model.f_insurance_company === '中国太平洋保险') {
+        this.applyType = this.$appdata.getParam('中国太平洋保险')
+      } else if (this.$refs.paged.$refs.criteria.model.f_insurance_company === '中意财险') {
+        this.applyType = this.$appdata.getParam('中意财险')
+      } else {
+        this.applyType = []
+      }
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      this.spans = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
+    },
+    'this.$refs.paged.$refs.criteria.model.f_insurance_company' (val) {
+      console.log(val)
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder {
+  border: none;
+}
+</style>