sale-client 4.1.230 → 4.2.1-ronghao

package/src/components/revenue/HandManager/WebHand.vue

@@ -41,7 +41,7 @@
                 <export-excel
                   :data="$parent.$parent.getCondition"
                   :field="$parent.$parent.getfield"
-                  sqlurl="api/af-revenue/logic/saleExport" sql-name="getIndustryCommerceHand" template-name='工业商业抄表导出'
+                  sqlurl="api/af-revenue/logic/saleExport" sql-name="sale_getWebHand" template-name='物联网抄表导出'
                   :choose-col="true">
                 </export-excel>
                 <div
@@ -359,11 +359,11 @@
       </header>
       <article slot="modal-body" class="modal-body">
         <div class="from-group" v-for="img in images">
-          <img-self :src="`/singlepage/rs/file/image/` + img" :width="150" :height="150"></img-self>
+          <img-self :src="`/singlepage/rs/image/file/` + img" :width="250" :height="250"></img-self>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
+        <button type="button" class="btn btn-success" @click='imgListClose'>关闭</button>
       </footer>
     </modal>
   </div>
@@ -513,11 +513,14 @@ export default {
       this.imgListShow = true
       this.images = JSON.parse(images)
     },
+    imgListClose () {
+      this.imgListShow = false
+    },
     imgclose () {
       this.imgshow = false
     },
     imgShow (val) {
-      this.imgfilename = `/rs/file/image/` + val
+      this.imgfilename = `/rs/image/file/` + val
       this.imgshow = true
     },
     async danhuCodeSearch () {

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

@@ -128,7 +128,7 @@
         <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;color:red;">隐患详情:</td>
         <td  colspan="3" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%;color:red;">
              <span  v-for="deviceCollect in model.deviceCollects">
-                      <span class="li-font">
+                      <span class="li-font" :class="[deviceCollect.value.indexOf('有隐患') >-1 ? 'defectcs' : '']" >
                         {{deviceCollect.name}}:{{deviceCollect.value}}&nbsp;&nbsp;&nbsp;
                       </span>
                 <br>
@@ -137,7 +137,7 @@
         <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
         <td  colspan="3" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))"  style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
              <span  v-for="deviceCollect in model.deviceCollects">
-                      <span class="li-font">
+                      <span class="li-font"  :class="[deviceCollect.value.indexOf('有隐患') >-1 ? 'defectcs' : '']" >
                         {{deviceCollect.name}}:{{deviceCollect.value}}&nbsp;&nbsp;&nbsp;
                       </span>
                 <br>
@@ -156,12 +156,16 @@
         <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%" v-if="checkitem.f_path!='' && checkitem.f_path!=null">
           <img-self :src="'rs/image/file/'+checkitem.f_path" style="float: left"  width="100" height="150"></img-self>
         </td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%;color:red" v-if="checkitem.f_filename_paths!='' && checkitem.f_filename_paths!=null">
+          <span class="defectcs" @click="getDefectImg(checkitem.f_filename_paths)" >查看图片</span>
+<!--          <img-self :src="'rs/image/file/'+checkitem.f_path" style="float: left"  width="100" height="150"></img-self>-->
+        </td>
         <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%" v-if="checkitem.f_path=='' && checkitem.f_path==null">
           暂无图片
         </td>
       </tr>
     </table>
-    <table class="table table-striped table-bordered" v-if="model.f_notified_path=='' && model.f_notified_path==null">
+    <table class="table table-striped table-bordered" v-if="model.f_notified_path!='' && model.f_notified_path!=null">
       <thead>
       <tr>  <th colspan="4" style="text-align: center;background-color: #8cbce2;">隐患整改通知单</th></tr>
       </thead>
@@ -217,6 +221,23 @@
       <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
     </footer>
   </modal>
+  <modal :show.sync="defectImgShow" v-ref:modal  styles="height:80vh">
+    <header slot="modal-header" class="modal-header">
+      隐患照片
+    </header>
+    <article slot="modal-body" class="modal-body"  >
+      <div class="from-group">
+        <div class="row">
+          <div class="col-sm-6" v-for="img in defectImgArr">
+            <img-self  :src="'rs/image/file/'+img.f_path" style="float: left"   width="300" height="400"></img-self>
+          </div>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" v-show="false">
+      <button type="button" class="btn btn-success" @click='imgDefectClose'>关闭</button>
+    </footer>
+  </modal>
 </template>
 <script>
   /**
@@ -241,6 +262,7 @@
       if (!(JSON.stringify(getSafeCheck.data) == '{}')) {
         self.model = {}
         self.model = Object.assign({}, self.model, getSafeCheck.data)
+        // self.model.safecheckitem[0].f_filename_paths = '50eeff69c7ff78bd7831f17ff181f4b2-device10-0-f_items1.jpg?0.10122581621022331,6a6ce267f9ddd8904f6a52aeabe11c0b-device10-0-f_items1.jpg?0.9118883785380048'
         self.hasCheck = 1
       } else {
         self.hasCheck = 0
@@ -266,6 +288,8 @@
         hasCheck: -1,
         imgshow: false,
         imgshow2: false,
+        defectImgShow: false,
+        defectImgArr: [],
         showimg1: '',
         showimg2: '',
         showimg3: '',
@@ -281,6 +305,17 @@
       }
     },
     methods: {
+      getDefectImg (row) {
+        this.defectImgShow = true
+        const itemsArray = row.split(',')
+        this.defectImgArr = itemsArray.map(item => ({
+          f_path: item
+        }))
+      },
+      imgDefectClose () {
+        this.defectImgShow = false
+        this.defectImgArr = []
+      },
       showpicture2 () {
         this.imgshow2 = true
       }
@@ -298,6 +333,9 @@
   }
 </script>
 <style scoped>
+  .defectcs{
+    cursor: pointer;
+  }
   .img {
     border: 1px solid #9773ed;
     width: auto;

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

@@ -0,0 +1,76 @@
+<template>
+  <div class="panel panel-info auto">
+    <div class="panel-heading auto" style="height: 30px">
+      <h4 style="display:inline-block;margin-top: auto">保险信息</h4>
+    </div>
+      <div class="auto info-content" v-if="feelist.data.length > 0">
+        <div class="row">
+          <label class="col-sm-4 ">险种:</label>
+          <span class="col-sm-8">{{row.f_insurance_type}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-4 ">购买时间:</label>
+          <span class="col-sm-8">{{row.f_operate_date}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-4 ">到期时间:</label>
+          <span class="col-sm-8">{{row.f_expiration_date}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-4 ">金额:</label>
+          <span class="col-sm-8">{{row.f_money}}</span>
+        </div>
+      </div>
+    <div v-else>
+      <div class="row">
+        <strong>暂无保险信息</strong>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  /**
+   *用户其他费用信息组件
+   */
+  export default {
+    props: ['userinfoid'],
+    data () {
+      return {
+        row: {},
+        feelist: []
+      }
+    },
+    methods: {
+      async userfees (userinfoid) {
+        console.log('获取保险费' + userinfoid)
+        if (userinfoid) {
+          this.feelist = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {data: {tablename: 't_userfees', condition: `f_userinfo_id='${userinfoid}'`, items: '*', orderitem: 'f_operate_date desc' }})
+          if (this.feelist.data.length !== 0) {
+            this.row = this.feelist.data[0]
+          }
+        } else {
+          this.feelist = []
+          this.row = {}
+        }
+      }
+    },
+    watch: {
+      'userinfoid' (val) {
+        this.userfees(val)
+      }
+    },
+    ready () {
+      this.userfees(this.userinfoid)
+    }
+  }
+</script>
+<style media="screen">
+  #table1{
+    text-align:center;
+  }
+  .self-table > tbody > tr > td {
+    padding: 3px;
+    text-align: center;
+  }
+</style>

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

@@ -4,6 +4,7 @@
     <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>
+    <user-fee-info :userinfoid="data.f_userinfo_id" v-ref:valueaddinfo></user-fee-info>
     <sale-safecheck-info :data="data"></sale-safecheck-info>
 
     <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>

package/src/components/revenue/base/rightview/CardList.vue

@@ -303,9 +303,9 @@
       search () {
         let condition = '1=1'
         if (this.f_orgid) {
-          condition += `and (u.f_filialeid in ${this.f_orgid} or g.f_orgid in ${this.f_orgid}) `
+          condition += `and (u.f_filialeid in ${this.f_orgid} or u.f_orgid in ${this.f_orgid}) `
         } else {
-          condition += `and (u.f_filialeid = '${this.$login.f.orgid}' or g.f_orgid ='${this.$login.f.orgid}')`
+          condition += `and (u.f_filialeid = '${this.$login.f.orgid}' or u.f_orgid ='${this.$login.f.orgid}')`
         }
         this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
           if (a.data.length === 0) {
@@ -460,7 +460,7 @@
               name = 'api/af-revenue/report/sendCard_bill'
             }
           }
-        } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表赠气' || type === '卡表收费撤销') {
+        } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表收费撤销') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'api/af-revenue/report/fmy_card_bill'
           } else {
@@ -502,6 +502,10 @@
           name = 'api/af-revenue/report/icGiftFee'
         } else if (type === '卡表赠气') {
           name = 'api/af-revenue/report/icGiftGas'
+        } else if (type === '保险收费') {
+          name = 'api/af-revenue/report/insurance_bill'
+        } else if (type === '自动下账') {
+          name = 'api/af-revenue/report/autoAccounts_bill'
         }
         return name
       },

package/src/components/revenue/batchDeduction/batchDeductionList.vue

@@ -192,7 +192,7 @@ export default {
     onFileUpload: async function (file, res) {
       this.isbusy = true
       let data = {
-        filepath: res.f_downloadpath,
+        filepath: res.f_realpath,
         f_operator: Vue.$login.f.name,
         f_operatorid: Vue.$login.f.id,
         f_orgid: Vue.$login.f.orgid,

package/src/components/revenue/cardHandManage/cardDown.vue

@@ -113,11 +113,19 @@
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">客户类型</label>
                 <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                          @change="$parent.$parent.userTypeChange()"
                           :options='$parent.$parent.usertypes' placeholder='客户类型'
                           style="width:60%"
                           close-on-select
                           condition="f_user_type = '{}'"></v-select>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">用气性质</label>
+                <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                          :options='$parent.$parent.gasproperties' placeholder='请选择'
+                          condition="f_gasproperties = '{}'"
+                          close-on-select></v-select>
+              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">用户等级</label>
                 <v-select :value.sync="model.f_user_level" v-model="model.f_user_level"
@@ -513,6 +521,7 @@ export default {
         user: []
       },
       sumsmodel: [],
+      gasproperties: [],
       orgCondtionStr: '',
       priceSplit: false,
       criteriaShow: false,
@@ -616,6 +625,15 @@ export default {
     document.getElementById(this.inputid).focus()
   },
   methods: {
+    userTypeChange () {
+      this.gasproperties = []
+      if (this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+        this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+      } else {
+        this.gasproperties = [{label: '全部', value: ''}]
+      }
+    },
     // 获得本月的最后一天。
     getLastDayOfMonth (year, month) {
       let new_year = year    // 取当前的年份

package/src/components/revenue/changeInsurance/InsuranceAdd.vue

@@ -243,6 +243,7 @@
         if (JSON.stringify(this.row) != '{}') {
           this.model = {
             f_userinfo_id: this.row.f_userinfo_id,
+            f_userfiles_id: this.row.f_userfiles_id,
             f_ins_stop_date: this.row.f_ins_stop_date,
             f_user_name: this.row.f_user_name,
             f_idnumber: this.row.f_idnumber,

package/src/components/revenue/changeInsurance/InsuranceRecord.vue

@@ -246,6 +246,7 @@ export default {
       console.log('this.recordlist', this.recordlist)
     },
     async auditConfirm () {
+      console.log(this.obj)
       if (this.model.f_audit_person === '' || this.model.f_audit_person === []) {
         this.$showAlert('请选择审核人', 'danger', 3000)
         this.model.f_audit_person = ''
@@ -315,7 +316,7 @@ export default {
     },
     cancelinsurance (row) {
       this.show = true
-      if (row.f_payment.indexOf('扫码枪') > -1) {
+      if (row.f_payment && row.f_payment.indexOf('扫码枪') > -1) {
         this.paymentShow = false
       }
       this.obj = row

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -76,7 +76,7 @@
             <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="s.f_userinfo_code = '{}'" placeholder='用户编号'>
+                     condition="f_userinfo_code = '{}'" placeholder='用户编号'>
             </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">&emsp;订单号:</label>

package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue

@@ -127,6 +127,7 @@
   let asyncIcTable = async function (self) {
     await self.$getConfig(self, 'icTable')
     console.log('卡表赠气赠费config', self.config)
+    this.model.f_add_gas = self.config.f_add_gas
   }
 
   export default {
@@ -147,10 +148,11 @@
           f_pregas: 0,
           f_preamount: 0,
           f_reason: '',
-          f_add_gas: '不计入'
+          f_add_gas: '计入'
         },
         config: {
-          hasPrint: false
+          hasPrint: false,
+          f_add_gas: '计入'
         },
         billData: {
           url: 'api/af-revenue/report/icGiftGas',