sale-client 4.0.89 → 4.0.91

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://192.168.50.67:31467/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://127.0.0.1:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,9 +20,9 @@ var devConfig = {
     },
     proxy: {
       '/api/af-revenue/logic': {
-        // pathRewrite: {
-        //   '/api/af-revenue/logic': '/logic'
-        // },
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
         target: localUrl
       },
       '/api/af-revenue/file': {
@@ -38,9 +38,9 @@ var devConfig = {
         target: 'http://410663id1ia4.vicp.fun'
       },
       '/api/af-revenue/sql': {
-        // pathRewrite: {
-        //   '/api/af-revenue/sql': '/sql'
-        // },
+        pathRewrite: {
+          '/api/af-revenue/sql': '/sql'
+        },
         target: localUrl
       },
       '/api': {

package/package.json

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

package/src/components/revenue/changeInsurance/InsuranceAdd.vue

@@ -63,10 +63,10 @@
               <input type="number" v-model="model.f_salecount" placeholder="购买年限" style="width: 60%"
                    class="input_search" v-validate:f_salecount='{required: true }' v-el:style v-next-el="inpipe">
           </div>
-          <div class="col-sm-6  form-group" v-if="model.f_state !=='待执行'">
+          <div class="col-sm-6  form-group" v-if="model.f_state !=='待执行'" :class="[$v.f_salecount.required? 'has-error' : '']">
             <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;购买年限</label>
               <input type="number" v-model="model.f_salecount" placeholder="购买年限" style="width: 60%"
-                   class="input_search" v v-el:style v-next-el="inpipe">
+                   class="input_search" v-validate:f_salecount='{required: true }' v-el:style v-next-el="inpipe">
           </div>
           <div class="col-sm-6  form-group" :class="[$v.f_expiration_date2.required ? 'has-error' : '']" v-if="model.f_state === '待执行'">
           <input type="text" v-show="false" v-model="tmp" :value.sync='model.f_expiration_date'  v-el:f_expiration_date2>
@@ -126,7 +126,8 @@
           <div class="col-sm-6  form-group" :class="[$v.f_money.required ? 'has-error' : '']">
             <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;保费金额</label>
             <input type="number" v-model="model.f_money" class="input_search" style="width:60%"
-                   v-validate:f_money='{required: true, dctest: [0, ">=" ] }' placeholder="保费金额">
+                   v-validate:f_money='{required: true, dctest: [0.00, ">=" ] }' v-scale="2"
+                   placeholder="保费金额">
           </div>
           <div class="col-sm-6  form-group" :class="[$v.payment.required ? 'has-error select-error' : '']">
             <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;收款方式</label>
@@ -183,6 +184,7 @@
         <button class="button_clear" @click="cancel">取消</button>
       </div>
     </validator>
+    <payment-code v-ref:paymentcode :payment="model.f_payment" :row="model" :money="model.f_money"></payment-code>
   </div>
 </template>
 <script>
@@ -219,10 +221,10 @@
     },
     props: {
       model: {
-        type:Object,
-        default:{
-          f_insurance_type:'',
-          f_state:''
+        type: Object,
+        default: {
+          f_insurance_type: '',
+          f_state: ''
         }
 
       },
@@ -279,7 +281,7 @@
         }
       },
       'model.f_money' (val) {
-        if (val && (val < 0 || Math.floor(val - 0) !== (val - 0))) {
+        if (val && (val < 0)) {
           this.model.f_money = 0
         }
       },
@@ -313,11 +315,11 @@
         }
       },
       'model.f_userinfo_id' (val) {
-        if(val&& this.model.f_userinfo_id){
+        if (val && this.model.f_userinfo_id) {
           this.model.f_insurance_type = this.model.f_insurance_type == null ? this.config.insuranceType : this.model.f_insurance_type
           this.model.f_state = this.model.f_state == null ? this.config.insurancestate : this.model.f_state
           this.model.f_ins_start_date = Util.toStandardTimeString()
-          console.log('cs===================cs',this.model.f_userinfo_id,this.model.f_ins_start_date)
+          console.log('cs===================cs', this.model.f_userinfo_id, this.model.f_ins_start_date)
         }
       }
     },
@@ -388,7 +390,12 @@
           }
         }
         if (saveState) {
+          let ss = await this.$refs.paymentcode.flowPath()
+          this.$refs.paymentcode.paymentCodeShow = false
+          console.log('付款码操作返回', ss)
+          if (!ss.result) return
           this.model.f_total_ins_charge = this.model.f_total_ins_charge == null ? 0 : this.model.f_total_ins_charge
+          this.model.f_serial_id = this.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
           this.model.f_operat_type = '保险'
           this.model.f_operator = this.operatorname[0]
           this.model.f_operatorid = this.f_operatorid[0]

package/src/filiale/foric-v3/MaterialsList.vue

@@ -182,7 +182,7 @@ export default {
         this.$showAlert('请先删除子目录！', 'warning', 2000)
         return
       }
-      this.$resetdelete(`rs/entity/t_material_info`, {id: obj.data.id}).then(res =>
+      this.$resetdelete(`api/af-revenue/entity/t_material_info`, {id: obj.data.id}).then(res =>
         this.searchData()
       )
     },