apply-clients 7.1.36-1 → 7.1.36-yuchuan-1

package/src/components/product/Ignition/IgnitionListManage.vue

@@ -5,25 +5,20 @@
         <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>
-                <input type="text" class="input_search" style="width: 60%" v-model="model.f_applycode"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="ui.f_applycode = '{}'" placeholder='工程编号'>
-              </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-2">
                 <label class="font_normal_body">片&emsp;&emsp;区：</label>
                 <v-select
-                  v-model="model.f_area"
+                  v-model="model.f_slice_area"
                   placeholder='片区'
-                  condition="ui.f_area = '{}'"
-                  :value.sync="model.f_area"
+                  condition="ui.f_slice_area = '{}'"
+                  :value.sync="model.f_slice_area"
                   :options='$parent.$parent.sliceareas'
                   class="select select_list"
                   :value-single="true"
                   close-on-select >
                 </v-select>
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-2">
                 <label class="font_normal_body">发卡状态：</label>
                 <v-select
                   v-model="model.f_whether_hairpin"
@@ -36,6 +31,28 @@
                   close-on-select >
                 </v-select>
               </div>
+              <div class="form-group col-sm-2">
+                <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="uf.f_open_date >= '{}'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2">
+                <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="uf.f_open_date <= '{}'">
+                </datepicker>
+              </div>
               <div class="form-group col-sm-3 button-range">
                 <button class="button_export button_spacing" @click="$parent.$parent.openOperatorModal()">批量派单</button>
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
@@ -50,7 +67,12 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body">工程编号：</label>
+                <input type="text" class="input_search" style="width: 60%" v-model="model.f_applycode"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="ui.f_applycode = '{}'" placeholder='工程编号'>
+              </div>
+              <div class="form-group col-sm-2">
                 <label class="font_normal_body">用户类型：</label>
                 <v-select
                   v-model="model.f_user_type"
@@ -63,17 +85,17 @@
                   close-on-select >
                 </v-select>
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-2">
                 <label class="font_normal_body">用户编号：</label>
                 <input type="text" class="input_search" style="width: 60%" v-model="model.f_userinfo_id"
                        v-on:keyup.enter="$parent.$parent.search()" condition="ui.f_userinfo_id = '{}'" placeholder='用户编号'>
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-2">
                 <label class="font_normal_body">用&ensp;户&ensp;名：</label>
                 <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
                        v-on:keyup.enter="$parent.$parent.search()" condition="ui.f_user_name = '{}'" placeholder='用户名'>
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-2">
                 <label class="font_normal_body">电&emsp;&emsp;话：</label>
                 <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_phone"
                        v-on:keyup.enter="$parent.$parent.search()" condition="ui.f_user_phone = '{}'" placeholder='电话'>
@@ -84,20 +106,23 @@
         <data-grid :model="model" optional 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 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>定位地址</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>
             </tr>
           </template>
           <template partial='body'>
@@ -105,6 +130,9 @@
               <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_userinfo_id}}</font></nobr>
               </td>
@@ -133,6 +161,9 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_meter_classify}}</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_meter_brand}}</font></nobr>
               </td>
@@ -142,6 +173,9 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_whether_hairpin}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_faka_date}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_contact}}</font></nobr>
               </td>
@@ -270,6 +304,12 @@ export default {
               return
             }
           }
+          // if(selectdata[i].f_surplus_money > 0 ){
+          //   let res = await this.$showMessage(`第${selectdata.length}条报建费用未结清，无法派单！`)
+          //   if (res == 'confirm') {
+          //     return
+          //   }
+          // }
         }
         let data = {
           operator: this.$login.f,
@@ -331,7 +371,8 @@ export default {
     searchCondition (args) {
       args.condition = args.condition + ` and ir.id is null`
       console.log("this.showDatade",this.showData)
-      args.condition = args.condition + ` and ui.f_process_id = '${this.showData.f_process_id}'`
+      // args.condition = args.condition + ` and ui.f_process_id = '${this.showData.f_process_id}'`
+      args.condition = args.condition + ` and ui.f_process_id is not null`
       this.model.search(args.condition, args.model)
     },
     // 查询

package/src/components/product/Ignition/IgnitionRecord.vue

@@ -77,6 +77,18 @@
                   close-on-select >
                 </v-select>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">用户性质：</label>
+                <v-select
+                  v-model="model.f_apply_nature"
+                  placeholder='用户性质'
+                  condition="ap.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 class="form-group col-sm-3">
                 <label class="font_normal_body">用&ensp;户&ensp;名：</label>
                 <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
@@ -92,30 +104,53 @@
                 <input type="text" class="input_search" style="width: 60%" v-model="model.f_meternumber"
                        v-on:keyup.enter="$parent.$parent.search()" condition="uf.f_meternumber = '{}'" placeholder='表号'>
               </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="ir.f_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="ir.f_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 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>定位地址</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>
             </tr>
           </template>
           <template partial='body'>
@@ -175,6 +210,9 @@
               <td style="text-align: center;" @click="$parent.$parent.$parent.getFiles(row)">
                 <nobr><font>{{row.f_ignition_state}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_apply_num}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <button
                   type="button" name="button" class="btn btn-link"
@@ -216,6 +254,7 @@ export default {
       states:[{label: '已通气', value: '结束'},{label: '已派单', value: '正在进行'}],//通气状态
       sliceareas: [], // 片区
       usertype:[{label: "全部", value: ""}, {label: "民用", value: "民用"}, {label: "非民用", value: "非民用"}],//用户类型
+      applyNatures: [{label: '全部', value: ''},{label: '工业', value: '工业'},{label: '商业', value: '商业'},{label: '散户', value: '散户'},{label: '小区', value: '小区'},{label: '分户挂表', value: '分户挂表'}], // 报建性质
       getfield: {
         'f_userinfo_id': '  用户编号  ',
         'f_user_name': '  用户名称  ',