sale-client 4.1.230 → 4.2.1-ronghao

package/src/components/charge/business/OtherChargeNew.vue

@@ -14,31 +14,27 @@
                           placeholder='请选择'
                           v-model="row.f_brand_spec"
                           :value.sync="row.f_brand_spec"
-                          :options='brandspec'
-                          @change="setTypename(row,index)"
+                          :options='materialTypeList'
+                          @change="setTypename(index)"
                           close-on-select clear-button>
                 </v-select>
               </div>
               <div class="col-sm-4" :class="{'has-success':row.f_typename,'has-error':!row.f_typename}">
                 <label for="f_typename" class=" font_normal_body">&nbsp;品名规格</label>
                 <v-select
-                  style="width: 100px"
                   v-model="row.f_typename"
-                  placeholder='请选择'
+                  :options="row.typeNameList"
                   :value.sync="row.f_typename"
-                  :options='row.typeNameList'
-                  @change="setTypenumber(row,index)"
+                  @change="setTypenumber(index)"
                   close-on-select clear-button>
                 </v-select>
               </div>
               <div class="col-sm-4" :class="{'has-success':row.f_typenumber,'has-error':!row.f_typenumber}">
                 <label for="f_typenumber" class=" font_normal_body">&nbsp;型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
                 <v-select
-                  style="width: 100px"
                   v-model="row.f_typenumber"
-                  placeholder='请选择'
+                  :options="row.typenumberList"
                   :value.sync="row.f_typenumber"
-                  :options='row.typenumberList'
                   @change="setTypeprice(index)"
                   close-on-select clear-button>
                 </v-select>
@@ -265,7 +261,6 @@ let asyncOtherCharge = async function (self) {
   await self.$getConfig(self, 'OtherCharge')
   self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
   self.model.f_payment = [self.config.payment]
-  self.model.otherdetail[0].f_brand_spec = [self.config.brandspec]
   self.model.f_service_person = [self.config.services]
 
   self.model.f_use_type = self.config.billType
@@ -307,7 +302,15 @@ export default {
         t_userfees: '',
         f_fee_type: ['其他费用'],
         f_fee_time: ['12'],
-        otherdetail: [{f_brand_spec: [''], typeNameList: [], f_typenumber: '', typenumberList: [], f_unitprice: '', f_number: ''}]
+        otherdetail: [{
+          f_brand_spec: '', // 只存名字
+          typeNameList: [],
+          f_typename: '',   // 只存名字
+          typenumberList: [],
+          f_typenumber: '', // 只存名字
+          f_unitprice: '',
+          f_number: ''
+        }]
       },
       eticket_msg: false,
       mjshow: false,
@@ -334,7 +337,9 @@ export default {
       paytype: this.$appdata.getParam('付款方式'),
       feetype: this.$appdata.getParam('其他费用'),
       services: this.$appdata.getParam('服务人员'),
-      isflag: false
+      isflag: false,
+      materialList: [], // 全部物料数据
+      materialTypeList: [] // 品名及规格
     }
   },
   props: ['row'],
@@ -342,6 +347,7 @@ export default {
     // this.model.f_unitprice = this.$appdata.getSingleValue('置换气费')
     asyncOtherCharge(this)
     this.getRandomId()
+    this.getMaterialList()
   },
   watch: {
     'model.f_fee_type' (val) {
@@ -394,18 +400,57 @@ export default {
         }
       }
     },
-    setTypeprice (val) {
-      console.log('单价变化：', val)
-      if (this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber[0]) {
-        let unitprice = this.$appdata.getSingleValue(this.model.otherdetail[val].f_typenumber[0])
-        if (unitprice) {
-          this.model.otherdetail[val].f_unitprice = Number(unitprice)
-          this.$resetValidation()
-          this.$nextTick(() => {
-            this.$validate()
-          })
+    async getMaterialList () {
+      let res = await this.$resetpost('api/af-revenue/sql/saleSingleTable', {
+        data: {
+          tablename: 't_material_management',
+          condition: '1=1'
         }
+      }, {resolveMsg: null, rejectMsg: '获取物料信息失败!'})
+      this.materialList = res.data || []
+      // 初始化收费类型下拉
+      this.materialTypeList = [...new Set(this.materialList.filter(i => i.f_material_type).map(i => i.f_material_type))]
+        .map(type => ({ label: type, value: type }))
+    },
+    // 选择品名及规格
+    setTypename (index) {
+      const typeLabel = this.model.otherdetail[index].f_brand_spec
+      console.log('1264578', typeLabel)
+      const categories = this.materialList.filter(i => i.f_material_stype === '分类' && i.f_material_type === typeLabel[0])
+      this.model.otherdetail[index].typeNameList = categories.map(i => ({ label: i.f_material_name, value: i.f_material_name, id: i.id }))
+      this.model.otherdetail[index].f_brand_spec = typeLabel
+      this.model.otherdetail[index].f_typename = ''
+      this.model.otherdetail[index].typenumberList = []
+      this.model.otherdetail[index].f_typenumber = ''
+      this.model.otherdetail[index].f_unitprice = ''
+    },
+    // 选择分类
+    setTypenumber (index) {
+      const categoryName = this.model.otherdetail[index].f_typename
+      const category = this.model.otherdetail[index].typeNameList.find(i => i.value === categoryName[0])
+      const categoryId = category ? category.id : ''
+      const models = this.materialList.filter(i => i.f_material_stype === '型号' && String(i.parent_id) === String(categoryId))
+      this.model.otherdetail[index].typenumberList = models.map(i => ({ label: i.f_material_name, value: i.f_material_name, id: i.id }))
+      this.model.otherdetail[index].f_typename = categoryName
+      this.model.otherdetail[index].f_typenumber = ''
+      this.model.otherdetail[index].f_unitprice = ''
+    },
+    // 选择型号
+    setTypeprice (index) {
+      const modelName = this.model.otherdetail[index].f_typenumber
+      const model = this.model.otherdetail[index].typenumberList.find(i => i.value === modelName[0])
+      const modelId = model ? model.id : ''
+      const modelObj = this.materialList.find(i => i.f_material_stype === '型号' && String(i.id) === String(modelId))
+      this.model.otherdetail[index].f_typenumber = modelName
+      if (modelObj && modelObj.f_material_price) {
+        this.model.otherdetail[index].f_unitprice = Number(modelObj.f_material_price)
+      } else {
+        this.model.otherdetail[index].f_unitprice = ''
       }
+      this.$resetValidation()
+      this.$nextTick(() => {
+        this.$validate()
+      })
     },
     async createQianfei () {
       let data = {
@@ -494,31 +539,6 @@ export default {
       this.eticket_show = false
       this.$dispatch('success')
     },
-    async setTypename (val, index) {
-      this.model.otherdetail[index].f_typenumber = ''
-      this.model.otherdetail[index].typeNameList = this.$appdata.getParam(val.f_brand_spec[0])
-      this.model.otherdetail[index].typenumberList = []
-      this.model.otherdetail[index].f_unitprice = ''
-      let self = this
-      if (val == '开卡费') {
-        if (this.$appdata.getSingleValue('开卡费')) {
-          let money = this.$appdata.getSingleValue('开卡费')
-          await this.model.otherdetail.forEach(function (item) {
-            self.isflag = false
-            if (item.f_brand_spec[0] == '开卡费') {
-              item.f_unitprice = money
-              item.f_number = 1
-              self.isflag = true
-            }
-          })
-          this.getcollection()
-        }
-      }
-    },
-    setTypenumber (val, index) {
-      this.model.otherdetail[index].typenumberList = this.$appdata.getParam(val.f_typename[0 ])
-      this.model.otherdetail[index].f_unitprice = ''
-    },
     async confirm (parameter) {
       let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行其他收费吗？`, ['confirm', 'cancel'])
       if (res != 'confirm') return
@@ -564,7 +584,7 @@ export default {
       if (!flag) this.model.f_collection = ''
     },
     addadetail () {
-      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: [''], f_typenumber: '', typeNameList: [], typenumberList: [], f_unitprice: '', f_number: ''})
+      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: '', f_typenumber: '', typeNameList: [], typenumberList: [], f_unitprice: '', f_number: '', f_typename: ''})
       console.log(JSON.stringify(this.model.otherdetail))
     },
     delthisdetail (index) {

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -50,6 +50,12 @@
         <saletab header="其他收费" v-if="permission('其他收费')">
           <other-charge-query-user  :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
         </saletab>
+        <saletab header="保险收费记录" v-if="permission('保险收费记录')">
+          <insurance-charges-record :row="row"  @deal-msg="dealMsg"></insurance-charges-record>
+        </saletab>
+        <saletab header="垃圾费收费记录" v-if="permission('垃圾费收费记录')">
+          <garbage-record-list :row="row"  @deal-msg="dealMsg"></garbage-record-list>
+        </saletab>
         <saletab header="过户查询" v-if="permission('过户查询')">
           <transfer-query-user  :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
         </saletab>
@@ -151,11 +157,14 @@
   import PriceAdjustmentQueryUser from './ic_detail/PriceAdjustmentQueryUser'
   import MeterParam from './ic_detail/MeterParam'
   import DeveiceRecord from './ic_detail/DeveiceRecord'
-
+  import GarbageRecordList from './ic_detail/GarbageRecordList.vue'
+  import InsuranceChargesRecord from './ic_detail/InsuranceChargesRecord.vue'
 export default {
     title: '用户详细信息',
     props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
     components: {
+      InsuranceChargesRecord,
+      GarbageRecordList,
       SecurityCheckInfo,
       RepairList,
       PriceAdjustmentQueryUser,

package/src/components/common/userinfo_detail/ic_detail/CardHandRecord.vue

@@ -31,7 +31,7 @@
                 <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
                 <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                               :field="$parent.$parent.fields" :header="$parent.$parent.other"
-                              sqlurl="rs/logic/saleExport" sql-name="sale_cardhandplanQuery" template-name='抄表查询导出'
+                              sqlurl="api/af-revenue/logic/saleExport" sql-name="sale_cardhandplanQuery" template-name='抄表查询导出'
                               :choose-col="true"  ref="salehandplanExport"></export-excel>
 
                 <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"

package/src/components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser.vue

@@ -90,7 +90,7 @@
               <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_change_operator}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_changetables_reason}}/{{row.f_reason}}/{{row.f_othereason}}</nobr></td>
+              <td style="text-align: center;"><nobr><span v-if="row.f_changetables_reason">{{row.f_changetables_reason}}/</span><span v-if="row.f_reason">{{row.f_reason}}/</span><span v-if="row.f_othereason">{{row.f_othereason}}/</span><span v-if="row.f_comments">{{row.f_comments}}</span></nobr></td>
             </tr>
           </template>
           <template partial='foot'></template>

package/src/components/common/userinfo_detail/ic_detail/GarbageRecordList.vue

@@ -0,0 +1,69 @@
+<template>
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <!-- <criteria partial='criteria'>
+      </criteria> -->
+      <data-grid :model="model" partial='list' v-ref:grid
+                 class="list_area table_sy">
+        <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>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align:center"><nobr> {{ row.f_money}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_state}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_payment}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  /**
+   *用户档案相关信息组件
+   */
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '垃圾费记录',
+    data () {
+      return {
+        model: new PagedList('api/af-revenue/sql/getGarbageRecord', 20),
+        row: Object,
+        show: false
+      }
+    },
+
+    props: {
+      row: {
+        type: Object
+      }
+    },
+    methods: {
+    },
+    watch: {
+      'row' (val) {
+        this.model.rows = []
+        this.model.search(`f_userinfo_id = '${this.row.f_userinfo_id}'`)
+      },
+      'clearflg' () {
+        this.model.rows = []
+      }
+    },
+    ready () {
+      console.log('看看row的信息', this.row)
+      if (this.row.f_userinfo_id) {
+        this.model.search(`f_userinfo_id = '${this.row.f_userinfo_id}'`)
+      }
+    }
+  }
+</script>