sale-client 3.6.293 → 3.6.295

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed May 15 09:49:58 CST 2024
+gradle.version=7.4

package/package.json

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

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

@@ -0,0 +1,51 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form class="form-horizontal">
+
+        <div class="row" style="margin-top:1px;">
+          <div class="col-sm-8 form-group">
+            <label for="f_reason">该用户未签合同请问是否进行签约</label>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search button_spacing" @click="confcontor()" >确认</button>
+        <button class="button_clear" @click="abolishcontr()" >取消</button>
+      </div>
+    </validator>
+  </div>
+  <contract-signing-brain :show="contractShow" @toggle="eticket_toggle" v-ref:contractbill></contract-signing-brain>
+</template>
+<script>
+  /**
+   *综合业务
+   表具停用组件
+   */
+  export default {
+    title: '表具停用',
+    props: ['row'],
+    data () {
+      return {
+        contractShow: false
+      }
+    },
+    ready () {
+    },
+    methods: {
+      eticket_toggle () {
+        this.contractShow = false
+      },
+      confcontor () {
+        this.contractShow = true
+        this.$refs.contractbill.getContractData(this.row.f_userinfo_id)
+      },
+      abolishcontr () {
+        this.$dispatch('refresh')
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/components/revenue/Common/LimitGas.vue

@@ -142,11 +142,11 @@
           f_third_pay: '0',
           f_time_type: '按月',
           f_limit_times: '',
-          f_time_value: '',
+          f_time_value: '0',
           f_limit_type: '气量',
           f_limit_style:'',
-          f_limit_value: 0,
-          f_limit_amount: 0,
+          f_limit_value: '',
+          f_limit_amount: '',
           f_start_date: this.$login.toStandardDateString()
         },
         limitshow: false,
@@ -191,12 +191,12 @@
         this.model = {
           f_third_pay: this.model.f_third_pay,
           f_time_type: this.model.f_time_type,
-          f_limit_times: '',
-          f_time_value: '',
-          f_limit_type: '气量',
-          f_limit_style:'',
-          f_limit_value: 0,
-          f_limit_amount: 0,
+          f_limit_times: this.model.f_limit_times,
+          f_time_value: this.model.f_time_value,
+          f_limit_type: this.model.f_limit_type,
+          f_limit_style: this.model.f_limit_style,
+          f_limit_value: this.model.f_limit_value,
+          f_limit_amount: this.model.f_limit_amount,
           f_start_date: this.$login.toStandardDateString()
         }
         console.log('提交限购数据', this.model)

package/src/filiale/bayan/ChargeOper.vue

@@ -13,23 +13,10 @@
   <div v-show="isBusiness" style="height: auto" class="select-overspread">
     <route v-ref:route></route>
   </div>
-  <modal :show.sync="modalContornShow" backdrop="false" width="50%" title="提示信息">
-    <article slot="modal-body">
-      <div style="width:98%;margin: auto">
-        <p>该用户未签合同请问是否进行签约</p>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer" style="border: 0">
-      <button class="button_search"   @click="abolishcontr()">取消</button>
-      <button class="button_search"   @click="confcontor()">确认</button>
-    </footer>
-  </modal>
-  <contract-signing :show="contractShow" @toggle="eticket_toggle" v-ref:contractbill></contract-signing>
 </template>
 
 <script>
 import {HttpResetClass} from 'vue-client'
-import Vue from 'vue'
 
 let getNewmetermsg = async function (self, row) {
   self.cardInfo = undefined
@@ -182,7 +169,13 @@ let getBtnsGen = async function (self) {
   console.log(self.data)
   console.log('-----------1111------------')
   if (self.data.f_is_signature !== '是') {
-    self.modalContornShow = true
+    self.operBtns.push({
+      name: '合同签名',
+      value: {
+        'weight': 0,
+        'routeName': 'contract-sig'
+      }
+    })
   }
 }