sale-client 3.6.313 → 3.6.315

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.313",
+  "version": "3.6.315",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/base/UserList.vue

@@ -165,6 +165,9 @@
                   <li v-if="row.f_meter_type === '物联网表' && $parent.$parent.$parent.jurisdiction.includes('补费扣费')">
                     <a href="#" @click.stop="$parent.$parent.$parent.operate('补费扣费', 'deduction-manage', row)">补费扣费</a>
                   </li>
+                  <li v-if="$parent.$parent.$parent.jurisdiction.includes('限购配置')">
+                    <a href="#" @click.stop="$parent.$parent.$parent.operate('限购配置', 'limit-gas-manage', row)">限购配置</a>
+                  </li>
                 </ul>
               </dropdown>
             </td>

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterListMaintain.vue

@@ -6,43 +6,104 @@
           <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch"
                     v-show="$parent.searchshow">
             <div novalidate class="form-inline auto" partial>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">组织机构</label>
-                <res-select :initresid='$parent.$parent.curorgid'
-                            @res-select="$parent.$parent.getorg"
-                            class="select select_list"
-                            restype='organization'
-                            style="width: 60%">
-                </res-select>
+<!--              <div class="col-sm-2 form-group">-->
+<!--                <label class="font_normal_body">组织机构</label>-->
+<!--                <res-select :initresid='$parent.$parent.curorgid'-->
+<!--                            @res-select="$parent.$parent.getorg"-->
+<!--                            class="select select_list"-->
+<!--                            restype='organization'-->
+<!--                            style="width: 60%">-->
+<!--                </res-select>-->
+<!--              </div>-->
+              <div class="row">
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}'" placeholder='客户编号'>
+                </div>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search" @click="search()">查 询</button>
+                  <export-excel v-if="$parent.$parent.excelTable"
+                                class="auto"
+                                :data="{condition: $parent.$parent.condition,orderitem: $parent.$parent.orderitem}"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/saleExport" progress="saleGetExportProgress"  sql-name="changemeterFiles"
+                                template-name='换表记录'
+                                :choose-col="true"></export-excel>
+                  <div
+                    :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                    @click="$parent.$parent.hidden()"
+                    class="button_spacing"
+                    style="float: right"></div>
+                </div>
               </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户编号</label>
-                <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
-                       condition="f_userinfo_code = '{}'" placeholder='客户编号'>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户姓名</label>
-                <input type="text" class="input_search"  style="width: 60%" v-model="model.f_user_name"
-                       condition="f_user_name = '{}'" placeholder='客户姓名'>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">有无附件</label>
-                <v-select :disabled=false
-                          :options='$parent.$parent.pj'
-                          :value-single="true"
-                          :value.sync="model.is_has_file"
-                          close-on-select
-                          placeholder='请选择'
-                          v-model="model.is_has_file"
-                          condition="is_has_file = '{}'"
-                          search=fasle
-                >
-                </v-select>
-              </div>
-              <div class="span" style="float:right;">
-                <button class="button_search" @click="search()">查 询</button>
+              <div class="row" v-if="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">客户姓名</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_user_name"
+                         condition="f_user_name = '{}'" placeholder='客户姓名'>
+                </div>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">有无附件</label>
+                  <v-select :disabled=false
+                            :options='$parent.$parent.pj'
+                            :value-single="true"
+                            :value.sync="model.is_has_file"
+                            close-on-select
+                            placeholder='请选择'
+                            v-model="model.is_has_file"
+                            condition="is_has_file = '{}'"
+                            search=fasle
+                  >
+                  </v-select>
+                </div>
+<!--                <div-->
+<!--                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"-->
+<!--                  class="form-group">-->
+<!--                  <label class="font_normal_body">换表编号</label>-->
+<!--                  <input type="text" class="input_search"  style="width: 60%" v-model="model.id"-->
+<!--                         condition="id = '{}'" placeholder='用户编号'>-->
+<!--                </div>-->
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select id="f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            placeholder='气表品牌'
+                            :value.sync="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrand'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select style="width: 60%"></v-select>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期" v-model="model.startDate" :value.sync="model.startDate" style="width:60%"
+                              :format="'yyyy-MM-dd 00:00:00'" condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
+                              :format="'yyyy-MM-dd 23:59:59'" condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
               </div>
             </div>
+
           </criteria>
           <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
             <template partial='head'>
@@ -177,7 +238,9 @@
 <script>
   import {PagedList} from 'vue-client'
 const myMap = new Map()
-
+  let asyncReadyGen = async function (self) {
+    await self.initQueryParam()
+  }
   export default {
     'title': '',
     data () {
@@ -187,12 +250,43 @@ const myMap = new Map()
         // 控制查询条件显示
         searchshow: true,
         curorgid: [this.$login.f.orgid],
+        criteriaShow: false,
         f_orgid: '',
+        condition: '',
         // 排序
         orderitem: 'f_operate_date desc',
         orderFields: {
           f_operate_date: 'no'
         },
+        // 控制样式
+        editList: false,
+        excelTable: true,
+        getfield: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户名称',
+          'f_address': '客户地址',
+          'f_type': '换表类型',
+          'f_changemeter_fee': '换表费',
+          'f_meternumber_old': '旧表号',
+          'f_meternumber': '新表号',
+          'f_meter_brand_old': '旧气表品牌',
+          'f_meter_brand': '新气表品牌',
+          'f_remanent_gas': '旧表剩余补气量',
+          'f_remanent_money': '旧表剩余金额',
+          'f_comments': '备注',
+          'f_change_operator': '换表人',
+          'f_state': '状态',
+          'f_operate_date': '换表日期',
+          'f_operator': '人员',
+          'f_depname': '所属部门',
+          'f_orgname': '所属公司'
+        },
+        meterbrand: [],
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
         whetherPay: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
         da: {
           rows: []
@@ -201,6 +295,7 @@ const myMap = new Map()
       }
     },
     ready () {
+      asyncReadyGen(this)
       this.search()
       // this.getwarehouse()
     },
@@ -210,6 +305,22 @@ const myMap = new Map()
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeid = val[0]
       },
+      async getRes (condition, obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+
+      },
+      initQueryParam () {
+        let arr = []
+        this.$GetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          arr.push(temp)
+        })
+        this.meterbrand = [{label: '全部', value: ''}, ...arr]
+      },
       view (row) {
         this.$parent.showupload = true
         this.$parent.row = row
@@ -231,7 +342,9 @@ const myMap = new Map()
       async getwarehouse () {
 
       },
-
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
       join1 (row) {
         this.joinrow = row
         this.joinshow = true
@@ -273,10 +386,13 @@ const myMap = new Map()
           this.getorg([this.$login.f.orgid])
         }
         console.log('查询。。。', this.f_orgid)
-        if (this.f_orgid) {
-          args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
         }
         this.model.search(args.condition, args.model)
+        this.condition = args.condition
       },
       mergeRowData (joinrows) {
 

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterOperate.vue

@@ -104,8 +104,18 @@
 
         <!--        </div>-->
 
-
-
+        <div class="row">
+          <div class="col-sm-8">
+            <label class="font_normal_body">换表原因</label>
+            <input type="text" v-model="model.f_comments"  style="width: 80%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-8">
+            <label class="font_normal_body">其他备注</label>
+            <input type="text" v-model="model.f_othereason"  style="width: 80%" class="input_search">
+          </div>
+        </div>
       </form>
       <div style="float: right">
         <button class="button_search" @click="save">保存</button>
@@ -195,7 +205,7 @@
           if(res.data.length>0){
             this.model.f_operator = res.data[0].name
           }else{
-            this.model.f_operatorid=''
+            this.model.f_operatorid = ''
             this.$showAlert('操作员信息未找到','warning',2000)
           }
           console.log('this.f_operatorid', this.model.f_operator)
@@ -224,29 +234,20 @@
               modifitime: Util.toStandardTimeString(),
               operator: this.$login.f.name,
               changemeter_id: this.model.id,
-              f_operator : this.$login.f.name,
-              f_operatorid : this.$login.f.id,
-              f_orgid : this.$login.f.orgid,
-              f_orgname : this.$login.f.orgs,
-              f_depid : this.$login.f.depids,
-              f_depname : this.$login.f.deps
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_orgid: this.$login.f.orgid,
+              f_orgname: this.$login.f.orgs,
+              f_depid: this.$login.f.depids,
+              f_depname: this.$login.f.deps
             }
             this.recordList.push(car)
             // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
             console.log(car)
           }
         }
-
         await this.$resetpost('rs/logic/saveChangeMeterRecord', {data: {recordlist: this.recordList, newData: this.model}})
-        // if(this.model.f_operat_type==='换表'||this.model.f_operat_type==='换表撤销'){
-        //   await this.$resetpost('rs/entity/t_changemeter', this.model, {
-        //     resolveMsg: '修改成功',
-        //     rejectMsg: '未通过，修改出错!!!'
-        //   })
-        //   await this.$resetpost('rs/entity/t_changetables', this.model, {
-        //     resolveMsg: '修改成功',
-        //     rejectMsg: '未通过，修改出错!!!'
-        //   })
+        await this.$resetpost('rs/entity/t_changetables', this.model, {resolveMsg: '修改成功', rejectMsg: '未通过，修改出错!!!'})
         console.log('this.model', this.model)
         this.$dispatch('close')
       }

package/src/components/revenue/comprehen/StairPrice/GasPriceUser.vue

@@ -26,7 +26,7 @@
               <export-excel
                 :data="{condition: $parent.$parent.condition}"
                 :field="$parent.$parent.getfield"
-                sqlurl="rs/logic/exportfile" sql-name="salegetGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"
+                sqlurl="rs/logic/saleExport" sql-name="getGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"
                 :choose-col="true"></export-excel>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_top': $parent.$parent.criteriaShow2,'button_shrink_bottom': !$parent.$parent.criteriaShow2}"

package/src/filiale/bayan/ChargeOper.vue

@@ -177,6 +177,14 @@ let getBtnsGen = async function (self) {
       }
     })
   }
+  // 添加“限制购气”按钮
+  self.operBtns.push({
+    name: '限制购气',
+    value: {
+      'weight': 0,
+      'routeName': 'limit-gas-manage'
+    }
+  })
 }
 
 export default {