sale-client 3.6.357 → 3.6.358

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Aug 08 09:41:12 CST 2024
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/', 'http://192.168.50.67:31785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:31785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/FilesManage/Edit.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <button @click="handleClick">渲染</button>
+    <button @click="savePaper">保存</button>
+    <iframe v-if="showSketchPage" :src="sketchPageSrc" id="aaaa2" style="width: 100%; height: 500px;"></iframe>
+  </div>
+</template>
+
+<script>
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+
+export default {
+  title: 'App',
+  data() {
+    return {
+      inputText: '',
+      showSketchPage: false,
+      sketchPageSrc: '/sketch',
+      sketchId: '',
+      title: '',
+      paperMessage: ''
+    };
+  },
+  props: {
+    row: ''
+  },
+  async ready() {
+    if (this.row) {
+      await new HttpResetClass().load('POST', 'rs/sql/tel_singleTable_OrderBy', {data: {
+        items: 'blob', tablename: 't_blob_sketch', condition: `id  = '${this.row}'`, orderitem: 'id'
+      }}).then(res => {
+        if (res.data.length === 0) { return }
+        try {
+          let hex = Buffer.from(res.data[0].blob, 'hex').toString('utf8');
+          if (!hex.includes('{')) {
+            this.inputText = Buffer.from(hex, 'hex').toString('utf8');
+          } else {
+            this.inputText = hex;
+          }
+        } catch (e) {
+          this.$showMessage('网络异常请联系管理员')
+        }
+        this.handleClick()
+      })
+    }
+  },
+  methods: {
+    handleClick() {
+      this.showSketchPage = true;
+      this.$nextTick(() => {
+        const sketchIframe = document.getElementById('aaaa2');
+
+        window.addEventListener('message', (event) => {
+          if (JSON.parse(event.data.param).gadgets.length > 0) {
+            this.paperMessage = event.data.param;
+          }
+        });
+
+        sketchIframe.contentWindow.postMessage(this.inputText, '*');
+      })
+    },
+    savePaper() {
+      if (!this.paperMessage) {
+        this.$showMessage('请先点击左上角保存图标')
+        return
+      }
+      let param = JSON.parse(this.paperMessage)
+      if (!param.title) {
+        this.$showMessage('请填写示意图标题')
+        return
+      }
+      let gadgets = param.gadgets
+      if (gadgets.length > 0) {
+        var jsonString = JSON.stringify(param);
+        var reqdata = {
+          blob: Buffer.from(jsonString,'utf8').toString('hex'),
+          orgid: this.$login.f.orgid,
+          orgname: this.$login.f.orgs,
+          title: param.title,
+          f_userinfo_id: this.row
+        }
+        new HttpResetClass().load('POST', 'rs/logic/savePaperEdit', {data: reqdata}).then(res => {
+          if (res.data.code === 200) {
+            this.$showMessage('保存成功')
+          } else {
+            this.$showMessage('保存失败')
+          }
+        })
+      }
+    },
+    hexToBytes(hex) {
+      for (var bytes = [], c = 0; c < hex.length; c += 2)
+        bytes.push(parseInt(hex.substring(c, 2), 16));
+      return new Uint8Array(bytes);
+    },
+    decodeHexStringToJSON(hexString) {
+      // 去除前缀 "0x"
+      var cleanHexString = hexString.slice(2);
+
+      // 将十六进制字符串转换为字节数组
+      var byteArray = this.hexToBytes(cleanHexString);
+
+      // 创建 Blob 对象
+      var blob = new Blob([byteArray], {type: 'application/json'});
+
+      // 读取 Blob 为文本
+      return new Promise(function(resolve, reject) {
+        var reader = new FileReader();
+        reader.onloadend = function() {
+          resolve(reader.result);
+        };
+        reader.onerror = function() {
+          reject(reader.error);
+        };
+        reader.readAsText(blob, 'UTF-8');
+      });
+    }
+  },
+  // beforeDestroy() {
+  //   this.savePaper()
+  // }
+}
+</script>
+
+<style>
+/* 这里可以添加样式 */
+</style>

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -11,6 +11,7 @@
           </button>
           <button class="button_search" style="width: max-content" @click="uploadFiles()">上传/查看附件</button>
           <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
+          <button class="button_search" style="width: max-content" @click="openPaper()" v-if="paperButton">图纸编辑</button>
           <button class="button_search" style="width: max-content" @click="openBankAccount()"
                   v-if="data.meterinfo[0].f_user_type[0] === '非民用' && ($login.r.includes('银行开户'))">银行开户
           </button>
@@ -143,6 +144,19 @@
         </button>
       </footer>
     </modal>
+    <modal :show.sync="showModal" backdrop="false" :width="1000" v-if="paperButton">
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          图纸编辑
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <edit :row="rowData" v-if="showModal"></edit>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" @click="cancelPaper">取消</button>
+      </div>
+    </modal>
   </div>
   <work-busy :is-busy="seaching"></work-busy>
 </template>
@@ -201,6 +215,9 @@ export default {
   components: {UserPaperInfoTest},
   data () {
     return {
+      showModal:false,
+      rowData:'',
+      paperButton:this.$appdata.getSingleValue('图纸编辑'),
       config: {
         hasnumber: false,
         adddevices: false,
@@ -337,6 +354,13 @@ export default {
     }
   },
   methods: {
+    openPaper(){
+      this.rowData = this.row.f_userinfo_id
+      this.showModal = true
+    },
+    cancelPaper(){
+      this.showModal = false
+    },
     async getOvedueset () {
       let overdueset = []
       let res = await this.$resetpost('rs/sql/saleSingleTable', {

package/src/components/revenue/comprehen/StairPrice/GasPriceUser.vue

@@ -84,6 +84,11 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-3" >
+              <label  class="font_normal_body">客户地址</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_address" placeholder='客户地址'
+                     condition="f_address like '%{}%'" @keyup.enter="search()">
+            </div>
           </div>
         </div>
       </criteria>

package/src/components/webMeter/paramSave/ParamSetForm.vue

@@ -159,6 +159,9 @@ export default {
             for (let j = 0; j < this.newmeterinfo[i].params.length; j++) {
               if (this.newmeterinfo[i].name === this.paramtype) {
                 for (let j = 0; j < this.newmeterinfo[i].params.length; j++) {
+                  if (this.newmeterinfo[i].params[j].data) {
+                    this.row[this.newmeterinfo[i].params[j].title] = this.newmeterinfo[i].params[j].data
+                  }
                   if (this.newmeterinfo[i].params[j].multiple == true) {
                     this.row[this.newmeterinfo[i].params[j].title] = []
                     console.log('====>', this.row[this.newmeterinfo[i].params[j].title])