apply-clients 3.1.44 → 3.1.48

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

@@ -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

@@ -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>
@@ -318,6 +329,7 @@
       },
       // 点击操作
       click(val) {
+        this.criteriaShow = false
         this.$dispatch('apply', val)
       }
     },

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

@@ -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/Report/ApplyGongliaoList.vue

@@ -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>