apply-clients 3.3.92 → 3.3.94-2

package/build/dev-server.js

@@ -8,28 +8,22 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
+// var ldap = 'http://192.168.20.27:8555'
+// var applyinstall = 'http://192.168.20.27:8555'
 var ldap = 'http://192.168.20.28:8400'
-var applyinstall = 'http://127.0.0.1:8080'
-// var ldap = 'http://192.168.20.28:8556'
-// var applyinstall = 'http://192.168.20.28:8556'
+var applyinstall = 'http://192.168.20.28:8400'
 var proxyTable = {
   '/wx': {
     target: ldap
   },
-  '/ncc': {
-    target: 'http://192.168.20.27:7890'
-  },
   '/rs/sql/filemanage_getUserfies/n': {
     target: ldap
   },
   '/rs/sql/filemanage_getUserfies': {
     target: ldap
   },
-  '/rs/entity/t_apply': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/logic/ApplyProductService': {
-    target: 'http://127.0.0.1:8080'
+  '/rs/logic/saveInsInfo': {
+    target: ldap
   },
   '/rs/logic/exportfile': {
     target: ldap
@@ -37,36 +31,9 @@ var proxyTable = {
   '/rs/logic/getBatchOperaPro': {
     target: ldap
   },
-  '/rs/sql/getApplyCharge': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/sql/getChargeAll': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs/sql/supervisory': {
-    target: 'http://127.0.0.1:8080'
-  },
   '/rs/logic/updateApplyOrder': {
     target: ldap
   },
-  // '/rs/sql/getAddresAndUserinfoAndUserfilesAmount': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/singleTable': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/countApplyUserinfo': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/getStockMaterial': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
-  '/rs/logic/resAreaSelect': {
-    target: 'http://127.0.0.1:8080'
-  },
-  // '/rs/logic/bjqCheck': {
-  //   target: 'http://127.0.0.1:8080'
-  // },
   '/rs/logic/getSaleInitData': {
     target: ldap
   },

package/package.json

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

package/src/App.vue

@@ -1,22 +1,20 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-<!--          <route :comp="{name: 'login-app'}"></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/android/AppServiceView.vue

@@ -180,16 +180,16 @@
       </div>
     </div>
       <!--区域地址联动-->
-      <div>
-        <app-res-area-select-group
-          v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"
-          labelstyle = "control-label"
-          @shiji-select = "getSelectShijiValue"
-          @xian-select = "getSelectXianValue"
-          @shequ-select = "getSelectShequValue"
-        >
-        </app-res-area-select-group>
-      </div>
+      <!--<div>-->
+      <!--  <app-res-area-select-group-->
+      <!--    v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"-->
+      <!--    labelstyle = "control-label"-->
+      <!--    @shiji-select = "getSelectShijiValue"-->
+      <!--    @xian-select = "getSelectXianValue"-->
+      <!--    @shequ-select = "getSelectShequValue"-->
+      <!--  >-->
+      <!--  </app-res-area-select-group>-->
+      <!--</div>-->
     <div class="col-sm-12 col-xs-12" id="test11">
       <accordion one-at-a-time="true">
         <panel v-for="(i,item) in data.onetomany" :header="item.title" :is-open="false" type="primary">
@@ -203,6 +203,16 @@
 
     <!--自定义组件-->
     <slot>
+      <div>
+        <app-res-area-select-group
+          v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"
+          labelstyle = "control-label"
+          @shiji-select = "getSelectShijiValue"
+          @xian-select = "getSelectXianValue"
+          @shequ-select = "getSelectShequValue"
+        >
+        </app-res-area-select-group>
+      </div>
     </slot>
 
     <!-- 按钮组 -->

package/src/components/android/AppSign.vue

@@ -1,151 +1,143 @@
-<template>
-  <div class="panel">
-    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
-      <div class="row form-group" style="height: 240px;overflow: scroll;">
-        <img :src="f_sign_path" width="100%" height="100%" />
-      </div>
-      <div class="row text-right form-group">
-        <button class="btn" style="background-color: #f1e404;border-radius: 5px;margin-right: 10px" @click="clean">清除</button>
-        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click="sign">签名</button>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import {getNowDate, guid, isEmpty} from '../Util'
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-import QRCode from 'qrcodejs2'
-import Vue from "vue";
-
-export default {
-  title: '签字',
-  props: ['filePath'],
-  data () {
-    return {
-      f_sign_path: null,
-      fileName: null
-    }
-  },
-  ready () {
-    this.f_sign_path = this.filePath
-  },
-  methods: {
-    clean () {
-      this.f_sign_path = null
-      this.fileName = null
-      this.$emit('sign-clean')
-    },
-    sign () {
-      console.log('==============签字开始============')
-      console.log(this.f_sign_path)
-      console.log(guid() )
-      this.delAudioFile(this.f_sign_path)
-      console.log(this.signCallback)
-      this.fileName = guid() + '.jpg'
-      console.log(this.fileName)
-      HostApp.__callback__ = this.signCallback
-      HostApp.__this__ = this
-
-
-      HostApp.getSignature({
-        file: this.fileName,
-        requestCode: 111,
-        callback: 'javascript:HostApp.__callback__("f_sign_path", "%s");'
-      })
-    },
-    // 签名回调
-    signCallback (prop, signPath) {
-      console.log('==============签字回调============')
-      console.log(signPath)
-      HostApp.__this__.$set(prop, signPath)
-      console.log(HostApp.__this__.f_sign_path)
-
-      HostApp.__this__.uploadFile()
-
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    },
-    uploadFile () {
-      console.log('===================签字文件上传==============')
-      let data = {
-        username: Vue.user.name,
-        fremarks: '报装手机签字文件',
-        fileName: HostApp.__this__.fileName,
-        fileUrl: HostApp.__this__.f_sign_path
-      }
-
-      console.log('-----------bzLogic-----------------')
-      console.log(JSON.stringify(data))
-      let res = HostApp.bzLogic({
-        'logic': 'appFileUpload',
-        'data': data
-      })
-      console.log('===============上传回调=================')
-      console.log(JSON.stringify(res))
-      HostApp.__this__.getFiles(res.id)
-    },
-    async getFiles (fileid) {
-      let http = new HttpResetClass()
-
-      let data = {
-        tablename: 't_files',
-        condition: `id = '${fileid}'`
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
-        // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
-        warnMsg: null,
-        resolveMsg: null
-      })
-
-      console.log('=========查询回调===============')
-      let fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
-      console.log(fileUrl)
-      // HostApp.__this__.$set('f_sign_path', fileUrl)
-      // HostApp.__this__.f_sign_path = fileUrl
-      this.f_sign_path = fileUrl
-
-      this.$emit('sign-success', fileUrl)
-    },
-    delAudioFile (signPath) {
-      console.log('=========回调===============')
-      console.log(signPath)
-      if (!signPath) {
-        return
-      }
-      HostApp.delfile(signPath)
-      this.f_sign_path = null
-      this.fileName = null
-    }
-  },
-  events: {
-  },
-  computed: {
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped lang="less">
-.qrcode {
-  display: inline-block !important;
-  margin: 10px 0px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.vertical-center {
-  display: flex;
-  align-items: center;
-  text-align: center;
-}
-/*清除model中的浮动*/
-.clearfix:after,.clearfix:before{
-  display: table;
-}
-.clearfix:after{
-  clear: both;
-}
-</style>
+<template>
+  <div class="panel">
+    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
+      <div class="row form-group" style="height: 240px;overflow: scroll;">
+        <img :src="f_sign_path" width="100%" height="100%" />
+      </div>
+      <div class="row text-right form-group">
+        <button class="btn" style="background-color: #f1e404;border-radius: 5px;margin-right: 10px" @click="clean">清除</button>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click="sign">签名</button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {getNowDate, guid, isEmpty} from '../Util'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import QRCode from 'qrcodejs2'
+import Vue from "vue";
+
+export default {
+  title: '签字',
+  props: ['filePath'],
+  data () {
+    return {
+      f_sign_path: null,
+      fileName: null
+    }
+  },
+  ready () {
+    this.f_sign_path = this.filePath
+  },
+  methods: {
+    clean () {
+      this.f_sign_path = null
+      this.fileName = null
+      this.$emit('sign-clean')
+    },
+    sign () {
+      this.delAudioFile(this.f_sign_path)
+      this.fileName = guid() + '.jpg'
+      HostApp.__callback__ = this.signCallback
+      HostApp.__this__ = this
+      HostApp.getSignature({
+        file: this.fileName,
+        requestCode: 111,
+        callback: 'javascript:HostApp.__callback__("f_sign_path", "%s");'
+      })
+    },
+    // 签名回调
+    signCallback (prop, signPath) {
+      console.log('==============签字回调============')
+      console.log(signPath)
+      HostApp.__this__.$set(prop, signPath)
+      console.log(HostApp.__this__.f_sign_path)
+
+      HostApp.__this__.uploadFile()
+
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    },
+    uploadFile () {
+      console.log('===================签字文件上传==============')
+      let data = {
+        blodid: HostApp.__this__.blobid,
+        username: Vue.user.name,
+        fremarks: '报装手机签字文件',
+        fileName: HostApp.__this__.fileName,
+        fileUrl: HostApp.__this__.f_sign_path
+      }
+
+      console.log('-----------bzLogic-----------------')
+      console.log(JSON.stringify(data))
+      let res = HostApp.bzLogic({
+          'logic': 'appFileUpload',
+         'data': data
+      })
+      console.log('===============上传回调=================')
+      console.log(JSON.stringify(res))
+      HostApp.__this__.getFiles(res.id)
+    },
+    async getFiles (fileid) {
+      let http = new HttpResetClass()
+
+      let data = {
+        tablename: 't_files',
+        condition: `id = '${fileid}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
+        // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      console.log('=========查询回调===============')
+      let fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      console.log(fileUrl)
+      // HostApp.__this__.$set('f_sign_path', fileUrl)
+      // HostApp.__this__.f_sign_path = fileUrl
+      this.f_sign_path = fileUrl
+
+      this.$emit('sign-success', fileUrl)
+    },
+    delAudioFile (signPath) {
+      if (!signPath) {
+        return
+      }
+      HostApp.delfile(signPath)
+      this.f_sign_path = null
+      this.fileName = null
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped lang="less">
+.qrcode {
+  display: inline-block !important;
+  margin: 10px 0px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.vertical-center {
+  display: flex;
+  align-items: center;
+  text-align: center;
+}
+/*清除model中的浮动*/
+.clearfix:after,.clearfix:before{
+  display: table;
+}
+.clearfix:after{
+  clear: both;
+}
+</style>