ソースを参照

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

chenrui 1 年間 前
コミット
a701f1cac6

+ 6 - 4
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -206,7 +206,7 @@
           :max="999999"
           placeholder="请输入"
           @blur="e => onCellBlur(e.target.value, record)"
-          style="width: 100%;" />
+          :style="{width:'100%',color:record.qty>=record.unitQtyR?'':'red'}" />
           <span v-else>{{ record.qty }}</span>
       </template>
       <!-- 当前库存 -->
@@ -375,8 +375,10 @@
                 // 按数量设置
                 if(data.list[i].unitType=='SL'){
                   data.list[i].unitQtyV = data.list[i].unitQty ? (data.list[i].unitQty + data.list[i].productUnit) : '--'
+                  data.list[i].unitQtyR = data.list[i].unitQty
                 }else{
-                  data.list[i].unitQtyV = data.list[i].packQty&&data.list[i].unitQty ? ((data.list[i].packQty*data.list[i].unitQty) + data.list[i].productUnit) : '--'
+                  data.list[i].unitQtyV = data.list[i].packQty&&data.list[i].unitQty ? ((data.list[i].unitQty+'*'+data.list[i].packQty) + data.list[i].productUnit) : '--'
+                  data.list[i].unitQtyR = data.list[i].packQty*data.list[i].unitQty
                 }
               }
               this.dataSource = data.list
@@ -429,12 +431,12 @@
           { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
         ]
         if (this.$hasPermissions('B_salesEdit_salesPrice')) { // 售价权限
-          arr.splice(4, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
+          arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
           let idx = 0
           // 如果是特价活动
           if(this.promo.promotionRule.promotionRuleType=='PROMO_PROD'){
             idx = idx + 1
-            arr.splice(5, 0, { title: '折扣', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' }})
+            arr.splice(4, 0, { title: '折扣', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' }})
           }
           arr.splice(8+idx, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         }