apply-clients 3.5.4-7 → 3.5.4-72

package/src/filiale/gongyi/android/AppDisclosurerecord.vue

@@ -0,0 +1,214 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">交底人</th>
+          <th class="textNoLineBreak">交底日期</th>
+          <th class="textNoLineBreak">交底内容</th>
+          <th class="textNoLineBreak">
+            <button type="button" class="btn btn-primary" @click="$parent.$parent.openMaterialModal()">添加
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operation_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_log_content.length > 20 ? row.f_log_content.substring(0, 50) + '...' : row.f_log_content }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deletelogs(row)">删除
+            </button>
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.look(row)">查看
+            </button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal v-if="showMaterialModal" :show.sync="showMaterialModal" v-ref:modal :large="true"
+           :backdrop="false" :title="title">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
+        <h4 class="modal-title">{{title}}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
+          <div class="row">
+            <div class="form-group col-sm-6">
+              <label class="col-sm-4 control-label">内容：</label>
+              <textarea
+                class="form-control"
+                v-model="item.f_log_content"
+                rows="3"
+                :readonly="mark === 1"
+              ></textarea>
+            </div>
+          </div>
+
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template v-if="mark!== 1">
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addlogs()"
+                  :disabled="!$v.valid">确认
+          </button>
+          <button type="button" class="btn btn-primary" v-if="title==='查看'" @click="changelogs()"
+                  :disabled="!$v.valid">修改
+          </button>
+        </template>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+
+export default {
+  name: '交底记录',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      onetomany: {
+        rows: []
+      },
+      title: '新增',
+      showMaterialModal: false,
+      materials: [
+        {
+
+        }
+      ],
+      meterialOptions: [],
+      row: {},
+      bjqChecklag:[],
+      fmaterialname:{}
+    }
+  },
+  ready() {
+    this.getOnetoManyData()
+  },
+  methods: {
+    look(row){
+      this.title = '查看'
+      this.materials = [
+        {
+          id: row.id,
+          f_log_content:row.f_log_content
+        }
+      ],
+        this.showMaterialModal = true
+    },
+
+    changelogs(){
+      let http = new HttpResetClass()
+      let  s={
+        id:this.materials[0].id,
+        f_process_id:this.selectdata.f_process_id,
+        f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_log_content:this.materials[0].f_log_content,
+        f_operator:Vue.user.name,
+        f_operator_id:Vue.user.id
+      }
+      let data = {
+        tableName:'t_tisclosure_record',
+        model:s
+      }
+      http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/entitySingleTable`,
+        data,
+        {resolveMsg: '修改成功', rejectMsg: '添加失败'}
+      ).then(res => {
+        this.closeMaterials()
+      })
+    },
+    addlogs(){
+      let http = new HttpResetClass()
+      let  s={
+        f_process_id:this.selectdata.f_process_id,
+        f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_log_content:this.materials[0].f_log_content,
+        f_operator:Vue.user.name,
+        f_operator_id:Vue.user.id
+      }
+      let data = {
+        tableName:'t_tisclosure_record',
+        model:s
+      }
+      http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/entitySingleTable`,
+        data,
+        {resolveMsg: '添加成功', rejectMsg: '添加失败'}
+      ).then(res => {
+        this.closeMaterials()
+      })
+    },
+    deletelogs(row){
+      let http = new HttpResetClass()
+      this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let data = {
+            tableName:'t_tisclosure_record',
+            id:row.id
+          }
+          http.load(
+            'POST',
+            `${this.$androidUtil.getProxyUrl()}/rs/logic/delentitySingleTable`,
+            data,
+            {resolveMsg: '删除成功', rejectMsg: '删除失败'}
+          ).then(res => {
+            this.getOnetoManyData()
+          })
+        }
+      })
+    },
+    async getOnetoManyData () {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: `t_tisclosure_record`,
+        condition: `f_process_id='${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable?aaa=123`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+      )
+      this.onetomany.rows = res.data
+    },
+    async openMaterialModal() {
+      this.title = '新增'
+      this.materials = [
+        {
+          f_logs_content:''
+        }
+      ],
+        this.showMaterialModal = true
+    },
+
+    closeMaterials() {
+      this.getOnetoManyData()
+      this.showMaterialModal = false
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/gongyi/android/AppInstallationDetails.vue

@@ -119,7 +119,6 @@
             <label class="col-xs-4 control-label">表&ensp;读&ensp;数：</label>
             <div class="col-xs-8">
               <input class="form-control input_view" style=""
-                     onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
                      type="number"
                      placeholder="表读数"
                      v-model="item.f_meter_base"
@@ -131,8 +130,7 @@
             <label class="col-xs-4 control-label">初始底数：</label>
             <div class="col-xs-8">
               <input class="form-control input_view" style=""
-                     onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
-                     type="number"
+                    type="number"
                      v-model="item.f_initial_base"
                      :value="item.f_initial_base"
                      placeholder="初始底数"
@@ -256,14 +254,22 @@ export default {
     this.getMeterbrands()
   },
   methods: {
+    // async scanCode () {
+    //   console.log('===============扫码===================')
+    //   HostApp.__this__ = this,
+    //     HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode();"})
+    //   await this.getCode()
+    // },
+    // async getCode () {
+    //   let code = HostApp.getCode().data;
+    //   this.userinfo.userfiles[0].f_meternumber = code
+    // },
     async scanCode () {
-      console.log('===============扫码===================')
-      HostApp.__this__ = this,
-        HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode();"})
-      await this.getCode()
+      HostApp.__this__=this,
+        HostApp.old_scanCode({callback:"javascript:HostApp.__this__.getCode();"})
     },
     async getCode () {
-      let code = HostApp.getCode().data;
+      let code =HostApp.old_getCode().data;
       this.userinfo.userfiles[0].f_meternumber = code
     },
     // 删除未保存的表具
@@ -407,8 +413,7 @@ export default {
     async search () {
       let http = new HttpResetClass()
       let data = {
-        condition: `ua.f_process_id = '${this.selectdata.f_process_id}'`,
-        condValue : tablestate
+        condition: `ua.f_process_id = '${this.selectdata.f_process_id}'`
       }
 
       if (this.selectdata.f_apply_type === '团购转散户' || this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建' || this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建') {

package/src/filiale/gongyi/android/AppLegacyIssues.vue

@@ -0,0 +1,309 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">创建人</th>
+          <th class="textNoLineBreak">创建日期</th>
+          <th class="textNoLineBreak">遗留问题</th>
+          <th class="textNoLineBreak">处理人</th>
+          <th class="textNoLineBreak">处理时间</th>
+          <th class="textNoLineBreak">处理方式</th>
+          <th class="textNoLineBreak">
+            <button type="button" class="btn btn-primary" @click="$parent.$parent.openMaterialModal()">添加
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operation_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{ row.f_log_content.length > 20 ? row.f_log_content.substring(0, 50) + '...' : row.f_log_content }}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_dispose_person}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_dispose_time}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_dispose_manner}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <button type="button" class="button_delete button_spacing"  @click="$parent.$parent.Dispose(row)">处理
+            </button>
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deletelogs(row)">删除
+            </button>
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.look(row)">查看
+            </button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal v-if="showMaterialModal" :show.sync="showMaterialModal" v-ref:modal :large="true"
+           :backdrop="false" :title="title">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
+        <h4 class="modal-title">{{title}}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
+          <div class="row">
+            <div class="form-group col-sm-6">
+              <label class="col-sm-4 control-label">遗留问题：</label>
+              <textarea
+                class="form-control"
+                v-model="item.f_log_content"
+                rows="3"
+              ></textarea>
+            </div>
+          </div>
+
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template v-if="mark!== 1">
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addlogs()"
+                  :disabled="!$v.valid">确认
+          </button>
+          <button type="button" class="btn btn-primary" v-if="title==='查看'" @click="changelogs()"
+                  :disabled="!$v.valid">修改
+          </button>
+        </template>
+      </footer>
+    </modal>
+    <modal v-if="showdispose" :show.sync="showdispose" v-ref:modal :large="true"
+           :backdrop="false" :title="title">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
+        <h4 class="modal-title">{{title}}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div v-for="(i,item) in content" class="form-group col-sm-12 panel panel-info">
+          <div class="row">
+            <div class="form-group col-sm-6" >
+              <label class="col-sm-4 control-label">是否处理：</label>
+              <div class="col-sm-8">
+                <input-select
+                  class="select select_list"
+                  :value.sync="item.f_is_dispose"
+                  v-model="item.f_is_dispose"
+                  :options="Options"
+                  :valueSingle="true"></input-select>
+              </div>
+            </div>
+            <div class="form-group col-sm-6" >
+              <label class="col-sm-4 control-label">处理方式：</label>
+              <div class="col-sm-8">
+                <input-select
+                  class="select select_list"
+                  :value.sync="item.f_dispose_manner"
+                  v-model="item.f_dispose_manner"
+                  :options="disOptions"
+                  :valueSingle="true"></input-select>
+              </div>
+            </div>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary"  @click="Confirmdispose()"
+                 >确认
+          </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  name: '遗留问题',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      onetomany: {
+        rows: []
+      },
+      disOptions: this.$appdata.getParam('遗留问题处理'),
+      Options: [ {label: '是', value: '是'},{label: '否', value: '否'} ],
+      title: '新增',
+      showdispose: false,
+      showMaterialModal: false,
+      materials: [
+        {
+
+        }
+      ],
+      content: [
+        {
+
+        }
+      ],
+      meterialOptions: [],
+      row: {},
+      bjqChecklag:[],
+      fmaterialname:{}
+    }
+  },
+  ready() {
+    this.getOnetoManyData()
+  },
+  methods: {
+    look(row){
+      this.title = '查看'
+      this.materials = [
+        {
+          id: row.id,
+          f_log_content:row.f_log_content
+        }
+      ],
+        this.showMaterialModal= true
+    },
+    Confirmdispose(){
+      let http = new HttpResetClass()
+      let  s={
+        id:this.content[0].id,
+        f_process_id:this.selectdata.f_process_id,
+        f_dispose_time:new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_dispose_person:Vue.user.name,
+        f_dispose_manner:this.content[0].f_dispose_manner,
+        f_is_dispose:this.content[0].f_is_dispose
+      }
+      let data = {
+        tableName:'t_legacy_issues',
+        model:s
+      }
+      http.load(
+        'POST',
+        `/rs/logic/entitySingleTable`,
+        data,
+        {resolveMsg: '修改成功', rejectMsg: '添加失败'}
+      ).then(res => {
+        this.closeMaterials()
+      })
+    },
+    Dispose(row){
+      this.title = '处理'
+      this.content = [
+        {
+          id: row.id,
+          f_log_content:row.f_log_content,
+          f_is_dispose:'',
+          f_dispose_manner:''
+        }
+      ],
+        this.showdispose = true
+    },
+    changelogs(){
+      let http = new HttpResetClass()
+      let  s={
+        id:this.materials[0].id,
+        f_process_id:this.selectdata.f_process_id,
+        f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_log_content:this.materials[0].f_log_content,
+        f_operator:Vue.user.name,
+        f_operator_id:Vue.user.id
+      }
+      let data = {
+        tableName:'t_legacy_issues',
+        model:s
+      }
+      http.load(
+        'POST',
+        `/rs/logic/entitySingleTable`,
+        data,
+        {resolveMsg: '修改成功', rejectMsg: '添加失败'}
+      ).then(res => {
+        this.closeMaterials()
+      })
+    },
+    addlogs(){
+      let http = new HttpResetClass()
+      let  s={
+        f_process_id:this.selectdata.f_process_id,
+        f_operation_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_log_content:this.materials[0].f_log_content,
+        f_operator:Vue.user.name,
+        f_operator_id:Vue.user.id
+      }
+      let data = {
+        tableName:'t_legacy_issues',
+        model:s
+      }
+      http.load(
+        'POST',
+        `/rs/logic/entitySingleTable`,
+        data,
+        {resolveMsg: '添加成功', rejectMsg: '添加失败'}
+      ).then(res => {
+        this.closeMaterials()
+      })
+    },
+    deletelogs(row){
+      let http = new HttpResetClass()
+      this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let data = {
+            tableName:'t_legacy_issues',
+            id:row.id
+          }
+          http.load(
+            'POST',
+            `/rs/logic/delentitySingleTable`,
+            data,
+            {resolveMsg: '删除成功', rejectMsg: '删除失败'}
+          ).then(res => {
+          this.getOnetoManyData()
+          })
+        }
+      })
+    },
+    async getOnetoManyData () {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: `t_legacy_issues`,
+        condition: `f_process_id='${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load(
+        'POST',
+        `/rs/sql/apply_singleTable?aaa=123`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+      )
+      this.onetomany.rows = res.data
+    },
+    async openMaterialModal() {
+      this.title = '新增'
+      this.materials = [
+        {
+          f_log_type:'',
+          f_logs_content:''
+        }
+      ],
+        this.showMaterialModal = true
+    },
+    closeMaterials() {
+      this.getOnetoManyData()
+      this.showMaterialModal = false
+      this.showdispose= false
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/gongyi/android/AppSign.vue

@@ -31,6 +31,19 @@ export default {
     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.filePath
+    if (this.filePath !== null || this.filePath !== '') {
+      // 定义照片格式的扩展名数组
+      const imageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff'];
+      // 获取文件扩展名
+      const fileExtension = this.filePath.toLowerCase().substring(this.filePath.lastIndexOf('.'));
+      // 判断文件扩展名是否在照片格式数组中
+      if (imageExtensions.includes(fileExtension)) {
+        console.log('这是一个照片文件');
+      } else {
+        this.f_sign_path=null
+      }
+    }
     this.getFiles()
   },
   methods: {
@@ -80,8 +93,8 @@ 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))
@@ -108,7 +121,7 @@ export default {
           debugger
           fileUrl= `${this.$androidUtil.getProxyUrl()}/${newPath}`
         }else {
-        fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
+          fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
         }
         console.log(fileUrl)
         this.f_sign_path = fileUrl