manage-client 3.3.113 → 3.3.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.113",
+  "version": "3.3.115",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/InspectListUser.vue

@@ -47,6 +47,7 @@
             <div class="span" style="float:right;">
               <button class="btn button_search" @click="search()">查询</button>
               <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
+              <button class="btn button_clear" @click="$parent.$parent.batchQuota()">批量限购</button>
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             :footer="$parent.$parent.footer"
@@ -165,13 +166,22 @@
               <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
                      condition="f_user_phone like '%{}%'" placeholder="客户电话">
             </div>
+            <div class="col-sm-2  form-group">
+              <label class="font_normal_body">是否安检</label>
+              <v-select :value.sync="model.f_ischeck"
+                        :options='$parent.$parent.ischecks'
+                        placeholder='请选择'
+                        v-model="model.f_ischeck"
+                        condition="f_ischeck = '{}'"
+                        close-on-select></v-select>
+            </div>
 
 
           </div>
 
         </div>
       </criteria>
-      <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
+      <data-grid :model="model" partial='list' class="list_area table_sy" :optional="true"  v-ref:grid>
         <template partial='head'>
           <tr>
             <th><nobr>序号</nobr></th>
@@ -199,6 +209,8 @@
             <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>累计未购气天数</nobr></th>
             <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>
             <th><nobr>组织机构</nobr></th>
+            <th><nobr>安检次数</nobr></th>
+            <th><nobr>最后安检时间</nobr></th>
           </tr>
         </template>
         <template partial='body'>
@@ -209,21 +221,23 @@
           <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
-          <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.delivery_date}}</nobr></th>
+          <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.delivery_date}}</nobr></td>
 
-          <th style="text-align: center;"><nobr>{{row.cishu}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.pregas}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
+          <td style="text-align: center;"><nobr>{{row.cishu}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.pregas}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.diffday}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_checknum}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_last_check_date}}</nobr></td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -239,7 +253,129 @@
       <div class="flex" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
-    </div></div>
+    </div>
+    <modal :show.sync="batchQuotaModalShow" v-ref:secureQuotaModalShow
+           backdrop="false" class="secureQuotaModalShow" @modal-close="batchQuotaModalClose">
+      <header slot="modal-header" class="modal-header" style="text-align: center">
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row">
+              <div class="col-sm-6 form-input-group" :class="[$v.third.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">第三方缴费</label>
+                <input type="text" v-show="false" v-model="$refs.third.selectedItems"
+                       v-validate:third='{required: true }'>
+                <v-select
+                  :value.sync="quotaData.f_third_pay"
+                  v-model="quotaData.f_third_pay"
+                  :options='thirdPays'
+                  :value-single="true"
+                  close-on-select v-ref:third></v-select>
+              </div>
+              <div class="col-sm-6 form-input-group" :class="[$v.style.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">限制类型</label>
+                <input type="text" v-show="false" v-model="$refs.style.selectedItems"
+                       v-validate:style='{required: true }'>
+                <v-select
+                  :value.sync="quotaData.f_limit_style"
+                  v-model="quotaData.f_limit_style"
+                  :options='limitstyle'
+                  :value-single="true"
+                  close-on-select v-ref:style></v-select>
+              </div>
+            </div>
+            <div class="row" style="margin-top:10px;" >
+              <div class="col-sm-6 form-input-group" :class="[$v.timetypes.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">周期类型</label>
+                <input type="text" v-show="false" v-model="$refs.timetypes.selectedItems"
+                       v-validate:timetypes='{required: true }'>
+                <v-select
+                  :value.sync="quotaData.f_time_type"
+                  v-model="quotaData.f_time_type"
+                  :options='timeTypes'
+                  :value-single="true"
+                  close-on-select v-ref:timetypes></v-select>
+              </div>
+              <div class="col-sm-6 form-input-group" :class="[$v.f_time_value.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">周期时长</label>
+                <input type="text" v-model="quotaData.f_time_value"
+                       placeholder="周期时长"
+                       style="vertical-align:middle"
+                       v-validate:f_time_value='{required: true }'>
+              </div>
+            </div>
+
+            <div class="row" style="margin-top:10px;" v-if="quotaData.f_limit_style !=='按总量'">
+              <div class="col-sm-6 form-input-group" :class="[$v.f_limit_times.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">限制次数</label>
+                <input type="text" style="width: 70%;display: inline-block" v-model="quotaData.f_limit_times" placeholder="限制次数" v-validate:f_limit_times='{required: true }'>
+              </div>
+              <div class="col-sm-6 form-input-group" v-if="quotaData.f_limit_type ==='气量'" :class="[$v.f_limit_value.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">单次限购</label>
+                <input type="text" v-model="quotaData.f_limit_value" placeholder="单次限购" v-validate:f_limit_value='{required: true }'>
+              </div>
+              <div class="col-sm-6 form-input-group" v-if="quotaData.f_limit_type ==='金额'" :class="[$v.f_limit_amount.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">单次限购</label>
+                <input type="text" v-model="quotaData.f_limit_amount" placeholder="单次限购" v-validate:f_limit_amount='{required: true }'>
+              </div>
+            </div>
+            <div class="row" style="margin-top:10px;" v-if="quotaData.f_limit_style ==='按总量'">
+              <div class="col-sm-6 form-input-group" v-if="quotaData.f_limit_type ==='气量'"  :class="[$v.f_limit_value.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">总限购量</label>
+                <input type="text" v-model="quotaData.f_limit_value" placeholder="单次限购" v-validate:f_limit_value='{required: true }'>
+              </div>
+              <div class="col-sm-6 form-input-group" v-if="quotaData.f_limit_type ==='金额'" :class="[$v.f_limit_amount.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">总限购量</label>
+                <input type="text" v-model="quotaData.f_limit_amount" placeholder="单次限购" v-validate:f_limit_amount='{required: true }'>
+              </div>
+            </div>
+            <div class="row" style="margin-top:10px;">
+              <div class="col-sm-6 form-input-group" :class="[$v.limittype.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3">支付限制</label>
+                <input type="text" v-show="false" v-model="$refs.limittype.selectedItems"
+                       v-validate:limittype='{required: true }'>
+                <v-select
+                  :value.sync="quotaData.f_limit_type"
+                  v-model="quotaData.f_limit_type"
+                  :options='limitTypes'
+                  :value-single="true"
+                  close-on-select v-ref:limittype></v-select>
+              </div>
+              <div class="col-sm-6 form-input-group">
+                <label class="font_normal_body col-sm-3">执行时间</label>
+                <datepicker placeholder="执行时间"
+                            v-model="quotaData.f_start_date"
+                            :value.sync="quotaData.f_start_date"
+                            :format="'yyyy-MM-dd'">
+                </datepicker>
+              </div>
+              <div class="row auto">
+                <div class="col-sm-12 form-group form-input-group" :class="[$v.f_operate_reason.required ? 'has-error' : '']">
+                  <label class="control-label">限购原因</label>
+                  <div class="col-sm-4">
+                    <textarea class="form-control col-sm-4"
+                              v-model="quotaData.f_operate_reason"
+                              v-validate:f_operate_reason='{required: true }'
+                              placeholder="限购原因">
+                    </textarea>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" :disabled="!$v.valid"
+                  @click='batchQuotaConfirm'>确定
+          </button>
+          <button type="button" class="btn btn-default" @click='batchQuotaModalClose'>取消</button>
+        </div>
+      </footer>
+    </modal>
+  </div>
 </template>
 <script>
   /**
@@ -273,7 +409,7 @@
           "f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址","f_createfile_date":"建档日期","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
-          "diffday":"未购气总天数"},
+          "diffday":"未购气总天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"},
         model: new PagedList('rs/sql/inspectList', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0}),
         rows: null,
         //orgid:'',
@@ -284,6 +420,26 @@
         config: {
           defaultPrint: ['f_userinfo_code','f_user_id']
         },
+        thirdPays: [{label: '支持', value: '1'},{label: '不支持', value: '0'}],
+        timeTypes: [{label: '按月', value: '按月'},{label: '按日', value: '按日'}],
+        limitTypes: [{label: '气量', value: '气量'},{label: '金额', value: '金额'}],
+        limitstyle: [{label: '按次数', value: '按次数'},{label: '按总量', value: '按总量'}],
+        batchRowList: [],
+        quotaData: {
+          f_third_pay: '0',
+          f_time_type: '按月',
+          f_limit_times: '',
+          f_time_value: '',
+          f_limit_type: '气量',
+          f_limit_style:'',
+          f_limit_value: 0,
+          f_limit_amount: 0,
+          f_start_date: this.$login.toStandardDateString(),
+          f_operate_reason: '',
+          f_limit_source: '营收批量限购'
+        },
+        ischecks: [{label: '全部', value: ''},{label: '已安检', value: '已安检'},{label: '未安检', value: '未安检'}],
+        batchQuotaModalShow: false,
         defaultfield: [],
       }
     },
@@ -297,7 +453,7 @@
             "f_createfile_date":"建档日期","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
-            "diffday":"累计未购气天数"}
+            "diffday":"累计未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
         }else if (val === '机表') {
           this.model.url = this.url = 'rs/sql/handinspectList'
           this.sqlName = 'handinspectList'
@@ -306,7 +462,7 @@
             "f_createfile_date":"建档日期","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
-            "diffday":"累计未抄表天数"}
+            "diffday":"累计未抄表天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
         } else if (val === '物联网表') {
           this.model.url = this.url = 'rs/sql/getWebMeterList'
           this.sqlName = 'getWebMeterList'
@@ -315,7 +471,7 @@
             "f_createfile_date":"建档日期", "f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购金额",
-            "diffday":"累计未购气天数"}
+            "diffday":"累计未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
         }
         this.clear()
         this.model.rows = []
@@ -340,6 +496,56 @@
       })
     },
     methods: {
+      batchQuotaConfirm () {
+        let selectRow =  this.$refs.paged.$refs.grid.getRowData()
+        let selectRowLen = selectRow.length
+        let msg = {
+          resolveMsg: `您已成功限购${selectRowLen}位用户！`,
+          rejectMsg: '批量作废限购失败！'
+        }
+        this.batchRowList = []
+        selectRow.forEach(row => {
+          this.batchRowList.push({"f_userinfo_id": row.f_userinfo_id, "f_priceid": row.f_priceid})
+        })
+        this.$showMessage(`您确定要将您你选中的${selectRowLen}位用户进行批量限购吗?`, ['confirm', 'cancel']).then(async (res) => {
+          if (res === 'confirm') {
+            console.log('所选中的用户:=======' + JSON.stringify(this.batchRowList))
+            let data = {
+              limitUserList: this.batchRowList,
+              f_operate_people: this.$login.f.name,
+              f_operate_peopleid: this.$login.f.id,
+              model: this.quotaData,
+              f_operate_type: '0'
+            }
+            await this.$resetpost('rs/logic/sale_operateQuotaRecord', {data: data}, msg)
+            this.batchQuotaModalClose()
+            this.search()
+          }
+        })
+      },
+      batchQuotaModalClose () {
+        this.quotaData = {
+          f_third_pay: '0',
+          f_time_type: '按月',
+          f_limit_times: '',
+          f_time_value: '',
+          f_limit_type: '气量',
+          f_limit_style:'',
+          f_limit_value: 0,
+          f_limit_amount: 0,
+          f_start_date: this.$login.toStandardDateString(),
+          f_operate_reason: '',
+          f_limit_source: '营收批量限购'
+        }
+        this.batchQuotaModalShow = false
+      },
+      batchQuota(){
+        if(this.$refs.paged.$refs.grid.getRowData().length === 0){
+          this.$showAlert('请至少选择一项！', 'warning', 2000)
+          return
+        }
+        this.batchQuotaModalShow = true
+      },
         getotherfooter(){
           // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
           // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];

package/src/components/sale/config/exportConfig.js

@@ -1185,6 +1185,22 @@ export default{
 
     'f_comments': '备注'
 
+  },
+  quotaQueryConfig: {
+    'f_userinfo_code': '用户编号',
+    'f_user_name': '用户名称',
+    'f_user_phone': '用户电话',
+    'f_address': '用户地址',
+    'f_operate_people': '操作人员',
+    'f_limit_source': '限购来源',
+    'f_operate_date': '限购时间',
+    'f_limit_type': '限购类型',
+    'f_time_type': '周期类型',
+    'f_time_value': '周期时长',
+    'f_limit_times': '限购次数',
+    'f_limit_value': '单次限购量',
+    'f_start_date': '执行时间',
+    'f_operate_reason': '限购原因'
   }
 }