Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/views/ecw/offer/components/Commossion.vue

@@ -160,7 +160,7 @@ export default {
       }
     },
     costPrice(){
-      return Decimal(this.form.seaFreight || 0).minus(this.form.lightCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
+      return Decimal(this.form.seaFreight || 0).minus(this.form.orgShadeCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
     },
     salePrice(){
       return Decimal(this.form.seaFreight || 0).minus(this.form.orgLightCommissionAmount || 0).plus(this.form.lightCommissionAmount || 0)

src/views/ecw/order/components/specialNeeds.vue

@@ -70,7 +70,6 @@ export default {
         i.todoDetail = this.todoDetail
       })
       let p = this.specialNeedsList.filter(i => this.advanceType.indexOf(i.advanceType) > -1)
-       console.log(p,'p')
       let p1 = []
       //获取新增的和修改的
       p.forEach(item => {
@@ -88,18 +87,13 @@ export default {
           p1.push(item)
        }
       })
-      if(p1.every(i => Number(i.transFee) > 0 )){
-        specialNeedCreate(p1).then(r=>{
-          if(r.code === 0){
-            this.$emit('update:show',false)
-            this.$emit('determine')
-            this.$message.success('提交成功');
-          }
-        })
-      }else {
-        this.$modal.msg("请输入大于0的金额。");
-      }
-
+      specialNeedCreate(p1).then(r=>{
+        if(r.code === 0){
+          this.$emit('update:show',false)
+          this.$emit('determine')
+          this.$message.success('提交成功');
+        }
+      })
     },
   },
   watch:{