ymy 1 anno fa
parent
commit
8193625e0b

+ 14 - 13
src/views/audit/synchronous/index.vue

@@ -100,19 +100,20 @@ export default class SynchronousProduct extends Vue {
               this.setCurrentRow(item);
             }
           }
-        },{
-          name:'直接注册',
-          audit:'',
-          event:{
-            show:(row:any) => {
-              return row.isSync != 1
-            },
-            click:(item:any) => {
-              this.$message('尚未开发!');
-              // console.log('该行数据:',item)
-            }
-          }
-        }]
+        }
+        // ,{
+        //   name:'直接注册',
+        //   audit:'',
+        //   event:{
+        //     show:(row:any) => {
+        //       return row.isSync != 1
+        //     },
+        //     click:(item:any) => {
+        //       this.$message('尚未开发!');
+        //     }
+        //   }
+        // }
+      ]
       }]
     }
   }

+ 1 - 1
src/views/oms/B2BOrder/components/addOrder.vue

@@ -91,7 +91,7 @@
             <by-tool :propConfig="toolConfig" v-if="orderValue.status !== 'Delivering' && orderValue.status !== 'Sent'" ref="tool"></by-tool>
             <div class="preferential">
               <div class="pre-title">抵扣金额<i class="el-icon-info" title="支持输入数字和百分比。若输入百分比,将自动计算折扣金额=商品成交总金额*百分比(举例:打9折,请输入10%),只在订单创建时计算一次,在订单创建后修改商品价格不会自动计算,运费不参与折扣。"></i>:</div>
-              <vxe-input v-if="!orderValue.id" v-model="freeAmount" class="freeAmount" placeholder="请输入" size="mini" @change="freeAmountChange"></vxe-input>
+              <vxe-input v-if="!orderValue.id" v-model="freeAmount" class="freeAmount" placeholder="请输入" size="mini" min="0" type="number" @change="freeAmountChange"></vxe-input>
               <span v-else>{{ freeAmount }}</span>
             </div>
           </div>

+ 0 - 1
src/views/oms/jushuitanOrder/compoments/inStore.vue

@@ -86,7 +86,6 @@ export default class Instore extends Vue {
     this.getList()
     this.$nextTick(() => {
       this.height = (this as any).$el.offsetHeight;
-      console.log('高度:', this.height)
       if(this.height > 200) {
         this.height = this.height - 50 - 50
       }