|
@@ -139,6 +139,7 @@
|
|
|
v-loading="listLoading"
|
|
|
:data="dataList"
|
|
|
element-loading-text="Loading"
|
|
|
+ max-height="600"
|
|
|
border
|
|
|
fit
|
|
|
highlight-current-row
|
|
@@ -290,6 +291,7 @@
|
|
|
icon="el-icon-info"
|
|
|
icon-color="red"
|
|
|
title="内容确定删除吗?"
|
|
|
+
|
|
|
@onConfirm="hanleDelete(scope.row.id, scope.$index)"
|
|
|
>
|
|
|
<el-button
|
|
@@ -321,15 +323,15 @@
|
|
|
@click="handleSave"
|
|
|
>保存</el-button>
|
|
|
</div>
|
|
|
- <el-pagination
|
|
|
- :current-page="dcurrentPage"
|
|
|
- :page-sizes="pageSizeArr"
|
|
|
- :page-size="size"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="listTotal"
|
|
|
- @size-change="handleSizeChange2"
|
|
|
- @current-change="handleCurrentChange2"
|
|
|
- />
|
|
|
+<!-- <el-pagination-->
|
|
|
+<!-- :current-page="dcurrentPage"-->
|
|
|
+<!-- :page-sizes="pageSizeArr"-->
|
|
|
+<!-- :page-size="size"-->
|
|
|
+<!-- layout="total, sizes, prev, pager, next, jumper"-->
|
|
|
+<!-- :total="listTotal"-->
|
|
|
+<!-- @size-change="handleSizeChange2"-->
|
|
|
+<!-- @current-change="handleCurrentChange2"-->
|
|
|
+<!-- />-->
|
|
|
</div>
|
|
|
|
|
|
<el-row>
|
|
@@ -348,7 +350,6 @@
|
|
|
<el-divider />
|
|
|
</el-row>
|
|
|
<el-table
|
|
|
- v-loading="listLoading"
|
|
|
:data="conditionList"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
@@ -566,7 +567,7 @@ export default {
|
|
|
if (query !== '') {
|
|
|
getK3List({
|
|
|
pageNum: 1,
|
|
|
- pageSize: -1,
|
|
|
+ pageSize: 100,
|
|
|
keyword: '',
|
|
|
number: type === 'number' ? query : '',
|
|
|
oldNumber: '',
|
|
@@ -716,6 +717,8 @@ export default {
|
|
|
// 获取货品信息
|
|
|
handletwoList() {
|
|
|
// this.searchForm.type
|
|
|
+ this.listLoading = true
|
|
|
+
|
|
|
const paramss = {
|
|
|
pageNum: this.dcurrentPage,
|
|
|
pageSize: this.dpageSize,
|
|
@@ -745,6 +748,7 @@ export default {
|
|
|
// this.dataList=[]
|
|
|
this.dataList = result.data.records
|
|
|
this.listTotal = result.data.total
|
|
|
+ this.listLoading = false
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
console.error(err)
|
|
@@ -830,7 +834,7 @@ export default {
|
|
|
|
|
|
this.dataList.push({
|
|
|
id: '',
|
|
|
- discAmount: '',
|
|
|
+ discAmount: 0,
|
|
|
materialId: '',
|
|
|
materialName: '',
|
|
|
materialNumber: '',
|
|
@@ -861,7 +865,7 @@ export default {
|
|
|
this.$errorMsg('请选择销售类型')
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!this.dataList[i].price) {
|
|
|
this.$errorMsg('请输入单价')
|
|
|
return
|
|
@@ -883,7 +887,7 @@ export default {
|
|
|
const item = this.k3List.filter((k) => {
|
|
|
return k.id == e
|
|
|
})[0]
|
|
|
- // this.$set(row,'materialNumber',item.number)
|
|
|
+ this.$set(row,'materialNumber',item.number)
|
|
|
this.$set(row, 'materialName', item.name)
|
|
|
this.$set(row, 'specification', item.specification)
|
|
|
this.$set(row, 'materialId', item.id)
|