|
|
@@ -108,9 +108,9 @@
|
|
|
<span slot="quantityTitle" class="form-table-heard">
|
|
|
主数量
|
|
|
</span>
|
|
|
- <span slot="unQuantityTitle" class="form-table-heard">
|
|
|
+ <!-- <span slot="unQuantityTitle" class="form-table-heard">
|
|
|
辅数量
|
|
|
- </span>
|
|
|
+ </span> -->
|
|
|
<span slot="inventoryNameTitle" class="form-table-heard">
|
|
|
料品名称
|
|
|
</span>
|
|
|
@@ -341,7 +341,7 @@
|
|
|
},
|
|
|
rules1:{
|
|
|
quantity:{required:true,message:"不可为空"},
|
|
|
- unQuantity:{required:true,message:"不可为空"},
|
|
|
+ // unQuantity:{required:true,message:"不可为空"},
|
|
|
inventoryName:{required:true,message:"不可为空"},
|
|
|
},
|
|
|
loading:false,
|
|
|
@@ -421,12 +421,12 @@
|
|
|
|
|
|
},
|
|
|
{
|
|
|
- // title: '辅数量',
|
|
|
+ title: '辅数量',
|
|
|
align:"center",
|
|
|
dataIndex: 'unQuantity',
|
|
|
ellipsis: true,
|
|
|
scopedSlots: { customRender: 'unQuantity' } ,
|
|
|
- slots:{title:'unQuantityTitle'},
|
|
|
+ // slots:{title:'unQuantityTitle'},
|
|
|
},
|
|
|
{
|
|
|
title: '换算率',
|
|
|
@@ -791,7 +791,10 @@
|
|
|
this.$set(recoerd,'inventory',data.ID )
|
|
|
this.$set(recoerd,'quantity','' )
|
|
|
this.$set(recoerd,'unQuantity','')
|
|
|
+ data.rate = data.rate?data.rate:1
|
|
|
this.$set(recoerd,'rate',data.rate)
|
|
|
+ this.$set(recoerd,'quantity','')
|
|
|
+ this.$set(recoerd,'unQuantity','')
|
|
|
this.$refs.formRef.clearValidate(['inventoryName']);
|
|
|
},
|
|
|
okDataDeparment(data){
|
