apply-clients 3.3.216 → 3.4.1

package/src/components/android/Supervisory/AppSupervisoryCart.vue

@@ -1,115 +1,121 @@
-<template>
-  <div style="padding: 10px">
-    <div partial class="auto app-text panel" style="margin-bottom: 20px">
-      <div class="panel-body panel-self">
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_entry_name }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>客户名称：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_user_name }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>电&emsp;&emsp;话：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_phone }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_num }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_type }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.defname }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>地&emsp;&emsp;址：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_address }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_date }}</p>
-        </div>
-      </div>
-    </div>
-    <div class="row" v-for="(i,row) in defnames">
-        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'">
-          {{row.defname}}
-          <br>
-          {{ row.finishtime ? row.finishtime : row.sendtime }}
-        </div>
-        <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
-      </div>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '流程节点',
-  props: ['selectdata'],
-  data () {
-    return {
-      defnames: []
-    }
-  },
-  ready () {
-    this.initial()
-  },
-  methods: {
-    async initial() {
-      // 获取流程节点信息
-      let http = new HttpResetClass()
-      let data = {
-        processid: this.selectdata.f_process_id
-      }
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/getAllNode`,
-        // `rs/sql/getAllNode`,
-        {data: data},
-        {
-          resolveMsg:null,
-          rejectMsg:null
-        })
-      this.defnames = res.data
-    },
-  },
-  watch: {
-  }
-}
-</script>
-
-<style scoped>
-.app-text {
-  font-size: 12px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.row{
-  padding: 0 40px;
-  text-align: center;
-  height: auto;
-}
-.item{
-  border-radius: 2em;
-  border: 1px solid silver;
-  line-height: 25px;
-}
-.arrow{
-  width: 100%;
-  color: #5ac0d9;
-  font-weight: bold;
-}
-.selectIndex{
-  background-color: #5ac0d9;
-  color: #ffffff;
-}
-</style>
+<template>
+  <div style="padding: 10px">
+    <div partial class="auto app-text panel" style="margin-bottom: 20px">
+      <div class="panel-body panel-self">
+        <div class="col-xs-6">
+          <p class="col-xs-6 text-left font"><b>工程编号：</b></p>
+          <p class="col-xs-6 text-left input-font">{{ selectdata.f_project_number }}</p>
+        </div>
+        <div class="col-xs-6">
+          <p class="col-xs-6 text-left font"><b>CEA号：</b></p>
+          <p class="col-xs-6 text-left input-font">{{ selectdata.f_cea_number }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_entry_name }}</p>
+        </div>
+        <div class="col-xs-6">
+          <p class="col-xs-6 text-left font"><b>项目类型：</b></p>
+          <p class="col-xs-6 text-left input-font">{{ selectdata.f_apply_type }}</p>
+        </div>
+        <div class="col-xs-6">
+          <p class="col-xs-6 text-left font"><b>工程类型：</b></p>
+          <p class="col-xs-6 text-left input-font">{{ selectdata.f_project_type }}</p>
+        </div>
+        <div class="col-xs-6">
+          <p class="col-xs-6 text-left font"><b>项目区域：</b></p>
+          <p class="col-xs-6 text-left input-font">{{ selectdata.f_project_area }}</p>
+        </div>
+        <div class="col-xs-6">
+          <p class="col-xs-6 text-left font"><b>联系人：</b></p>
+          <p class="col-xs-6 text-left input-font">{{ selectdata.f_contact }}</p>
+        </div>
+        <div class="col-xs-6">
+          <p class="col-xs-6 text-left font"><b>联系电话：</b></p>
+          <p class="col-xs-6 text-left input-font">{{ selectdata.f_phone }}</p>
+        </div>
+        <div class="col-xs-6">
+          <p class="col-xs-6 text-left font"><b>办理环节：</b></p>
+          <p class="col-xs-6 text-left input-font">{{ selectdata.defname }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>项目地址：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_address }}</p>
+        </div>
+      </div>
+    </div>
+    <div class="row" v-for="(i,row) in defnames">
+        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'">
+          {{row.defname}}
+          <br>
+          {{ row.finishtime ? row.finishtime : row.sendtime }}
+        </div>
+        <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
+      </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '流程节点',
+  props: ['selectdata'],
+  data () {
+    return {
+      defnames: []
+    }
+  },
+  ready () {
+    this.initial()
+  },
+  methods: {
+    async initial() {
+      // 获取流程节点信息
+      let http = new HttpResetClass()
+      let data = {
+        processid: this.selectdata.f_process_id
+      }
+      let res = await http.load(
+        'POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/getAllNode`,
+        {data: data},
+        {
+          resolveMsg:null,
+          rejectMsg:null
+        })
+      this.defnames = res.data
+    },
+  },
+  watch: {
+  }
+}
+</script>
+
+<style scoped>
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.row{
+  padding: 0 40px;
+  text-align: center;
+  height: auto;
+}
+.item{
+  border-radius: 2em;
+  border: 1px solid silver;
+  line-height: 25px;
+}
+.arrow{
+  width: 100%;
+  color: #5ac0d9;
+  font-weight: bold;
+}
+.selectIndex{
+  background-color: #5ac0d9;
+  color: #ffffff;
+}
+</style>

package/src/components/android/TaskGraph.vue

@@ -0,0 +1,125 @@
+<template>
+  <div>
+    <div :style="'height:' + AmapHeight">
+      <AMap-location
+        :islocation="true"
+        :locationzoomcenter="false"
+        :usenative="true"
+        :isshowsearch="false"
+        :mylocationinfo="false"
+        :islocationclearmark="false"
+        :isshowmapmodel="false"
+        :locationwindow="false"
+        mapmodel="dragMarker"
+        :labelmarksarray="labelmarksarray"
+        @diyspotmouseclick="diyspotmouseclick"
+      ></AMap-location>
+    </div>
+    <div class="auto row" v-if="selectdata">
+      <div class="col-sm-12 col-xs-12 form-group app-input" style="margin-top: 10px"></div>
+      <template v-for="item in fileds">
+        <div class="col-sm-12 col-xs-12 form-group app-input">
+          <label class="">{{ item.label }}</label>
+          <div :class="item.type === 'tel' || item.type === 'map' ? 'col-sm-8 col-xs-8' : 'col-sm-8 col-xs-9'">
+            <input style="width: 100%" type="text" placeholder="" v-model="selectdata[item.field]" :value="selectdata[item.field]" readonly>
+            <svg v-if="item.type === 'tel'" @click.prevent="dialNumber(selectdata[item.field])" style="width: 25px;height: 25px;position: absolute;bottom: 8px;" t="1628575136009" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2374" width="200" height="200"><path d="M682.25 465.262c0 16.695 11.115 27.811 27.81 27.811s27.812-11.116 27.812-27.811A167.395 167.395 0 0 0 570.96 298.35c-16.695 0-27.811 11.116-27.811 27.811s11.16 27.812 27.811 27.812a111.597 111.597 0 0 1 111.29 111.289z m111.289 0c0 16.695 11.115 27.811 27.81 27.811s27.812-11.116 27.812-27.811c0-152.984-125.217-278.201-278.2-278.201-16.696 0-27.812 11.16-27.812 27.855s11.16 27.811 27.811 27.811c122.405 0 222.579 100.174 222.579 222.535zM417.976 367.9c30.623-30.579 33.391-77.898 5.58-111.289L337.31 148.134c-27.811-36.16-80.666-41.74-116.869-13.928-2.768 2.812-5.536 2.812-5.536 5.58l-75.13 75.13c-72.318 72.318 30.623 267.041 217.042 453.417C543.15 854.708 735.06 954.88 807.378 885.33l75.13-75.13c33.392-33.391 33.392-86.246 0-116.825l-5.536-5.58-108.52-86.246c-33.348-27.81-80.623-25.043-111.246 5.58l-47.275 47.319c-50.087-30.623-94.593-64.014-133.564-102.941-38.927-38.971-72.275-83.478-102.898-133.565l44.507-50.043z m-38.927-75.13c8.348 11.16 8.348 27.855-2.812 36.203l-61.202 63.97a29.569 29.569 0 0 0-5.536 33.392 721.425 721.425 0 0 0 122.405 164.1 721.512 721.512 0 0 0 164.1 122.405 29.569 29.569 0 0 0 33.39-5.58l63.971-63.97c11.16-11.116 25.043-11.116 36.203-2.769l108.477 89.014s2.768 0 2.768 2.768a26.889 26.889 0 0 1 0 38.971l-75.13 75.13c-36.115 36.115-208.606-55.666-372.75-217.042-164.1-161.332-253.114-336.548-216.955-372.75l77.854-77.899c11.16-8.348 30.623-8.348 38.971 5.58l86.246 108.521z" fill="#8A8A8A" p-id="2375"></path></svg>
+            <svg v-if="item.type === 'map'" @click="openAmap(selectdata[item.field])" style="width: 25px;height: 25px;position: absolute;bottom: 8px;" t="1628575336648" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3201" width="200" height="200"><path d="M512 956h-1.1c-10.9 0-20.5-6.9-24.7-17L369.9 654.1 85 537.8c-10.1-4.1-16.8-13.7-17.2-24.6-0.4-10.9 5.6-21 15.3-25.9l833-416.5c10.7-5.3 23.6-3.2 32.1 5.2s10.5 21.4 5.2 32.1L536.8 940.9c-4.7 9.4-14.3 15.1-24.8 15.1zM162.7 509.6l239 97.6c6.9 2.8 12.4 8.3 15.2 15.2l97.6 239 351.9-703.8-703.7 352z" fill="#666666" p-id="3202"></path></svg>
+          </div>
+        </div>
+      </template>
+      <div class="col-sm-12 col-xs-12 form-group app-btn">
+        <button class="btn btn-info" @click.prevent="click()">查看详情</button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+export default {
+  title: '地图任务点',
+  props: {
+    data: {
+      type: Array,
+      default: []
+    },
+    fileds: {
+      type: Array,
+      default: []
+    }
+  },
+  data () {
+    return {
+      labelmarksarray: [],
+      selectdata: null,
+      AmapHeight: '100%'
+    }
+  },
+  ready () {
+    this.getLocatingPoint()
+  },
+  methods: {
+    // 查看详情
+    click () {
+      let _this = this
+      this.$dispatch('gotoson', {
+        _this: _this,
+        title: _this.selectdata.defname,
+        safe: true
+      })
+      this.$goto('app-service-control', {selectdata: _this.selectdata}, 'self', null)
+    },
+    // 导航
+    openAmap (address) {
+      let _this = this
+      HostApp.openThirdPartyMap({
+        lon: _this.selectdata.f_longitude,
+        lat: _this.selectdata.f_dimension,
+        address: address
+      })
+    },
+    // 拨打电话
+    dialNumber (tel) {
+      this.$showMessage(`是否拨打电话：${tel}`, ['confirm']).then((res) => {
+        if (res === 'confirm') {
+          this.$androidUtil.makeAPhoneCall(tel)
+        }
+      })
+    },
+    // 点击定位点回调
+    diyspotmouseclick (data) {
+      this.AmapHeight = '60%'
+
+      this.selectdata = data
+    },
+    // 获取定位点
+    getLocatingPoint () {
+      this.data.forEach(item => {
+        this.labelmarksarray.push({
+          data: {
+            data: item,
+            content: item.f_user_name
+          },
+          position: [item.f_longitude, item.f_dimension],
+          isclearmarker: false,
+          islabel: false
+        })
+      })
+    }
+  },
+  events: {
+  },
+  watch: {
+    'data' () {
+      this.getLocatingPoint()
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .app-input {
+    label {
+      float: left;
+    }
+  }
+</style>

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -1,16 +1,12 @@
 <template>
     <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">组织机构：</label>
-              <res-select
-                restype='organization'
-                :initresid='$parent.$parent.curorgid'
-                @res-select="$parent.$parent.getorg"
-                is-mul="false"
-              ></res-select>
+              <label class="font_normal_body">项目名称：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_entry_name like '%{}%'" placeholder='项目名'>
             </div>
             <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
@@ -20,7 +16,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="cr.f_charge_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="cr.f_charge_date >= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -31,7 +27,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="cr.f_charge_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="cr.f_charge_date <= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3 button-range">
@@ -53,8 +49,8 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">工程编号：</label>
-              <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" style="width: 60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="a.f_apply_num = '{}'">
             </div>
@@ -64,12 +60,6 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="a.f_contract_number = '{}'">
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">流&ensp;水&ensp;号：</label>
-              <input type="text" style="width: 60%" class="input_search" placeholder='流水号' v-model="model.f_payer_number"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="cr.f_payer_number = '{}'">
-            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建类型：</label>
               <v-select
@@ -103,11 +93,11 @@
             <div class="form-group col-sm-3">
               <label class="font_normal_body">缴费状态：</label>
               <v-select
-                v-model="model.f_charge_status"
+                v-model="model.f_charging_status"
                 placeholder='请选择'
-                condition="cr.f_charge_status = '{}'"
-                :value.sync="model.f_charge_status"
-                :options='$parent.$parent.chargeStatus'
+                condition="cr.f_charging_status = '{}'"
+                :value.sync="model.f_charging_status"
+                :options='$parent.$parent.chargingStatus'
                 class="select select_list"
                 :value-single="true"
                 close-on-select ></v-select>
@@ -119,16 +109,17 @@
         <template partial='head'>
           <tr>
             <th>序号</th>
-            <th>工程编号</th>
+            <th>报建编号</th>
+            <th>项目名称</th>
             <th>合同编号</th>
             <th>报建类型</th>
             <th>缴费编码</th>
-            <th>收费金额(退款金额)</th>
+            <th>收费金额</th>
             <th>付款方式</th>
-            <th>流水号</th>
-            <th>收费人员(退款人员)</th>
-            <th>收费日期(退款日期)</th>
+            <th>收费人员</th>
+            <th>收费日期</th>
             <th>状态</th>
+            <th>地址</th>
           </tr>
         </template>
         <template partial='body'>
@@ -139,6 +130,9 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_entry_name}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>
@@ -154,9 +148,6 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_payment_method}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_payer_number}}</font></nobr>
-            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_collectors}}</font></nobr>
             </td>
@@ -164,7 +155,10 @@
               <nobr><font>{{row.f_charge_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_status}}</font></nobr>
+              <nobr><font>{{row.f_charging_status}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_address}}</font></nobr>
             </td>
           </tr>
         </template>
@@ -179,17 +173,19 @@ export default {
   title: '报建收费列表',
   data () {
     return {
-      model: new PagedList('rs/sql/getApplyCharge', 30, null, {
+      model: new PagedList('rs/sql/getApplyCharge', 30, {
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }, {
         f_charge_money: 0
       }),
-      curorgid: [this.$login.f.orgid],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
-      chargeStatus: [
+      chargingStatus: [
         {label: '全部', value: ''},
         {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'},
-        {label: '退款', value: '退款'}
+        {label: '作废', value: '作废'}
       ],
       criteriaShow: false,
       chargeAll: {
@@ -197,7 +193,7 @@ export default {
         sum: 0
       },
       getfield: {
-        'f_apply_num': '工程编号',
+        'f_apply_num': '报建编号',
         'f_entry_name': '项目名称',
         'f_contract_number': '合同编号',
         'f_apply_type': '报建类型',
@@ -205,7 +201,8 @@ export default {
         'f_payment_method': '付款方式',
         'f_charge_collectors': '收费人员',
         'f_charge_date': '收费日期',
-        'f_charge_status': '状态'
+        'f_charging_status': '状态',
+        'f_address': '地址'
       }
     }
   },
@@ -216,13 +213,9 @@ export default {
   methods: {
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = ''
+        this.$refs.cp.$refs.cri.model[key] = []
       })
     },
-    searchCondition (args) {
-      args.condition = args.condition + ` and cr.f_orgid = '${this.curorgid[0]}'`
-      this.model.search(args.condition, args.model)
-    },
     // 查询
     search () {
       this.$refs.cp.$refs.cri.search()
@@ -239,13 +232,6 @@ export default {
       let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
 
       this.chargeAll = res.data[0]
-    },
-    getorg (val) {
-      if (val.length <= 0) {
-        return
-      }
-      this.curorgid = val
-      this.search()
     }
   },
   computed: {

package/src/components/product/ApplyCharge/ApplyChargeSearch.vue

@@ -4,9 +4,9 @@
       <div style="height: 95%">
         <apply-charge-list v-ref:query ></apply-charge-list>
       </div>
-      <p class="bg-info text-center" style="font-size: 20px;height: 5%">
-        合计记录共<span style="color: red">&ensp;{{$refs.query.chargeAll.count}}&ensp;</span>笔，
-        合计金额<span style="color: red">&ensp;{{$refs.query.chargeAll.sum}}&ensp;</span>元
+      <p class="bg-info text-center" style="font-size: 20px;height: 5%">合计收费记录共
+        <span style="color: red">{{$refs.query.chargeAll.count}}</span>笔，
+        合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
       </p>
     </div>
   </div>