apply-clients 3.3.79 → 3.3.84

package/src/components/android/AppOnetomany.vue

@@ -151,7 +151,7 @@ import {guid, toStandardTimeString} from '../Util'
 import Vue from 'vue'
 export default {
   title: 'onetomany',
-  props: ['onetomany', 'index'],
+  props: ['onetomany', 'index','selectdata'],
   data () {
     return {
       showModal: false,
@@ -163,12 +163,54 @@ export default {
   ready () {
   },
   methods: {
-    confirmModal () {
+    async confirmModal () {
       if (this.modelTitle === '新增') {
-        if (this.onetomany.add.event) {
-          this.$dispatch(this.onetomany.add.event, this.index)
-        } else {
-          this.$dispatch('onetomanyadd', this.index)
+        //报警器设备型号校验
+        if (this.modelTitle === '新增' && this.selectdata.f_apply_type === '报警器报建'){
+          let data = {
+            f_material_name : "",
+            f_bjq_sid: "",
+          }
+          this.onetomany.fields.forEach(item=>{
+            if (item.label === '材料编号'){
+              data.f_bjq_sid = item.value
+            }
+            if (item.label === '材料名称'){
+              data.f_material_name = item.value
+            }
+          })
+          if (data.f_material_name.substr(0,3) === '报警器'){
+            let res = await this.$resetpost(
+              `${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqcheck`,
+              // `/rs/logic/bjqcheck`,
+              data
+            )
+            if (res.data.code == 200){
+              if (this.onetomany.add.event) {
+                this.$dispatch(this.onetomany.add.event, this.index)
+              } else {
+                this.$dispatch('onetomanyadd', this.index)
+              }
+              this.closeModal()
+            }else {
+              this.disableButton = true
+              this.$showMessage(res.data.msg)
+            }
+          }else {
+            if (this.onetomany.add.event) {
+              this.$dispatch(this.onetomany.add.event, this.index)
+            } else {
+              this.$dispatch('onetomanyadd', this.index)
+            }
+            this.closeModal()
+          }
+        }else {
+          if (this.onetomany.add.event) {
+            this.$dispatch(this.onetomany.add.event, this.index)
+          } else {
+            this.$dispatch('onetomanyadd', this.index)
+          }
+          this.closeModal()
         }
       }
       if (this.modelTitle === '修改') {
@@ -177,9 +219,9 @@ export default {
         } else {
           this.$dispatch('onetomanyupdate', this.index, this.rowIndex)
         }
+        this.closeModal()
       }
-
-      this.closeModal()
+      // this.closeModal()
     },
     onchange (fieldIndex) {
       this.disableModalButton()

package/src/components/android/AppServiceView.vue

@@ -5,7 +5,7 @@
     <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)&& (item.label !== '证件号码')&&(item.label !== '身份证') && (item.label !== '用户电话')"
+           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:''"
@@ -24,9 +24,30 @@
         </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==='身份证') || (data.f_credentials === '身份证' && item.label === '证件号码')"
+       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:''"
@@ -60,7 +81,7 @@
                  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: 11, maxlength: 11  }"
+                 v-validate:f_user_phone="{minlength: 7, maxlength: 11  }"
                  v-model="data.fields[index].value"
                  :placeholder="item.placeholder"
                  :value="data.fields[index].value"
@@ -158,11 +179,21 @@
         </div>
       </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 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">
           <component :is="item.name" :selectdata="data" :mark="item.mark"></component>
@@ -171,7 +202,8 @@
     </div>
 
     <!--自定义组件-->
-    <slot></slot>
+    <slot>
+    </slot>
 
     <!-- 按钮组 -->
     <div class="text-center">
@@ -298,7 +330,7 @@
         </button>
       </footer>
     </modal>
-</form>>
+</form>
   </div>
 </template>
 <script>
@@ -338,7 +370,12 @@ export default {
       model: {}, // 公司等属性
       disable_button: true, // 控制按钮禁用
       disable_modal_button: true, // 控制按钮禁用
-      showButModal: false
+      showButModal: false,
+      areaData:{
+        sjvalue:'',
+        xianvalue:'',
+        sqvalue:'',
+      }
     }
   },
   watch: {
@@ -364,6 +401,34 @@ 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
@@ -383,6 +448,17 @@ export default {
         }
       }
 
+      //区域下拉框必选 流程模式为报警器报建
+      if (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
+          }
+        }
+      }
+
       this.disable_button = flag
     },
     // 失去焦点且值最终发生变化触发
@@ -435,6 +511,9 @@ export default {
     },
     // 点击按钮组按钮
     async click_but (button) {
+      //报警器区域地址
+      this.data.areaData = this.areaData
+
       if (this.data.defname === '通气点火') {
 
       this.$showMessage(`请确认表号是否正确`).then((res) => {
@@ -482,6 +561,7 @@ export default {
         this.$dispatch('button')
       }
       }
+
     },
     confirmModal () {
       this.closeModal()

package/src/components/android/AppSign.vue

@@ -1,142 +1,151 @@
-<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 = {
-        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>
+<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>