调整

src/api/xjWorkSiteCheckApi.js

@@ -89,7 +89,9 @@ export function getFileImg(token, path) {
 // 工地监护 => 获取音频
 export function getFileAudio(token, path) {
   return request({
-    url: '/base/file/loadAudio?access_token=' + token + '&remotePath=' + path.replace(/\//g, '%2f'),
+    // url: '/base/file/loadAudio?access_token=' + token + '&remotePath=http://172.31.21.200:8089/calllist' + path.replace(/\//g, '%2f'),
+    // url: '/base/file/loadAudio?access_token=' + token + '&remotePath=' + path.replace(/\//g, '%2f'),
+    url: '/callfile/calllist' + path,
     method: 'get',
     responseType: 'blob'
   })

src/views/currentSystem/regionalMetering/DMAManageUser/index.vue

@@ -209,10 +209,13 @@ export default {
 
       const ids = this.multipleSelection
         .map((item) => {
-          debugger
           return item.tf_id;
         })
         .join(",");
+        if(!ids){
+          this.$message.info("客户未绑定总表，无法移除")
+          return
+        }
       const sendData = {
         ids: ids,
       };

src/views/currentSystem/waterHotline/statisticalReport/callLogStatistics.vue

@@ -291,8 +291,12 @@ export default {
       this.dialogVisible = true
       var token = this.$store.state.user.token
       console.log(this.multipleSelection,'this.multipleSelection')
-      this.audioSrc = `${IP}/base/file/loadAudio?remotePath=${this.multipleSelection[0].recordFile}&access_token=${token}`
-      this.$refs.audio.play()
+      // this.audioSrc = `${IP}/base/file/loadAudio?remotePath=http://172.31.21.200.8089/calllist${this.multipleSelection[0].recordFile}&access_token=${token}`
+      this.audioSrc = `http://172.31.21.200:8089/calllist${this.multipleSelection[0].recordFile}`
+      this.$nextTick(()=>{
+        console.log(this.$refs.audio,'audio')
+        this.$refs.audio.play()
+      })
       // })
     },
     pause() {
@@ -308,18 +312,19 @@ export default {
       getFileAudio2(
         this.$store.state.user.token,
         this.multipleSelection[0].recordFile).then(src => {
-        console.log('路径：' + src)
-        var reader = new FileReader()
-        reader.readAsDataURL(src)
-        reader.onload = (e) => {
-          const a = document.createElement('a')
+          console.log(src,'src')
+        let BLOB = new Blob([src]);
+        console.log(BLOB,'blob')
+        let url = window.URL.createObjectURL(BLOB);
+        console.log(url,'url')
+        const a = document.createElement('a')
           a.download = '录音文件'
           // 后端设置的文件名称在res.headers的 "content-disposition": "form-data; name=\"attachment\"; filename=\"20181211191944.zip\"",
-          a.href = e.target.result
+          a.href = url
+          console.log(a.href,'href')
           document.body.appendChild(a)
           a.click()
           document.body.removeChild(a)
-        }
       })
     },
 

src/views/currentSystem/waterHotline/workbench/components/payMessage.vue

@@ -21,6 +21,7 @@ import TableItem from "@/components/Table";
 import { getMail } from "@/api/hotline";
 import { lcInfo } from "staticPub/config";
 import axios from "axios";
+import commonMe from '@/utils/common'
 
 export default {
   name: "HistoricalWO",
@@ -42,25 +43,45 @@ export default {
         //   label: "水表表号",
         //   prop: "telephone",
         // },
+        // {
+        //   label: "缴费金额",
+        //   prop: "paymoney",
+        // },
+        // {
+        //   label: "缴费渠道",
+        //   prop: "sfy",
+        // },
+        // {
+        //   label: "缴费日期",
+        //   prop: "paydate",
+        // },
+        // {
+        //   label: "缴费类型",
+        //   prop: "paytypeid",
+        // },
+        // {
+        //   label: "财务日期",
+        //   prop: "kptime",
+        // },
         {
           label: "缴费金额",
-          prop: "paymoney",
+          prop: "PayMoney",
         },
         {
           label: "缴费渠道",
-          prop: "sfy",
+          prop: "SFY",
         },
         {
           label: "缴费日期",
-          prop: "paydate",
+          prop: "PayDate",
         },
         {
           label: "缴费类型",
-          prop: "paytypeid",
+          prop: "PayTypeName",
         },
         {
           label: "财务日期",
-          prop: "kptime",
+          prop: "KPTime",
         },
       ],
       total: 0,
@@ -77,6 +98,22 @@ export default {
   },
 
   methods: {
+    //时间戳转换
+    timeChange(val) {
+      if(val){
+        const date = new Date(val);
+      const year = date.getFullYear();
+      const month = date.getMonth() + 1;
+      const day = date.getDate();
+
+      const formattedDatetime = `${year}-${month}-${day}`;
+      // console.log(formattedDatetime);
+      return formattedDatetime;
+      }else{
+        return "-"
+      }
+ 
+    },
     handleCurrentChange(currentPage) {
       // if (currentPage == 1) {
       //   this.pagination.current = 0;
@@ -95,45 +132,77 @@ export default {
     async fetchData(data) {
       try {
         // const tableData = await getMail(this.pagination);
+        const startTime = commonMe.getDayAppend(commonMe.getPreYaerDate('day'), 'start')
+      const endTime = commonMe.getDayAppend(commonMe.getCurrentDate('day'), 'end')
         const newaxios = axios.create({
           withCredentials: true, // 跨域请求时发送cookiesokies
           timeout: 60000, // 请求超时
         });
         if (this.userId) {
+          // newaxios({
+          //   method: "get",
+          //   url: lcInfo.otherUrlWater,
+          //   headers: {
+          //     "Content-Type": "application/x-www-form-urlencoded",
+          //     Appkey: "sz8ihx4tyyf56h2jn1zunhj7",
+          //     AppSecret: "ihzzm4cgog275557bw84jqfwwn2dggxt",
+          //   },
+          //   params: {
+          //     UserId: this.userId,
+          //     // userId: "9031204",
+          //     limit: this.pagination.size,
+          //     start: this.pagination.current,
+          //     // limit: 10,
+          //     // start: 1,
+          //   },
+          // })
           newaxios({
-            method: "get",
-            url: lcInfo.otherUrlWater,
-            headers: {
-              "Content-Type": "application/x-www-form-urlencoded",
-              Appkey: "sz8ihx4tyyf56h2jn1zunhj7",
-              AppSecret: "ihzzm4cgog275557bw84jqfwwn2dggxt",
-            },
-            params: {
-              UserId: this.userId,
-              // userId: "9031204",
-              limit: this.pagination.size,
-              start: this.pagination.current,
-              // limit: 10,
-              // start: 1,
-            },
-          })
-            .then((res) => {
-              console.log("浪潮接口用户缴费信息", res);
-              let tableList = res.data.result;
-              // console.log("浪潮接口JSON转换", tableList);
+        method: "get",
+        // url: lcInfo.otherUrlUserdetail,
+        // url: lcInfo.getWaterUserInfosDetails,
+        // headers: {
+        //   "Content-Type": "application/x-www-form-urlencoded",
+        //   Appkey: "oievemzt7bowa9v9sf2iczmg",
+        //   AppSecret: "9rbbnwcs3idyyzfpvs2xv9aqr2g28hd7",
+        //   // Appkey: "sz8ihx4tyyf56h2jn1zunhj7",
+        //   // AppSecret: "ihzzm4cgog275557bw84jqfwwn2dggxt",
+        // },
+        url:lcInfo.getWaterUserInfosDetails2,
+        headers: {
+          // "Content-Type": "application/x-www-form-urlencoded",
+          // Appkey: "sz8ihx4tyyf56h2jn1zunhj7",
+          // AppSecret: "ihzzm4cgog275557bw84jqfwwn2dggxt",
+          Appkey:lcInfo.client_id2,
+          AppSecret: lcInfo.client_secret2,
+        },
+        params: {
+          userId: this.userId,
+          startTime: startTime,
+          endTime: endTime
+          // userid: "0101012064",
+        },
+      }).then((res) => {
+              console.log("浪潮接口用户缴费信息1", res);
+              // let tableList = res.data.result;
+              let tableList = JSON.parse(res.data.result);
+              console.log("浪潮接口JSON转换", tableList);
 
-              tableList.data.forEach((item) => {
-                item.userCode = item.UserID;
-                item.userName = item.UserName;
-                item.meterReadingArea = item.AreaName;
-                item.userAddress = item.Address;
-                item.meterReadingBook = item.CbNo;
-                item.waterMeterCode = item.WaterTabID;
-                // item.waterMeterNature = item.watertype1;
-                // item.waterMeterCaliber = item.caliber;
-              });
+              // tableList.data.forEach((item) => {
+              //   item.userCode = item.UserID;
+              //   item.userName = item.UserName;
+              //   item.meterReadingArea = item.AreaName;
+              //   item.userAddress = item.Address;
+              //   item.meterReadingBook = item.CbNo;
+              //   item.waterMeterCode = item.WaterTabID;
+              //   // item.waterMeterNature = item.watertype1;
+              //   // item.waterMeterCaliber = item.caliber;  timeChange
+              // });
+              tableList.data.forEach(item=>{
+                item.PayDate = this.timeChange(item.PayDate)
+                item.KPTime = this.timeChange(item.KPTime)
+              })
               this.list = tableList.data;
-              this.total = Number(res.data.result.total);
+              this.total = Number(tableList.data.length);
             })
             .catch((err) => {
               this.userTableLoading = false;

src/views/currentSystem/waterHotline/workbench/components/waterMessage.vue

@@ -38,7 +38,7 @@ export default {
           sortable: true,
         },
         {
-          label: "用水量",
+          label: "用水量(吨)",
           prop: "waternum1",
         },
         {

src/views/currentSystem/waterHotline/workbench/index.vue

@@ -2468,8 +2468,8 @@ export default {
     // this.loadEchart()
     // this.StartRing(
     //   {
-    //     _Caller:18119511965
-    //     // _Caller:18990330343
+    //     // _Caller:18119511965
+    //     _Caller:18990330343
     //   }
     // )
     this.getdeptdata();

src/views/currentSystem/waterHotline/workbench/register.vue

@@ -196,6 +196,7 @@ export default {
       ],
       rejectedList: [],
       registerForm: {
+        intabManName:'',
         id: "",
         gdbh: "",
         ldhm: "",
@@ -540,6 +541,8 @@ export default {
           // }
           // this.pageInfoShow=true;
           // this.number=number;
+          this.registerForm.intabManName = tempData.data[0].InTabManName
+          this.number=number;
           let lastChange = tempData.data[0].LastChange
           let totalMoney = tempData.data[0].TotMoneyDX
           let payMoney = tempData.data[0].PayMoney
@@ -566,8 +569,10 @@ export default {
         this.registerForm.metertype = data.metertype;
         this.registerForm.lxdh = data.tel1;
         this.registerForm.ysxz = data.watertype1;
+        debugger
         this.registerForm.sbkj=data.caliber
         this.registerForm.kaihutime=data.kaihutime;
+        
     },
     /**
      * @description 来电记录

src/views/currentSystem/work/order/register/components/customerQuery.vue

@@ -110,11 +110,11 @@ export default {
           prop: "address",
         },
         {
-          label: "抄表区域",
+          label: "区域",
           prop: "meterReadingArea",
         },
         {
-          label: "抄表本",
+          label: "册号",
           prop: "meterReadingBook",
         },
         {
@@ -217,14 +217,15 @@ export default {
           item.contactNumber = item.tel1;
           item.address = item.address
           item.phone = item.tel;
-          item.meterReadingArea = item.areaid;
+          item.meterReadingArea = item.areaname;
           item.userAddress = item.address;
           item.meterReadingBook = item.sectionid;
           item.waterMeterCode = item.watertabid;
-          item.waterMeterNature = item.watertype1;
+          item.waterMeterNature = item.wtype1;
           item.waterMeterCaliber = item.caliber;
         });
         that.list = tempData.data.user;
+        console.log(this.list,'list')
         that.pagination.total = Number(tempData.data.total);
       });
 
@@ -300,6 +301,7 @@ export default {
           data[0].nowChange = tempData.data[0].NowChange
           data[0].totalMoney = tempData.data[0].TotMoneyDX
           data[0].payMoney = tempData.data[0].PayMoney
+          data[0].intabManName = tempData.data[0].InTabManName
         this.$emit("userList", data);
       })
 

src/views/currentSystem/work/order/register/register_merge.vue

@@ -263,13 +263,21 @@
               </el-form-item>
             </el-col>
             <el-col :span="16">
-              <el-form-item label="水表类型:" prop="metertype">
+              <!-- <el-form-item label="水表类型:" prop="metertype">
                 <el-input
                   v-model="registerForm.metertype"
                   size="mini"
                   :disabled="disabled"
                   style="width: 100%"
                 />
+              </el-form-item> -->
+              <el-form-item label="抄表员:" prop="intabManName">
+                <el-input
+                  v-model="registerForm.intabManName"
+                  size="mini"
+                  :disabled="disabled"
+                  style="width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -1001,13 +1009,20 @@
                       <div class="component" style="height: 300px">
                         <peopleDistance :point="pointGeo"> </peopleDistance>
                       </div>
-                      <el-button
+                      <!-- <el-button
                         slot="reference"
                         type="primary"
                         plain
                         size="mini"
                         icon="el-icon-s-order"
                         :disabled="workOrderPosition == ''"
+                      /> -->
+                      <el-button
+                        slot="reference"
+                        type="primary"
+                        plain
+                        size="mini"
+                        icon="el-icon-s-order"
                       />
                     </el-popover>
                   </el-tooltip>
@@ -1539,6 +1554,7 @@ export default {
       paginationUser: { current: 1, size: 10 },
       isLcjd: true,
       registerForm: {
+        intabManName:'',
         yue:'',
         position: "",
         id: "",
@@ -3164,11 +3180,13 @@ timestampToDateString(timestamp) {
       // this.registerForm.zgl = val[0].scds || val[0].zgl
       // this.registerForm.cbry = val[0].cbryName
       this.registerForm.khdz = val[0].userAddress;
-      this.registerForm.ysxz = val[0].waterMeterNature;
+      // this.registerForm.ysxz = val[0].waterMeterNature;
+      this.registerForm.ysxz = val[0].wtype1
       this.registerForm.sbbh = val[0].waterMeterCode;
       this.registerForm.sbkj = val[0].waterMeterCaliber;
       this.registerForm.kaihutime = this.timestampToDateString(val[0].kaihutime);
-      this.registerForm.metertype = val[0].metertype;
+      this.registerForm.intabManName = val[0].intabManName;
+      // this.registerForm.metertype = val[0].metertype;
       // if(val[0].nowChange ==0){
       //   if(val[0].lastChange==0){
       //     this.registerForm.yue = 0

src/views/zhpt/zonghezhanshi/waterMeterDataMatch/config.json

@@ -6,15 +6,15 @@
         },
         {
             "value": "0",
-            "name": "未确认"
+            "name": "未确定"
         },
         {
             "value": "1",
-            "name": "已确认"
+            "name": "确定"
         },
         {
             "value": "2",
-            "name": "自动分配"
+            "name": "自动匹配"
         }
     ],
     "bufferDistance":10,

src/views/zhpt/zonghezhanshi/waterMeterDataMatch/widget.vue

@@ -150,18 +150,18 @@
             placeholder="客户编号、客户名称、地址"
             size="small"
           />
-          <span class="title">抄表片区</span>
+          <span class="title">区域</span>
           <el-input
-            v-model="customersWaterMeter.search.cbpq"
+            v-model="customersWaterMeter.search.areaName"
             style="display: inline-block; margin-left: 5px; width: 100px"
-            placeholder="抄表片区"
+            placeholder="区域"
             size="small"
           />
-          <span class="title">抄表本</span>
+          <span class="title">册号</span>
           <el-input
-            v-model="customersWaterMeter.search.cbbmc"
+            v-model="customersWaterMeter.search.sectionId"
             style="display: inline-block; margin-left: 5px; width: 100px"
-            placeholder="抄表本"
+            placeholder="册号"
             size="small"
           />
           <el-button size="small" type="primary" @click="searchCustomerList"
@@ -198,16 +198,16 @@
             label="序号"
           />
           <el-table-column
-            prop="meterReadingArea"
+            prop="areaName"
             align="center"
-            label="抄表片区"
+            label="区域"
           />
           <el-table-column
-            prop="meterReadingBook"
+            prop="intabMan"
             align="center"
-            label="抄表本编码"
+            label="抄表员"
           />
-          <el-table-column prop="cbbmc" align="center" label="抄表本" />
+          <el-table-column prop="sectionId" align="center" label="册号" />
           <el-table-column prop="userCode" align="center" label="客户编号" />
           <el-table-column prop="userName" align="center" label="客户姓名" />
           <!-- <el-table-column prop="waterMeterCode" align="center" label="水表编号" /> -->
@@ -216,7 +216,6 @@
             prop="watertabid"
             align="center"
             label="已关联总表"
-            :formatter="userWaterormatter"
           />
           <el-table-column label="操作">
             <template slot-scope="scope" width="60">
@@ -552,7 +551,9 @@ export default {
           // 查询的数据
           str: "", // 客户编号、客户名称、地址
           cbpq: "", //抄表片区
+          areaName:'',
           cbbmc: "", //抄表本名称
+          sectionId:'',
           size: 10, // 当前每页显示条数
           current: 1, // 当前第几页
         },
@@ -818,7 +819,7 @@ export default {
         },
         params: {
           keyWord: this.customersWaterMeter.search.str,
-          areaName: this.customersWaterMeter.search.cbpq,
+          areaName: this.customersWaterMeter.search.areaName,
           pageNum: this.customersWaterMeter.search.current,
           pageSize: this.customersWaterMeter.search.size,
         },
@@ -832,10 +833,11 @@ export default {
           tableList.data.data.forEach((item) => {
             item.userCode = item.UserID;
             item.userName = item.UserName;
-            item.meterReadingArea = item.AreaName;
+            item.areaName = item.AreaName;
             item.userAddress = item.Address;
-            item.meterReadingBook = item.CbNo;
-            item.waterMeterCode = item.WaterTabID;
+            item.intabMan = item.InTabManID;
+            item.sectionId = item.SectionID;
+            item.watertabid = item.WaterTabID;
             // item.waterMeterNature = item.watertype1;
             // item.waterMeterCaliber = item.caliber;
           });