sale-client 3.6.560 → 3.6.562

package/package.json

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

package/src/components/chargeNew/thirdSurplus.vue

@@ -179,6 +179,7 @@
     <article slot="modal-body" class="modal-body">
       <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
                    action="rs/file/uploadFile" tagname="调价导入" v-ref:file :headers="headers" multiple></file-upload>
+      <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
     </article>
     <footer slot="modal-footer" class="modal-footer">
     </footer>
@@ -190,7 +191,7 @@ import Vue from 'vue'
 
 export default {
   title: '调价导入',
-  data() {
+  data () {
     return {
       model: new PagedList('rs/sql/getsurplus', 20, {items: '"*"', tablename: '"t_meterinfo"', orderitem: '"id"'}),
       criteriaShow: false,
@@ -213,18 +214,22 @@ export default {
       show: false
     }
   },
-  ready() {
+  ready () {
     this.search()
   },
 
   methods: {
-    clear() {
+    clear () {
       Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
         this.$refs.paged.$refs.criteria.model[key] = []
       })
       this.deleteShow = false
     },
-    delete() {
+    downloadFiles () {
+      let downurl = 'rs/downloadfile/file?filename=调价补差导入模板'
+      this.$downFile(downurl, '调价补差导入模板.xlsx')
+    },
+    delete () {
       if (this.ids.length !== 0) {
         this.$refs.paged.$refs.criteria.condition = this.$refs.paged.$refs.criteria.condition + 'and id in (' + this.ids + ')'
       }
@@ -240,14 +245,14 @@ export default {
         }
       })
     },
-    deleteAdjustImport(condition) {
+    deleteAdjustImport (condition) {
       console.log(condition)
       return this.$resetpost('rs/logic/deleteAdjustImport', {condition: condition}, {
         resolveMsg: '删除成功',
         rejectMsg: '删除失败'
       })
     },
-    isAll(page) {
+    isAll (page) {
       // console.log(this.model.ids)
       if (this.pages.includes(page)) { // 已添加,取消动作
         // 从ids中删除本页所有数据的ids
@@ -260,7 +265,7 @@ export default {
         this.addOrRemove(true)
       }
     },
-    addOrRemove(is) {
+    addOrRemove (is) {
       let that = this
       if (is) { // 添加本页所有数据到ids中
         this.ids = []
@@ -278,13 +283,13 @@ export default {
         })
       }
     },
-    hidden() {
+    hidden () {
       this.criteriaShow = !this.criteriaShow
     },
-    search() {
+    search () {
       this.$refs.paged.$refs.criteria.search()
     },
-    selfSearch(args) {
+    selfSearch (args) {
       if (!this.f_orgid) {
         this.getorgCur([this.$login.f.orgid])
       }
@@ -299,14 +304,14 @@ export default {
       }
     },
 
-    getorgCur(val) {
+    getorgCur (val) {
       console.log('组织事件返回。。', val[0])
       this.f_orgid = this.$login.convertToIn(val)
       this.f_filialeids = val[0]
       this.$parent.f_filialeid = val[0]
       this.search()
     },
-    importFile() {
+    importFile () {
       this.show = true
     }
 

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

@@ -50,6 +50,7 @@
         console.log(userinfoid)
         this.showbuy = true
         this.f_userinfo_id = userinfoid
+        console.log("uuuurl", window.location.href)
         this.$resetpost('wx/rs/logic/wordToosRept', {f_userinfo_id: this.f_userinfo_id}, {resolveMsg: null, rejectMsg: '获取合同失败！！'}).then(item => {
           if (item.data.length > 0) {
             this.scheduleData = item.data[0]
@@ -58,7 +59,8 @@
             // 2. 对 URL 进行编码
             let fullUrl = encodeURI(this.url.replace(/\\/g, '/'))
             this.$resetpost(`rs/convert/convertImg`, {url: fullUrl}, {resolveMsg: null, rejectMsg: null}).then((ret) => {
-              let img = window.location.href + 'files' + ret.data
+              let href = window.location.href.split('#')[0]
+              let img = href + 'files' + ret.data
               this.imgurl = encodeURI(img.replace(/\\/g, '/'))
               console.log(this.imgurl)
               this.showbuy = false

package/src/filiale/bayan/NoCardMeterCenter.vue

@@ -109,7 +109,7 @@
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
             <div class="col-sm-4">
-              <label for="f_write_card" style="color: red" class=" font_normal_body">是否写卡</label>
+              <label for="f_write_card" style="color: red" class=" font_normal_body">是否写</label>
               <v-select id="f_write_card"
                         v-model="model.f_write_card"
                         placeholder='是否写卡'
@@ -459,13 +459,21 @@
           }
         }
       },
-      calText (val) {
-        let str = ''
+      calText(val) {
+        let str = '';
+        let total = 0; // 用于存储总金额
+
         val.forEach((item) => {
-          str = str + item.f_price + ' x ' + item.f_gas + '+'
-        })
-        str = str.slice(0, str.length - 1)
-        this.calculatedetail = str
+          const price = parseFloat(item.f_price);
+          const gas = parseFloat(item.f_gas);
+          const result = price * gas; // 计算每项的结果
+          total += result; // 累加到总金额
+          str += `${price} x ${gas} = ${result.toFixed(3)} + `; // 显示三位小数
+        });
+
+        str = str.slice(0, -2); // 去掉最后的 " + "
+        str += ` = ${total.toFixed(3)}`; // 添加总和，并保留三位小数
+        this.calculatedetail = str;
       },
       close () {
         this.print = false

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -172,7 +172,11 @@ export default {
     },
     changeDate () {
       for (let i = 0; i < this.devicesinfonew.length; i++) {
-        if (this.devicesinfonew[i].f_devices_type == '报警器') {
+        if (this.devicesinfonew[i].f_devices_type == '民用-报警器') {
+          this.devicesinfonew[i].f_alarm_type = '民用'
+          this.alarmExpireDate(i)
+        } else if(this.devicesinfonew[i].f_devices_type == '工商-报警器'){
+          this.devicesinfonew[i].f_alarm_type = '工商'
           this.alarmExpireDate(i)
         } else if (this.devicesinfonew[i].f_devices_type == '切断阀' || this.devicesinfonew[i].f_devices_type == '自闭阀') {
           this.expireDate(i)
@@ -200,6 +204,9 @@ export default {
       } else {
         let b = new Date(this.devicesinfonew[index].f_firstcheck_date)
         let year = (b.getFullYear() - 0) + 5
+        if(this.devicesinfonew[index].f_alarm_type == '民用'){
+          year = (b.getFullYear() - 0) + 3
+        }
         let year2 = (b.getFullYear() - 0) + 1
         let month = (b.getMonth() - 0) + 1
         var day = b.getDate()