Quellcode durchsuchen

Merge branch 'develop' of http://git.chelingzhu.com/jianguan-web/jq-repairFusion-html into develop_szhj

# Conflicts:
#	src/views/numsGoodsShelves/goodsShelvesAdministration/settlementModifyModal.vue
#	src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue
zhangdan vor 3 Jahren
Ursprung
Commit
d122234a8b

+ 0 - 3
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementModifyModal.vue

@@ -201,13 +201,10 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = Object.assign({}, _this.form)
-<<<<<<< HEAD
           if (params.creditWarnLimit >= params.creditLimit) {
             _this.$message.warning('结算提醒金额需要小于授信额度')
             return
           }
-=======
->>>>>>> 099acb7acfa483cfbefb59cea751df80b8ef9b7c
           if (this.shelfInfo) {
             console.log(this.shelfInfo, 'this.nowData')
             params.shelfSn = this.shelfInfo.shelfSn

+ 0 - 4
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -147,11 +147,7 @@
                       id="settlementSet-creditWarnLimit"
                       v-model="form.creditWarnLimit"
                       :precision="2"
-<<<<<<< HEAD
                       :min="0.01"
-=======
-                      :min="0"
->>>>>>> 099acb7acfa483cfbefb59cea751df80b8ef9b7c
                       :max="999999"
                       placeholder="请输入正数(最多允许两位小数)"
                       style="width: 100%;display: inline-block;" />