apply-clients 3.0.7-148 → 3.0.7-151

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.7-148",
+  "version": "3.0.7-151",
   "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,15 +312,16 @@
     },
     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)`
           }
-          debugger
-          if(f_apply_department==='调度中心'||f_apply_department==='设计院'||f_apply_department==='财务部'){
+          if(f_apply_department==='调度中心'||f_apply_department==='设计院'||f_apply_department==='财务部'||f_apply_department==='工程部'
+            ||f_apply_department==='gis班' ||f_apply_department==='监理单位' ||f_apply_department===' 施工单位'||f_apply_department==='供销部'){
           args.condition = `${args.condition}`
         }
-          if(f_apply_department != '成山供气部' &&  f_apply_department !='调度中心' && f_apply_department!='设计院' && f_apply_department!='财务部'){
+          if(f_apply_department != '成山供气部' && (f_apply_department==='市场发展部' || f_apply_department==='管网运行部'||f_apply_department==='客户服务部')){
             args.condition = `${args.condition} and (u.f_apply_department != '成山供气部' OR  u.f_apply_department is null) `
           }
 
@@ -316,6 +335,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()
@@ -607,6 +632,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/Processes/Service/ServiceControl.vue

@@ -1189,6 +1189,37 @@
     }
     ,
     events: {
+      async 'dizhi'(){
+        debugger
+          // this.selectdata.f_address_type = this.$refs.service_show.data.fields[index].value
+          for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+            //地址类型为特殊
+        if (this.selectdata.f_address_type==='特殊') {
+
+         if(        this.$refs.service_show.data.fields[i].label === '区域' ||
+                    this.$refs.service_show.data.fields[i].label === '民用小区域' ||
+                    this.$refs.service_show.data.fields[i].label === '地址'){
+           this.$refs.service_show.data.fields[i].hidden = false
+         }
+        }
+        //地址类型为民用
+            if (this.selectdata.f_address_type==='民用') {
+
+              if(        this.$refs.service_show.data.fields[i].label === '区域' ||
+                this.$refs.service_show.data.fields[i].label === '民用小区域' ||
+                this.$refs.service_show.data.fields[i].label === '地址' ||
+                this.$refs.service_show.data.fields[i].label === '小区' ||
+                this.$refs.service_show.data.fields[i].label === '楼号' ||
+                this.$refs.service_show.data.fields[i].label === '单元' ||
+                this.$refs.service_show.data.fields[i].label === '楼层' ||
+                this.$refs.service_show.data.fields[i].label === '门牌号'
+              ){
+                this.$refs.service_show.data.fields[i].hidden = false
+              }
+            }
+
+          }
+      },
       async 'created'() {
         //荣成联合验收
         if (this.$refs.service_show.data.defname.includes("联合验收")) {

package/src/components/product/ServiceView.vue

@@ -409,6 +409,9 @@
       }
     },
     methods: {
+      dizhi1(){
+        this.$dispatch('dizhi')
+      },
       async openProject(){
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/singleTable', {
@@ -817,6 +820,7 @@
       // 监听
       select_change(index) {
         this.$dispatch('select_cascade', index)
+        debugger
         // 如果有错误信息提示走错误信息判断处理
         if (this.data.fields[index].error || this.data.fields[index].type == 'datepicker') {
           this.$dispatch('error_check', index)
@@ -896,7 +900,13 @@
         let fields = this.data.fields
         this.data.fields = fields
       }
-    }
+    },
+    ready(){
+      debugger
+
+        this.dizhi1()
+      }
+
   }
 </script>
 <style scoped>