Browse Source

Merge branch 'develop_szhj' of jianguan-web/jq-repairFusion-html into develop

李磊 3 years ago
parent
commit
ebc74e33e3

+ 4 - 4
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementModifyModal.vue

@@ -163,7 +163,7 @@ export default {
         creditWarnLimit: '', // 结算提醒金额
         settleDay: undefined, // 每月结算日
         warnBeforeDays: undefined, // 结算提醒提前天数
-        limitFlag: ''// 是否限制使用
+        limitFlag: 0// 是否限制使用
       },
       rules: {
         settleType: [ { required: true, message: '请选择结算方式', trigger: 'change' } ],
@@ -202,9 +202,9 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = Object.assign({}, _this.form)
-          if (params.limitFlag == '') {
-            params.limitFlag = 0
-          }
+          // if (params.limitFlag == '') {
+          //   params.limitFlag = 0
+          // }
           if (this.shelfInfo) {
             console.log(this.shelfInfo, 'this.nowData')
             params.shelfSn = this.shelfInfo.shelfSn

+ 5 - 6
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -213,7 +213,7 @@ export default {
         creditWarnLimit: '', // 结算提醒金额
         settleDay: undefined, // 每月结算日
         warnBeforeDays: undefined, // 结算提醒提前天数
-        limitFlag: '', // 是否限制使用
+        limitFlag: 0, // 是否限制使用
         bondFlag: '', // 是否缴纳保证金
         bondAmount: '' // 保证金金额
       },
@@ -309,7 +309,6 @@ export default {
           if (res.status == 200) {
             this.form = Object.assign({}, res.data)
             this.form.limitFlag = Number(this.form.limitFlag)
-
             this.settleInfo = res.data
           } else {
             this.form = {}
@@ -339,10 +338,10 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = Object.assign({}, _this.form)
-          console.log(params, 'params')
-          if (params.limitFlag == '') {
-            params.limitFlag = 0
-          }
+          console.log(params, 'params', _this.form)
+          // if (params.limitFlag == '') {
+          //   params.limitFlag = 0
+          // }
           if (this.pageInfo) {
             params.shelfSn = this.pageInfo.shelfSn
             params.storeSn = this.pageInfo.storeSn

+ 4 - 4
vue.config.js

@@ -27,10 +27,10 @@ const assetsCDN = {
   css: [],
   // https://unpkg.com/browse/vue@2.6.10/
   js: [
-    '//cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js',
-    '//cdn.jsdelivr.net/npm/vue-router@3.1.3/dist/vue-router.min.js',
-    '//cdn.jsdelivr.net/npm/vuex@3.1.1/dist/vuex.min.js',
-    '//cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js'
+    '//vuepkg.oss-cn-beijing.aliyuncs.com/vue.min.js',
+    '//vuepkg.oss-cn-beijing.aliyuncs.com/vue-router.min.js',
+    '//vuepkg.oss-cn-beijing.aliyuncs.com/vuex.min.js',
+    '//vuepkg.oss-cn-beijing.aliyuncs.com/axios.min.js'
   ]
 }