sale-client 3.6.362 → 3.6.363

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Aug 14 11:29:51 CST 2024
+gradle.version=5.2.1

package/build/dev-server.js

@@ -29,12 +29,12 @@ var devConfig = {
       '/invoice/rs/logic/getInvoice': {
         target: serverRul
       },
-      // '/rs/sql/filemanage_getUserfies':{
-      //   target: 'http://127.0.0.1:8080/'
-      // },
-      // '/rs/logic/importNetworkValve':{
-      //   target: 'http://127.0.0.1:8080/'
-      // },
+      '/rs/sql/filemanage_getUserfies':{
+        target: 'http://127.0.0.1:8080/'
+      },
+      '/rs/logic/importNetworkValve':{
+        target: 'http://127.0.0.1:8080/'
+      },
       '/rs/file': {
         target: localUrl
       },

package/package.json

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

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

@@ -85,7 +85,7 @@
               <th><nobr>用气量</nobr></th>
               <th><nobr>用气金额 </nobr></th>
               <th><nobr>本期余额</nobr></th>
-              <th v-if="!row.f_meter_type.includes('物联网表')"><nobr>是否缴费 </nobr></th>
+              <th><nobr>是否缴费 </nobr></th>
               <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>一阶单价 </nobr></th>
               <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>一阶气量 </nobr></th>
               <th v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')"><nobr>二阶单价 </nobr></th>
@@ -111,7 +111,7 @@
               <td style="text-align:center">{{row.f_oughtamount}}</td>
               <td style="text-align:center">{{row.f_oughtfee}}</td>
             <td style="text-align:center">{{row.f_curbalance}}</td>
-              <td style="text-align:center" v-if="!row.f_meter_type.includes('物联网表')">{{row.f_whether_pay}}</td>
+              <td style="text-align:center">{{row.f_whether_pay}}</td>
               <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair1price}}</td>
               <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stairamount1}}</td>
               <td style="text-align:center" v-if="!$parent.$parent.$parent.f_calculation.includes('表端结算')">{{row.f_stair2price}}</td>
@@ -248,7 +248,8 @@
     props: ['row'],
     ready () {
       this.$refs.paged.$refs.criteria.model.f_hand_state = ['有效']
-      this.f_calculation = this.row.f_calculation
+      this.f_calculation = this.row.f_calculation ? this.row.f_calculation : ''
+      console.log('123' + this.f_calculation)
       this.$refs.paged.$refs.criteria.search()
       // this.sumgasandmoney= this.$refs.paged.$refs.grid.model.sums
       for (let i in this.all) {

package/src/filiale/bayan/EnableManage.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-6  form-group">
+            <label class="font_normal_body">停用时间</label>
+            <input type="text" class="input_search" v-model="disable.f_operate_date" style="width:60%" disabled placeholder="上次停用时间"/>
+          </div>
+          <div class="col-sm-6  form-group">
+            <label class="font_normal_body">操作人</label>
+            <input type="text" class="input_search" v-model="disable.f_operator" style="width:60%" disabled placeholder="操作人"/>
+          </div>
+          <div class="col-sm-12  form-group">
+            <label class="font_normal_body">停用原因</label>
+            <input type="text" class="input_search" v-model="disable.f_comments" style="width:60%" disabled placeholder="停用原因"/>
+          </div>
+          <div class="col-sm-12  form-group">
+            <label class="font_normal_body">其他原因</label>
+            <input type="text" class="input_search" v-model="disable.f_othereason" style="width:60%" disabled placeholder="停用原因"/>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label for="f_reason" class="font_normal_body">启用原因</label>
+            <v-select v-model="model.f_comments" style="width:60%"
+                      placeholder='启用原因'
+                      :value.sync="model.f_comments"
+                      :options='reason'
+                      v-ref:reason
+                      close-on-select ></v-select>
+          </div>
+          <div class="checkbox col-sm-4" style="margin-left:5%" v-if="!kaifa&&row.f_meter_type ==='物联网表'">
+            <label>
+              <input style="zoom: 200%;top: 1px;left: 14px;" @click="changeisuse(true)" type="checkbox" name="optionsRadios" :id="'optionsRadios'+index" value="option1"  :checked="kaifa?'checked':''">
+              开阀
+            </label>
+          </div>
+          <div class="checkbox col-sm-4" style="margin-left:5%" v-if="kaifa&&row.f_meter_type ==='物联网表'">
+            <label>
+              <input style="zoom: 200%;top: 1px;left: 14px;" @click="changeisuse(false)" type="checkbox" name="optionsRadios" :id="'optionsRadios'+index" value="option1"  :checked="kaifa?'checked':''">
+              开阀
+            </label>
+          </div>
+        </div>
+        <div class="row" style="margin-top:1px;">
+          <div class="col-sm-8 form-group">
+            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"/>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_clear" @click="clean()" >取消</button>
+      </div>
+      <upload :blodid="model.f_userinfo_id"  :businessid="randomBusinessId" isremark="true" :deleteimg="true" fusetype="表具启用"></upload>
+    </validator>
+  </div>
+</template>
+<script>
+/**
+*综合业务
+*表具启用组件
+*/
+
+let meterEnable = async function (self, model, row) {
+  let data = {
+    f_userfiles_id: {
+      f_userfiles_id: row.f_userfiles_id,
+      f_table_state: '正常',
+      version: row.version
+    },
+    f_user_id: row.f_user_id,
+    record_userinfo: row.f_userinfo_id,
+    f_userinfo_id: row.f_userinfo_id,
+    f_user_name: row.f_user_name,
+    f_user_phone: row.f_user_phone,
+    f_state: '有效',
+    f_comments: model.f_comments[0],
+    f_othereason: model.f_othereason,
+    f_operat_type: '启用',
+    f_describe: `${self.$login.f.name}对客户${row.f_user_name}进行表具启用操作`,
+    f_operator: self.$login.f.name,
+    f_operatorid: self.$login.f.id,
+    f_orgid: self.$login.f.orgid,
+    f_orgname: self.$login.f.orgs,
+    f_depid: self.$login.f.depids,
+    f_depname: self.$login.f.deps,
+    f_zoneid: self.$login.f.zoneid,
+    f_zones: self.$login.f.zones
+  }
+  let returnData = await self.$resetpost('rs/entity/t_enable', data, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
+  console.log('1111111111111')
+  console.log(returnData)
+  console.log('111111111111')
+  let param1 = []
+  for (let row of self.resid) {
+    param1.push({id: row.id})
+  }
+  let param = {
+    param: param1,
+    f_blobid: returnData.data.id
+  }
+  await self.$resetpost('rs/logic/updatefiles', param)
+  if(self.kaifa){
+    let array = [{
+      f_user_id: self.row.f_userfiles_id,
+      f_alias: self.row.f_alias,
+      f_userinfo_id: self.row.f_userinfo_id,
+      f_orgname: self.$login.f.orgs,
+      f_orgid: self.$login.f.orgid,
+      f_meternumber: self.row.f_meternumber
+    }]
+    await self.$resetpost('rs/logic/iot_instructUpdateAndDelect',
+      {
+        data: {
+          data1: {
+            f_apply_type: '阀门控制',
+            userid: array,
+            nowDate: new Date(),
+            f_apply_value: '开阀',
+            f_apply_beizhu: '表具停用自动开阀',
+            f_apply_operator: self.$login.f.name
+          },
+          data2: {
+            userid: array,
+            instructtype: '阀门控制',
+            isOpen: '开阀',
+            instructTitle: '手动开阀',
+            f_instruct_state: '待发送',
+            inputtor: self.$login.f.name
+          }
+        }
+      })
+  }
+  self.$dispatch('success')
+}
+
+export default {
+  title: '启用管理',
+  props: ['row'],
+  data () {
+    return {
+      model: {
+      },
+      select: {
+        f_date: '',
+        f_reason: ''
+      },
+      resid:[],
+      randomBusinessId:null,
+      reason: this.$appdata.getParam('启用原因'),
+      disable: {},
+      kaifa:false
+    }
+  },
+  ready () {
+    this.deactivatedReason()
+    this.getRandomId()
+  },
+  events: {
+    // 删除Resid数组元素
+    'delResid' (val) {
+      this.resid.$remove({id: val, f_biobid: ''})
+      // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+    },
+    // 增加Resid数组元素
+    'resid' (val) {
+      console.log('-=', val)
+      this.resid.push({id: val, f_biobid: ''})
+    }
+  },
+  methods: {
+    getRandomId () {
+      this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        let res = Math.random() * 16 | 0
+        let v = c == 'x' ? res : (res & 0x3 | 0x8)
+        return v.toString(16)
+      })
+    },
+    changeisuse(val){
+      if(val){
+        this.kaifa = true
+      }else{
+        this.kaifa = false
+      }
+    },
+    // 查询停用原因
+    async deactivatedReason () {
+      let data = {
+        tablename: 't_disable',
+        condition: `id = (select max(id) from t_disable where f_userfiles_id = '${this.row.f_userfiles_id}')`
+      }
+      let res = await this.$resetpost('rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取上次停用原因失败'})
+      this.disable = res.data[0]
+    },
+    confirm () {
+      meterEnable(this, this.model, this.row)
+      // this.$LogicService.meterEnable(this.model, this.row)
+      // .then(
+      //   (res) => this.$dispatch('success', '表具启用', this.row, res)
+      // ).catch(
+      //   (error) => {
+      //     if (error.state === 603) {
+      //       this.$error('重复提交')
+      //       return
+      //     }
+      //     this.$dispatch('error', '表具启用', this.row, error)
+      //   }
+      // )
+    },
+    clean () {
+      this.$dispatch('refresh')
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/bayan/EnableManageDetail.vue

@@ -0,0 +1,121 @@
+<template>
+  <partial-view v-ref:pv>
+    <div class="row">
+      <label class="col-sm-4">客户名称:</label>
+      <span class="col-sm-8" style="text-align:left">{{model.f_user_name}}</span>
+    </div>
+    <div class="row">
+      <label class="col-sm-4">表编号:</label>
+      <span class="col-sm-8" style="text-align:left">{{model.f_user_id}}</span>
+    </div>
+    <div class="row">
+      <label class="col-sm-4">启用原因:</label>
+      <pre style="padding:0" class="col-sm-8">{{model.f_reason}}</pre>
+    </div>
+    <div class="row">
+      <label class = "col-sm-4">备注:</label>
+      <pre style="padding:0" class = "col-sm-8">{{model.f_othereason}}</pre>
+    </div>
+    <div class="row">
+    <div class="row">
+      <label class="col-sm-4">操作人:</label>
+      <span class="col-sm-8" style="text-align:left">{{model.f_operator}}</span>
+    </div>
+    <div class="row">
+      <label class="col-sm-4">操作时间:</label>
+      <span class="col-sm-8" style="text-align:left">{{data.f_operate_date}}</span>
+    </div>
+    <div class="row">
+      <button class="button_search" style="margin-left:9%" @click="fileUpload()">附件查看</button>
+    </div>
+
+    <!-- 弹窗组件 -->
+    <div v-if="showUpload" class="modal">
+      <div class="modal-content">
+        <span class="close" @click="showUpload = false">&times;</span>
+        <upload-img :blodid="data.f_userinfo_id"  :businessid="data.id" isremark="true"  fusetype="表具启用"></upload-img>
+      </div>
+    </div>
+  </partial-view>
+</template>
+
+<script>
+export default {
+  title: '表具启用详情',
+  props: ['data'],
+  data () {
+    return {
+      model: {},
+      showUpload: false
+    }
+  },
+  mounted () {
+    console.log('组件已挂载')
+    console.log('初始 model:', this.model)
+  },
+  ready () {
+    console.log('this.data', this.data)
+    let sql = 'getEnable'
+    let condition = {
+      id: this.data.id,
+      f_userinfo_id: this.data.f_userinfo_id
+    }
+    this.$info(`加载数据, sql:${sql}`)
+    this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: condition}}).then((a) => {
+      this.model = a.data
+    }).catch((error) => {
+      if (error.status) {
+        this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
+        return
+      }
+      throw error
+    })
+  },
+  methods: {
+    fileUpload () {
+      this.showUpload = true
+      console.log('文件上传按钮被点击')
+      console.log('客户名称:', this.model.f_user_name) // 打印 model.f_user_name
+      console.log('客户名称:', this.model) // 打印 model.f_user_name
+    }
+  }
+}
+</script>
+
+<style>
+/* 样式可根据需要调整 */
+.modal {
+  display: block;
+  position: fixed;
+  z-index: 1;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgb(0,0,0);
+  background-color: rgba(0,0,0,0.4);
+}
+
+.modal-content {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 80%;
+}
+
+.close {
+  color: #aaa;
+  float: right;
+  font-size: 28px;
+  font-weight: bold;
+}
+
+.close:hover,
+.close:focus {
+  color: black;
+  text-decoration: none;
+  cursor: pointer;
+}
+</style>