apply-clients 3.3.34 → 3.3.38

package/src/components/product/Install/InstallProject.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.searchCondition' 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>
+              </div>
+              <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"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_apply_num = '{}'">
+              </div>
+              <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_construction_unit"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_construction_unit like '%{}%'">
+              </div>
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+                <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/applyExportfile"
+                              sql-name="applyGetMaterial"
+                              template-name='材料明细导出'
+                              :choose-col="true"></export-excel>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </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_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_user_name = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">安装项目：</label>
+                <v-select
+                  v-model="$parent.$parent.f_install_project"
+                  placeholder='安装项目'
+                  :value.sync="$parent.$parent.f_install_project"
+                  :options='$parent.$parent.installProjects'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
+              <div class="form-group col-sm-3">
+                <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'"
+                            :show-reset-button="true"
+                            condition="f_construction_date >= '{}'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-3">
+                <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'"
+                            :show-reset-button="true"
+                            condition="f_construction_date <= '{}'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>工程编号</th>
+              <th>客户名称</th>
+              <th>安装项目</th>
+              <th>施工单位</th>
+              <th>施工时间</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_apply_num}}</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_install_project}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_construction_unit}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_construction_date}}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '安装项目',
+  data () {
+    return {
+      model: new PagedList('rs/sql/applyGetInstall', 30, {
+        data: {
+          f_install_project: this.f_install_project
+        }
+      }),
+      f_install_project: null,
+      curorgid: [this.$login.f.orgid],
+      installProjects: [{label: '全部', value: ''}, ...this.$appdata.getParam('安装项目')],
+      criteriaShow: false,
+      getfield: {
+        'f_apply_num': '工程编号',
+        'f_user_name': '客户名称',
+        'f_install_project': '安装项目',
+        'f_construction_unit': '施工单位',
+        'f_construction_date': '施工时间'
+      }
+    }
+  },
+  ready () {
+    this.model.f_install_project = null
+      // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    searchCondition (args) {
+      args.condition = args.condition + ` and f_orgid = '${this.curorgid[0]}'`
+      // if (this.model.model && this.model.model.f_install_project) {
+      //   this.model.f_install_project = this.model.model.f_install_project
+      // }
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/components/product/Material/MaterialDetailed.vue

@@ -48,7 +48,13 @@
                 <label class="font_normal_body">客户名称：</label>
                 <input type="text" style="width: 60%" class="input_search" placeholder='客户名称' v-model="model.f_user_name"
                        v-on:keyup.enter="$parent.$parent.search()"
-                       condition="a.f_user_name = '{}'">
+                       condition="a.f_user_name like '%{}%'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">地&emsp;&emsp;址：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='地址' v-model="model.f_address"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="a.f_address like '%{}%'">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">材料名称：</label>
@@ -105,6 +111,7 @@
               <th>序号</th>
               <th>工程编号</th>
               <th>客户名称</th>
+              <th>地址</th>
               <th>材料名称</th>
               <th>材料型号</th>
               <th>材料单位</th>
@@ -124,6 +131,9 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_user_name}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_address}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_material_name}}</font></nobr>
               </td>
@@ -154,7 +164,7 @@
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 export default {
-  title: '报建收费列表',
+  title: '材料明细',
   data () {
     return {
       model: new PagedList('rs/sql/applyGetMaterial', 30, null),
@@ -175,6 +185,7 @@ export default {
       getfield: {
         'f_apply_num': '工程编号',
         'f_user_name': '客户名称',
+        'f_address': '地址',
         'f_material_name': '材料名称',
         'f_material_style': '材料型号',
         'f_material_unit': '材料单位',

package/src/components/product/OldApply/Handle/HandleApply.vue

@@ -131,6 +131,8 @@
               <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>
               <th style="white-space: nowrap;">客户编号</th>
               <th style="white-space: nowrap;">操作</th>
@@ -168,6 +170,12 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_contract_money}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_meternumber}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_card_number}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_apply_date}}</font></nobr>
               </td>
@@ -258,6 +266,9 @@ export default {
     search () {
       this.$refs.cp.$refs.cri.search()
     },
+    loadPage () {
+      this.$refs.cp.loadPage(this.model.pageIndex)
+    },
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
         this.$refs.cp.$refs.cri.model[key] = null

package/src/components/product/OldApply/Monitor/MonitorApply.vue

@@ -29,6 +29,12 @@
               <div class="form-group col-sm-3 button-range">
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/applyExportfile"
+                              sql-name="getOldApply"
+                              template-name='旧报装信息导出'
+                              :choose-col="true"></export-excel>
                 <div
                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                   @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
@@ -142,6 +148,8 @@
               <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>
               <th style="white-space: nowrap;">客户编号</th>
             </tr>
@@ -178,6 +186,12 @@
               <td @click="$parent.$parent.$parent.click(row)" style="text-align: center;">
                 <nobr><font>{{row.f_contract_money}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_meternumber}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_card_number}}</font></nobr>
+              </td>
               <td @click="$parent.$parent.$parent.click(row)" style="text-align: center;">
                 <nobr><font>{{row.f_apply_date}}</font></nobr>
               </td>
@@ -225,7 +239,44 @@ export default {
         {label: '商业', value: '商业'},
         {label: '工业', value: '工业'}
       ],
-      stopReasons: [{label: '全部', value: ''}, ...this.$appdata.getParam('终止原因')]
+      stopReasons: [{label: '全部', value: ''}, ...this.$appdata.getParam('终止原因')],
+      getfield: {
+        'f_userinfo_code': '用户编号',
+        'f_apply_num': '工程编号',
+        'f_apply_type': '报建类型',
+        'f_sub_state': '流程状态',
+        'f_user_name': '单位名称',
+        'f_contact': '联系人',
+        'f_phone': '电话',
+        'f_idnumber': '身份证号',
+        'f_gas_nature': '用气性质',
+        'f_apply_date': '报建接收时间',
+        'f_apply_check_date': '报建审核日期',
+        'f_contract_money': '合同价格',
+        'f_payment_term': '收费项目',
+        'f_unit_name': '集收单位',
+        'f_address': '地址',
+        'f_apply_remarks': '报建备注',
+        'f_construction_unit': '施工项目部',
+        'f_construction_worker': '施工负责人',
+        'f_completion_time': '施工完成时间',
+        'f_meternumber': '表号',
+        'f_card_number': '防盗卡号',
+        'f_construction_check_time': '施工审核时间',
+        'f_plan_date': '计划通气时间',
+        'f_gas_price_name': '计划气价名称',
+        'f_remark_stask': '计划通气备注',
+        'f_ventilate_date': '通气日期',
+        'f_gas_remarks': '通气备注',
+        'f_acceptor': '验收人',
+        'f_acceptor_date': '验收日期',
+        'f_acceptance_is_qualified': '验收结果',
+        'f_price_name': '气价名称',
+        'f_stop_reason': '终止原因',
+        'f_stop_user': '终止人员',
+        'f_stop_date': '终止时间',
+        'f_stop_remarks': '终止备注'
+      }
     }
   },
   ready () {
@@ -242,6 +293,9 @@ export default {
     search () {
       this.$refs.cp.$refs.cri.search()
     },
+    loadPage () {
+      this.$refs.cp.loadPage(this.model.pageIndex)
+    },
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
         this.$refs.cp.$refs.cri.model[key] = null
@@ -253,6 +307,13 @@ export default {
       }
       this.curorgid = val
     }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition + ` and f_orgid = '${this.curorgid[0]}'`
+      }
+    }
   }
 }
 </script>

package/src/components/product/OldApply/OldApply.vue

@@ -118,10 +118,10 @@ export default {
       this.type = null
 
       if (this.$refs.handle) {
-        this.$refs.handle.search()
+        this.$refs.handle.loadPage()
       }
       if (this.$refs.monitor) {
-        this.$refs.monitor.search()
+        this.$refs.monitor.loadPage()
       }
       console.log(this.$refs)
     }