npm - sale-client - Versions diffs - 3.5.148 → 3.5.150 - Mend

sale-client 3.5.148 → 3.5.150

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

package/package.json CHANGED Viewed

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

package/src/components/FilesManage/MeterinfoTest.vue CHANGED Viewed

@@ -113,6 +113,10 @@
             <v-select :value.sync="row.f_concentrator_id" :options='concentrators' value-single placeholder='集中器' close-on-select v-else
                       search v-model='row.f_concentrator_id' :disabled="false"></v-select>
           </div>
+          <div class="col-sm-4 form-group" v-if="(row.gasbrand.length > 0 && ((row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是') || (row.f_meter_classify.includes('卡表'))) && row.f_user_id )">
+            <label class="font_normal_body">&ensp;卡&emsp;&emsp;号</label>
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_card_id" placeholder='卡号' @blur="checkCardId" :disabled="!jurisdiction.includes('卡号修改')">
+          </div>
         </div>
         <div>
           <a style="font-size: 16px;font-weight: 500;">气价信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
@@ -539,6 +543,8 @@
         show: false,
         field: '',
         ratioshow: false,
+        // 原本的卡号
+        orginCardId: '',
         userfileid: '',
         gasid: '',
         gastype: 'userfiles',
@@ -571,6 +577,7 @@
     async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
       this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
+      this.orginCardId = this.row.f_card_id
       if(this.row.f_meter_classify){
         if(this.row.f_meter_classify==='物联网表'){
           this.isiot=true
@@ -588,6 +595,21 @@
       co(meterBookGen(this))
     },
     methods: {
+      checkCardId() {
+        this.$resetpost('rs/logic/checkCardId', {
+          data: {
+            f_userfiles_id: this.row.f_userfiles_id,
+            gasbrandId: this.row.f_gasbrand_id,
+            cardId: this.row.f_card_id,
+            f_orgid: this.row.f_orgid
+          }
+        }, {resolveMsg: null, rejectMsg: '获取表号出错'}).then(res => {
+          if(res.data.code !== '200') {
+            this.row.f_card_id = this.orginCardId
+            this.$showAlert(res.data.msg,'warning',1500)
+          }
+        })
+      },
       gasDateChange () {
         if (!this.row.f_scrap_date && this.row.f_gas_date) {
           if (this.row.f_use_limit) {

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue CHANGED Viewed

@@ -652,7 +652,7 @@ export default {
             f_depid: this.$login.f.depids,
             f_depname: this.$login.f.deps,
             f_perform_date: this.newinfo.f_perform_date,
-            f_change_reason: ''
+            f_change_reason: '换表调价'
           }
           await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新气价成功', rejectMsg: '更新气价失败'})

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue CHANGED Viewed

@@ -656,7 +656,7 @@ export default {
             f_depid: this.$login.f.depids,
             f_depname: this.$login.f.deps,
             f_perform_date: this.newinfo.f_perform_date,
-            f_change_reason: ''
+            f_change_reason: '换表调价'
           }
           await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新气价成功', rejectMsg: '更新气价失败'})

package/src/components/revenue/comprehen/StairPrice/GasPrice.vue CHANGED Viewed

@@ -57,8 +57,8 @@
           <div :class="[$v.f_stairmonths.required || $v.f_stairmonths.dctest ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
             <label class="font_normal_body" for="f_stairmonths">阶段月数</label>
             <input :disabled='isEdit' class="input_search" style="width:60%" type="number"
-                   v-model="model.f_stairmonths" v-validate:f_stairmonths='{required: true, dctest: [ 12, "<=" ] }'>
-            <span class="help-block" v-if="$v.f_stairmonths.dctest">阶段月数不能大于12</span>
+                   v-model="model.f_stairmonths" v-validate:f_stairmonths='{required: true}'>
+<!--            <span class="help-block" v-if="$v.f_stairmonths.dctest">阶段月数不能大于36</span>-->
           </div>
           <div  :class="[$v.f_stair_start_date.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group" v-if="stairStartShow">
             <input class="input_search" style="width:60%" type="text" v-model="model.f_stair_start_date" v-show="false"

package/src/components/revenue/third/transferAudit.vue CHANGED Viewed

@@ -3,7 +3,7 @@
     <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
       <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
         <div class="row">
-          <div class="col-sm-2 form-group">
+          <div class="col-sm-3 form-group">
             <label class="font_normal_body">用户编号</label>
             <input type="text" class="input_search"
                    style="width:60%"
@@ -11,8 +11,8 @@
                    condition="f_userinfo_code = '{}'"
                    placeholder="用户编号"/>
           </div>
-          <div class="col-sm-2 form-group">
-            <label class="font_normal_body">用户姓名</label>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body">旧用户姓名</label>
             <input type="text" class="input_search"
                    style="width:60%"
                    v-model="model.f_user_name"
@@ -21,15 +21,15 @@
           </div>
           <div class="col-sm-2 form-group">
             <label class="font_normal_body">处理状态</label>
-            <v-select v-model="model.f_orderstate" style="width:60%"
+            <v-select v-model="model.f_order_state" style="width:60%"
                       placeholder='处理状态'
-                      :value.sync="model.f_orderstate"
+                      :value.sync="model.f_order_state"
                       :options='$parent.$parent.getState'
                       :value-single="true"
                       close-on-select value-single>
             </v-select>
           </div>
-          <div class="span col-sm-2 form-group button-range" style="float: right">
+          <div class="span col-sm-3 form-group button-range" style="float: right">
             <button class="button_search button_spacing" @click="search()" v-el:cx>查询</button>
             <button class="button_clear button_spacing" @click="clear">清空</button>
             <div style="float: right" class="button_spacing"
@@ -37,35 +37,34 @@
                  @click="criteriaShow = !criteriaShow"></div>
           </div>
           <div class="row" v-show="criteriaShow">
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">联系电话</label>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">旧联系电话</label>
               <input type="text" class="input_search"
                      style="width:60%"
-                     v-model="model.f_phone"
-                     condition="f_phone = '{}'"
+                     v-model="model.f_user_phone"
+                     condition="f_user_phone = '{}'"
                      placeholder="联系电话"/>
             </div>
-            <div class="col-sm-2 form-group">
+            <div class="col-sm-4 form-group">
               <label class="font_normal_body">起始时间</label>
-              <datepicker placeholder='预约时间' style="width:60%"
+              <datepicker placeholder='预约时间'
                           v-model="model.f_orderdate_start"
                           :value.sync="model.f_orderdate_start"
-                          :format="'yyyy-MM-dd'"
+                          :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
-                          condition="f_orderdate >= '{} 00:00:00'">
+                          condition="f_order_date >= '{}'">
               </datepicker>
             </div>
-            <div class="col-sm-2 form-group">
+            <div class="col-sm-4 form-group">
               <label class="font_normal_body">结束时间</label>
-              <datepicker placeholder='结束时间' style="width:60%"
+              <datepicker placeholder='预约时间'
                           v-model="model.f_orderdate_end"
                           :value.sync="model.f_orderdate_end"
-                          :format="'yyyy-MM-dd'"
+                          :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
-                          condition="f_orderdate <= '{} 00:00:00'">
+                          condition="f_order_date <= '{}'">
               </datepicker>
             </div>
-            s
           </div>
         </div>
       </div>
@@ -77,13 +76,22 @@
             <nobr>用户编号</nobr>
           </th>
           <th>
-            <nobr>用户姓名</nobr>
+            <nobr>旧用户姓名</nobr>
+          </th>
+          <th>
+            <nobr>旧联系电话</nobr>
+          </th>
+          <th>
+            <nobr>旧身份证号</nobr>
+          </th>
+          <th>
+            <nobr>新用户姓名</nobr>
           </th>
           <th>
-            <nobr>联系电话</nobr>
+            <nobr>新联系电话</nobr>
           </th>
           <th>
-            <nobr>详细地址</nobr>
+            <nobr>新身份证号</nobr>
           </th>
           <th>
             <nobr>备注信息</nobr>
@@ -109,13 +117,18 @@
         <tr>
           <td style="text-align:center">{{ row.f_userinfo_code }}</td>
           <td style="text-align:center">{{ row.f_user_name }}</td>
-          <td style="text-align:center">{{ row.f_phone ? row.f_phone : f_user_phone }}</td>
-          <td style="text-align:center">{{ row.f_address }}</td>
-          <td style="text-align:center">{{ row.f_orderremark }}</td>
-          <td style="text-align:center">{{ row.f_ordertype }}</td>
-          <td style="text-align:center">{{ row.f_orderdate }}</td>
-          <td style="text-align:center">{{ row.f_orderstate ? row.f_orderstate : '待处理' }}</td>
-          <td style="text-align:center">{{ row.f_disposedate }}</td>
+          <td style="text-align:center">{{ row.f_user_phone}}</td>
+          <td style="text-align:center">{{ row.f_idnumber }}</td>
+          <td style="text-align:center">{{ row.f_newuser_name }}</td>
+          <td style="text-align:center">{{ row.f_newuser_phone}}</td>
+          <td style="text-align:center">{{ row.f_newidnumber }}</td>
+          <td style="text-align:center">{{ row.f_comments }}</td>
+          <td style="text-align:center">{{ row.f_operate_type }}</td>
+          <td style="text-align:center">{{ row.f_order_date }}</td>
+          <td style="text-align:center">{{ row.f_order_state ? row.f_order_state : '待处理' }}</td>
+          <td style="text-align:center">{{ row.f_operate_date }}</td>
           <td style="text-align:center">{{ row.f_dispose_operator }}</td>
         </tr>
       </template>
@@ -132,11 +145,11 @@ import {PagedList} from 'vue-client'
 export default {
   data () {
     return {
-      model: new PagedList('/rs/sql/getorderRepair', 20,
+      model: new PagedList('rs/sql/singleTable_OrderBy', 20,
         {
-          tablename: '`t_order_transfer`',
-          items: '`f_userChange_name,f_userChange_idnumber,f_userChange_phone,f_imgList,f_newImgList`',
-          orderitem: '`f_orderdate`'
+          tablename: '"t_transfer_midorder"',
+          items: '"*"',
+          orderitem: '"f_order_date desc"'
         }),
       criteriaShow: false
     }
@@ -155,24 +168,24 @@ export default {
       this.$refs.paged.$refs.criteria.search()
     },
     selfSearch (args) {
-      if (this.$refs.paged.$refs.criteria.model.f_orderstate) {
-        if (this.$refs.paged.$refs.criteria.model.f_orderstate === '待处理') {
-          args.condition += ' and f_orderstate is null '
+      if (this.$refs.paged.$refs.criteria.model.f_order_state) {
+        if (this.$refs.paged.$refs.criteria.model.f_order_state === '待处理') {
+          args.condition += ` and f_order_state = '待处理 '`
         }
-        if (this.$refs.paged.$refs.criteria.model.f_orderstate === '预约成功') {
-          args.condition += ` and   f_orderstate = '预约成功' `
+        if (this.$refs.paged.$refs.criteria.model.f_order_state === '预约成功') {
+          args.condition += ` and   f_order_state = '预约成功' `
         }
-        if (this.$refs.paged.$refs.criteria.model.f_orderstate === '预约失败') {
-          args.condition += ` and   f_orderstate = '预约失败' `
+        if (this.$refs.paged.$refs.criteria.model.f_order_state === '预约失败') {
+          args.condition += ` and   f_order_state = '预约失败' `
         }
       }
-      args.condition = `${args.condition} and f_ordertype='预约过户' and f_orgstr in ${this.f_orgid}`
+      args.condition = `${args.condition} and f_operate_type='预约过户' and f_state = '有效' and f_orgid in ('${this.$login.f.orgid}')`
       this.model.search(args.condition, args.model)
     }
   },
   computed: {
     getState () {
-      return [{label: '全部', value: ''}, {label: '待处理', value: '待处理'}, {
+      return [{label: '全部', value: ''}, {label: '待处理', value: ''}, {
         label: '预约成功',
         value: '预约成功'
       }, {label: '预约失败', value: '预约失败'}]

package/src/components/revenue/third/transferAuditCenter.vue ADDED Viewed

@@ -0,0 +1,102 @@
+<template>
+  <div id="unit" class="flex-row" style="width: 100%">
+    <div class="flex binary-left" style="flex: 1; width:60%">
+      <transfer-audit v-ref:list @select-changed="selected"></transfer-audit>
+    </div>
+    <div class="flex binary-left" style="width:40%">
+      <transfer-audit-dispose-basics
+        :row="row"
+        :img-info="imgInfo"
+        :user-info="userInfo"
+        :title="title">
+      </transfer-audit-dispose-basics>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    title: '第三方过户预约审核',
+    data () {
+      return {
+        row: {},
+        title: '',
+        imgInfo: [],
+        userInfo: []
+      }
+    },
+    ready () {
+    },
+    methods: {
+      async selected(data) {
+        console.log("data?", data)
+        this.userInfo = []
+        this.imgInfo = []
+        this.title = data.val.f_operate_type + '处理'
+        this.row = data.val
+        // 普通预约信息字段
+        this.userInfo.push({
+          key: data.val.f_describe,
+          value: data.val
+        })
+        let ywh = data.val.f_serial_number
+        //todo 根据业务号获取影像资料列表
+        let res = await this.$resetget(`datums/contentPageList?ywh=${ywh}`, {resolveMsg: null, rejectMsg: '获取数据错误！'})
+        let now = new Date().getTime()+""
+        let param = {ywh: ywh, ids: [], timestamp: now}
+        let imgList = []
+        let img = {}
+        console.log("res.data",res.data.data)
+        if (res.data.data.length) {
+          for (let item of res.data.data) {
+            img = item
+            console.log("图片名",img.name)
+            if (img.name.indexOf("买方身份证（买方提供）") !== -1 || img.name.indexOf("网签备案合同") !== -1){
+              imgList.push(
+                {
+                  name:img.name,
+                  id:img.uid,
+                  fileType:img.fileType
+                }
+              )
+              param.ids.push(img.uid)
+            }
+          }
+        }
+        console.log("param.ids",param.ids)
+        if (param.ids.length) {
+         await this.$resetpost('rs/content/getContent', param, {resolveMsg: null, rejectMsg: '获取数据错误'}).then((res) => {
+            if (res.data.data.length) {
+              // 分别出图片字段和普通预约信息字段
+              for (let item of res.data.data) {
+                console.log("item",item)
+                for (let img of imgList){
+                  if (item.id===img.id){
+                    this.imgInfo.push({
+                      key: img.name + img.id,
+                      value: 'data:image/'+`${img.fileType}`+';base64,'+item.pageContent
+                    })
+                  }
+                }
+              }
+            }
+          })
+        }
+      },
+      init () {
+        this.row = {},
+        this.title = '',
+        this.imgInfo= [],
+        this.userInfo= []
+      }
+    },
+    events: {
+      'refresh' () {
+        this.$refs.list.$refs.paged.$refs.criteria.search()
+        this.init()
+      }
+    }
+  }
+</script>
+<style>
+</style>

package/src/components/revenue/third/transferAuditDisposeBasics.vue ADDED Viewed

@@ -0,0 +1,209 @@
+<template>
+  <div class="auto" id="orderApplyDispose">
+    <validator name='v'>
+      <form novalidate class="form-horizontal select-overspread">
+        <ul class="nav nav-tabs">
+          <li class="active"><a style="font-size: 16px" href="#">{{title}}</a></li>
+        </ul>
+        <div class="outbox">
+          <!--图片信息-->
+          <div class="auto" v-if="imgInfo.length">
+            <div class="form-group" v-for="row in imgInfo">
+              <label class="col-sm-3 control-label">{{row.key}}</label>
+              <div class="col-sm-9">
+                <img :src="row.value" v-if="row.value"  width="70%"/>
+              </div>
+            </div>
+          </div>
+          <!--展示信息-->
+          <div class="auto" v-if="userInfo.length">
+            <div class="form-group" v-for="row in userInfo">
+              <ul class="nav nav-tabs">
+                <li class="active a-tabs"><a href="#">{{row.key}}</a></li>
+              </ul>
+              <div>
+                <div class="row">
+                  <div class="col-sm-6 form-group">
+                    <label for="f_userinfo_code" class="font_normal_body">用户编号</label>
+                    <input class="input_search" style="width:60%" type="text"
+                           v-model="row.value.f_userinfo_code" readonly
+                           placeholder="用户编号">
+                  </div>
+                  <div class="col-sm-6 form-group" >
+                    <label for="f_user_name" class="font_normal_body">旧用户名</label>
+                    <input class="input_search" style="width:60%" type="text"
+                           v-model="row.value.f_user_name" readonly
+                           placeholder="旧用户名">
+                  </div>
+                  <div class="col-sm-5 form-group">
+                    <label for="f_user_phone" class=" font_normal_body">旧联系方式</label>
+                    <input class="input_search" style="width:60%" type="text"
+                           v-model="row.value.f_user_phone" readonly
+                           placeholder="旧联系方式">
+                  </div>
+                  <div class="col-sm-7 form-group">
+                    <label for="f_idnumber" class=" font_normal_body">旧身份账号</label>
+                    <input class="input_search" style="width:60%" type="text"
+                           v-model="row.value.f_idnumber" readonly
+                           placeholder="旧身份账号">
+                  </div>
+                  <div class="col-sm-6 form-group">
+                    <label for="f_newuser_name" class="font_normal_body">新用户名</label>
+                    <input class="input_search" style="width:60%" type="text"
+                           v-model="row.value.f_newuser_name" readonly
+                           placeholder="新用户名">
+                  </div>
+                  <div class="col-sm-5 form-group">
+                  <label for="f_newuser_phone" class="font_normal_body">新联系方式</label>
+                  <input class="input_search" style="width:60%" type="text"
+                         v-model="row.value.f_newuser_phone" readonly
+                         placeholder="新联系方式">
+                  </div>
+                  <div class="col-sm-5 form-group">
+                    <label for="f_newrent_phone" class="font_normal_body">新备用联系方式</label>
+                    <input class="input_search" style="width:60%" type="text"
+                           v-model="row.value.f_newrent_phone" readonly
+                           placeholder="新备用联系方式">
+                  </div>
+                  <div class="col-sm-7 form-group">
+                    <label for="f_newidnumber" class=" font_normal_body">新身份证号</label>
+                    <input class="input_search" style="width:60%" type="text"
+                           v-model="row.value.f_newidnumber" readonly
+                           placeholder="新身份证号">
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-sm-12 form-group">
+                    <label for="f_describe" class="font_normal_body">描&emsp;述</label>
+                    <input class="input_search" type="text" style="width:87%" v-model="row.value.f_describe"
+                           readonly
+                           placeholder="描述">
+                  </div>
+                  <div class="col-sm-12 form-group">
+                    <label for="f_comments" class=" font_normal_body">备&emsp;注</label>
+                    <input class="input_search" type="text" style="width:87%" v-model="row.value.f_comments"
+                           readonly
+                           placeholder="备注">
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div style="text-align:right;height:auto;margin-top:10px;margin-right:30px;">
+          <span style="color: red" v-if="row.f_order_state !== '待处理'&&row.f_order_state!==''&&row.f_order_state!==null">该条预约已处理</span>
+          <br>
+          <button type="button" :disabled="row.f_order_state!=='待处理'&&row.f_order_state!==''&&row.f_order_state!==null" class="btn btn-warning" @click="confirm(row)" style="width:80px;margin-left:20px;">预约失败</button>
+          <button type="button" :disabled="row.f_order_state!=='待处理'&&row.f_order_state!==''&&row.f_order_state!==null" class="btn btn-primary" @click="confirm1(row)" style="width:80px;margin-left:20px;">预约成功</button>
+        </div>
+      </form>
+    </validator>
+  </div>
+</template>
+<script>
+  export default {
+    data () {
+      return {
+        show: false,
+        f_operator: this.$login.f.name,
+        placeholder: ''
+      }
+    },
+    props: {
+      row: {
+        type: Object
+      },
+      title: {
+        type: String
+      },
+      userInfo: {
+        type: Array
+      },
+      imgInfo: {
+        type: Array
+      }
+    },
+    methods: {
+      close () {
+        this.show = false
+      },
+      async confirm(row) {
+        // 预约失败处理
+        let orderParam = {
+          f_order_state: '预约失败',
+          f_dispose_operator: this.f_operator,
+          f_operate_date: this.$login.toStandardTimeString(),
+          id: row.id
+        }
+        let transferParam = row
+        let data = {
+          orderParam: orderParam,
+          transferParam: transferParam
+        }
+        await this.$resetpost('rs/logic/transferOrderHandle', data, {
+          resolveMsg: '审核成功',
+          rejectMsg: '审核失败!!'
+        }).then((res) => {
+          if (res.data.code === 200) {
+            this.$showAlert('预约失败审核成功！！', 'success', 2000)
+          } else {
+            this.$showAlert('预约失败审核失败！！', 'danger', 2000)
+          }
+        })
+        this.$dispatch('refresh')
+      },
+      async confirm1(row) {
+        // 预约成功处理
+        let orderParam = {
+          f_order_state: '预约成功',
+          f_dispose_operator: this.f_operator,
+          f_operate_date: this.$login.toStandardTimeString(),
+          id: row.id
+        }
+        let transferParam = row
+        let data = {
+          orderParam: orderParam,
+          transferParam: transferParam
+        }
+        await this.$resetpost('rs/logic/transferOrderHandle', data, {
+          resolveMsg: '审核成功',
+          rejectMsg: '审核失败!!'
+        }).then((res) => {
+          if (res.data.code === 200) {
+            this.$showAlert('预约成功审核成功！！', 'success', 2000)
+          } else {
+            this.$showAlert('预约成功审核失败！！', 'danger', 2000)
+          }
+        })
+        this.$dispatch('refresh')
+      }
+    }
+  }
+</script>
+<style lang="less">
+  #orderApplyDispose{
+    .modal-header {
+      border: none;
+      .close {
+        position: absolute;
+        top: 7px;
+        right: 10px;
+      }
+    }
+    .modal-body {
+      padding-bottom: 0px;
+    }
+    .modal-footer {
+      padding: 10px 15px;
+      border: none;
+    }
+    .outbox {
+      height: 500px;
+      overflow-y: auto;
+    }
+  }
+</style>

package/src/filiale/dongguan/components/newchangemeter/ChangeMeter.vue CHANGED Viewed

@@ -660,7 +660,7 @@ export default {
             f_depid: this.$login.f.depids,
             f_depname: this.$login.f.deps,
             f_perform_date: this.newinfo.f_perform_date,
-            f_change_reason: ''
+            f_change_reason: '换表调价'
           }
           await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新气价成功', rejectMsg: '更新气价失败'})

package/src/filiale/dongguan/components/newchangemeter/ResetMeter.vue CHANGED Viewed

@@ -665,7 +665,7 @@ export default {
             f_depid: this.$login.f.depids,
             f_depname: this.$login.f.deps,
             f_perform_date: this.newinfo.f_perform_date,
-            f_change_reason: ''
+            f_change_reason: '换表调价'
           }
           await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新气价成功', rejectMsg: '更新气价失败'})

package/src/filiale/gehua/FileUserFiles.vue CHANGED Viewed

@@ -799,9 +799,6 @@ let loadParamGem = async function (self) {
         args.condition = `${args.condition} ` + this.orgcondition
         this.criteriaShow = false
         this.$refs.paged.$refs.grid.$el.scrollTop = 0
-        if(args.condition.indexOf("f_user_state") === -1){
-          args.condition = args.condition + ` and f_user_state = '正常'`
-        }
         this.model.search(args.condition, args.model)
         let http = new HttpResetClass()

package/src/filiale/guangxi/ChangeMeter.vue CHANGED Viewed

@@ -652,7 +652,7 @@ export default {
             f_depid: this.$login.f.depids,
             f_depname: this.$login.f.deps,
             f_perform_date: this.newinfo.f_perform_date,
-            f_change_reason: ''
+            f_change_reason: '换表调价'
           }
           await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新气价成功', rejectMsg: '更新气价失败'})

package/src/filiale/guangxi/ResetMeter.vue CHANGED Viewed

@@ -656,7 +656,7 @@ export default {
             f_depid: this.$login.f.depids,
             f_depname: this.$login.f.deps,
             f_perform_date: this.newinfo.f_perform_date,
-            f_change_reason: ''
+            f_change_reason: '换表调价'
           }
           await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新气价成功', rejectMsg: '更新气价失败'})

package/src/filiale/jinjiang/ChangeMeter.vue CHANGED Viewed

@@ -473,7 +473,7 @@ export default {
             f_depid: this.$login.f.depids,
             f_depname: this.$login.f.deps,
             f_perform_date: this.newinfo.f_perform_date,
-            f_change_reason: ''
+            f_change_reason: '换表调价'
           }
           await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新气价成功', rejectMsg: '更新气价失败'})