sale-client 4.2.67 → 4.2.69

package/package.json

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

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

@@ -0,0 +1,136 @@
+<template>
+  <div class="panel panel-info auto">
+    <div class="panel-heading auto" style="height: 35px">
+      <h4 style="display:inline-block;margin-top: auto">未处理隐患</h4>
+    </div>
+
+    <table class="table table-striped table-bordered" v-if="hiddenDangerList.length > 0">
+      <tbody v-for="(index,row) in hiddenDangerList">
+        <tr>
+          <td colspan="4" style="text-align: center;background-color: #8cbce2;">未处理隐患{{index+1}}明细
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患名称:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ row.f_item_name }}</td>
+        </tr>
+        <tr>
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">发现时间:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ row.f_offsite_time }}</td>
+        </tr>
+        <tr>
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">发现人员:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ row.f_checker_name }}</td>
+        </tr>
+        <tr>
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">隐患照片:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+            <div class="img">
+              <img-self :src="'rs/image/file/' + row.f_path" width="150" height="150"></img-self>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="row.f_p1_path">
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">隐患照片2:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+            <div class="img">
+              <img-self :src="'rs/image/file/' + row.f_p1_path" width="150" height="150"></img-self>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="row.f_p2_path">
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">隐患照片3:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+            <div class="img">
+              <img-self :src="'rs/image/file/' + row.f_p2_path" width="150" height="150"></img-self>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="row.f_p3_path">
+          <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">隐患照片4:</td>
+          <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+            <div class="img">
+              <img-self :src="'api/af-revenue/file/image/' + row.f_p3_path" width="150" height="150"></img-self>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <div class="auto info-content" v-if="hiddenDangerList.length === 0">
+      <div class="row">
+        <strong>暂无未处理隐患信息</strong>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+/**
+ *用户信息
+ *安检信息
+ */
+
+import { HttpResetClass } from 'vue-client'
+
+let getHiddenDangerGen = async function (self) {
+  try {
+    let http = new HttpResetClass()
+    let condition = `f_userinfoid = ${self.data.f_userinfo_id} and f_is_repaired = '隐患未处理'`
+    let getHiddenDanger = await http.load('POST', 'api/af-safecheck/sql/defectDetails', {
+      data: {
+        condition: condition,
+        f_filialeid: `('${self.$login.f.orgid}')`
+      }
+    }, {resolveMsg: null, rejectMsg: null})
+    console.log('getHiddenDanger', getHiddenDanger)
+    self.hiddenDangerList = getHiddenDanger.data
+  } catch (error) {
+    console.error(error)
+  }
+}
+
+export default {
+  title: '安检信息',
+  data () {
+    return {
+      hiddenDangerList: [],
+      style: 'text-align: center;border: #E9E9E9 solid 1px;'
+    }
+  },
+  props: ['data'],
+  ready () {
+    if (this.data) {
+      getHiddenDangerGen(this)
+    }
+  },
+  methods: {},
+  computed: {},
+  watch: {
+    'data' () {
+      if (this.data == null) {
+        this.hiddenDangerList = []
+      } else {
+        getHiddenDangerGen(this)
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.img {
+  border: 1px solid #9773ed;
+  width: auto;
+  height: auto;
+  margin: 6px auto;
+  display: inline-block;
+  text-align: center;
+}
+
+img {
+  margin: 6px;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>

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

@@ -6,7 +6,8 @@
     <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>
-
+    <!--  未处理隐患  -->
+    <sale-hidden-danger-info :data="data"></sale-hidden-danger-info>
     <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>
     <check-gas :data="data" v-if="checkgas==='气量核对'"></check-gas>
   </div>

package/src/filiale/fugou/MeterinfoTest.vue

@@ -375,8 +375,14 @@
             <label for="f_adjustable" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_adjustable','调压箱')}}</label>
             <input type="text" v-model="row.f_adjustable" v-show="false"
                    v-validate:f_adjustable=getConfigValidate("f_adjustable",false)>
-            <v-select :value.sync="row.f_adjustable" :options='adjustables' placeholder='调压箱' close-on-select
-                      v-model='row.f_adjustable' :search='true'></v-select>
+            <v-select :value.sync="row.f_adjustable"
+                      :options='adjustables'
+                      placeholder='调压箱'
+                      close-on-select
+                      @select-search="getAdjustables"
+                      v-model='row.f_adjustable'
+                      :search='true'>
+            </v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_hand_date.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_hand_date && formconfig.f_hand_date.required) || !onlyshowmust"
@@ -761,6 +767,7 @@
         opteratormetrbook: false, // 抄表册操作
         oldrow: [],
         overdueset: [],
+        adjustables: [],
         isiot: true,
         meterNumberDisabled: false,
         meterChangeDisabled: this.$appdata.getSingleValue('建档后禁止更改表号') ? this.$appdata.getSingleValue('建档后禁止更改表号') : false,
@@ -799,8 +806,26 @@
       await this.getConcentrators()
       co(meterBookGen(this))
       await readyGen(this)
+      await this.getAdjustables()
     },
     methods: {
+      async getAdjustables (searchText) {
+        let condition = `f_orgid = '${this.$login.f.orgid}'`
+        if (searchText) {
+          condition = condition + ` and (f_adjustable_name like '%${searchText}%' or f_adjustable_id like '%${searchText}%')`
+        }
+        let data = {
+          items: 'id,f_adjustable_name,f_adjustable_id',
+          tablename: 't_adjustablebox',
+          condition: condition,
+          orderitem: 'id desc'
+        }
+        let result = await this.$resetpost('rs/sql/singleTable_OrderBy?pageNo=1&pageSize=100', {data: data}, {resolveMsg: null, rejectMsg: '获取集中器失败!'})
+        this.adjustables = [{label: '全部', value: ''}]
+        for (let row of result.data) {
+          this.adjustables.push({label: `[${row.f_adjustable_id}]-${row.f_adjustable_name}`, value: row})
+        }
+      },
       validateInput (event, key) {
         const value = event.target.value
         const sanitizedValue = value.replace(/[^0-9.]/g, '')
@@ -1150,18 +1175,6 @@
         })
         return Array.from(new Set(result))
       },
-
-      adjustables () {
-        let arr = []
-        let filter = this.f_filialeid
-        this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
-          let temp = {}
-          temp.label = `[${item.value.f_adjustable_id}]-${item.label}`
-          temp.value = item.value
-          arr.push(temp)
-        })
-        return [{label: '全部', value: ''}, ...arr]
-      },
       inputtores () {
         // return this.$login.f.f_gasman
         let rs = new Array()

package/src/filiale/hongYa/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -13,7 +13,6 @@
                       :value.sync="model.f_type"
                       :options='replacewatchtype'
                       @change="typeChange"
-                      :disabled="!(row.f_meter_type.includes('卡表')||row.f_meter_type ==='物联网表')"
                       close-on-select clear-button>
             </v-select>
           </div>

package/src/plugins/CommonService.js

@@ -244,7 +244,9 @@ let CommonService = {
       totalmoney: cardParams.data.f_collection,
       stairversion: cardParams.data.f_stairversion,
       pricedate: cardParams.data.pricedate,
-      pricetype: cardParams.data.pricetype
+      pricetype: cardParams.data.pricetype,
+      stairperiod: cardParams.data.stairperiod ? cardParams.data.stairperiod : null,
+      stairstartdate: cardParams.data.stairstartdate ? cardParams.data.stairstartdate : null
     }
 
     // 对阶梯进行处理

package/src/sale.js

@@ -134,6 +134,8 @@ export default function () {
   Vue.component('user-fee-info', (resolve) => { require(['./components/revenue/base/leftview/UserFeeInfo'], resolve) })
   // 安检信息
   Vue.component('sale-safecheck-info', (resolve) => { require(['./components/revenue/base/leftview/SafeCheck'], resolve) })
+  // 未处理隐患信息
+  Vue.component('sale-hidden-danger-info', (resolve) => { require(['./components/revenue/base/leftview/HiddenDangerInfo'], resolve) })
   // 当前选择用户的发票信息
   Vue.component('bill-message', (resolve) => { require(['./components/revenue/base/leftview/billMessage'], resolve) })
   // 当前选择用户的阶梯使用信息