apply-clients 3.4.2 → 3.4.4

package/src/components/android/AppServiceView.vue

@@ -1,9 +1,11 @@
 <template>
   <div class="form-horizontal select-overspread">
+    <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
+    <!--<form>-->
     <div v-for="(index,item) in data.fields">
       <!--input-->
       <div :style="item.style ? item.style : ''"
-           v-if="(item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email') && !item.hidden && (item.device === 'app' || !item.device)"
+           v-if="(item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email') && !item.hidden && (item.device === 'app' || !item.device) && (item.label != '证件号码')&&(item.label != '身份证') && (item.label != '用户电话')"
            :class="[item.required && !(item.value) ? 'apply-has-error' : '', item.bootstraped ? item.bootstraped + ' form-group app-input':'col-xs-12 form-group app-input']">
         <label class="control-label-justify">{{item.label}}</label>
         <div :style="item.value_style ? item.value_style:''"
@@ -22,6 +24,74 @@
         </div>
       </div>
 
+      <div :style="item.style ? item.style : ''"
+           v-if="(data.fields[index-1].value ==='营业执照'||data.fields[index-1].value ==='军官证')&& (item.label === '证件号码')"
+           :class="[item.required && !(item.value) ? 'apply-has-error' : '', item.bootstraped ? item.bootstraped + ' form-group app-input':'col-xs-12 form-group app-input']">
+        <label class="control-label-justify">{{item.label}}</label>
+        <div :style="item.value_style ? item.value_style:''"
+             :class="item.value_bootstraped ? item.value_bootstraped : 'col-xs-8'">
+          <input class="" style="width: 100%"
+                 :type="item.type"
+                 v-model="data.fields[index].value"
+                 :placeholder="item.placeholder"
+                 :value="data.fields[index].value"
+                 :readonly="item.readonly"
+                 :disabled="item.disabled"
+                 @change="onchange(index)"
+                 @blur="onblur(index)"
+                 @input="oninput(index)"
+          />
+        </div>
+      </div>
+
+
+      <!--input身份证验证-->
+      <div :style="item.style ? item.style : ''"
+       v-if="(item.label==='身份证') || (item.label === '证件号码' && data.fields[index-1].value ==='身份证')"
+           :class="[$v.f_idnumber2.identityCardValid ? 'apply-has-error' : '',item.bootstraped ? item.bootstraped + ' form-group app-input':'col-xs-12 form-group app-input']">
+        <label class="control-label-justify">{{item.label}}</label>
+        <div :style="item.value_style ? item.value_style:''"
+             :class="item.value_bootstraped ? item.value_bootstraped : 'col-xs-8'">
+          <input class="" style="width: 100%"
+                 :type="item.type"
+                 maxlength="18"
+                 v-model="data.fields[index].value"
+                 :placeholder="item.placeholder"
+                 :value="data.fields[index].value"
+                 :readonly="item.readonly"
+                 v-validate:f_idnumber2='{identityCardValid: true}'
+                 @change="onchange(index)"
+                 @blur="onblur(index)"
+                 @input="oninput(index)"
+          />
+        </div>
+      </div>
+
+
+      <!--input手机号验证-->
+      <div :style="item.style ? item.style : ''"
+           v-if="item.label === '用户电话'"
+           :class="[$v.f_user_phone.minlength || $v.f_user_phone.maxlength ? 'apply-has-error' : '',item.bootstraped ? item.bootstraped + ' form-group app-input':'col-xs-12 form-group app-input']">
+        <label class="control-label-justify">{{item.label}}</label>
+        <div :style="item.value_style ? item.value_style:''"
+             :class="item.value_bootstraped ? item.value_bootstraped : 'col-xs-8'">
+          <input class="" style="width: 100%"
+                 maxlength="18"
+                 type="number"
+                 onKeypress="return(/[\d\.]/.test(String.fromCharCode(event.keyCode)))"
+                 oninput="if(value.length > 11) value=value.slice(0,11)"
+                 v-validate:f_user_phone="{minlength: 7, maxlength: 11  }"
+                 v-model="data.fields[index].value"
+                 :placeholder="item.placeholder"
+                 :value="data.fields[index].value"
+                 :readonly="item.readonly"
+                 @change="onchange(index)"
+                 @blur="onblur(index)"
+                 @input="oninput(index)"
+          />
+        </div>
+      </div>
+
       <!--select-->
       <div :style="item.style ? item.style : ''"
            v-if="item.type==='select' && !item.hidden  && (item.device === 'app' || !item.device)"
@@ -34,6 +104,7 @@
             :placeholder="item.placeholder"
             :search="item.search"
             close-on-select value-single
+            @select-search="selectSearch($arguments,index)"
             :options="data.fields[index].options"
             v-model="data.fields[index].value"
             :value.sync="data.fields[index].value"
@@ -107,20 +178,21 @@
         </div>
       </div>
     </div>
-
-    <div class="col-sm-12 col-xs-12">
+    <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">
-          <app-onetomany :onetomany="item" :index="i"></app-onetomany>
+          <app-onetomany :onetomany="item" :index="i" :selectdata="data"></app-onetomany>
         </panel>
-        <panel v-for="(i,item) in data.components" :header="item.title" :is-open="false" type="primary" v-if="item.device === 'app' || !item.device">
+        <panel v-for="(i,item) in data.components" :header="item.title" :is-open="true" type="primary" v-if="item.device === 'app' || !item.device">
           <component :is="item.name" :selectdata="data" :mark="item.mark"></component>
         </panel>
       </accordion>
     </div>
 
     <!--自定义组件-->
-    <slot></slot>
+    <slot>
+
+    </slot>
 
     <!-- 按钮组 -->
     <div class="text-center">
@@ -128,7 +200,16 @@
               :disabled="button.disabled && disable_button"
               style="min-width:100px"
               :class="button.disabled && disable_button ? 'btn btn-default button_spacing' : 'btn btn-primary button_spacing'"
-              v-if="!button.hidden"
+              v-if="!button.hidden && button.button_name !=='提交'&& button.button_name !=='确认'"
+              @click.prevent="click_but(button)"
+      >
+        {{button.button_name}}
+      </button>
+      <button v-for="(index,button) in data.buttons"
+              :disabled="(button.disabled && disable_button) || (!$v.valid)"
+              style="min-width:100px"
+              :class="button.disabled && disable_button || (!$v.valid) ? 'btn btn-default button_spacing' : 'btn btn-primary button_spacing'"
+              v-if="!button.hidden && (button.button_name ==='提交'||button.button_name ==='确认')"
               @click.prevent="click_but(button)"
       >
         {{button.button_name}}
@@ -238,6 +319,7 @@
         </button>
       </footer>
     </modal>
+<!--</form>-->
   </div>
 </template>
 <script>
@@ -277,7 +359,13 @@ export default {
       model: {}, // 公司等属性
       disable_button: true, // 控制按钮禁用
       disable_modal_button: true, // 控制按钮禁用
-      showButModal: false
+      showButModal: false,
+      areaData:{
+        sjvalue:'',
+        xianvalue:'',
+        sqvalue:'',
+        mapvalue:'',
+      }
     }
   },
   watch: {
@@ -303,10 +391,37 @@ export default {
       // 是否禁用按钮
       this.disableButton()
     },
+    async getSelectShijiValue(sjvalue,sjlable) {
+
+      this.areaData.sjvalue = sjvalue
+      console.log("这是父级接收的市级值:",sjvalue,sjlable)
+      this.data.areaData = this.areaData
+      console.log(this.areaData)
+      // 是否禁用按钮
+      this.disableButton()
+    },
+    async getSelectXianValue(xianvalue,xianlable) {
+
+      this.areaData.xianvalue = xianvalue
+      this.data.areaData = this.areaData
+      console.log("这是父级接收的县级值:",xianvalue,xianlable)
+      console.log(this.areaData)
+
+      // 是否禁用按钮
+      this.disableButton()
+    },
+    async getSelectShequValue(sqvalue,sqlable) {
+      this.areaData.sqvalue = sqvalue
+      this.data.areaData = this.areaData
+      console.log(this.areaData)
+      console.log("这是父级接收的社区值:",sqvalue,sqlable)
+
+      // 是否禁用按钮
+      this.disableButton()
+    },
     // 是否禁用按钮
     disableButton () {
-      let flag = false
-
+      var flag = false
       for (const field of this.data.fields) {
         if (field.required && !field.value && !field.hidden && field.value !== 0) {
           flag = true
@@ -321,6 +436,27 @@ export default {
           flag = true
         }
       }
+       //区域下拉框必选 流程模式为报警器报建              工商业报警器报建
+      if ((this.data.f_apply_type === '报警器报建' || this.data.f_apply_type === '工商业报警器报建') && this.data.defname === '工程施工' && this.data.title === '工程施工' && this.data.f_sub_state !='完工'){
+        if (!flag){
+          if (this.areaData.sjvalue ==null || this.areaData.sjvalue.length ==0 || this.areaData.sqvalue == null || this.areaData.sqvalue.length ==0
+            || this.areaData.xianvalue == null || this.areaData.xianvalue == 0){
+            console.log("区域为空禁止提交:",this.areaData)
+            flag = true
+          }
+          if (this.areaData.mapvalue ==null  || this.areaData.mapvalue ==0){
+            console.log("坐标为空禁止提交map:",this.areaData.mapvalue)
+            flag = true
+          }
+          for (const fields of this.areaData.mapvalue) {
+           //  console.log("报警器数据:",fields.f_bjq_lng)
+            if (fields.f_bjq_lng ==null  || fields.f_bjq_lng.length ==0){
+              console.log("坐标为空禁止提交44444:",this.areaData.mapvalue)
+              flag = true
+            }
+          }
+        }
+      }
 
       this.disable_button = flag
     },
@@ -328,6 +464,7 @@ export default {
     async onchange (index) {
       // 是否禁用按钮
       this.disableButton()
+      // this.disablebtu()
 
       if (!isEmpty(this.data.fields[index].value)) {
         // 前缀、后缀
@@ -363,6 +500,9 @@ export default {
 
       this.$dispatch('onblur', index)
     },
+    disablebtu(){
+      this.flag = true
+    },
     oninput (index) {
       // 是否禁用按钮
       this.disableButton()
@@ -374,6 +514,14 @@ export default {
     },
     // 点击按钮组按钮
     async click_but (button) {
+      //报警器区域地址
+      this.data.areaData = this.areaData
+
+      if (this.data.defname === '通气点火') {
+
+      this.$showMessage(`请确认表号是否正确`).then((res) => {
+
+
       this.disable_button = true
 
       this.data.fields.forEach(item => {
@@ -392,6 +540,31 @@ export default {
       } else {
         this.$dispatch('button')
       }
+
+      })
+
+      }
+     else{
+      this.disable_button = true
+
+      this.data.fields.forEach(item => {
+        this.data[item.field] = item.value
+      })
+
+      this.data.button = button
+
+      if (button.button_fields && button.button_fields.length > 0) {
+        this.showButModal = true
+        return
+      }
+
+      if (this.data.button.event) {
+        this.$dispatch(this.data.button.event)
+      } else {
+        this.$dispatch('button')
+      }
+      }
+
     },
     confirmModal () {
       this.closeModal()
@@ -490,6 +663,12 @@ export default {
           }
         }
       }
+    },
+    selectSearch(event, index) {
+      if (this.data.fields[index].selectSearch) {
+        this.$dispatch(this.data.fields[index].selectSearch, event[0], index)
+      }
+      this.$dispatch('selectSearch', event[0], index)
     }
   },
   events: {

package/src/components/android/AppSign.vue

@@ -5,8 +5,8 @@
         <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" v-if="isclean">清除</button>
-        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click="sign" v-if="issign">签名</button>
+        <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>
@@ -20,7 +20,7 @@ import Vue from "vue";
 
 export default {
   title: '签字',
-  props: ['filePath', 'isclean', 'issign'],
+  props: ['filePath','blobid','type', 'defname'],
   data () {
     return {
       f_sign_path: null,
@@ -28,7 +28,10 @@ export default {
     }
   },
   ready () {
+    console.log('在ready里打印一下this.filePath',this.filePath)
     this.f_sign_path = this.filePath
+    console.log('在ready里打印一下this.f_sign_path',this.f_sign_path)
+    // this.getFiles()
   },
   methods: {
     clean () {
@@ -37,6 +40,9 @@ export default {
       this.$emit('sign-clean')
     },
     sign () {
+      debugger
+      this.type='手机签字'
+      console.log('==============签字打印this============',this)
       this.delAudioFile(this.f_sign_path)
       this.fileName = guid() + '.jpg'
       HostApp.__callback__ = this.signCallback
@@ -61,7 +67,11 @@ export default {
     },
     uploadFile () {
       console.log('===================签字文件上传==============')
+      console.log('===================打印id==============',HostApp.__this__.blobid)
       let data = {
+        defname:HostApp.__this__.defname,
+        type:HostApp.__this__.type,
+        blodid: HostApp.__this__.blobid,
         username: Vue.user.name,
         fremarks: '报装手机签字文件',
         fileName: HostApp.__this__.fileName,
@@ -71,19 +81,21 @@ export default {
       console.log('-----------bzLogic-----------------')
       console.log(JSON.stringify(data))
       let res = HostApp.bzLogic({
-        'logic': 'appFileUpload',
-        'data': data
+          'logic': 'appFileUpload',
+         'data': data
       })
       console.log('===============上传回调=================')
       console.log(JSON.stringify(res))
       HostApp.__this__.getFiles(res.id)
     },
     async getFiles (fileid) {
+      debugger
+      console.log('=========进来===============')
       let http = new HttpResetClass()
-
+      console.log('=========进来===============')
       let data = {
         tablename: 't_files',
-        condition: `id = '${fileid}'`
+        condition: `f_blobid = '${this.blobid}' and fremarks='报装手机签字文件' `
       }
       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}, {

package/src/components/android/AppTakePic.vue

@@ -1,143 +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;">
-        <div class="col-xs-4 col-sm-3 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" v-for="(index,file) in fileList">
-          <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
-          <img v-if="isdelete" src="../../../src/assets/删除.png" style="width: 15px;margin-top: -80px" @click.prevent="delfile(file, index)">
-        </div>
-      </div>
-      <div class="row text-right form-group" v-if="istakepic">
-        <v-select
-          class="fileType"
-          placeholder="请选择使用类型"
-          v-if="istype"
-          :search="false"
-          close-on-select
-          value-single
-          :options="typeList"
-          v-model="type"
-          :value.sync="type"
-        ></v-select>
-        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-import {guid, toStandardTimeString} from '../Util'
-import Vue from 'vue'
-export default {
-  title: '附件',
-  props: ['blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
-  data () {
-    return {
-      fileList: []
-    }
-  },
-  ready () {
-    this.getFiles()
-  },
-  methods: {
-    async getFiles () {
-      console.log('----------------开始查询图片----------------')
-      this.fileList = []
-
-      let http = new HttpResetClass()
-
-      let data = {
-        tablename: 't_files',
-        condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
-      }
-      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
-      })
-
-      for (var i = 0; i < res.data.length; i++) {
-        console.log('-----------地址----------------')
-        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
-        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
-      }
-
-      this.fileList = res.data
-    },
-    delfile (file, index) {
-      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-        this.$dispatch("delResid", file.id)
-        this.getFiles()
-      })
-    },
-    takePic (title) {
-      // 拍照成功回调
-      HostApp.__callback__ = this.cameraCallBack
-      HostApp.__this__ = this
-      let fileName = guid() + '.jpg'
-      // 打开相机
-      HostApp._open_a_page({
-        type: 'boomerang',
-        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
-        param: {
-          file: fileName,
-          requestCode: 200,
-          callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
-          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
-        }
-      })
-    },
-    cameraCallBack (fileName, fileUrl) {
-      console.log('-----------cameraCallBack-----------------')
-
-      let data = {
-        blodid: HostApp.__this__.blobid,
-        type: HostApp.__this__.type,
-        defname: HostApp.__this__.defname,
-        username: Vue.user.name,
-        fremarks: '手机拍照',
-        fileName: fileName,
-        fileUrl: fileUrl
-      }
-
-      console.log('-----------bzLogic-----------------')
-      HostApp.bzLogic({
-        'logic': 'appFileUpload',
-        'data': data
-      })
-
-      console.log('----------------开始回调查询-------------------')
-      HostApp.__this__.getFiles()
-      console.log('----------------查询回调结束-------------------')
-
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    }
-  },
-  computed: {
-    typeList () {
-      if (this.typelabel) {
-        return this.$appdata.getParam(this.typelabel)
-      }
-      return this.$appdata.getParam('使用类型')
-    }
-  },
-  events: {
-  }
-}
-</script>
-
-<style lang="less">
-.fileType {
-  float: left;
-  .select-style {
-    background: #f8f8f8;
-    border: 0px;
-  }
-  input {
-    border-left: none;
-    width: 100%;
-  }
-}
-</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;">
+        <div class="col-xs-4 col-sm-3 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" v-for="(index,file) in fileList">
+          <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
+          <img v-if="isdelete" src="../../../src/assets/删除.png" style="width: 15px;margin-top: -80px" @click.prevent="delfile(file, index)">
+        </div>
+      </div>
+      <div class="row text-right form-group" v-if="istakepic">
+        <v-select
+          class="fileType"
+          placeholder="请选择使用类型"
+          v-if="istype"
+          :search="false"
+          close-on-select
+          value-single
+          :options="typeList"
+          v-model="type"
+          :value.sync="type"
+        ></v-select>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import {guid, toStandardTimeString} from '../Util'
+import Vue from 'vue'
+export default {
+  title: '附件',
+  props: ['blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
+  data () {
+    return {
+      fileList: []
+    }
+  },
+  ready () {
+    this.getFiles()
+  },
+  methods: {
+    async getFiles () {
+      console.log('----------------开始查询图片----------------')
+      this.fileList = []
+
+      let http = new HttpResetClass()
+
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
+      }
+      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
+      })
+
+      for (var i = 0; i < res.data.length; i++) {
+        console.log('-----------地址----------------')
+        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      }
+
+      this.fileList = res.data
+    },
+    delfile (file, index) {
+      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch("delResid", file.id)
+        this.getFiles()
+      })
+    },
+    takePic (title) {
+      // 拍照成功回调
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let fileName = guid() + '.jpg'
+      // 打开相机
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
+        param: {
+          file: fileName,
+          requestCode: 200,
+          callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
+          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
+        }
+      })
+    },
+    cameraCallBack (fileName, fileUrl) {
+      console.log('-----------cameraCallBack-----------------')
+
+      let data = {
+        blodid: HostApp.__this__.blobid,
+        type: HostApp.__this__.type,
+        defname: HostApp.__this__.defname,
+        username: Vue.user.name,
+        fremarks: '手机拍照',
+        fileName: fileName,
+        fileUrl: fileUrl
+      }
+
+      console.log('-----------bzLogic-----------------')
+      HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+
+      console.log('----------------开始回调查询-------------------')
+      HostApp.__this__.getFiles()
+      console.log('----------------查询回调结束-------------------')
+
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    }
+  },
+  computed: {
+    typeList () {
+      if (this.typelabel) {
+        return this.$appdata.getParam(this.typelabel)
+      }
+      return this.$appdata.getParam('使用类型')
+    }
+  },
+  events: {
+  }
+}
+</script>
+
+<style lang="less">
+  .fileType {
+    float: left;
+    .select-style {
+      background: #f8f8f8;
+      border: 0px;
+    }
+    input {
+      border-left: none;
+      width: 100%;
+    }
+  }
+</style>