apply-clients 7.1.36-yuchuan-3 → 7.1.36-yuchuan-4.1

package/src/components/product/List/ShowAllActivity.vue

@@ -2,19 +2,19 @@
   <div class="flex-row">
     <div class="basic-main">
       <criteria-paged :model="model" v-ref:cp>
-        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <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-2">
                 <label class="font_normal_body">报建编号：</label>
                 <input type="text" class="input_search" style="width: 60%" v-model="model.f_apply_num"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="ap.f_apply_num like '%{}%'"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="t.f_apply_num like '%{}%'"
                        placeholder='报建编号'>
               </div>
               <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_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="ap.f_user_name like '%{}%'"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="t.f_user_name like '%{}%'"
                        placeholder='用户名称'>
               </div>
               <div class="form-group col-sm-2">
@@ -22,7 +22,7 @@
                 <v-select
                   v-model="model.f_apply_type"
                   placeholder='请选择'
-                  condition="ap.f_apply_type = '{}'"
+                  condition="t.f_apply_type = '{}'"
                   :value.sync="model.f_apply_type"
                   :options='$parent.$parent.applytype'
                   class="select select_list"
@@ -35,11 +35,11 @@
                 <v-select
                   v-model="model.defname"
                   placeholder='办理环节'
-                  condition="act.defname = '{}'"
                   :value.sync="model.defname"
-                  :options='$parent.$parent.defnames'
+                  :options='$parent.$parent.defnames1'
                   class="select select_list"
                   :value-single="true"
+                  @change="$parent.$parent.defnameChange()"
                   close-on-select ></v-select>
               </div>
               <div class="form-group col-sm-3 button-range">
@@ -69,7 +69,7 @@
                             :value.sync="model.sq_startDate"
                             :format="'yyyy-MM-dd 00:00:00'"
                             :show-reset-button="true"
-                            condition="ap.f_apply_date >= '{}'">
+                            condition="sq_sendtime >= '{}'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
@@ -80,7 +80,7 @@
                             :value.sync="model.sq_endDate"
                             :format="'yyyy-MM-dd 23:59:59'"
                             :show-reset-button="true"
-                            condition="ap.f_apply_date <= '{}'">
+                            condition="sq_sendtime<= '{}'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
@@ -91,7 +91,7 @@
                             :value.sync="model.wc_startDate"
                             :format="'yyyy-MM-dd 00:00:00'"
                             :show-reset-button="true"
-                            condition="ap.f_apply_finish_date >= '{}'">
+                            condition="sq_finishtime>= '{}'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
@@ -102,7 +102,7 @@
                             :value.sync="model.wc_endDate"
                             :format="'yyyy-MM-dd 23:59:59'"
                             :show-reset-button="true"
-                            condition="ap.f_apply_finish_date <= '{}'">
+                            condition="sq_finishtime<= '{}'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
@@ -113,7 +113,7 @@
                             :value.sync="model.hjks_startDate"
                             :format="'yyyy-MM-dd 00:00:00'"
                             :show-reset-button="true"
-                            condition="act.sendtime >= '{}'">
+              >
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
@@ -124,10 +124,10 @@
                             :value.sync="model.hjks_endDate"
                             :format="'yyyy-MM-dd 23:59:59'"
                             :show-reset-button="true"
-                            condition="act.sendtime <= '{}'">
+              >
                 </datepicker>
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-3" v-if="$parent.$parent.defnameShow">
                 <label for="startDate" class="font_normal_body">环节结束时间：</label>
                 <datepicker id="startDate" placeholder="开始日期"
                             style="width: 60%!important;"
@@ -135,10 +135,10 @@
                             :value.sync="model.hjjs_startDate"
                             :format="'yyyy-MM-dd 00:00:00'"
                             :show-reset-button="true"
-                            condition="act.finishtime >= '{}'">
+               >
                 </datepicker>
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-3" v-if="$parent.$parent.defnameShow">
                 <label for="endDate" class="font_normal_body">环节结束时间：</label>
                 <datepicker id="endDate" placeholder="结束日期"
                             style="width: 60%!important;"
@@ -146,9 +146,21 @@
                             :value.sync="model.hjjs_endDate"
                             :format="'yyyy-MM-dd 23:59:59'"
                             :show-reset-button="true"
-                            condition="act.finishtime <= '{}'">
+                >
                 </datepicker>
               </div>
+              <div class="form-group col-sm-2" v-if="$parent.$parent.typeShow">
+                <label class="font_normal_body">派工类型：</label>
+                <v-select
+                  v-model="model.f_dispatching_type"
+                  placeholder='工队/维修'
+                  condition="f_dispatching_type = '{}'"
+                  :value.sync="model.f_dispatching_type"
+                  :options='$parent.$parent.dispatching'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
             </div>
           </div>
         </criteria>
@@ -200,6 +212,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>
+           </tr>
           </template>
           <template partial='body'>
             <tr>
@@ -338,6 +352,9 @@
               <td style="text-align: center;">
                 <nobr><font>{{ row.gcck_finishtime  }}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.wg_sendtime  }}</font></nobr>
+              </td>
             </tr>
           </template>
         </data-grid>
@@ -361,8 +378,33 @@ export default {
         }
       }),
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-      defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')],
+      dispatching:  [{label: '全部', value: ''}, {label: '施工工队', value: '施工工队'}, {label: '安检维修中心', value: '安检维修中心'}],
+      defnames1: [{label: '全部', value: ''},
+        {label: '报装申请', value: 'sq_'},
+        {label: '报建受理', value: 'sl_'},
+        {label: '现场勘察', value: 'kc_'},
+        {label: '收费标准', value: 'bz_'},
+        {label: '报装缴费', value: 'jf_'},
+        {label: '合同签订', value: 'ht_'},
+        {label: '设计出图', value: 'ct_'},
+        {label: '工程派工', value: 'pg_'},
+        {label: '工程队派工', value: 'gdpg_'},
+        {label: '监理单位派工', value: 'jlpg_'},
+        {label: '工程施工', value: 'sg_'},
+        {label: '点火通气', value: 'tq_'},
+        {label: '核算费用', value: 'hs_'},
+        {label: '部长审核', value: 'bzsh_'},
+        {label: '经理审核', value: 'jlsh_'},
+        {label: '维修派单', value: 'wxpd_'},
+        {label: '安检维修施工', value: 'wxsg_'},
+        {label: '图纸变更', value: 'tzbg_'},
+        {label: '核对气量', value: 'hdql_'},
+        {label: '工程查看', value: 'gcck_'},
+        {label: '完工', value: 'wg_'}
+      ],
       criteriaShow: false,
+      defnameShow: true,
+      typeShow:false,
       getfield: {
         'f_apply_num': ' 报 建 编 号 ',
         'f_apply_type': ' 报 建 类 型 ',
@@ -407,7 +449,9 @@ export default {
         'hdql_sendtime':'核对气量',
         'hdql_finishtime':'核对气量完成时间',
         'gcck_sendtime':'工程查看',
-        'gcck_finishtime':'工程查看完成时间'
+        'gcck_finishtime':'工程查看完成时间',
+        'f_address':'地址',
+        'wg_sendtime':'完工时间'
       }
     }
   },
@@ -416,6 +460,46 @@ export default {
     this.search()
   },
   methods: {
+    searchCondition (args) {
+      if(!isEmpty(args.model.defname)){
+         //判断是否选了时间，没有则提示
+        if(args.model.defname=='wg_'){
+          if(isEmpty(args.model.hjks_startDate)){
+            this.$showMessage('请选择完工环节开始时间')
+            return
+          }
+        }else{
+          if(isEmpty(args.model.hjks_startDate)){
+            this.$showMessage('请选择环节开始时间')
+            return
+          }
+        }
+      }
+      if(!isEmpty(args.model.hjks_startDate)){
+        args.condition+= " AND " +`${args.model.defname}`+'sendtime'+'>='+`'${args.model.hjks_startDate}'`
+      }
+      if(!isEmpty(args.model.hjks_endDate)){
+        args.condition+= " AND " +`${args.model.defname}`+'sendtime'+'<='+`'${args.model.hjks_endDate}'`
+      }
+      if(!isEmpty(args.model.hjjs_startDate)){
+        args.condition+= " AND " +`${args.model.defname}`+'finishtime'+'>='+`'${args.model.hjjs_startDate}'`
+      }
+      if(!isEmpty(args.model.hjjs_endDate)){
+        args.condition+= " AND " +`${args.model.defname}`+'finishtime'+'<='+`'${args.model.hjjs_endDate}'`
+      }
+      this.model.search(args.condition, args.model)
+    },
+    defnameChange(){
+      debugger
+      //选择的是完工，则隐藏环节结束时间
+      if(this.$refs.cp.$refs.cri.model.defname=='wg_'){
+        this.typeShow=true
+       this.defnameShow=false
+      }else{
+        this.typeShow=false
+        this.defnameShow=true
+      }
+    },
     async applyTypeChange () {
       if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
         let res = await this.$resetpost('rs/logic/getDefnameByType',
@@ -439,8 +523,9 @@ export default {
   },
   computed: {
     getCondition () {
+
       return {
-        condition: this.$refs.cp.$refs.cri.condition,
+        condition: this.model.condition,
         data: {
           f_filiale: this.$login.f.f_fengongsi
         }

package/src/components/product/List/ShowDevices.vue

@@ -225,7 +225,7 @@ export default {
         'f_contract_number': ' 供用气合同编号 ',
         'f_contract_state': ' 合同状态 ',
         'f_due_money': ' 合同金额 ',
-        'f_charge_date': ' 收费日期 ',
+        'f_create_date': ' 合同创建日期 ',
         'f_apply_type': ' 报 建 类 型 ',
         'f_apply_nature': ' 报建性质 ',
         'f_install_count': ' 安装处数 ',

package/src/components/product/Process/ExplorationSelect.vue

@@ -9,7 +9,7 @@
               <label class="font_normal_body"><strong>工程编号：</strong></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 like '%{}%'">
+                     condition="u.f_apply_num like '%{}%'">
             </div>
             <div class="form-group col-sm-2">
               <label class="font_normal_body"><strong>客户名称：</strong></label>
@@ -370,7 +370,8 @@ export default {
         'defname': ' 办 理 环 节 ',
         'f_install_count': ' 安装户数 ',
         'f_designer_people':' 设计人员 ',
-        'f_construction_name':' 安 装 单 位 '
+        'f_construction_name':' 安 装 单 位 ',
+        'f_charge_date':'缴费时间'
       }
     }
   },
@@ -493,8 +494,9 @@ export default {
         source: 'this.getParentByType($organization$).getChildByName($设计人员$).getChildren()',
         userid: this.$login.f.id
       }
-
-      let res = await this.$resetpost(
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
         'rs/search',
         {data: data},
         {resolveMsg: null, rejectMsg: '设计人员人员查询失败！！！'}
@@ -537,37 +539,41 @@ export default {
     }
   },
   watch: {
-    'model.rows': {
-      handler: function () {
-        let isover = []           // 过期(超时)数据
-        let isbeforeover = []     // 未过期 提前提醒
-        for (let i = 0; i < this.model.rows.length; i++) {
-          let item = this.model.rows[i]
-          if (item.isover === '过期') {
-            isover.push(i + 1)
-          }
-          if (item.isbeforeover === '预期提醒') {
-            isbeforeover.push(i + 1)
-          }
-        }
-        let msg = null
-        if (isover.length > 0) {
-          msg = `第${isover.toString()}条数据已过期`
-          this.$showAlert(msg, 'warning', 3000)
-        }
-
-        if (isbeforeover.length > 0) {
-          msg = `第${isbeforeover.toString()}条数据即将过期`
-          if (isover.length > 0) {
-            setTimeout(() => {
-              this.$showAlert(msg, 'warning', 3000)
-            }, 4000)
-          } else {
-            this.$showAlert(msg, 'warning', 3000)
-          }
-        }
-      }
-    }
+    // 'model.rows': {
+    //   handler: function () {
+    //     let isover = []           // 过期(超时)数据
+    //     let isbeforeover = []     // 未过期 提前提醒
+    //     for (let i = 0; i < this.model.rows.length; i++) {
+    //       let item = this.model.rows[i]
+    //       if (item.isover === '过期') {
+    //         isover.push(i + 1)
+    //       }
+    //       if (item.isbeforeover === '预期提醒') {
+    //         isbeforeover.push(i + 1)
+    //       }
+    //     }
+    //     let msg1 = null
+    //     let msg = null
+    //     if (isover.length > 0) {
+    //       msg1 = `第${isover.toString()}条数据已过期`
+    //     }
+    //
+    //     if (isbeforeover.length > 0) {
+    //       msg = `第${isbeforeover.toString()}条数据即将过期`
+    //       this.$showAlert(msg, 'warning', 3000)
+    //       if (isover.length > 0) {
+    //         setTimeout(() => {
+    //           this.$showAlert(msg1, 'warning', 3000)
+    //         }, 2000)
+    //       } else {
+    //         if (isover.length > 0) {
+    //           this.$showAlert(msg1, 'warning', 3000)
+    //         }
+    //
+    //       }
+    //     }
+    //   }
+    // }
   },
   events: {
   }

package/src/components/product/Process/NewExplorationSelect.vue

@@ -538,37 +538,37 @@ export default {
     }
   },
   watch: {
-    'model.rows': {
-      handler: function () {
-        let isover = []           // 过期(超时)数据
-        let isbeforeover = []     // 未过期 提前提醒
-        for (let i = 0; i < this.model.rows.length; i++) {
-          let item = this.model.rows[i]
-          if (item.isover === '过期') {
-            isover.push(i + 1)
-          }
-          if (item.isbeforeover === '预期提醒') {
-            isbeforeover.push(i + 1)
-          }
-        }
-        let msg = null
-        if (isover.length > 0) {
-          msg = `第${isover.toString()}条数据已过期`
-          this.$showAlert(msg, 'warning', 3000)
-        }
-
-        if (isbeforeover.length > 0) {
-          msg = `第${isbeforeover.toString()}条数据即将过期`
-          if (isover.length > 0) {
-            setTimeout(() => {
-              this.$showAlert(msg, 'warning', 3000)
-            }, 4000)
-          } else {
-            this.$showAlert(msg, 'warning', 3000)
-          }
-        }
-      }
-    }
+    // 'model.rows': {
+    //   handler: function () {
+    //     let isover = []           // 过期(超时)数据
+    //     let isbeforeover = []     // 未过期 提前提醒
+    //     for (let i = 0; i < this.model.rows.length; i++) {
+    //       let item = this.model.rows[i]
+    //       if (item.isover === '过期') {
+    //         isover.push(i + 1)
+    //       }
+    //       if (item.isbeforeover === '预期提醒') {
+    //         isbeforeover.push(i + 1)
+    //       }
+    //     }
+    //     let msg = null
+    //     if (isover.length > 0) {
+    //       msg = `第${isover.toString()}条数据已过期`
+    //       this.$showAlert(msg, 'warning', 3000)
+    //     }
+    //
+    //     if (isbeforeover.length > 0) {
+    //       msg = `第${isbeforeover.toString()}条数据即将过期`
+    //       if (isover.length > 0) {
+    //         setTimeout(() => {
+    //           this.$showAlert(msg, 'warning', 3000)
+    //         }, 4000)
+    //       } else {
+    //         this.$showAlert(msg, 'warning', 3000)
+    //       }
+    //     }
+    //   }
+    // }
   },
   events: {
   }

package/src/components/product/Process/Processes/InstallationDetails.vue

@@ -1,5 +1,14 @@
 <template>
+  <div style="float: right">
+    <export-excel :data="getConditions"
+                  :field="getfields"
+                  sqlurl="rs/logic/applyExportfile"
+                  sql-name="getApplyUserinfo"
+                  template-name='用户信息导出'
+                  :choose-col="true"></export-excel>
+  </div>
   <div class="col-sm-12" style="margin: 20px 0px;">
+
     <criteria-paged :model="model" v-ref:cp>
       <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -12,6 +21,7 @@
             <th>客户编号</th>
             <th>客户名称</th>
             <th>客户电话</th>
+            <th>身份证号</th>
             <th>地址信息</th>
             <th>表号</th>
             <th>气表品牌</th>
@@ -52,6 +62,7 @@
               </template>
             </th>
           </tr>
+
         </template>
         <template partial='body'>
           <tr>
@@ -67,6 +78,9 @@
             <td style="text-align: center;">
               <nobr>{{row.f_user_phone}}</nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_idnumber}}</nobr>
+            </td>
             <td style="text-align: center;">
               <nobr>{{row.f_address}}{{row.f_address_detail}}</nobr>
             </td>
@@ -586,6 +600,16 @@ export default {
         'f_address': '     地址     ',
         'f_meternumber': '   表号  ',
         'f_aroundmeter': '  表向 '
+      },
+      getfields:{
+        'f_userinfo_id':'客户编号',
+        'f_user_name':'客户名称',
+        'f_user_phone':'客户电话',
+        'f_meter_brand':'气表品牌',
+        'f_meter_style':'气表型号',
+        'f_idnumber':'身份证号',
+        'f_address':'地址',
+        'f_meternumber':'表号'
       }
     }
   },
@@ -1023,9 +1047,18 @@ export default {
     }
   },
   computed: {
+    getConditions () {
+      return {
+        condition: `ui.f_process_id = '${this.selectdata.f_process_id}'`,
+        data: {
+          userid: this.$login.f.id,
+          f_filiale: this.$login.f.f_fengongsi
+        }
+      }
+    },
     showDeleteUserInfo () {
       return this.selectdata.f_apply_type === '民用报建' &&
-        (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察'||this.selectdata.defname === '收费标准')
+        (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察')
     },
     newShowDeleteUserInfo () {
       return this.selectdata.f_apply_type === '设备拆除' && this.selectdata.defname === '核对气量'