npm - apply-clients - Versions diffs - 3.1.46 → 3.1.49 - Mend

apply-clients 3.1.46 → 3.1.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.1.46",
+  "version": "3.1.49",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -93,7 +93,7 @@
     "system-clients": "3.2.2",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.21.61-akyh-1",
+    "vue-client": "1.21.61-akyh-3",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

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

@@ -1,304 +1,315 @@
-<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>
-              <input type="text" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="search" condition=" (f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='二选一输入'>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">报建编号：</label>
-              <input type="text"  class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
-                     v-on:keyup.enter="search"
-                     condition="u.f_apply_num like '%{}%'">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">工程类型：</label>
-              <v-select
-                v-model="model.f_project_type"
-                placeholder='请选择'
-                condition="u.f_project_type like '%{}%'"
-                :value.sync="model.f_project_type"
-                :options='$parent.$parent.projectType'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></v-select>
-            </div>
-            <div class="form-group col-sm-3 button-range">
-              <button type="button" class="btn btn-info head-but" @click="search(),$parent.$parent.close()" v-el:cx>查询</button>
-              <button type="button" class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-              <export-excel :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"
-                            sqlurl="rs/logic/applyExportfile"
-                            sql-name="supervisory3"
-                            template-name='报建记录信息导出'
-                            :choose-col="true"></export-excel>
-              <!--              <button class="button_search button_spacing width-60" @click="search(),$parent.$parent.close()" v-el:cx>查询</button>-->
-              <div
-                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                @click="$parent.$parent.hidden()"
-                class="button_spacing"
-                style="float: right">
-              </div>
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">小&emsp;&emsp;区：</label>
-              <v-select
-                v-model="model.f_residential_area"
-                placeholder='请选择'
-                condition="u.f_residential_area = '{}'"
-                :value.sync="model.f_residential_area"
-                :options='$parent.$parent.area'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></v-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">用户地址：</label>
-              <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
-                     v-on:keyup.enter="search"
-                     condition="f_address like '%{}%'">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">票&emsp;&emsp;号：</label>
-              <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
-                     v-on:keyup.enter="search"
-                     condition="c.f_ticket_number like '%{}%'">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">合同编号：</label>
-              <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
-                     v-on:keyup.enter="search"
-                     condition="f_contract_number like '%{}%'">
-            </div>
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">报建类型：</label>
-              <v-select
-                v-model="model.f_apply_type"
-                placeholder='报建类型'
-                condition="f_apply_type  like '%{}%'"
-                :value.sync="model.f_apply_type"
-                :options='$parent.$parent.applytype'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></v-select>
-            </div>
-            <div class="col-sm-3  form-group">
-              <label class="font_normal_body">办理环节：</label>
-              <v-select
-                v-model="model.defname"
-                placeholder='办理环节'
-                condition="defname = '{}'"
-                :value.sync="model.defname"
-                :options='$parent.$parent.defnames'
-                class="select select_list"
-                :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 00:00:00'"
-                          :show-reset-button="true"
-                          condition="f_apply_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 23:59:59'"
-                          :show-reset-button="true"
-                          condition="f_apply_date <= '{}'">
-              </datepicker>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
-        <template partial='head'>
-          <tr>
-            <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'>
-          <tr>
-            <td  style="text-align: center;">
-              <nobr>{{$index+1}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_apply_num}}</font></nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_sub_state}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.money}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_user_name}}/{{row.f_contact}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_contract_number}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_phone}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_address}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.defname}}</nobr>
-            </td>
-            <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_apply_date}}</nobr>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-<script>
-import {PagedList} from 'vue-client'
-import getNowDate from '../../getNowDate.js'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '勘探详情',
-  data() {
-    return {
-      applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
-      model: new PagedList('rs/sql/supervisory3', 20, {
-        data: {
-          id: `${this.$login.f.name}`,
-          org: `${this.$login.f.orgs}`
-        }
-      }),
-      defnames:[], // 所有流程节点
-      condition: '', // 查询条件
-      criteriaShow: false,
-      area:[],
-      getfield: {
-        'f_apply_num': ' 报 建 编 号 ',
-        'defname': ' 当 前 环 节 ',
-        'f_sub_state': ' 流 程 状 态 ',
-        'f_user_name': ' 客 户 名 称 ',
-        'f_contact': ' 联 系 人 ',
-        'f_contract_number': ' 合 同 编 号 ',
-        'f_phone': ' 电 话 ',
-        'f_address': '              地              址             ',
-        'f_apply_type': ' 报 建 类 型 ',
-        'f_apply_date': '  报 建 日 期  ',
-        'money': ' 缴纳总金额 ',
-        'f_households_sum': ' 报建户数 '
-      }
-    }
-  },
-  async ready() {
-    // 调用查询
-    this.$refs.cp.$refs.cri.search()
-    // 获取所有办理环节
-    this.getDefnames()
-    this.getAreaAll()
-  },
-  events: {
-  },
-  methods: {
-    clear () {
-      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = ''
-      })
-    },
-    hidden() {
-      this.$dispatch('hidden', this.criteriaShow)
-      this.criteriaShow = !this.criteriaShow
-    },
-    // 获取所有办理环节
-    getDefnames() {
-      let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/getAllDefname', {}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then((res) => {
-        this.defnames = [{label: '全部', value: ''}, ...res.data]
-      })
-    },
-    async getAreaAll () {
-      let http = new HttpResetClass()
-      let condition = "f_filialeid = " + this.$login.f.orgid
-      let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
-      this.area = res.data.queryArea.map(item => {
-        return {
-          'label': item.f_residential_area,
-          'value': item.f_residential_area,
-        }
-      })
-    },
-    check(val) {
-      this.$dispatch('apply', val)
-    },
-    close() {
-      this.$dispatch('close')
-    }
-  },
-  computed: {
-    projectType() {
-      return this.$appdata.getParam("工程类型")
-    },
-    getCondition () {
-      console.log("condition",this.$refs.cp.$refs.cri.condition)
-      return {
-        condition: this.$refs.cp.$refs.cri.condition,
-        data: {
-          org: `${this.$login.f.orgs}`,
-          orgid: this.$login.f.orgid
-        }
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-.operate{
-  text-align: right;
-  display: flex;
-  align-items: center; /*子元素中线居中*/
-  justify-content: flex-end; /*子元素靠右*/
-  margin-top: 7px;
-}
-.head-but{
-  margin-left: 5px;
-  height: 34px;
-  background-color: #6aa6e2;
-  border-radius: 4px;
-  font-family: PingFang;
-  color: #ffffff;
-}
-</style>
+<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>
+              <input type="text" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="search" condition=" (f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='二选一输入'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text"  class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
+                     v-on:keyup.enter="search"
+                     condition="u.f_apply_num like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">工程类型：</label>
+              <v-select
+                v-model="model.f_project_type"
+                placeholder='请选择'
+                condition="u.f_project_type like '%{}%'"
+                :value.sync="model.f_project_type"
+                :options='$parent.$parent.projectType'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3 button-range">
+              <button type="button" class="btn btn-info head-but" @click="search(),$parent.$parent.close()" v-el:cx>查询</button>
+              <button type="button" class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/applyExportfile"
+                            sql-name="supervisory3"
+                            template-name='报建记录信息导出'
+                            :choose-col="true"></export-excel>
+              <!--              <button class="button_search button_spacing width-60" @click="search(),$parent.$parent.close()" v-el:cx>查询</button>-->
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.hidden()"
+                class="button_spacing"
+                style="float: right">
+              </div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">小&emsp;&emsp;区：</label>
+              <v-select
+                v-model="model.f_residential_area"
+                placeholder='请选择'
+                condition="u.f_residential_area = '{}'"
+                :value.sync="model.f_residential_area"
+                :options='$parent.$parent.area'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户地址：</label>
+              <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
+                     v-on:keyup.enter="search"
+                     condition="f_address like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">票&emsp;&emsp;号：</label>
+              <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
+                     v-on:keyup.enter="search"
+                     condition="c.f_ticket_number like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">合同编号：</label>
+              <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
+                     v-on:keyup.enter="search"
+                     condition="f_contract_number like '%{}%'">
+            </div>
+            <div class="col-sm-3  form-group">
+              <label class="font_normal_body">报建类型：</label>
+              <v-select
+                v-model="model.f_apply_type"
+                placeholder='报建类型'
+                condition="f_apply_type  like '%{}%'"
+                :value.sync="model.f_apply_type"
+                :options='$parent.$parent.applytype'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="col-sm-3  form-group">
+              <label class="font_normal_body">办理环节：</label>
+              <v-select
+                v-model="model.defname"
+                placeholder='办理环节'
+                condition="defname = '{}'"
+                :value.sync="model.defname"
+                :options='$parent.$parent.defnames'
+                class="select select_list"
+                :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 00:00:00'"
+                          :show-reset-button="true"
+                          condition="f_apply_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 23:59:59'"
+                          :show-reset-button="true"
+                          condition="f_apply_date <= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">收费日期：</label>
+              <datepicker id="f_charge_date" placeholder="收费日期"
+                          style="width: 60%!important;"
+                          v-model="model.f_charge_date"
+                          :value.sync="model.f_charge_date"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <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'>
+          <tr>
+            <td  style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_num}}</font></nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_sub_state}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.money}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_user_name}}/{{row.f_contact}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_contract_number}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_phone}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_address}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.defname}}</nobr>
+            </td>
+            <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_apply_date}}</nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import getNowDate from '../../getNowDate.js'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '勘探详情',
+  data() {
+    return {
+      applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
+      model: new PagedList('rs/sql/supervisory3', 20, {
+        data: {
+          id: `${this.$login.f.name}`,
+          org: `${this.$login.f.orgs}`
+        }
+      }),
+      defnames:[], // 所有流程节点
+      condition: '', // 查询条件
+      criteriaShow: false,
+      area:[],
+      getfield: {
+        'f_apply_num': ' 报 建 编 号 ',
+        'defname': ' 当 前 环 节 ',
+        'f_sub_state': ' 流 程 状 态 ',
+        'f_user_name': ' 客 户 名 称 ',
+        'f_contact': ' 联 系 人 ',
+        'f_contract_number': ' 合 同 编 号 ',
+        'f_phone': ' 电 话 ',
+        'f_address': '              地              址             ',
+        'f_apply_type': ' 报 建 类 型 ',
+        'f_apply_date': '  报 建 日 期  ',
+        'money': ' 缴纳总金额 ',
+        'f_households_sum': ' 报建户数 '
+      }
+    }
+  },
+  async ready() {
+    // 调用查询
+    this.$refs.cp.$refs.cri.search()
+    // 获取所有办理环节
+    this.getDefnames()
+    this.getAreaAll()
+  },
+  events: {
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    hidden() {
+      this.$dispatch('hidden', this.criteriaShow)
+      this.criteriaShow = !this.criteriaShow
+    },
+    // 获取所有办理环节
+    getDefnames() {
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/logic/getAllDefname', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        this.defnames = [{label: '全部', value: ''}, ...res.data]
+      })
+    },
+    async getAreaAll () {
+      let http = new HttpResetClass()
+      let condition = "f_filialeid = " + this.$login.f.orgid
+      let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
+      this.area = res.data.queryArea.map(item => {
+        return {
+          'label': item.f_residential_area,
+          'value': item.f_residential_area,
+        }
+      })
+    },
+    check(val) {
+      this.$dispatch('apply', val)
+    },
+    close() {
+      this.$dispatch('close')
+    }
+  },
+  computed: {
+    projectType() {
+      return this.$appdata.getParam("工程类型")
+    },
+    getCondition () {
+      console.log("condition",this.$refs.cp.$refs.cri.condition)
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          org: `${this.$login.f.orgs}`,
+          orgid: this.$login.f.orgid
+        }
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.operate{
+  text-align: right;
+  display: flex;
+  align-items: center; /*子元素中线居中*/
+  justify-content: flex-end; /*子元素靠右*/
+  margin-top: 7px;
+}
+.head-but{
+  margin-left: 5px;
+  height: 34px;
+  background-color: #6aa6e2;
+  border-radius: 4px;
+  font-family: PingFang;
+  color: #ffffff;
+}
+</style>

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

@@ -104,6 +104,17 @@
                           condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-4">
+              <label for="endDate" class="font_normal_body">收费日期：</label>
+              <datepicker id="f_charge_date" placeholder="收费日期"
+                          style="width: 60%!important;"
+                          v-model="model.f_charge_date"
+                          :value.sync="model.f_charge_date"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>

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

@@ -105,6 +105,17 @@
                             condition="f_apply_date <= '{}'">
                 </datepicker>
               </div>
+              <div class="form-group col-sm-3">
+                <label for="endDate" class="font_normal_body">收费日期：</label>
+                <datepicker id="f_charge_date" placeholder="收费日期"
+                            style="width: 60%!important;"
+                            v-model="model.f_charge_date"
+                            :value.sync="model.f_charge_date"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="true"
+                            condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
+                </datepicker>
+              </div>
             </div>
           </div>
       </criteria>

package/src/components/product/Process/ExplorationUser.vue CHANGED Viewed

@@ -1,168 +1,168 @@
-<template>
-  <div class="basic-main">
-    <div class="tops" v-bind:style="{ height: topheight }">
-      <exploration-select v-ref:queryuser v-show="show"></exploration-select>
-    </div>
-    <div v-if="showtotal" v-bind:style="{ height: botheight, 'margin-top' : '20px'}">
-      <tabset v-ref:tabs :close="false">
-        <tab header='集中报装' v-if="selectdata.f_apply_type == '集中报建'" style="background-color :#f6f6f6">
-          <record-message v-ref:record :selectdata="selectdata" :key="tittle1"
-                          :edit = "true">
-          </record-message>
-        </tab>
-        <tab :header='header' style="background-color :#ffffff!important;overflow: auto;">
-          <service-control  v-ref:service :selectdata="selectdata"></service-control>
-        </tab>
-        <tab header='附件' style="background-color :#ffffff!important;overflow: auto;">
-          <apply-upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "true" :isremark = "true" :isupload = "true" :defname="selectdata.defname"></apply-upload>
-        </tab>
-      </tabset>
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建流程',
-    data () {
-      return {
-        show: true,       // 控制列表列表
-        showtotal: false, // 详情显示
-        header: null,     // tag 标题
-        selectdata: {},
-        botheight: '0%',   // 详情信息显示高度
-        topheight: '100%', // 列表显示高度
-        xmlname: ''        // 配置文件名
-      }
-    },
-    created () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let http = new HttpResetClass()
-        let xmldata = {
-          data: this.$login.f,
-          workname: this.xmlname
-        }
-        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
-        if (res.data.code && res.data.code === 200) {
-          Vue.prototype.$workflow_vue = res.data.workflow_vue
-        } else {
-          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-          return
-        }
-      },
-      async getProcessId() {
-        let http = new HttpResetClass()
-        let data = {
-          workname: this.xmlname
-        }
-        let res = await http.load('POST', 'rs/logic/getProcessId', {data: data}, {resolveMsg: null, rejectMsg: null})
-        this.selectdata.f_process_id = res.data
-      }
-    },
-    events: {
-      'onMessage' (data) {
-        console.log('接收消息')
-        console.log(data)
-        if (data.type === 'apply-task') {
-          this.$refs.queryuser.$refs.cp.$refs.cri.search()
-        }
-      },
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-        if (servicedata.id) {
-          let data = {
-            condition: `u.id = ${servicedata.id}`,
-            data: {
-              id: this.$login.f.id,
-              org: this.$login.f.orgs
-            }
-          }
-          let res = await this.$resetpost(
-            'rs/sql/checkuser',
-            {data: data},
-            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
-          )
-          this.selectdata = res.data[0]
-        } else {
-          this.selectdata = servicedata
-        }
-        this.showtotal = false
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      },
-      // 初始化
-      async 'apply' (val) {
-        this.selectdata = val
-        if (this.selectdata.f_apply_type === '集中报建') {
-          this.xmlname = '集中报建流程'
-        } else if (this.selectdata.f_apply_type === '散户报建') {
-          this.xmlname = '散户报建流程'
-        } else if (this.selectdata.f_apply_type === '非民用报建') {
-          this.xmlname = '非民用报建流程'
-        } else {
-          this.$showMessage('暂无此类报装')
-          return
-        }
-        // 获取页面json配置文件
-        // 次方法必须同步执行，否则后续会出问题
-        await this.loadName()
-        if(this.selectdata.defname === this.$workflow_vue.start_activity) {
-          // 获取流程id
-          await this.getProcessId()
-        }
-        // 显示详细
-        this.showtotal = true
-        this.topheight = '10%'
-        this.botheight = '90%'
-        // 列表显示当前数据
-        this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [this.selectdata]
-        // 关闭分页
-        this.$refs.queryuser.$refs.cp.pager = false
-        // tab标题
-        this.header = this.selectdata.defname
-      },
-      // 关闭详情页等
-      'close' () {
-        this.showtotal = false
-        this.topheight = '100%'
-        this.botheight = '0%'
-        this.$refs.queryuser.$refs.cp.pager = true
-        this.$refs.queryuser.$refs.cp.$refs.cri.search()
-      },
-      'hidden' (criteriaShow) {
-        if (!this.showtotal && !criteriaShow) {
-        }
-        if (!this.showtotal && criteriaShow) {
-        }
-        if (this.showtotal && !criteriaShow) {
-          this.topheight = '20%'
-          this.botheight = '80%'
-        }
-        if (this.showtotal && criteriaShow) {
-          this.topheight = '10%'
-          this.botheight = '90%'
-        }
-      }
-    },
-    watch: {
-    }
-  }
-</script>
+<template>
+  <div class="basic-main">
+    <div class="tops" v-bind:style="{ height: topheight }">
+      <exploration-select v-ref:queryuser v-show="show"></exploration-select>
+    </div>
+    <div v-if="showtotal" v-bind:style="{ height: botheight, 'margin-top' : '20px'}">
+      <tabset v-ref:tabs :close="false">
+        <tab header='集中报装' v-if="selectdata.f_apply_type == '集中报建'" style="background-color :#f6f6f6">
+          <record-message v-ref:record :selectdata="selectdata" :key="tittle1"
+                          :edit = "true">
+          </record-message>
+        </tab>
+        <tab :header='header' style="background-color :#ffffff!important;overflow: auto;">
+          <service-control  v-ref:service :selectdata="selectdata"></service-control>
+        </tab>
+        <tab header='附件' style="background-color :#ffffff!important;overflow: auto;">
+          <apply-upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "true" :isdelete = "true" :isremark = "true" :isupload = "true" :defname="selectdata.defname"></apply-upload>
+        </tab>
+      </tabset>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建流程',
+    data () {
+      return {
+        show: true,       // 控制列表列表
+        showtotal: false, // 详情显示
+        header: null,     // tag 标题
+        selectdata: {},
+        botheight: '0%',   // 详情信息显示高度
+        topheight: '100%', // 列表显示高度
+        xmlname: ''        // 配置文件名
+      }
+    },
+    created () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let http = new HttpResetClass()
+        let xmldata = {
+          data: this.$login.f,
+          workname: this.xmlname
+        }
+        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
+        if (res.data.code && res.data.code === 200) {
+          Vue.prototype.$workflow_vue = res.data.workflow_vue
+        } else {
+          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+          return
+        }
+      },
+      async getProcessId() {
+        let http = new HttpResetClass()
+        let data = {
+          workname: this.xmlname
+        }
+        let res = await http.load('POST', 'rs/logic/getProcessId', {data: data}, {resolveMsg: null, rejectMsg: null})
+        this.selectdata.f_process_id = res.data
+      }
+    },
+    events: {
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        }
+      },
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+        if (servicedata.id) {
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              id: this.$login.f.id,
+              org: this.$login.f.orgs
+            }
+          }
+          let res = await this.$resetpost(
+            'rs/sql/checkuser',
+            {data: data},
+            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+          )
+          this.selectdata = res.data[0]
+        } else {
+          this.selectdata = servicedata
+        }
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+      },
+      // 初始化
+      async 'apply' (val) {
+        this.selectdata = val
+        if (this.selectdata.f_apply_type === '集中报建') {
+          this.xmlname = '集中报建流程'
+        } else if (this.selectdata.f_apply_type === '散户报建') {
+          this.xmlname = '散户报建流程'
+        } else if (this.selectdata.f_apply_type === '非民用报建') {
+          this.xmlname = '非民用报建流程'
+        } else {
+          this.$showMessage('暂无此类报装')
+          return
+        }
+        // 获取页面json配置文件
+        // 次方法必须同步执行，否则后续会出问题
+        await this.loadName()
+        if(this.selectdata.defname === this.$workflow_vue.start_activity) {
+          // 获取流程id
+          await this.getProcessId()
+        }
+        // 显示详细
+        this.showtotal = true
+        this.topheight = '10%'
+        this.botheight = '90%'
+        // 列表显示当前数据
+        this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [this.selectdata]
+        // 关闭分页
+        this.$refs.queryuser.$refs.cp.pager = false
+        // tab标题
+        this.header = this.selectdata.defname
+      },
+      // 关闭详情页等
+      'close' () {
+        this.showtotal = false
+        this.topheight = '100%'
+        this.botheight = '0%'
+        this.$refs.queryuser.$refs.cp.pager = true
+        this.$refs.queryuser.$refs.cp.$refs.cri.search()
+      },
+      'hidden' (criteriaShow) {
+        if (!this.showtotal && !criteriaShow) {
+        }
+        if (!this.showtotal && criteriaShow) {
+        }
+        if (this.showtotal && !criteriaShow) {
+          this.topheight = '20%'
+          this.botheight = '80%'
+        }
+        if (this.showtotal && criteriaShow) {
+          this.topheight = '10%'
+          this.botheight = '90%'
+        }
+      }
+    },
+    watch: {
+    }
+  }
+</script>

package/src/components/product/Process/Service/ServiceControl.vue CHANGED Viewed

@@ -524,6 +524,52 @@
           }
         }
       },
+      getTotalCost(){
+        if (this.selectdata.defname === '结算') {
+          for (let i = 0; i < this.show_data.fields.length; i++) {
+            if (this.show_data.fields[i].label === '低压工程款') {
+              this.show_data.f_project_money_down = Number(this.show_data.fields[i].value)
+              console.log("测试1", this.show_data.f_project_money_down)
+            } else if (this.show_data.fields[i].label === '中压工程款') {
+              this.show_data.f_project_money_up = Number(this.show_data.fields[i].value)
+              console.log("测试2", this.show_data.f_project_money_up)
+            } else if (this.show_data.fields[i].label === '低压材料款') {
+              this.show_data.f_material_money_down = Number(this.show_data.fields[i].value)
+              console.log("测试3", this.show_data.f_material_money_down)
+            } else if (this.show_data.fields[i].label === '中压材料款') {
+              this.show_data.f_material_money_up = Number(this.show_data.fields[i].value)
+              console.log("测试4", this.show_data.f_material_money_up)
+            } else if (this.show_data.fields[i].label === '支付结算') {
+              console.log("测试5", this.show_data.f_payment_settlement)
+              if ((this.show_data.f_project_money_down + this.show_data.f_project_money_up) > 0) {
+                this.show_data.fields[i].value = this.show_data.f_project_money_down + this.show_data.f_project_money_up
+              }
+              this.show_data.f_payment_settlement = Number(this.show_data.fields[i].value)
+            } else if (this.show_data.fields[i].label === '支付材料') {
+              console.log("测试6", (this.show_data.f_material_money_down + this.show_data.f_material_money_up))
+              if ((this.show_data.f_material_money_down + this.show_data.f_material_money_up) > 0) {
+                console.log("测试6", (this.show_data.f_material_money_down + this.show_data.f_material_money_up))
+                this.show_data.fields[i].value = this.show_data.f_material_money_down + this.show_data.f_material_money_up
+              }
+              this.show_data.f_payment_material = Number(this.show_data.fields[i].value)
+            } else if (this.show_data.fields[i].label === '总成本') {
+              if ((this.show_data.f_payment_material + this.show_data.f_payment_settlement) > 0) {
+                console.log("测试7")
+                this.show_data.fields[i].value = this.show_data.f_payment_material + this.show_data.f_payment_settlement
+              }
+              this.show_data.f_total_cost = this.show_data.fields[i].value
+            } else if (this.show_data.fields[i].label === '毛利') {
+              if (this.show_data.f_total_cost > 0) {
+                console.log("测试8")
+                let number = parseFloat((this.selectdata.f_contract_money - this.show_data.f_total_cost) / this.selectdata.f_contract_money).toFixed(5)
+                let realVal = number.substring(0, number.length - 1)
+                this.show_data.fields[i].value =(realVal * 100).toFixed(2)+"%"
+              }
+            }
+          }
+          console.log("测试", this.show_data)
+        }
+      },
       an_kang_yi_hua () {
         //===================安康逸华前端特殊逻辑===========================
         let swap1 = null  // 小区名称转换
@@ -896,6 +942,7 @@
         this.an_kang_yi_hua()
         this.getGasMeter1()
         this.getGasPrice()
+        this.getTotalCost()
         // 合成地址

package/src/components/product/Report/ApplyGongliaoList.vue CHANGED Viewed

@@ -124,7 +124,7 @@
             <nobr><font>{{row.f_ticket_number}}</font></nobr>
           </td>
           <td style="text-align: center;">
-            <nobr><font>{{row.f_operation_date}}</font></nobr>
+            <nobr><font>{{row.f_charge_date}}</font></nobr>
           </td>
           <td style="text-align: center;">
             <nobr><font>{{row.f_operator}}</font></nobr>

package/src/components/product/ReportForm/CustomerRecordMessage.vue CHANGED Viewed

@@ -981,8 +981,10 @@
         this.selectdata = val
       },
       async load() {
-        if (!this.selectdata)
+        if (!this.selectdata || !this.selectdata.f_process_id){
           return
+        }
+        console.log("当前数据",!this.selectdata.f_process_id)
         let data = {
           f_process_id: this.selectdata.f_process_id
         }

package/src/components/product/Supervisory/SupervisoryList.vue CHANGED Viewed

@@ -123,6 +123,17 @@
                           condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">收费日期：</label>
+              <datepicker id="f_charge_date" placeholder="收费日期"
+                          style="width: 60%!important;"
+                          v-model="model.f_charge_date"
+                          :value.sync="model.f_charge_date"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>

package/src/components/product/Supervisory/SupervisoryList2.vue CHANGED Viewed

@@ -122,6 +122,17 @@
                           condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">收费日期：</label>
+              <datepicker id="f_charge_date" placeholder="收费日期"
+                          style="width: 60%!important;"
+                          v-model="model.f_charge_date"
+                          :value.sync="model.f_charge_date"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="true"
+                          condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>