sale-client 3.5.237 → 3.5.239-1

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Apr 18 13:56:21 CST 2023
+gradle.version=5.2.1

package/.project

@@ -5,7 +5,30 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1671099057782</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://192.168.50.4:8400', 'http://192.168.50.4:8400']
+const [localUrl, serverRul] = ['http://59.48.150.94:8300', 'http://59.48.150.94:8300']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/FilesManage/FileAddressManage.vue

@@ -3,7 +3,7 @@
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
       <file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
     </div>
-    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
+    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
       <div class="flex">
         <file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -205,7 +205,7 @@
         </div>
       </form>
     </validator>
-    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="70%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="50%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
                              @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/revenue/base/leftview/otherinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
+    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
     <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
     <safe-check :data="data"></safe-check>

package/src/components/revenue/comprehen/Bill/Eticket/EticketCommon.vue

@@ -0,0 +1,63 @@
+<template>
+<!--    <div v-if="listpage">-->
+  <tab-button v-ref:list>
+    <tabs header="发票管理">
+      <e-ticket-manage @deal-msg="dealMsg"></e-ticket-manage>
+    </tabs>
+    <tabs header="抬头录入">
+      <company-info-manage @deal-msg="dealMsg"></company-info-manage>
+    </tabs>
+    <tabs header="商品信息录入">
+      <goods-info-manage @deal-msg="dealMsg"></goods-info-manage>
+    </tabs>
+  </tab-button>
+<!--    </div>-->
+<!--    <div v-if="!listpage">-->
+<!--      <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
+<!--    </div>-->
+</template>
+
+<script>
+import TabButton from '../../common/TabButton.vue'
+import Tabs from '../../common/Tabs.vue'
+
+export default {
+  name: 'EticketCommon',
+  title: '发票公共管理',
+  data () {
+    return {// 页面开关
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [true]
+    }
+  },
+  components: {Tabs, TabButton},
+  ready () {
+    console.log(this.$refs.list)
+    console.log('发票管理')
+  },
+  methods: {
+    cancel (obj) {
+      this.listpage = true
+    },
+    dealMsg (obj) {
+      this.rowData = obj
+      this.listpage = false
+      console.log(obj.model)
+      this.f_start_date = obj.model.startDate
+      this.f_end_date = obj.model.endDate
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/components/revenue/comprehen/Bill/Eticket/EticketManage.vue

@@ -24,7 +24,7 @@ import Tabs from '../../../comprehen/common/Tabs'
 export default {
   name: 'eticket',
   title: '发票管理',
-  components: {Tabs, TabButton },
+  components: { Tabs, TabButton },
   data () {
     return {// 页面开关
       f_start_date: '',

package/src/components/revenue/comprehen/Bill/paper/BillList.vue

@@ -149,7 +149,6 @@
           f_outlets: this.$login.f.f_parentname,
           f_orgstr: this.$login.f.orgpathstr,
           f_filialeids: this.$login.f.orgid
-
         },
         billstate: [{label: '全部', value: ''}, {label: '启用', value: '启用'}, {label: '停用', value: '停用'}],
         billusers: this.$appdata.getParam('票据使用人')

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

@@ -10,7 +10,6 @@
     <div class="binary-right" v-if="usershow" :style="{width: usershow ? '50%' : 'auto'}">
       <gasprice-user :priceid="priceid" :pricename="pricename" :priceorgid="priceorgid"></gasprice-user>
     </div>
-
   </div>
   <div v-if="!listpage">
 <!--    <user-info-detail-manage :f_userinfo_id="f_userinfo_id" @cancel-main="cancel" ></user-info-detail-manage>-->
@@ -30,7 +29,6 @@ let readGen = async function (self) {
     Object.assign(self.config, self.config, getConfig.data)
   }
 }
-
 export default {
   title: '气价管理',
   data () {
@@ -52,7 +50,6 @@ export default {
       priceorgid: '',
       gasPriceShow: false,
       usershow: false,
-
       // 控制气价信息界面和变更操作记录界面的展示
       changeView: false
     }

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,13 +414,12 @@
           dep: [],
           user: []
         },
-        config: {
-          examine: false
+        config:{
+          examine: false,
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
-        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -445,8 +444,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -476,7 +475,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -597,9 +596,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log('-----------val2:', val)
+        console.log("-----------val2:",val)
         this.imgfilename = `rs/image/file/` + val
-        console.log('-----------imgfilename2:', this.imgfilename)
+        console.log("-----------imgfilename2:",this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -633,17 +632,6 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
-        // 抄表员查询条件
-        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
-        if (this.inputtouPerson.length !== 0) {
-          let str = JSON.stringify(this.inputtouPerson)
-          str = str.replace(/"/g, `'`)
-          str = str.replace(/\[/g, ``)
-          str = str.replace(/\]/g, ``)
-          console.log('=====抄表员model22222222222绑定====', str)
-          // 查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
-        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -708,7 +696,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      }
+      },
 
     },
     computed: {

package/src/components/revenue/third//346/227/245/347/205/247/transferAudit.vue

@@ -0,0 +1,205 @@
+<template>
+  <criteria-paged :model="model" v-ref:paged>
+    <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-3 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-3 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 like '%{}%'"
+                   placeholder="用户姓名"/>
+          </div>
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body">处理状态</label>
+            <v-select v-model="model.f_order_state" style="width:60%"
+                      placeholder='处理状态'
+                      :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-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"
+                 :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
+                 @click="criteriaShow = !criteriaShow"></div>
+          </div>
+          <div class="row" v-show="criteriaShow">
+            <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_phone"
+                     condition="f_user_phone = '{}'"
+                     placeholder="联系电话"/>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body">起始时间</label>
+              <datepicker placeholder='预约时间'
+                          v-model="model.f_orderdate_start"
+                          :value.sync="model.f_orderdate_start"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="f_order_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body">结束时间</label>
+              <datepicker placeholder='预约时间'
+                          v-model="model.f_orderdate_end"
+                          :value.sync="model.f_orderdate_end"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="f_order_date <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </div>
+    </criteria>
+    <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>
+            <nobr>用户编号</nobr>
+          </th>
+          <th>
+            <nobr>旧用户姓名</nobr>
+          </th>
+          <th>
+            <nobr>旧联系电话</nobr>
+          </th>
+          <th>
+            <nobr>旧身份证号</nobr>
+          </th>
+          <th>
+            <nobr>新用户姓名</nobr>
+          </th>
+          <th>
+            <nobr>新联系电话</nobr>
+          </th>
+          <th>
+            <nobr>新身份证号</nobr>
+          </th>
+          <th>
+            <nobr>备注信息</nobr>
+          </th>
+          <th>
+            <nobr>预约类型</nobr>
+          </th>
+          <th>
+            <nobr>预约时间</nobr>
+          </th>
+          <th>
+            <nobr>处理状态</nobr>
+          </th>
+          <th>
+            <nobr>处理时间</nobr>
+          </th>
+          <th>
+            <nobr>处&ensp;理&ensp;人</nobr>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <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_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>
+      <template partial='foot'></template>
+    </data-grid>
+  </criteria-paged>
+
+
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      model: new PagedList('rs/sql/singleTable_OrderBy', 20,
+        {
+          tablename: '"t_transfer_midorder"',
+          items: '"*"',
+          orderitem: '"f_order_date desc"'
+        }),
+      criteriaShow: false
+    }
+  },
+  ready () {
+    // 默认查询待处理状态预约
+    this.search()
+  },
+  methods: {
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+      this.initAreas(this.f_filialeids)
+    },
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      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_order_state === '预约成功') {
+          args.condition += ` and   f_order_state = '预约成功' `
+        }
+        if (this.$refs.paged.$refs.criteria.model.f_order_state === '预约失败') {
+          args.condition += ` and   f_order_state = '预约失败' `
+        }
+      }
+      args.condition = `${args.condition} and f_operate_type='预约过户' and f_state = '有效'`
+      this.model.search(args.condition, args.model)
+    }
+  },
+  computed: {
+    getState () {
+      return [{label: '全部', value: ''}, {label: '待处理', value: ''}, {
+        label: '预约成功',
+        value: '预约成功'
+      }, {label: '预约失败', value: '预约失败'}]
+    },
+    orderType () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('预约类型')]
+    }
+  },
+  watch: {
+    'sliceArea' () {
+      this.model.model.f_slice_area = ''
+    }
+  }
+}
+</script>
+<style lang="less">
+</style>

package/src/components/revenue/third//346/227/245/347/205/247/transferAuditCenter.vue

@@ -0,0 +1,75 @@
+<template>
+  <div id="unit" class="flex-row" style="width: 100%">
+    <div class="flex binary-left" style="flex: 1; width:50%">
+      <transfer-audit v-ref:list @select-changed="selected"></transfer-audit>
+    </div>
+    <div class="flex binary-left" style="width:50%">
+      <transfer-audit-dispose-basics
+        :row="row"
+        :images="images"
+        :user-info="userInfo"
+        :title="title">
+      </transfer-audit-dispose-basics>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Json from 'vue-resource/src/http/interceptor/json'
+
+  export default {
+    title: '第三方过户预约审核',
+    data () {
+      return {
+        row: {},
+        title: '',
+        imgInfo: [],
+        userInfo: [],
+        images: []
+      }
+    },
+    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
+        })
+        try {
+          await this.$resetget(`http://193.168.1.50:8887/rs/content/images?path=${data.val.f_userinfo_code}`, {resolveMsg: null, rejectMsg: '获取数据错误！'})
+            .then(res => {
+              console.log('离谱啊', res)
+              let img = res.data.replace('[', '')
+              img = img.replace(']', '')
+              this.images = img.split(',')
+              console.log('离谱到家了', this.images)
+            }
+            )
+        } catch (e) {
+          console.log(e.message)
+        }
+      },
+      init () {
+        this.row = {},
+        this.title = '',
+        this.imgInfo= [],
+        this.userInfo= []
+      }
+    },
+    events: {
+      'refresh' () {
+        this.$refs.list.$refs.paged.$refs.criteria.search()
+        this.init()
+      }
+    }
+  }
+</script>
+<style>
+</style>