apply-clients 3.5.5-7 → 3.5.5-70

package/src/filiale/fugou/pc/addressAndUserinfoManagement.vue

@@ -43,7 +43,7 @@
               <nobr>{{row.f_pcd}}</nobr>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_slice_area}}</nobr>
+              <nobr>{{row.f_community}}</nobr>
             </td>
             <td style="text-align: center;">
               <nobr>{{row.f_street}}</nobr>

package/src/filiale/fugou/pc/chargeReport.vue

@@ -4,6 +4,45 @@
       <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">组织机构：</label>
+              <res-select
+                restype='organization'
+                :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                :is-mul="false"
+              ></res-select>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">部&emsp;&emsp;门：</label>
+              <res-select
+                restype='department'
+                :parentresid="$parent.$parent.curorgid"
+                :initresid='$parent.$parent.curdepid'
+                @res-select="$parent.$parent.getdep"
+                :is-mul="true"
+              ></res-select>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">人&emsp;&emsp;员：</label>
+              <res-select
+                restype='user'
+                :parentresid="$parent.$parent.curdepid"
+                :initresid='$parent.$parent.curuserid'
+                @res-select="$parent.$parent.getuser"
+                :is-mul="true"></res-select>
+            </div>
+            <div class="col-sm-2" >
+              <label class="font_normal_body" for="startDate">分组项:</label>
+              <v-select
+                     :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1'
+                        placeholder='请选择'
+                        close-on-select
+              ></v-select>
+            </div>
             <div class="col-sm-2" >
               <label class="font_normal_body" for="startDate">开始日期:</label>
               <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
@@ -54,7 +93,7 @@
             </th>
           </tr>
           <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+            <th :colspan='$par ent.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>
@@ -70,9 +109,9 @@
           </tr>
           <tfoot>
           </tfoot>
-        </table>
+      </table>
       </div>
-    </criteria-paged>
+    </criteria-page d>
   </div>
 </template>
 <script>
@@ -83,6 +122,9 @@ export default {
   data () {
     return {
       printTime: this.$login.toStandardTimeString(),
+      curorgid: [this.$login.f.orgid],
+      curdepid: [],
+      curuserid: [],
       depresid: [],
       userresid: [],
       f_orgid: this.$login.f.orgid,
@@ -98,40 +140,70 @@ export default {
       orgCondtionStr: '1=1',
       model: new DataModel('rs/report/fgChargeRecord', {
         startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'
+        f_orgid: 'this.model.f_orgid',
+        f_public_group1: 'this.model.f_public_group1[0]',
+        group1Name: 'this.model.group1Name'
       }),
       reportStr: null,
       spans: 0,
+      f_public_group1: '',
+      group1Name: ''
     }
   },
   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()
   },
   created () {
   },
   methods: {
-    searchData () {
-      this.$refs.paged.$refs.criteria.search()
-    },
     selfSearch(args) {
-      console.log(args)
+      this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+      if (this.curuserid.length > 0) {
+        args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
+      }
       let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
+      let name1 = args.model.f_public_group1
+      if (name1 == null || name1 == ''){
+        alert("请选择分组项！！！")
+        return
+      }
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
       this.$refs.paged.search(args)
     },
-    getRes (obj) {
-      this.orgname = obj.res[0]
-      this.f_orgid = obj.resids
+    getuser (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curuserid = val
+    },
+    getdep (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curdepid = val
+      this.curuserid = []
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.curdepid = []
+      this.curuserid = []
+    },
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
     }
   },
+  computed: {
+      group1() {
+        return [{label:'报建类型', value:'f_apply_type'}, {label:'报建性质', value:'f_apply_nature'}]
+      }
+  },
   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)
     }
   }
 }

package/src/filiale/fugou/pc/devicesManagement.vue

@@ -414,6 +414,7 @@ export default {
       this.userfile = null
 
       this.search()
+      this.$dispatch('breakControl', this.selectdata)
     }
   },
   events: {

package/src/filiale/fugou/pc.js

@@ -11,6 +11,8 @@ let specialComp = {
   'apply-charge-report': (resolve) => { require(['./pc/chargeReport'], resolve) },
   'service-view': (resolve) => { require(['./pc/serviceview'], resolve) },
   'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList'], resolve) },
-  'apply-print-chargepc': (resolve) => { require(['./pc/printChargepc'], resolve) }
+  'apply-print-chargepc': (resolve) => { require(['./pc/printChargepc'], resolve) },
+  'stop-apply-list': (resolve) => { require(['./pc/StopApplyList'], resolve) },
+  'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/gongyi/android/AppDisclosurerecord.vue

@@ -1,214 +1,214 @@
-<template>
-  <div>
-    <data-grid :model="onetomany" class="list_area table_sy">
-      <template partial='head'>
-        <tr>
-          <th class="textNoLineBreak">交底人</th>
-          <th class="textNoLineBreak">交底日期</th>
-          <th class="textNoLineBreak">交底内容</th>
-          <th class="textNoLineBreak">
-            <button type="button" class="btn btn-primary" @click="$parent.$parent.openMaterialModal()">添加
-            </button>
-          </th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <tr>
-          <td style="text-align: center;">
-            <nobr>{{row.f_operator}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_operation_date}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{ row.f_log_content.length > 20 ? row.f_log_content.substring(0, 50) + '...' : row.f_log_content }}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deletelogs(row)">删除
-            </button>
-            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.look(row)">查看
-            </button>
-          </td>
-        </tr>
-      </template>
-    </data-grid>
-    <modal v-if="showMaterialModal" :show.sync="showMaterialModal" v-ref:modal :large="true"
-           :backdrop="false" :title="title">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
-        <h4 class="modal-title">{{title}}</h4>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
-          <div class="row">
-            <div class="form-group col-sm-6">
-              <label class="col-sm-4 control-label">内容：</label>
-              <textarea
-                class="form-control"
-                v-model="item.f_log_content"
-                rows="3"
-                :readonly="mark === 1"
-              ></textarea>
-            </div>
-          </div>
-
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <template v-if="mark!== 1">
-          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addlogs()"
-                  :disabled="!$v.valid">确认
-          </button>
-          <button type="button" class="btn btn-primary" v-if="title==='查看'" @click="changelogs()"
-                  :disabled="!$v.valid">修改
-          </button>
-        </template>
-      </footer>
-    </modal>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-import Vue from "vue";
-
-export default {
-  name: '交底记录',
-  props: {
-    selectdata: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      onetomany: {
-        rows: []
-      },
-      title: '新增',
-      showMaterialModal: false,
-      materials: [
-        {
-
-        }
-      ],
-      meterialOptions: [],
-      row: {},
-      bjqChecklag:[],
-      fmaterialname:{}
-    }
-  },
-  ready() {
-    this.getOnetoManyData()
-  },
-  methods: {
-    look(row){
-      this.title = '查看'
-      this.materials = [
-        {
-          id: row.id,
-          f_log_content:row.f_log_content
-        }
-      ],
-        this.showMaterialModal = true
-    },
-
-    changelogs(){
-      let http = new HttpResetClass()
-      let  s={
-        id:this.materials[0].id,
-        f_process_id:this.selectdata.f_process_id,
-        f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
-        f_log_content:this.materials[0].f_log_content,
-        f_operator:Vue.user.name,
-        f_operator_id:Vue.user.id
-      }
-      let data = {
-        tableName:'t_tisclosure_record',
-        model:s
-      }
-      http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/logic/entitySingleTable`,
-        data,
-        {resolveMsg: '修改成功', rejectMsg: '添加失败'}
-      ).then(res => {
-        this.closeMaterials()
-      })
-    },
-    addlogs(){
-      let http = new HttpResetClass()
-      let  s={
-        f_process_id:this.selectdata.f_process_id,
-        f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
-        f_log_content:this.materials[0].f_log_content,
-        f_operator:Vue.user.name,
-        f_operator_id:Vue.user.id
-      }
-      let data = {
-        tableName:'t_tisclosure_record',
-        model:s
-      }
-      http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/logic/entitySingleTable`,
-        data,
-        {resolveMsg: '添加成功', rejectMsg: '添加失败'}
-      ).then(res => {
-        this.closeMaterials()
-      })
-    },
-    deletelogs(row){
-      let http = new HttpResetClass()
-      this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
-        if (res === 'confirm') {
-          let data = {
-            tableName:'t_tisclosure_record',
-            id:row.id
-          }
-          http.load(
-            'POST',
-            `${this.$androidUtil.getProxyUrl()}/rs/logic/delentitySingleTable`,
-            data,
-            {resolveMsg: '删除成功', rejectMsg: '删除失败'}
-          ).then(res => {
-            this.getOnetoManyData()
-          })
-        }
-      })
-    },
-    async getOnetoManyData () {
-      let http = new HttpResetClass()
-      let data = {
-        tablename: `t_tisclosure_record`,
-        condition: `f_process_id='${this.selectdata.f_process_id}'`
-      }
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable?aaa=123`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
-      )
-      this.onetomany.rows = res.data
-    },
-    async openMaterialModal() {
-      this.title = '新增'
-      this.materials = [
-        {
-          f_logs_content:''
-        }
-      ],
-        this.showMaterialModal = true
-    },
-
-    closeMaterials() {
-      this.getOnetoManyData()
-      this.showMaterialModal = false
-    }
-  }
-}
-
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">交底人</th>
+          <th class="textNoLineBreak">交底日期</th>
+          <th class="textNoLineBreak">交底内容</th>
+          <th class="textNoLineBreak">
+            <button type="button" class="btn btn-primary" @click="$parent.$parent.openMaterialModal()">添加
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operation_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_log_content.length > 20 ? row.f_log_content.substring(0, 50) + '...' : row.f_log_content }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deletelogs(row)">删除
+            </button>
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.look(row)">查看
+            </button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal v-if="showMaterialModal" :show.sync="showMaterialModal" v-ref:modal :large="true"
+           :backdrop="false" :title="title">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
+        <h4 class="modal-title">{{title}}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
+          <div class="row">
+            <div class="form-group col-sm-6">
+              <label class="col-sm-4 control-label">内容：</label>
+              <textarea
+                class="form-control"
+                v-model="item.f_log_content"
+                rows="3"
+                :readonly="mark === 1"
+              ></textarea>
+            </div>
+          </div>
+
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template v-if="mark!== 1">
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addlogs()"
+                  :disabled="!$v.valid">确认
+          </button>
+          <button type="button" class="btn btn-primary" v-if="title==='查看'" @click="changelogs()"
+                  :disabled="!$v.valid">修改
+          </button>
+        </template>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+
+export default {
+  name: '交底记录',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      onetomany: {
+        rows: []
+      },
+      title: '新增',
+      showMaterialModal: false,
+      materials: [
+        {
+
+        }
+      ],
+      meterialOptions: [],
+      row: {},
+      bjqChecklag:[],
+      fmaterialname:{}
+    }
+  },
+  ready() {
+    this.getOnetoManyData()
+  },
+  methods: {
+    look(row){
+      this.title = '查看'
+      this.materials = [
+        {
+          id: row.id,
+          f_log_content:row.f_log_content
+        }
+      ],
+        this.showMaterialModal = true
+    },
+
+    changelogs(){
+      let http = new HttpResetClass()
+      let  s={
+        id:this.materials[0].id,
+        f_process_id:this.selectdata.f_process_id,
+        f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_log_content:this.materials[0].f_log_content,
+        f_operator:Vue.user.name,
+        f_operator_id:Vue.user.id
+      }
+      let data = {
+        tableName:'t_tisclosure_record',
+        model:s
+      }
+      http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/entitySingleTable`,
+        data,
+        {resolveMsg: '修改成功', rejectMsg: '添加失败'}
+      ).then(res => {
+        this.closeMaterials()
+      })
+    },
+    addlogs(){
+      let http = new HttpResetClass()
+      let  s={
+        f_process_id:this.selectdata.f_process_id,
+        f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_log_content:this.materials[0].f_log_content,
+        f_operator:Vue.user.name,
+        f_operator_id:Vue.user.id
+      }
+      let data = {
+        tableName:'t_tisclosure_record',
+        model:s
+      }
+      http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/entitySingleTable`,
+        data,
+        {resolveMsg: '添加成功', rejectMsg: '添加失败'}
+      ).then(res => {
+        this.closeMaterials()
+      })
+    },
+    deletelogs(row){
+      let http = new HttpResetClass()
+      this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let data = {
+            tableName:'t_tisclosure_record',
+            id:row.id
+          }
+          http.load(
+            'POST',
+            `${this.$androidUtil.getProxyUrl()}/rs/logic/delentitySingleTable`,
+            data,
+            {resolveMsg: '删除成功', rejectMsg: '删除失败'}
+          ).then(res => {
+            this.getOnetoManyData()
+          })
+        }
+      })
+    },
+    async getOnetoManyData () {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: `t_tisclosure_record`,
+        condition: `f_process_id='${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable?aaa=123`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+      )
+      this.onetomany.rows = res.data
+    },
+    async openMaterialModal() {
+      this.title = '新增'
+      this.materials = [
+        {
+          f_logs_content:''
+        }
+      ],
+        this.showMaterialModal = true
+    },
+
+    closeMaterials() {
+      this.getOnetoManyData()
+      this.showMaterialModal = false
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>