apply-clients 3.2.34 → 3.2.48

package/src/components/app_apply/ProgressReport/ProgressReportList.vue

@@ -0,0 +1,209 @@
+<template>
+  <div style="width: 100%">
+    <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>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_entry_name condition="f_entry_name like '%{}%'" />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label  class="font text-left">CEA号：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_cea_number condition="f_cea_number 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>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_project_number condition="f_project_number like '%{}%'" />
+            </div>
+          </div>
+          <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+            <div class="col-xs-4">
+              <label  class="font text-left">类&emsp;&emsp;型：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input-select
+                v-model="model.f_type"
+                condition="pr.f_type like '%{}%'"
+                :value.sync="model.f_type"
+                :options='$parent.$parent.typeList'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <div class="row app-row text-right" style="padding-bottom: 10px;height: auto">
+            <button class="btn btn-primary" @click="$parent.$parent.search()">查询</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 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>
+            <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>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>类&emsp;&emsp;型：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_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_pr_operator }}</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_pr_operation_date }}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>详细说明：</b></p>
+              <span class="col-xs-9 text-left input-font">
+                <p class="exceed">{{ row.f_explanation }}</p>
+              </span>
+            </div>
+            <div class="col-xs-12 text-right">
+              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看详情</button>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<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/getProgressReportList`, 20, {
+      // model: new PagedList('rs/sql/getProgressReportList', 20, {
+        data: {
+          id: Vue.user.id,
+          orgid: Vue.user.orgid
+          // id: '266',
+          // orgid: '212'
+        }
+      }),
+      criteriaShow: false,
+      typeList: [
+        {'label': '全部', 'value': ''},
+        {'label': '文明施工', 'value': '文明施工'},
+        {'label': '管沟开挖', 'value': '管沟开挖'},
+        {'label': '管道焊接', 'value': '管道焊接'},
+        {'label': '打压记录', 'value': '打压记录'},
+        {'label': '防腐记录', 'value': '防腐记录'},
+        {'label': '隐蔽回填', 'value': '隐蔽回填'},
+        {'label': '高空作业', 'value': '高空作业'},
+        {'label': '签证记录', 'value': '签证记录'}
+      ]
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    click (row) {
+      let _this = this
+      this.$dispatch('gotoson', {
+        _this: _this,
+        title: `${row.f_type}详情`,
+        safe: true
+      })
+      this.$goto('progress-report-detail', {selectdata: row}, 'self', _this.search)
+    }
+  },
+  events: {
+  },
+  watch: {
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.exceed {
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.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;
+  background-color: #F8F8F8;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.button_shrink_top {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_top.png")
+}
+
+.button_shrink_bottom {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_bottom.png")
+}
+</style>

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

@@ -3,7 +3,7 @@
     <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 vertical-center">
+          <div class="row app-row">
             <div class="col-xs-4">
               <label  class="font text-left">项目名称：</label>
             </div>
@@ -11,122 +11,25 @@
               <input  class="search_input input-font" v-model=model.f_entry_name condition="u.f_entry_name like '%{}%'" />
             </div>
           </div>
-          <div class="row app-row vertical-center" v-if="$parent.$parent.criteriaShow">
+          <div class="row app-row">
             <div class="col-xs-4">
-              <label  class="font text-left">客户名称：</label>
+              <label  class="font text-left">CEA号：</label>
             </div>
             <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_user_name condition="u.f_user_name like '%{}%'" />
+              <input  class="search_input input-font" v-model=model.f_cea_number condition="u.f_cea_number like '%{}%'" />
             </div>
           </div>
-          <div class="row app-row vertical-center" v-if="$parent.$parent.criteriaShow">
+          <div class="row app-row" v-if="$parent.$parent.criteriaShow">
             <div class="col-xs-4">
-              <label  class="font text-left">联&ensp;系&ensp;人：</label>
+              <label  class="font text-left">工程编号：</label>
             </div>
             <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_contact condition="u.f_contact like '%{}%'" />
+              <input  class="search_input input-font" v-model=model.f_project_number condition="u.f_project_number like '%{}%'" />
             </div>
           </div>
-          <div class="row app-row vertical-center" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">报建编号：</label>
-            </div>
-            <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_apply_num condition="u.f_apply_num like '%{}%'" />
-            </div>
-          </div>
-          <div class="row app-row vertical-center" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">合同编号：</label>
-            </div>
-            <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_contract_number condition="u.f_contract_number like '%{}%'" />
-            </div>
-          </div>
-          <div class="row app-row vertical-center" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">报建类型：</label>
-            </div>
-            <div class="col-xs-8" >
-              <v-select
-                width="100%"
-                v-model="model.f_apply_type"
-                placeholder='报建类型'
-                condition="u.f_apply_type like '%{}%'"
-                :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 app-row vertical-center" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">办理环节：</label>
-            </div>
-            <div class="col-xs-8" >
-              <v-select
-                width="100%"
-                v-model="model.defname"
-                placeholder='办理环节'
-                condition="act.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 app-row vertical-center" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">联系电话：</label>
-            </div>
-            <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_phone condition="u.f_phone like '%{}%'" />
-            </div>
-          </div>
-          <div class="row app-row vertical-center" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">用户地址：</label>
-            </div>
-            <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_address condition="u.f_address like '%{}%'" />
-            </div>
-          </div>
-          <div class="row app-row vertical-center" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">开始时间：</label>
-            </div>
-            <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 HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="u.f_apply_date >= '{}'">
-              </datepicker>
-            </div>
-          </div>
-          <div class="row app-row vertical-center" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">结束时间：</label>
-            </div>
-            <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 HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="f_apply_date <= '{}'">
-              </datepicker>
-            </div>
-          </div>
-          <div class="row app-row text-right" style="padding-bottom: 10px;height: auto;">
+          <div class="row app-row text-right" style="padding-bottom: 10px;height: auto">
             <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>
@@ -186,7 +89,6 @@
 <script>
   import Vue from 'vue'
   import { PagedList, HttpResetClass } from 'vue-client'
-  import {isEmpty} from '../../Util'
   export default {
     title: '报建流程',
     data () {
@@ -195,13 +97,11 @@
           data: {
             id: Vue.user.id,
             orgid: Vue.user.orgid
-            // id: '178686',
-            // orgid: '178632'
+            // id: '266',
+            // orgid: '212'
           }
         }),
-        criteriaShow: false,
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-        defnames: [{label: '全部', value: ''}]
+        criteriaShow: false
       }
     },
     ready () {
@@ -225,18 +125,6 @@
           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]
-          })
-        } else {
-          this.defnames = [{label: '全部', value: ''}]
-        }
       }
     },
     events: {
@@ -246,11 +134,6 @@
   }
 </script>
 <style scoped>
-  .vertical-center {
-    display: flex;
-    align-items: center;
-    text-align: center;
-  }
   .app-row {
     height: auto;
     background-color: white;

package/src/components/product/{ApplyCharge → Apply/ApplyCharge}/ApplyChargeList.vue

@@ -14,7 +14,7 @@
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd 00:00:00'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
                           condition="cr.f_charge_date >= '{}'">
               </datepicker>
@@ -25,7 +25,7 @@
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd 23:59:59'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
                           condition="cr.f_charge_date <= '{}'">
               </datepicker>
@@ -113,7 +113,6 @@
             <th>项目名称</th>
             <th>合同编号</th>
             <th>报建类型</th>
-            <th>缴费编码</th>
             <th>收费金额</th>
             <th>付款方式</th>
             <th>收费人员</th>
@@ -131,7 +130,7 @@
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_apply_entry_name}}</font></nobr>
+              <nobr><font>{{row.f_entry_name}}</font></nobr>
             </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
@@ -139,9 +138,6 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_number}}</font></nobr>
-            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_money}}</font></nobr>
             </td>
@@ -213,7 +209,7 @@ 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] = null
       })
     },
     // 查询

package/src/components/product/{ApplyCharge → Apply/ApplyCharge}/ApplyChargeSearch.vue

@@ -1,10 +1,8 @@
 <template>
   <div class="flex-row">
     <div class="basic-main">
-      <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%">合计收费记录共
+      <apply-charge-list v-ref:query></apply-charge-list>
+      <p class="bg-info text-center" style="font-size: 20px">合计收费记录共
         <span style="color: red">{{$refs.query.chargeAll.count}}</span>笔，
         合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
       </p>

package/src/components/product/{Function → Apply/Function}/InstallFunction.vue

@@ -3,11 +3,11 @@
     <div class="basic-main">
       <div class="col-sm-12">
         <div :class="showData ? 'top' : 'auto'">
-          <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
+          <installinfo-select :show-data="showData" v-ref:query></installinfo-select>
         </div>
-        <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
-          <div class="panel-heading head" style="background-color: #e8f4ff">{{funcdata.title}}</div>
-          <div class="panel-body" style="height: 89%">
+        <div v-if="showtotal" class="panel panel-info">
+          <div class="panel-heading head auto" style="background-color: #e8f4ff">{{funcdata.title}}</div>
+          <div class="panel-body" style="overflow: auto;">
             <function-service-control v-ref:func :funcdata="funcdata" :selectdata="selectdata"></function-service-control>
           </div>
         </div>

package/src/components/product/{Function → Apply/Function}/InstallInfoSelect.vue

@@ -9,7 +9,7 @@
               <input type="text" class="input_search" v-model="model.f_user_name"
                      v-on:keyup.enter="$parent.$parent.search()" condition=" (f_entry_name like '%{}%' or f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='三选一输入'>
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-4">
               <label class="font_normal_body">报建编号：</label>
               <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="$parent.$parent.search()"
@@ -27,13 +27,13 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-4">
               <label class="font_normal_body">合同编号：</label>
               <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_contract_number = '{}'">
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-4">
               <label class="font_normal_body">报建类型：</label>
               <v-select
                 v-model="model.f_apply_type"
@@ -46,7 +46,7 @@
                 @change="$parent.$parent.applyTypeChange()"
                 close-on-select ></v-select>
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-4">
               <label class="font_normal_body">办理环节：</label>
               <v-select
                 v-model="model.defname"
@@ -58,36 +58,36 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-4">
               <label class="font_normal_body">联系电话：</label>
               <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_phone like '%{}%'">
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-4">
               <label class="font_normal_body">用户地址：</label>
               <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_address like '%{}%'">
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-4">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
               <datepicker id="startDate" placeholder="开始日期"
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd 00:00:00'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
                           condition="f_apply_date >= '{}'">
               </datepicker>
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-4">
               <label for="endDate" class="font_normal_body">结束时间：</label>
               <datepicker id="endDate" placeholder="结束日期"
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd 23:59:59'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
                           condition="f_apply_date <= '{}'">
               </datepicker>
@@ -164,7 +164,7 @@
 <script>
   import {HttpResetClass} from 'vue-client'
   import {PagedList} from 'vue-client'
-  import {isEmpty} from '../../Util'
+  import {isEmpty} from '../../../Util'
   export default {
     title: '报建业务信息',
     props: ['showData'],
@@ -189,7 +189,7 @@
     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] = null
         })
       },
       // 查询
@@ -226,10 +226,6 @@
               continue
             }
           }
-
-          if ((row.f_apply_type === '散户集体报建' || row.f_apply_type === '煤改气报建') && (row.defname === '竣工验收' || row.defname === '完工') && functions[i].title === '收费') {
-            continue
-          }
           this.funcs.push(functions[i])
         }
       },

package/src/components/product/{Function → Apply/Function}/Service/FunctionServiceControl.vue

@@ -7,7 +7,6 @@
                   :isusetype="true"
                   :isremark = "true"
                   :takeimg="false"
-                  :issearch="true"
                   :defname="show_data.defname"
     >
     </apply-upload>

package/src/components/product/{Function → Apply/Function}/functions/ApplyRecordCancel.vue

@@ -53,7 +53,7 @@
   </div>
 </template>
 <script>
-  import * as Util from '../../../Util'
+  import * as Util from '../../../../Util'
   import {HttpResetClass} from 'vue-client'
   export default {
     title: '终止报建',