qymljy 2 лет назад
Родитель
Сommit
839985767c
1 измененных файлов с 0 добавлено и 5 удалено
  1. 0 5
      src/HDrpManagement/orderManage/details/tabs/productlist.vue

+ 0 - 5
src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -52,13 +52,8 @@
           width="180">
           <template slot-scope="scope">
             <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-<<<<<<< HEAD
             <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
             <span v-else>{{scope.row.qty}}</span>
-=======
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <!-- <span v-else>{{scope.row.qty}}</span> -->
->>>>>>> xiaoqin
           </template>
         </el-table-column>
         <el-table-column