apply-clients 3.4.3 → 3.4.4

package/src/components/android/Process/Processes/selectUserinfo.vue

@@ -0,0 +1,182 @@
+<template>
+  <div style="margin-bottom: 20px" class="form-group select-overspread">
+    <label class="control-label-justify control-label col-sm-3">选择用户</label>
+    <div class="col-sm-5" >
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openSelect" :disabled="mark === 1">选择</button>
+    </div>
+  </div>
+
+  <modal v-if="showselect" :show.sync="showselect" width="100%" title="用户信息" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body" style="height: 600px!important;">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.$parent.searchCondition' v-ref:cri>
+          <div novalidate 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>
+                <input type="text" style="width:60%" class="input_search" placeholder='客户编号' v-model="model.f_userinfo_code"
+                       v-on:keyup.enter="search"
+                       condition="ui.f_userinfo_code = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="search" condition="ui.f_user_name like '%{}%'" placeholder='客户名称'>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户电话：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                       v-on:keyup.enter="search" condition="ui.f_user_phone = '{}'" placeholder='客户电话'>
+              </div>
+
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_search button_spacing" @click.prevent="search" v-el:cx>查询</button>
+                <button class="button_clear button_spacing"  @click.prevent="$parent.$parent.$parent.clear()">清空</button>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.$parent.criteriaShow = !$parent.$parent.$parent.criteriaShow"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$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" v-model="model.f_address"
+                       v-on:keyup.enter="search" condition="ua.f_address like '%{}%'" placeholder='客户地址'>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" style="height: 100%">
+          <template partial='head'>
+            <tr>
+              <th style="white-space: nowrap;">序号</th>
+              <th style="white-space: nowrap;">客户编号</th>
+              <th style="white-space: nowrap;">客户名称</th>
+              <th style="white-space: nowrap;">客户电话</th>
+              <th style="white-space: nowrap;">地址信息</th>
+              <th style="white-space: nowrap;">选择</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_userinfo_code }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_name }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_phone }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_address }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>
+                  <button type="button" name="button" class="button_export" @click.prevent="$parent.$parent.$parent.$parent.select(row)">确认选择</button>
+                </font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '收费管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showselect: false,
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/applyGetUserinfos`, 20, null),
+      criteriaShow: false
+    }
+  },
+  ready () {
+  },
+  methods: {
+    select (row) {
+      this.$dispatch('selectUserinfo', row)
+
+      this.showselect = false
+    },
+    searchCondition (args) {
+      args.condition = `${args.condition} and ui.f_filialeid = '${Vue.user.orgid}'`
+
+      this.model.search(args.condition, args.model)
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    openSelect () {
+      this.showselect = true
+      setTimeout(() => {
+        this.$refs.cp.$refs.cri.search()
+      }, 100)
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.control-label-justify {
+  display: inline-block;
+  vertical-align: top;
+  width: 110px;
+  text-align: justify;
+  font-family: PingFang-SC-Bold;
+}
+
+.control-label-justify::after {
+  content: "";
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  height: 0;
+}
+.input_view{
+  padding: 8px;
+  background-color: #ffffff;
+  border-radius: 2px;
+  border: solid 1px #c7c7c7!important;
+  color: #333333!important;
+  font-size: 15px!important;
+}
+
+.input_view[readonly]{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+.input_view:disabled{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+</style>

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

@@ -1,84 +1,185 @@
 <template>
-  <div style="width: 100%">
+  <div class="p-10">
     <criteria-paged :model="model" v-ref:cp>
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div partial style="padding: 10px">
-          <div class="row app-row">
-            <div class="col-xs-4">
-              <label  class="font text-left">项目名称：</label>
+        <div partial class="auto">
+          <div class="row form-group app-input">
+            <label class="">客户名称：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_user_name condition="u.f_user_name like '%{}%'" />
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">联&ensp;系&ensp;人：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_contact condition="u.f_contact like '%{}%'" />
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">操&ensp;作&ensp;人：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_operator condition="u.f_operator like '%{}%'" />
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">报建编号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_apply_num condition="u.f_apply_num like '%{}%'" />
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">合同编号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_contract_number condition="u.f_contract_number like '%{}%'" />
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">报建类型：</label>
+            <div class="col-xs-8" >
+              <v-select
+                width="100%"
+                v-model="model.f_apply_type"
+                placeholder='报建类型'
+                condition="u.f_apply_type = '{}'"
+                :value.sync="model.f_apply_type"
+                :options='$parent.$parent.applytype'
+                class="select select_list"
+                :value-single="true"
+                @change="$parent.$parent.applyTypeChange()"
+                close-on-select ></v-select>
             </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">报建性质：</label>
             <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_entry_name condition="u.f_entry_name like '%{}%'" />
+              <v-select
+                width="100%"
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
             </div>
           </div>
-          <div class="row app-row">
-            <div class="col-xs-4">
-              <label  class="font text-left">CEA号：</label>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">办理环节：</label>
+            <div class="col-xs-8" >
+              <v-select
+                width="100%"
+                v-model="model.defname"
+                placeholder='办理环节'
+                condition="defname = '{}'"
+                :value.sync="model.defname"
+                :options='$parent.$parent.defnames'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
             </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">联系电话：</label>
             <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_cea_number condition="u.f_cea_number like '%{}%'" />
+              <input class="" v-model=model.f_phone condition="u.f_phone like '%{}%'" />
             </div>
           </div>
-          <div class="row app-row" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">工程编号：</label>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">用户地址：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_address condition="u.f_address like '%{}%'" />
             </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">施工单位：</label>
             <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_project_number condition="u.f_project_number like '%{}%'" />
+              <input class="" v-model=model.f_construction_unit condition="u.f_construction_unit like '%{}%'" />
             </div>
           </div>
-          <div class="row app-row text-right" style="padding-bottom: 10px;height: auto">
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">开始时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 100%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="u.f_apply_date >= '{}'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">结束时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 100%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="f_apply_date <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row form-group text-right" style="">
             <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
-            <button class="btn btn-info"  @click="$parent.$parent.clear()">清空</button>
+            <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
             <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
           </div>
         </div>
       </criteria>
       <list :model="model" partial='list'>
-        <div partial class="auto app-text panel" style="margin: 10px">
+        <div partial class="auto app-text panel">
           <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">{{ row.f_project_number }}</p>
-            </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>CEA&emsp;号：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_cea_number }}</p>
+            <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">{{ row.f_user_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">{{ row.f_entry_name }}</p>
+              <p class="col-xs-3 text-left font"><b>电&emsp;&emsp;话：</b></p>
+<!--              <p class="col-xs-9 text-left input-font">{{ row.f_phone }}</p>-->
+              <p class="col-xs-9 text-left input-font">
+                {{ row.f_phone }}&ensp;
+                <svg @click.prevent="$parent.$parent.$parent.dialNumber(row.f_phone)" style="width: 25px;height: 25px;position: absolute;" 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>
+              </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">{{ row.f_apply_type }}</p>
+            <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">{{ row.f_apply_num }}</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">{{ row.f_project_type }}</p>
+            <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">{{ row.f_userinfo_code }}</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">{{ row.f_project_area }}</p>
+            <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">{{ row.f_apply_type }}</p>
             </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>联&ensp;系&ensp;人：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_contact }}</p>
+            <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">{{ row.defname }}</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">{{ row.f_phone }}</p>
+            <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">{{ row.f_address }}</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">{{ row.defname }}</p>
+            <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">{{ row.f_apply_date }}</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">{{ row.f_address }}</p>
+              <p class="col-xs-3 text-left font"><b>施工单位：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_construction_unit }}</p>
+            </div>
+            <div class="col-xs-12" style="color: red">
+              <p class="col-xs-3 text-left font"><b>施工备注：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_construction_remarks }}</p>
             </div>
+
             <div class="col-xs-12 text-right">
-              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看进度</button>
+              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看</button>
             </div>
           </div>
         </div>
@@ -89,25 +190,38 @@
 <script>
   import Vue from 'vue'
   import { PagedList, HttpResetClass } from 'vue-client'
+  import {isEmpty} from '../../Util'
   export default {
     title: '报建流程',
     data () {
       return {
         model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/supervisory`, 20, {
+        // model: new PagedList('rs/sql/supervisory', 20, {
           data: {
             id: Vue.user.id,
             orgid: Vue.user.orgid
-            // id: '266',
-            // orgid: '212'
+            // id: '35814',
+            // orgid: '10101'
           }
         }),
-        criteriaShow: false
+        criteriaShow: false,
+    //    applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+        applytype: [{label: '全部', value: ''},  ...this.$appdata.getParam('报建类型') || [] ], // 所有报建类型
+        defnames: [{label: '全部', value: ''}],
+        applyNatures: [{label: '全部', value: ''}] // 报建性质
       }
     },
     ready () {
       this.search()
     },
     methods: {
+      dialNumber (phone) {
+        this.$showMessage(`是否拨打电话：${phone}`, ['confirm']).then((res) => {
+          if (res === 'confirm') {
+            this.$androidUtil.makeAPhoneCall(phone)
+          }
+        })
+      },
       clear () {
         Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
           this.$refs.cp.$refs.cri.model[key] = null
@@ -125,6 +239,22 @@
           safe: true
         })
         this.$goto('app-supervisory-cart', {selectdata: row}, 'self', _this.search)
+      },
+      applyTypeChange () {
+        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          let http = new HttpResetClass()
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getDefnameByType`, {
+            f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            this.defnames = [{label: '全部', value: ''}, ...res.data]
+
+            this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
+          })
+        } else {
+          this.defnames = [{label: '全部', value: ''}]
+
+          this.applyNatures = [{label: '全部', value: ''}]
+        }
       }
     },
     events: {
@@ -134,23 +264,6 @@
   }
 </script>
 <style scoped>
-  .app-row {
-    height: auto;
-    background-color: white;
-    padding: 10px 10px 0 10px;
-    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-  }
-  .search_input {
-    border: 0;
-    outline: none;
-  }
-  .input-font{
-    font: 15px PingFang-SC-Medium;
-    color: #333333;
-  }
-  .app-text {
-    font-size: 12px;
-  }
   .panel-self{
     border-radius: 10px;
     border:1px solid #499EDF;
@@ -160,10 +273,6 @@
     font: 15px PingFang-SC-Medium;
     color: #666666;
   }
-  .input-font{
-    font: 15px PingFang-SC-Medium;
-    color: #333333;
-  }
 
   .button_shrink_top {
     width: 34px;
@@ -181,3 +290,28 @@
     background-image: url("../../../../static/newStyle/stretch_bottom.png")
   }
 </style>
+<style lang="less">
+.app-input {
+  label {
+    float: left;
+  }
+  .select {
+    button {
+      border: none;
+      outline: none;
+      text-align: left;
+      .btn-placeholder {
+        color: #ACA899
+      }
+    }
+  }
+  .datepicker {
+    .form-control:focus {
+      border: none!important;
+      outline: none!important;
+      -webkit-box-shadow: none;
+      box-shadow: none;
+    }
+  }
+}
+</style>