apply-clients 3.0.7-149 → 3.0.7-152

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.7-149",
+  "version": "3.0.7-152",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/App.vue

@@ -1,20 +1,20 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-  export default {
-
-
-  }
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <route :comp="{name: 'login'}"></route>
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+  export default {
+
+
+  }
+</script>

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

@@ -97,6 +97,11 @@
               <button class="btn btn-primary btn-sm col-sm-1" style="margin-right: 20px" type="button" @click="$parent.$parent.addactive(6)">
                 <span class="glyphicon glyphicon-plus" ></span>市政工程报装申请
               </button>
+              <a type="button" class="btn btn-primary btn-sm col-sm-1"
+                 href="applyinstall/excel/民现户报装模板.xlsx" style="margin-right: 20px" download>模板下载</a>
+              <button class="btn btn-primary btn-sm col-sm-1" style="margin-right: 20px" type="button"
+                      @click="$parent.$parent.showFile = !$parent.$parent.showFile">批量民现户导入</button>
+
               <button class="btn btn-primary btn-sm col-sm-1" style="margin-right: 20px"  type="button" @click="$parent.$parent.searchNow(),$parent.$parent.close()">
                 <span class="glyphicon glyphicon-search"></span>查询
               </button>
@@ -212,6 +217,18 @@
           </template>
         </data-grid>
       </criteria-paged>
+      <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" title="选择文件">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+          <h4 class="modal-title">选择文件</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="form-group">
+            <file-upload class="my-file-uploader" action="rs/file/uploadFile" tagname="确定" v-ref:file></file-upload>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer"></footer>
+      </modal>
     </div>
   </div>
 </template>
@@ -256,6 +273,7 @@
           }
         }),
         condition: '',
+        showFile: false,
         select: '',
         urlname: '',
         workflow_name:['',''],
@@ -294,7 +312,6 @@
     },
     methods: {
       selfSearch (args) {
-        debugger
         let f_apply_department = this.$login.f.f_department_name
           if(f_apply_department === '成山供气部'){
             args.condition = `${args.condition} and (u.f_apply_department = '成山供气部' OR  u.f_apply_department is null)`
@@ -317,6 +334,12 @@
 
         this.model.search(args.condition, args.model)
       },
+      closeFile () {
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+        this.search()
+      },
       generateUUID() {
         console.log("--------------进入generateUUID---------------")
         var d = new Date().getTime()
@@ -454,6 +477,9 @@
       ,
       check(val) {
         console.log("--------------进入check---------------")
+        new HttpResetClass().load('POST','rs/log/html',
+          `列表点击数据：${JSON.stringify(val)}`
+        , {resolveMsg: null, rejectMsg: null})
         this.$dispatch('check', val)
         this.$dispatch('addactive',val)
       }
@@ -608,6 +634,17 @@
       selected() {
         return this.$refs.cp.$refs.grid.selected
       }
+    },
+    events: {
+      async 'onFileUpload'(file, result) {
+        let data = {
+          filepath: result.f_downloadpath,
+          user: this.$login.f
+        }
+        let res = await this.$resetpost(`rs/logic/importApply`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败！！！', silent: true}, 0)
+
+        this.closeFile()
+      }
     }
   }
 </script>

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

@@ -1,182 +1,158 @@
-<template>
-  <div class="col-sm-12" style="overflow:auto;background-color: #ffffff;">
-    <div class="tops" v-bind:style="{ height: topheight }">
-      <exploration-select v-ref:queryuser v-show="show"></exploration-select>
-      <modify-user-files v-ref:modifyuser v-show="!show"></modify-user-files>
-    </div>
-    <div v-show="showtotal" v-bind:style="{ height: botheight ,'position': 'relative', 'top': '110px', 'background-color' : '#f6f6f6' ,padding:'12px'}">
-      <div class="col-sm-10">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='header' style="background-color :#f6f6f6;overflow: auto;">
-            <service-control  v-ref:service :selectdata="selectdata"></service-control>
-          </tab>
-          <tab header='附件'>
-            <apply-upload v-ref:file
-                          :blodid="selectdata.f_process_id"
-                          :isupload = "true"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="false"
-                          :issearch="true"
-                          :defname="selectdata.defname">
-            </apply-upload>
-          </tab>
-        </tabset>
-      </div>
-      <div class="col-sm-2" style="overflow:auto;" v-show="showbasic" >
-        <history_control v-ref:binfo :selectdata="selectdata" ></history_control>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建流程',
-    data() {
-      return {
-        flagg: false,
-        show: true,
-        showbasic: false,
-        showtotal: false,
-        header: null,
-        selectdata: {},
-        botheight: '0%',
-        topheight: '100%',
-        tittle1: '户档案管理',
-        tittle2: '表档案管理',
-        tittle3: '设备管理',
-        xmlname: ''
-      }
-    },
-   created(){
-     let http = new HttpResetClass()
-     if (this.selectdata.type === '工业户' || this.selectdata.type === '商业户' || this.selectdata.f_apply_type === '工业户' || this.selectdata.f_apply_type === '商业户') {
-       this.xmlname = '工商户'
-     } else if (this.selectdata.f_apply_type === '民建户' || this.selectdata.f_apply_type === '民现户') {
-       this.xmlname = this.selectdata.f_apply_type
-     } else {
-       this.xmlname = this.selectdata.type
-     }
-     let xmldata = {
-       data: this.$login.f,
-       workname: this.xmlname + '报建流程'
-     }
-     if (this.selectdata.type === '工程管理') {
-       xmldata.workname = '工程管理流程'
-     }
-     http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null}
-     ).then((res) => {
-       if (res.data.code && res.data.code === 200) {
-         Vue.workflow_vue = Vue.prototype.$workflow_vue = res.data.workflow_vue
-       } else {
-         this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-         return
-       }
-     })
-    },
-    events: {
-      'onMessage' (data) {
-        console.log('接收消息')
-        console.log(data)
-        if (data.type === 'apply-task') {
-          this.$refs.queryuser.$refs.cp.$refs.cri.search()
-          this.$refs.file.load()
-        }
-      },
-      'addactive' () {
-        //this.$refs.queryuser.$refs.cp.$refs.cri.search()
-        this.hidden()
-        this.showbasic = true
-        this.topheight = '8%'
-        this.botheight = '88.9%'
-      },
-      'changeheight'() {
-        this.show = true
-        this.botheight = '0%'
-      },
-      'check' (val) {
-        this.selectdata = null
-        this.selectdata = val
-        if (this.selectdata.f_apply_type === '工业户' || 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 if (this.selectdata.f_apply_type === '改造工程') {
-          this.xmlname = '改造报建流程'
-        } else if (this.selectdata.f_apply_type === '市政工程') {
-          this.xmlname = '市政报建流程'
-        } else {
-          this.xmlname = this.selectdata.type + '报建流程'
-        }
-        let xmldata = {
-          data: this.$login.f,
-          workname: this.xmlname
-        }
-        let http = new HttpResetClass()
-        http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null}
-        ).then((res) => {
-          if (res.data.code && res.data.code === 200) {
-            Vue.workflow_vue = Vue.prototype.$workflow_vue = res.data.workflow_vue
-            if (res.data.msg) {
-              console.log('获取配置文件信息：', res.data.msg)
-            }
-            this.topheight = '8%'
-            this.botheight = '88.9%'
-            // this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
-            this.$refs.queryuser.$refs.cp.pager = false
-            this.showbasic = true
-            this.header = val.defname
-            this.hidden()
-            this.$refs.service.refurbish(val)
-          } else {
-            this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-            return
-          }
-        })
-      },
-      'selfsearch'() {
-        this.$refs.queryuser.$refs.cp.$refs.cri.search()
-      },
-      '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()
-      },
-      'cancelmain'() {
-        this.showtotal = false
-        this.topheight = '100%'
-        this.botheight = '0%'
-        /* this.$refs.queryuser.$refs.cp.loadPage()*/
-        this.$refs.queryuser.$refs.cp.pager = true
-        this.$refs.queryuser.model.loadPage(this.$refs.queryuser.model.pageIndex)
-      }
-    },
-    methods: {
-      hidden() {
-        this.showtotal = true
-      },
-      close() {
-        this.hidden()
-        this.topheight = '100%'
-        this.botheight = '0%'
-      }
-    },
-    watch: {
-      'selectdata'(val) {
-        console.log('selectdata:', val)
-      },
-      'selectdata.f_customer_type'() {
-        if (this.selectdata.f_customer_type == '企业') {
-          this.flagg = true
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <div class="col-sm-12" style="overflow:auto;background-color: #ffffff;">
+    <div class="tops" v-bind:style="{ height: topheight }">
+      <exploration-select v-ref:queryuser v-show="show"></exploration-select>
+      <modify-user-files v-ref:modifyuser v-show="!show"></modify-user-files>
+    </div>
+    <div v-show="showtotal" v-bind:style="{ height: botheight ,'position': 'relative', 'top': '110px', 'background-color' : '#f6f6f6' ,padding:'12px'}">
+      <div class="col-sm-10">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='header' style="background-color :#f6f6f6;overflow: auto;">
+            <service-control  v-ref:service :selectdata="selectdata"></service-control>
+          </tab>
+          <tab header='附件'>
+            <apply-upload v-ref:file
+                          :blodid="selectdata.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :issearch="true"
+                          :defname="selectdata.defname">
+            </apply-upload>
+          </tab>
+        </tabset>
+      </div>
+      <div class="col-sm-2" style="overflow:auto;" v-show="showbasic" >
+        <history_control v-ref:binfo :selectdata="selectdata" ></history_control>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建流程',
+    data() {
+      return {
+        flagg: false,
+        show: true,
+        showbasic: false,
+        showtotal: false,
+        header: null,
+        selectdata: {},
+        botheight: '0%',
+        topheight: '100%',
+        tittle1: '户档案管理',
+        tittle2: '表档案管理',
+        tittle3: '设备管理',
+        xmlname: ''
+      }
+    },
+   created(){
+   },
+    events: {
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+          this.$refs.file.load()
+        }
+      },
+      'addactive' () {
+        //this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        this.hidden()
+        this.showbasic = true
+        this.topheight = '8%'
+        this.botheight = '88.9%'
+      },
+      'changeheight'() {
+        this.show = true
+        this.botheight = '0%'
+      },
+      'check' (val) {
+        this.selectdata = null
+        this.selectdata = val
+        if (this.selectdata.f_apply_type === '工业户' || 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 if (this.selectdata.f_apply_type === '改造工程') {
+          this.xmlname = '改造报建流程'
+        } else if (this.selectdata.f_apply_type === '市政工程') {
+          this.xmlname = '市政报建流程'
+        } else {
+          this.xmlname = this.selectdata.type + '报建流程'
+        }
+        let xmldata = {
+          data: this.$login.f,
+          workname: this.xmlname
+        }
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null}
+        ).then((res) => {
+          if (res.data.code && res.data.code === 200) {
+            Vue.workflow_vue = Vue.prototype.$workflow_vue = res.data.workflow_vue
+            if (res.data.msg) {
+              console.log('获取配置文件信息：', res.data.msg)
+            }
+            this.topheight = '8%'
+            this.botheight = '88.9%'
+            // this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
+            this.$refs.queryuser.$refs.cp.pager = false
+            this.showbasic = true
+            this.header = val.defname
+            this.hidden()
+            this.$refs.service.refurbish(val)
+          } else {
+            this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+            return
+          }
+        })
+      },
+      'selfsearch'() {
+        this.$refs.queryuser.$refs.cp.$refs.cri.search()
+      },
+      '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()
+      },
+      'cancelmain'() {
+        this.showtotal = false
+        this.topheight = '100%'
+        this.botheight = '0%'
+        /* this.$refs.queryuser.$refs.cp.loadPage()*/
+        this.$refs.queryuser.$refs.cp.pager = true
+        this.$refs.queryuser.model.loadPage(this.$refs.queryuser.model.pageIndex)
+      }
+    },
+    methods: {
+      hidden() {
+        this.showtotal = true
+      },
+      close() {
+        this.hidden()
+        this.topheight = '100%'
+        this.botheight = '0%'
+      }
+    },
+    watch: {
+      'selectdata'(val) {
+        console.log('selectdata:', val)
+      },
+      'selectdata.f_customer_type'() {
+        if (this.selectdata.f_customer_type == '企业') {
+          this.flagg = true
+        }
+      }
+    }
+  }
+</script>