apply-clients 7.1.40 → 7.1.43

package/src/components/product/VueUtils/ApplyUpload.vue

@@ -30,6 +30,7 @@
               <img v-if="row.f_filetype === 'pdf'" src="../../image/pdf.jpg" alt="" />
               <img v-if="row.f_filetype === 'xls'||row.f_filetype === 'xlsx'" src="../../image/excel.jpg" alt=""  />
               <img v-if="row.f_filetype === 'doc'||row.f_filetype === 'docx'" src="../../image/doc.jpg" alt=""  />
+              <img v-if="row.f_filetype === 'txt'" src="../../image/TXT.png" alt=""  />
               <img v-if="row.f_filetype === 'dwg'" src="../../image/dwg.png" alt=""  />
               <img v-if="row.f_filetype === 'dxf'" src="../../image/dxf.png" alt=""  />
             </a>
@@ -45,21 +46,14 @@
               <a v-if="row.f_filetype === 'dwg' || row.f_filetype==='dxf'" style="background:#6aa6e2" class="btn btn-primary" :href="row.f_downloadURL" role="button" download>下载</a>
               <a v-if="row.f_filetype !=='jpg' && row.f_filetype !=='png' && row.f_filetype !=='gif' && row.f_filetype !=='bmp' && row.f_filetype !=='dxf' && row.f_filetype !=='dwg'"
                  @click="downloadfile(row.f_downloadURL)" style="background:#6aa6e2" class="btn btn-primary" role="button">下载</a>
-              <a v-if="isdelete && row.defname === defname" @click="delet($index, row)" href="#" class="btn btn-default" role="button" role="button">删除</a>
+              <a v-if="isdelete" @click="delet($index, row)" href="#" class="btn btn-default" role="button" role="button">删除</a>
             </p>
           </div>
         </div>
       </div>
     </div>
   </div>
-  <apply-high-meter
-    v-if="showhighmeter"
-    :show.sync="showhighmeter"
-    :isusetype="isusetype"
-    :isremark="isremark"
-    @photo-finish="newPhoto"
-    v-ref:ltgao
-  ></apply-high-meter>
+  <high-meter v-if="showhighmeter" :show.sync="showhighmeter" @photo-finish="newPhoto" v-ref:ltgao ></high-meter>
   <modal  :show.sync="showUpload" v-ref:modal backdrop="false">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="close"><span class="glyphicon glyphicon-remove"></span></button>
@@ -68,7 +62,7 @@
     <article slot="modal-body" class="modal-body form-horizontal">
       <div class="form-group" style="text-align: center">
         <file-upload class="my-file-uploader" :name="'myFile' + blodid"
-                     action="rs/file/uploadFile" tagname="文件上传" :headers="headers" multiple v-ref:file></file-upload>
+                     action="apply/rs/file/uploadFile" tagname="文件上传" :headers="headers" multiple v-ref:file></file-upload>
       </div>
       <div class="form-group" v-if="isusetype">
         <label class="col-sm-2 control-label">文件类型：</label>
@@ -97,7 +91,6 @@
 
 <script>
 import {HttpResetClass} from 'vue-client'
-import {isEmpty} from "../../Util";
 export default {
   title: '附件',
   props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'isdelete', 'bootstraped', 'issearch'],
@@ -135,7 +128,6 @@ export default {
     // 关闭文件上传对话框
     close () {
       this.showUpload = false
-      this.showhighmeter = false
       // 将选的文件清空
       this.$refs.file.$el.querySelector('input').value = ''
       this.headers.fusetype = ''
@@ -150,33 +142,29 @@ export default {
       }else{
         condition = `f_blobid= '${this.headers.blodid}' `
       }
-      if (!isEmpty(this.useType)) {
+      if(this.useType){
         condition += `and fusetype like '${this.useType}'`
       }
-      let http = new HttpResetClass()
+      var http = new HttpResetClass()
       let data = {
         tablename: 't_files',
         condition: condition + ` order by f_uploaddate desc `
       }
-      let getFile = await http.load('POST', 'rs/sql/applySingleTable', {data: data}, {
+      let getFile = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
         warnMsg: null,
         resolveMsg: null
       })
 
       for (var i = 0; i < getFile.data.length; i++) {
         // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
-        if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
-          getFile.data.splice(i,1)
-          i--
-          continue
-        }
+        // if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
+        //   getFile.data.splice(i,1)
+        //   i--
+        //   continue
+        // }
         let temp = getFile.data[i].f_downloadpath
-        if (temp.includes('http:')){
-          getFile.data[i].f_downloadURL = temp
-        } else {
-          let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
-          getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
-        }
+        let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+        getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
       }
       this.fileInfoData = []
       this.fileInfoData = getFile.data
@@ -189,10 +177,7 @@ export default {
       this.showhighmeter = !this.showhighmeter
     },
     // 高拍仪回调
-    newPhoto(Imgbase64, fusetype, fremarks) {
-      this.headers.fusetype = fusetype
-      this.headers.fremarks = fremarks
-
+    newPhoto(Imgbase64) {
       let form = new FormData()
       let xhr = new XMLHttpRequest()
       let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
@@ -207,7 +192,7 @@ export default {
       }
       xhr.send(form)
       setTimeout(() => {
-        this.close()
+        this.load()
       }, 5000)
     },
     convertBase64ToBlob(base64String) {
@@ -242,40 +227,40 @@ export default {
 </script>
 
 <style scoped>
-.clears{
-  overflow:hidden;
-  text-overflow:ellipsis;
-  white-space:nowrap;
-}
-.showData {
-  padding: 15px 10px 0px 10px;
-  box-sizing: border-box;
-  height: 230px;
-  font-family: "微软雅黑";
-}
-.showData .item{
-  padding-bottom: 10px;
-  border-bottom: solid 1px #c1c1c1;
-}
-.left {
-  padding-right: 10px;
-}
-.left img{
-  height: 100%;
-  width: 100%;
-}
-.right{
-  height: 100%;
-  /*display: -webkit-flex;*/
-  /*display: flex;*/
-  /*flex-direction: column;*/
-  /*justify-content: space-around;*/
-}
-.item_btn{
-  width: 80%;
-  background-color: #6aa6e2;
-  border-radius: 4px;
-  color: #FFFFFF;
-  font-family: PingFang;
-}
+  .clears{
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+  }
+  .showData {
+    padding: 15px 10px 0px 10px;
+    box-sizing: border-box;
+    height: 230px;
+    font-family: "微软雅黑";
+  }
+  .showData .item{
+    padding-bottom: 10px;
+    border-bottom: solid 1px #c1c1c1;
+  }
+  .left {
+    padding-right: 10px;
+  }
+  .left img{
+    height: 100%;
+    width: 100%;
+  }
+  .right{
+    height: 100%;
+    /*display: -webkit-flex;*/
+    /*display: flex;*/
+    /*flex-direction: column;*/
+    /*justify-content: space-around;*/
+  }
+  .item_btn{
+    width: 80%;
+    background-color: #6aa6e2;
+    border-radius: 4px;
+    color: #FFFFFF;
+    font-family: PingFang;
+  }
 </style>

package/src/components/product/VueUtils/ToolsPage.vue

@@ -0,0 +1,51 @@
+<template>
+  <div class="page-header app-header auto">
+    <div @click='back()' v-show="needBack">
+     <img src="../../../assets/back.png"/>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '底部返回组件',
+    data () {
+      return {}
+    },
+    props: {
+      title: {
+        type: String,
+        default: '燃气应用'
+      },
+      needBack: {
+        type: Boolean,
+        default: true
+      }
+    },
+    methods: {
+      back () {
+        // console.log('发送返回事件')
+        this.$emit('flag')
+      },
+      // 关闭新消息响铃（静音）
+      mute () {
+        HostApp.mute()
+      },
+    }
+  }
+</script>
+<style scoped>
+  .app-header {
+    border-radius: 50%;
+    position:fixed;
+    background: rgba(73, 158, 223, 0.12);
+    color: #FFF;
+    padding: 8px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -20px;
+  }
+</style>

package/src/components/product/VueUtils/Tree.vue

@@ -0,0 +1,330 @@
+<template>
+  <div id="treemx" class="tree fonte" v-if="refreshed" style="overflow-x: scroll;max-height: 80vh" >
+    <ul v-for='(rootindex,item) in menulist' :key="item.id">
+      <!-- 没有子集 -->
+      <li v-if='!item._child'>
+        <div class="treeItem" @click="selected(item)">
+          <a href="#">{{item.catename}}</a>
+          <div class="liright">
+            <span :class="item.enabled_text == '启用'?'bgYes':'bgNo'">{{item.enabled_text}}</span>
+          </div>
+        </div>
+      </li>
+      <!-- 有子集 -->
+      <li v-if='item._child'>
+        <div class="onechild treeItem" >
+          <a href="#" @click.native='toggleChildren(rootindex)'>{{item.expanded?'▼ ':'►'}}{{item.catename}}</a>
+          <div class="liright">
+            <span :class="item.enabled_text == '启用'?'bgYes':'bgNo'">{{item.enabled_text}}</span>
+          </div>
+        </div>
+        <ul v-show='item.expanded' class="childs" style="overflow-x: auto;">
+          <li v-for='(parentindex,child) in item._child' :key="child.id" >
+            <!-- 没有子集 -->
+            <div class="twochild treeItem marginL60" v-if="!child._child" @click="selected(child,rootindex)"><a href="#">{{child.catename}}</a>
+              <div class="liright">
+                <span :class="child.enabled_text == '启用'?'bgYes':'bgNo'">{{child.enabled_text}}</span>
+              </div>
+            </div>
+            <!-- 有子集 -->
+            <div class="twochild marginL60" v-if="child._child">
+              <div class="treeItem" >
+                <a href="#" @click.native='toggleChildren(rootindex,parentindex)'>{{child.expanded?'▼ ':'►'}}{{child.catename}}</a>
+                <div class="liright">
+                  <span :class="child.enabled_text == '启用'?'bgYes':'bgNo'">{{child.enabled_text}}</span>
+                </div>
+              </div>
+
+              <ul v-show='child.expanded'>
+                <!-- 遍历第三层 -->
+                <li class="threechild" v-for="(childIndex,child1) in child._child" :key="child1.id" style="overflow-x: auto;">
+                  <div class="treeItem marginL60">
+                      <a href="#" @click.native="add(rootindex,parentindex,childIndex)">{{child1.catename}}   <span v-if="child1.count">数量：{{child1.count}}</span></a>
+                  </div>
+                </li>
+              </ul>
+            </div>
+          </li>
+        </ul>
+      </li>
+
+    </ul>
+  </div>
+
+  <modal :show.sync="addshow2" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeadd"><span>&times;</span></button>
+      <h4 class="modal-title">数量</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <input class="form-control" style="background-color: #f7fbff;"
+             type="number"
+             v-model="inputvalue"
+             :value="inputvalue"
+      />
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <!--<button type="button" class="btn btn-default" @click='addclose'>取消</button>-->
+      <button type="button" class="btn btn-success" @click='addconfirm2'>确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+  export default {
+    title: 'new',
+    props: {
+      menulist: {
+        type: Array,
+        default: []
+      },
+      scrolltop:{
+        default:0
+      }
+    },
+    data() {
+      return {
+        rootindex:null,
+        parentindex:null,
+        childIndex:null,
+        inputvalue:null,
+        addshow2:false,
+        refreshed:true, //强制刷新
+        menulist: [{
+          catename: '水果',
+          expanded: false,
+          _child: [{
+            catename: '苹果',
+          }, {
+            catename: '荔枝'
+          }, {
+            catename: '葡萄'
+          }, {
+            catename: '火龙果',
+            expanded: false,
+            _child: [
+              {
+                id: 0,
+                catename: '白心',
+              }, {
+                id: 1,
+                catename: '红心',
+              },
+            ]
+          }]
+        }]
+      }
+    },
+    ready(){
+      this.updatecrollTop(this.scrolltop)
+    },
+    methods: {
+      updatecrollTop(hight){
+        console.log("scrollTop",hight)
+        let doc = document.getElementById("treemx")
+        doc.scrollTop = 0
+        doc.scrollTop = hight
+        // document.getElementById("treemx").scrollTop = hight
+        // document.documentElement.scrollTop = hight
+        // window.pageYOffset = hight
+        // document.body.scrollTop = hight
+      },
+      closeadd(){
+        this.rootindex = null
+        this.parentindex = null
+        this.childIndex = null
+        this.inputvalue = null
+        this.addshow2 = false
+      },
+      addconfirm2(){
+        this.menulist[this.rootindex]._child[this.parentindex]._child[this.childIndex].count = this.inputvalue
+        this.$dispatch('menulistSelected', this.menulist[this.rootindex]._child[this.parentindex]._child[this.childIndex],this.rootindex,this.parentindex)
+        this.closeadd()
+      },
+      add(rootindex,parentindex,childIndex){
+        this.rootindex = rootindex
+        this.parentindex = parentindex
+        this.childIndex = childIndex
+        this.addshow2 = true
+      },
+      selectedFormat(rootindex,parentindex,childIndex){
+        if(this.menulist[rootindex]._child[parentindex]._child[childIndex].showButton == undefined){
+          this.menulist[rootindex]._child[parentindex]._child[childIndex].showButton = false
+        }
+        this.menulist[rootindex]._child[parentindex]._child[childIndex].showButton = !this.menulist[rootindex]._child[parentindex]._child[childIndex].showButton
+        // this.refreshed = false
+        // this.$nextTick(()=>{
+        //   this.refreshed = true
+        // })
+      },
+      selectedCount(rootindex,parentindex,childIndex){
+        this.menulist[rootindex]._child[parentindex]._child[childIndex].expanded = true
+      },
+      inputCount(item,parentindex,childIndex){
+        console.log('count',item.count)
+        this.$dispatch('menulistSelected', item,val1,val2)
+      },
+      selected(item,val1,val2) {
+        console.log('item', item)
+        this.$dispatch('menulistSelected', item,val1,val2)
+      },
+      toggleChildren(rootindex,parentindex) {
+        if(parentindex!=undefined){
+          this.menulist[rootindex]._child[parentindex].expanded = !this.menulist[rootindex]._child[parentindex].expanded
+          // this.refreshed = false
+          // this.$nextTick(()=>{
+          //   this.refreshed = true
+          // })
+        }else if(rootindex!=undefined) {
+          this.menulist[rootindex].expanded = !this.menulist[rootindex].expanded
+        }
+        this.$dispatch('updateTree')
+
+      },
+    }
+  }
+</script>
+
+
+<style scoped>
+
+  ul {
+    display: block;
+    list-style-type: disc;
+    margin-block-start: 1em;
+    margin-block-end: 1em;
+    margin-inline-start: 0px;
+    margin-inline-end: 0px;
+    padding-inline-start: 40px;
+  }
+
+  .addressBox {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 5.1rem;
+    z-index: 9;
+    background: #f5f5f5;
+    display: block !important;
+  }
+
+  span:focus {
+    background-color: silver;
+  }
+
+  a {
+    font-size: 20px;
+    text-decoration: none;
+    color: black;
+  }
+
+  a:hover {
+    font-size: 20px;
+    text-decoration: none;
+    color: deepskyblue;
+    /*background-color: silver;*/
+  }
+
+  .addressBox ul {
+    width: 33%;
+    height: 5.1rem;
+    background: #E6E6E6;
+    overflow-y: scroll;
+    overflow-x: auto;
+  }
+
+  .addressBox li {
+    height: 0.62rem;
+    font: normal 0.26rem/0.62rem "微软雅黑";
+    color: #666;
+    text-align: center;
+  }
+
+  .cityBox {
+    position: absolute;
+    top: 0;
+    left: 33%;
+    width: 100%;
+    height: 5.1rem;
+    display: none;
+    overflow-y: scroll;
+    z-index: 19;
+    background: #E6E6E6;
+    -webkit-overflow-scrolling: touch;
+    overflow-x: auto;
+  }
+
+  .cityBox ul {
+    width: 100%;
+    height: 5.1rem;
+  }
+
+  .cityBox li {
+    padding-left: 0.17rem;
+    text-align: left;
+    border-bottom: 0.01rem solid #e6e6e6;
+  }
+
+  .areaBox {
+    position: absolute;
+    top: 0;
+    left: 33%;
+    width: 33%;
+    height: 5.1rem;
+    display: none;
+    overflow-y: scroll;
+    z-index: 9999;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  /*模态框*/
+  .model {
+    position: absolute;
+    top: 0%;
+    left: 0%;
+    background: rgba(0, 0, 0, 0.3);
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    z-index: 9999;
+  }
+
+  .model-content {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: .15rem;
+    margin: auto;
+    background-color: #ffffff;
+    text-align: center;
+  }
+
+  input {
+    font-size: 0.32rem;
+    width: 100%;
+    text-align: center;
+    margin-top: .3rem;
+    border: 1px solid #ccc;
+  }
+
+  /*点击省份，出现城市*/
+  .addressBox .active {
+    background: #f5f5f5;
+  }
+
+  .addressBox .active .cityBox {
+    display: block;
+  }
+
+  /*点击城市，出现区域*/
+  .cityBox .active {
+    background: #f5f5f5;
+  }
+
+  .cityBox .active .areaBox {
+    display: block;
+  }
+
+</style>

package/src/main.js

@@ -1,27 +1,23 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import {ldap} from 'ldap-clients'
-import {system} from 'system-clients'
-import {sale} from 'sale-client'
-import {material} from 'material-client'
-import {fadada} from 'fadada-clients'
-import { weixinManage } from 'weixin-manage-client'
-
-import apply from './apply'
-
-all()
-weixinManage('yuchuan', 'test')
-apply()
-ldap()
-sale()
-material()
-system(false)
-fadada()
-
-require('system-clients/src/styles/less/bootstrap.less')
-require('./expandcss.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import {ldap} from 'ldap-clients'
+import {system} from 'system-clients'
+import {sale} from 'sale-client'
+import {material} from 'material-client'
+
+import apply from './apply'
+
+all()
+apply()
+ldap()
+sale()
+material()
+system(false)
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('./expandcss.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})