apply-clients 3.3.32 → 3.3.36

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

@@ -118,17 +118,21 @@
       <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>
-            <th>付款方式</th>
-            <th>流水号</th>
-            <th>收费人员(退款人员)</th>
-            <th>收费日期(退款日期)</th>
-            <th>状态</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>
+            <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>
           </tr>
         </template>
         <template partial='body'>
@@ -142,9 +146,21 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</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_phone}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_nature}}</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_charge_number}}</font></nobr>
             </td>
@@ -198,11 +214,16 @@ export default {
       },
       getfield: {
         'f_apply_num': '工程编号',
-        'f_entry_name': '项目名称',
         'f_contract_number': '合同编号',
         'f_apply_type': '报建类型',
+        'f_apply_nature': '报建性质',
+        'f_user_name': '用户名称',
+        'f_phone': '用户电话',
+        'f_address': '用户地址',
+        'f_charge_number': '缴费编码',
         'f_charge_money': '收费金额',
         'f_payment_method': '付款方式',
+        'f_payer_number': '流水号',
         'f_charge_collectors': '收费人员',
         'f_charge_date': '收费日期',
         'f_charge_status': '状态'

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -389,6 +389,11 @@
           {resolveMsg: null, rejectMsg: '删除失败！！！'}
         )
 
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       },
       async 'onetomanyupdate' (index, rowIndex) {
@@ -402,11 +407,21 @@
           data
         )
 
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       },
       async 'onetomanyadd' (index) {
         let data = {
-          f_process_id : this.show_data.f_process_id
+          f_process_id : this.show_data.f_process_id,
+          f_operator_id: this.$login.f.id,
+          f_operator: this.$login.f.name,
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs
         }
         this.show_data.onetomany[index].fields.forEach(item => {
           data[item.field] = item.value
@@ -415,6 +430,12 @@
           `rs/entity/${this.show_data.onetomany[index].tables[0]}`,
           data
         )
+
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       }
     },

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

@@ -0,0 +1,224 @@
+<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="a.f_apply_num = '{}'">
+              </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_operator"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_operator 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="a.f_user_name = '{}'">
+              </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_material_name"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_name = '{}'">
+              </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_material_style"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_style = '{}'">
+              </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_material_unit"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_unit = '{}'">
+              </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_material_number"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_number = '{}'">
+              </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="ma.f_operation_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="ma.f_operation_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>
+              <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_material_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_style}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_unit}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_number}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_operator}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_operation_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/applyGetMaterial', 30, null),
+      curorgid: [this.$login.f.orgid],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
+      chargeStatus: [
+        {label: '全部', value: ''},
+        {label: '有效', value: '有效'},
+        {label: '作废', value: '作废'},
+        {label: '退款', value: '退款'}
+      ],
+      criteriaShow: false,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
+      getfield: {
+        'f_apply_num': '工程编号',
+        'f_user_name': '客户名称',
+        'f_material_name': '材料名称',
+        'f_material_style': '材料型号',
+        'f_material_unit': '材料单位',
+        'f_material_number': '材料数量',
+        'f_operator': '操作人',
+        'f_operation_date': '操作时间'
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    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 ma.f_orgid = '${this.curorgid[0]}'`
+      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/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>
@@ -181,8 +189,8 @@
                   </button>
                   <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
                     <li>
-                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('工程部派工') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1" @click="$parent.$parent.$parent.click(row)">{{row.f_sub_state}}</a>
-                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('营业厅报装') !== -1" @click="$parent.$parent.$parent.stopApply(row)">异常终止</a>
+                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('工程部派工') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1 || (this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 && row.f_sub_state === '待点火')" @click="$parent.$parent.$parent.click(row)">{{row.f_sub_state}}</a>
+                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1" @click="$parent.$parent.$parent.stopApply(row)">异常终止</a>
                     </li>
                   </ul>
                 </dropdown>