|
@@ -164,10 +164,10 @@
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
|
|
|
|
- <!-- 导入产品 -->
|
|
|
|
- <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: salesBillSn}" @close="closeGuideModel" @ok="hanldeOk" />
|
|
|
|
- <!-- 仓库设置 -->
|
|
|
|
- <setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false" />
|
|
|
|
|
|
+ <!-- 导入产品 -->
|
|
|
|
+ <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: salesBillSn}" @close="closeGuideModel" @ok="hanldeOk" />
|
|
|
|
+ <!-- 仓库设置 -->
|
|
|
|
+ <setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -179,7 +179,7 @@
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
import ProductBrand from '@/views/common/productBrand.js'
|
|
import ProductBrand from '@/views/common/productBrand.js'
|
|
import productTypeAll from '@/views/common/productTypeAll.js'
|
|
import productTypeAll from '@/views/common/productTypeAll.js'
|
|
- import { salesDetailAllList, salesDetailInsert, salesDetailUpdateQty, salesDetailDel, salesDetailBatchDel, deleteAll, updateWarehouse, addPromoGoods, salesBatchInsert } from '@/api/salesDetailNew'
|
|
|
|
|
|
+ import { salesDetailList, salesDetailInsert, salesDetailUpdateQty, salesDetailDel, salesDetailBatchDel, deleteAll, updateWarehouse, addPromoGoods, salesBatchInsert } from '@/api/salesDetailNew'
|
|
export default {
|
|
export default {
|
|
name: 'ProductList',
|
|
name: 'ProductList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
@@ -216,9 +216,9 @@
|
|
spinning: false,
|
|
spinning: false,
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
- // this.disabled = true
|
|
|
|
|
|
+ this.disabled = true
|
|
this.queryParam.salesBillSn = this.salesBillSn || ''
|
|
this.queryParam.salesBillSn = this.salesBillSn || ''
|
|
- return salesDetailAllList(Object.assign(parameter, this.queryParam, {showStock: true})).then(res => {
|
|
|
|
|
|
+ return salesDetailList(Object.assign(parameter, this.queryParam, {showStock: true})).then(res => {
|
|
let data
|
|
let data
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
data = res.data
|
|
data = res.data
|
|
@@ -227,9 +227,9 @@
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].qtyBackups = data.list[i].qty
|
|
data.list[i].qtyBackups = data.list[i].qty
|
|
}
|
|
}
|
|
|
|
+ this.disabled = false
|
|
this.dataSource = data.list
|
|
this.dataSource = data.list
|
|
}
|
|
}
|
|
- // this.disabled = false
|
|
|
|
return data
|
|
return data
|
|
})
|
|
})
|
|
},
|
|
},
|