suojin
/
smartpark_durable_front
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

Browse Source
master
taozi 5 months ago
parent 7ee3048269
commit f79bcbfbb1
7 changed files with 346 additions and 172 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/api/firstOrder/inbound.js
  2. 42
      src/api/materials/list.js
  3. 15
      src/api/purchaseOrders/index.js
  4. 118
      src/views/firstOrder/inbound.vue
  5. 146
      src/views/materials/index.vue
  6. 98
      src/views/purchaseOrders/index.vue

15
src/api/firstOrder/inbound.js
Unescape View File

@ -0,0 +1,15 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
return request({
url: '/smartpark/onePutStorage/list',
method: 'get',
params: {
...params,
pageSize:size,
pageNum:current,
},
cryptoToken: false,
cryptoData: false
})
}

42
src/api/materials/list.js
Unescape View File

@ -0,0 +1,42 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
return request({
url: '/smartpark/material/list',
method: 'get',
params: {
...params,
pageSize: size,
pageNum: current,
},
cryptoToken: false,
cryptoData: false
})
}
export const add = (row) => {
return request({
url: '/smartpark/material/submit',
method: 'post',
data: row,
cryptoToken: false,
cryptoData: false
})
}
export const update = (row) => {
return request({
url: '/smartpark/material/submit',
method: 'post',
data: row,
cryptoToken: false,
cryptoData: false
})
}
export const remove = (ids) => {
return request({
url: '/smartpark/material/remove',
method: 'post',
params: { ids }, // 使用params而不是data，将参数放在URL查询参数中
cryptoToken: false,
cryptoData: false
})
}

15
src/api/purchaseOrders/index.js
Unescape View File

@ -0,0 +1,15 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
return request({
url: '/smartpark/purchaseEnd/list',
method: 'get',
params: {
...params,
pageSize: size,
pageNum: current,
},
cryptoToken: false,
cryptoData: false
})
}

118
src/views/firstOrder/inbound.vue
Unescape View File

@ -12,7 +12,8 @@
</el-button> </el-button>
</template> </template>
<template slot-scope="scope" slot="caigoudanmingcheng"> <template slot-scope="scope" slot="caigoudanmingcheng">
<el-button type="text" @click.stop="purchaseFn(scope.row)" v-if="scope.row.caigoudanmingcheng!=''">{{scope.row.caigoudanmingcheng}}</el-button> <el-button type="text" @click.stop="purchaseFn(scope.row)" v-if="scope.row.caigoudanmingcheng != ''">{{
scope.row.caigoudanmingcheng }}</el-button>
<span v-else>无</span> <span v-else>无</span>
</template> </template>
<template #menu="scope"> <template #menu="scope">
@ -26,12 +27,13 @@
</inDialog> </inDialog>
<!-- 采购单详情 --> <!-- 采购单详情 -->
<purchaseDialog :showDialog="purchaseOpen" v-if="purchaseOpen" @closeDialog="closeDialog" :purchaseTitle="purchaseTitle"></purchaseDialog> <purchaseDialog :showDialog="purchaseOpen" v-if="purchaseOpen" @closeDialog="closeDialog"
:purchaseTitle="purchaseTitle"></purchaseDialog>
</basic-container> </basic-container>
</template> </template>
<script> <script>
import { getList, remove } from "@/api/report/report"; import { getList } from "@/api/firstOrder/inbound";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import inDialog from './components/inDialog.vue'; import inDialog from './components/inDialog.vue';
import purchaseDialog from './components/purchaseDialog.vue'; import purchaseDialog from './components/purchaseDialog.vue';
@ -75,61 +77,86 @@ export default {
column: [ column: [
{ {
label: "采购单名称", label: "采购单名称",
prop: "caigoudanmingcheng", prop: "purchaseEneInfo",
width: 180, width: 180,
}, },
{ {
label: "仓库类型", label: "仓库名称",
prop: "str1", prop: "warehouseName",
}, },
{ {
label: "入库单号", label: "入库单号",
prop: "str2", prop: "orderNo",
width: 110
}, },
{ {
label: "入库时间", label: "入库日期",
prop: "str3", prop: "inDate",
search: true, search: true,
type: "date", type: "datetime",
searchRange: true, searchRange: true,
startPlaceholder: '开始时间', startPlaceholder: '开始时间',
endPlaceholder: "结束时间", endPlaceholder: "结束时间",
format: 'yyyy-MM-DD HH:mm:ss',
valueFormat: 'yyyy-MM-DD HH:mm:ss',
width: 120,
searchParam: 'startTime',
searchEndParam: 'endTime'
}, },
{ {
label: "入库人", label: "入库人",
prop: "str4", prop: "inOperatorName",
search: true, search: true,
}, },
{ {
label: "审批人", label: "来源",
prop: "str5", prop: "source",
search: false,
}, },
{ {
label: "来源", label: "事由",
prop: "str6", prop: "reason",
search: false, search: false,
}, },
{ {
label: "审批状态", label: "物资类型",
prop: "str7", prop: "materialType",
search: false,
type: 'select', type: 'select',
dicData:[ // dicData:[{
{ // label: '办公物资',
label:'暂存', // value: '1'
value:1 // },
// {
// label: '其他物资',
// value: '2'
// }]
}, },
{ {
label:'待审批', label: "审批人员",
value:2 prop: "approverName",
}, },
{ {
label:'已审批', label: "状态",
value:3 prop: "status",
}, type: 'select',
] // dicData:[
// {
// label:'暂存',
// value:1
// },
// {
// label:'待审批',
// value:1
// },
// {
// label:'已审批',
// value:2
// },
// ]
}, },
] ]
@ -287,10 +314,37 @@ export default {
refreshChange() { refreshChange() {
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}, },
// onLoad(page, params = {}) {
// this.loading = true;
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// console.log(89122229,res.data.result)
// // const data = res.data.data;
// this.data = res.data.result.list;
// this.loading = false;
// this.page.total = res.data.result.total;
// // this.selectionClear();
// });
// }
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
const queryParams = {
this.loading = false ...params,
...this.query,
pageSize: page.pageSize,
pageNum: page.currentPage
};
if (queryParams.inDate && Array.isArray(queryParams.inDate)) {
queryParams.startTime = queryParams.inDate[0];
queryParams.endTime = queryParams.inDate[1];
delete queryParams.inDate;
}
console.log("处理后的参数：", queryParams);
getList(page.currentPage, page.pageSize, queryParams).then(res => {
this.data = res.data.result.list;
this.loading = false;
this.page.total = res.data.result.total;
});
} }
} }
}; };

146
src/views/materials/index.vue
Unescape View File

@ -12,12 +12,24 @@
</el-button> </el-button>
</template> </template>
</avue-crud> --> </avue-crud> -->
<avue-crud :option="option" v-model="form" :data="data" @row-del="rowDel" @on-load="onLoad" @row-update="rowUpdate" @row-save="rowSave"></avue-crud> <avue-crud
:option="option"
v-model="form"
:data="data"
@row-del="rowDel" @on-load="onLoad"
:table-loading="loading"
@row-update="rowUpdate"
@row-save="rowSave"
@search-change="searchChange"
@search-reset="searchReset"
:page.sync="page"
></avue-crud>
</basic-container> </basic-container>
</div> </div>
</template> </template>
<script> <script>
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { getList, add, remove, update } from "@/api/materials/list";
export default { export default {
data() { data() {
return { return {
@ -54,24 +66,41 @@ export default {
column: [ column: [
{ {
label: "物资名称", label: "物资名称",
prop: "name", prop: "materialName",
search: true, search: true,
}, },
// {
// label: "规格",
// prop: "ge",
// },
{ {
label: "规格/型号", label: "规格/型号",
prop: "xh", prop: "model",
}, },
{ {
label: "类别", label: "类别",
prop: "lb", prop: "materialType",
type: 'select',
dicData: [{
label: '易耗品',
value: 1
}, {
label: '耐用品',
value: 2
}],
props: {
label: 'label',
value: 'value'
},
formatter: (row, value, label, column) => {
// 根据value值返回对应的label
const typeMap = {
1: '易耗品',
2: '耐用品'
};
return typeMap[value] || value;
},
dataType: 'number'
}, },
{ {
label: "单位", label: "单位",
prop: "dj", prop: "unit",
}, },
] ]
}, },
@ -131,7 +160,6 @@ export default {
this.tableData = this.bfTable this.tableData = this.bfTable
} }
}, },
searchReset() { searchReset() {
this.query = {}; this.query = {};
this.onLoad(this.page); this.onLoad(this.page);
@ -159,41 +187,47 @@ export default {
refreshChange() { refreshChange() {
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}, },
//新增
rowSave(row, done, loading) { rowSave(row, done, loading) {
// add(row).then(() => { add(row).then(() => {
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!"
}); });
done(); done();
// }, error => { }, error => {
// window.console.log(error); window.console.log(error);
// loading(); loading();
// }); });
}, },
//修改
rowUpdate(row, index, done, loading) { rowUpdate(row, index, done, loading) {
debugger update(row).then(() => {
// update(row).then(() => { this.onLoad(this.page)
this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!"
}); })
done(); done(row)
// }, error => {
// window.console.log(error); },error => {
window.console.log(error);
loading(); loading();
// }); })
}, },
rowDel(row) {
//删除
rowDel(row, index, done) {
this.$confirm("确定将选择数据删除?", { this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
return remove(row.id); return remove(row.id.toString());
}) })
.then(() => { .then(() => {
this.onLoad(this.page); this.onLoad(this.page);
@ -201,40 +235,50 @@ export default {
type: "success", type: "success",
message: "操作成功!" message: "操作成功!"
}); });
done();
})
.catch(action => {
if (action !== 'cancel') {
this.$message({
type: "error",
message: "操作失败"
});
}
}); });
},
remove(){
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
this.data.push({ // this.data.push({
no: '00100001', // no: '00100001',
name: '物资1', // name: '物资1',
xh: '1', // xh: '1',
lb: '易耗品', // lb: '易耗品',
unit: '11', // unit: '11',
number: '1', // number: '1',
dj: '11', // dj: '11',
pice: '11' // pice: '11'
}, { // }, {
no: '00100002', // no: '00100002',
name: '物资2', // name: '物资2',
xh: '2', // xh: '2',
lb: '耐用品', // lb: '耐用品',
unit: '22', // unit: '22',
number: '2', // number: '2',
dj: '11', // dj: '11',
pice: '22' // pice: '22'
}) // })
this.loading = false this.loading = false
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { // 发起列表数据请求
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// const data = res.data.data; // const data = res.data.data;
// this.page.total = data.total; // 处理返回的列表数据
// this.data = data.records; this.data = res.data.result.list; // 赋值列表数据
// this.loading = false; this.loading = false
this.page.total = res.data.result.total; // 赋值总条数
// this.selectionClear(); // this.selectionClear();
// }); });
this.loading = false
} }
} }
}; };

98
src/views/purchaseOrders/index.vue
Unescape View File

@ -13,7 +13,7 @@
</div> </div>
</template> </template>
<script> <script>
import { getList, remove } from "@/api/report/report"; import { getList } from "@/api/purchaseOrders/index";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {
@ -51,28 +51,32 @@ export default {
column: [ column: [
{ {
label: "采购单号", label: "采购单号",
prop: "no", prop: "purchaseNo",
search: true, search: true,
}, },
{ {
label: "采购时间", label: "物资Id",
prop: "name", prop: "materialId",
}, },
{ {
label: "物品名称", label: "规格型号",
prop: "number", prop: "model",
}, },
{ {
label: "型号", label: "类别",
prop: "number", prop: "type",
},
{
label: "单位",
prop: "unit",
}, },
{ {
label: "数量", label: "数量",
prop: "number", prop: "num",
}, },
{ {
label: "金额", label: "金额",
prop: "pice", prop: "money",
} }
] ]
}, },
@ -81,18 +85,18 @@ export default {
activeName: 'first', activeName: 'first',
tableData: [], tableData: [],
ckTable: [ // ckTable: [
{str1: '3', str2: '2025-04-09', str3: '部门一'}, // {str1: '3', str2: '2025-04-09', str3: '部门一'},
{str1: '37', str2: '2025-04-03', str3: '部门一'} // {str1: '37', str2: '2025-04-03', str3: '部门一'}
], // ],
rkTable: [ // rkTable: [
{str1: '5',str2: '2025-03-19',str3: '部门二'}, // {str1: '5',str2: '2025-03-19',str3: '部门二'},
{str1: '12',str2: '2025-03-19',str3: '部门二'}, // {str1: '12',str2: '2025-03-19',str3: '部门二'},
], // ],
bfTable: [ // bfTable: [
{str1: '9',str2: '2025-03-19',str3: '部门三'}, // {str1: '9',str2: '2025-03-19',str3: '部门三'},
{str1: '19',str2: '2025-03-19',str3: '部门三'}, // {str1: '19',str2: '2025-03-19',str3: '部门三'},
], // ],
}; };
}, },
computed: { computed: {
@ -162,33 +166,33 @@ export default {
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
this.data.push({ // this.data.push({
no: '00100001', // no: '00100001',
name: '物品1', // name: '物品1',
xh: '1', // xh: '1',
lb: '易耗品', // lb: '易耗品',
unit: '11', // unit: '11',
number: '1', // number: '1',
dj: '11', // dj: '11',
pice: '11' // pice: '11'
}, { // }, {
no: '00100002', // no: '00100002',
name: '物品2', // name: '物品2',
xh: '2', // xh: '2',
lb: '耐用品', // lb: '耐用品',
unit: '22', // unit: '22',
number: '2', // number: '2',
dj: '11', // dj: '11',
pice: '22' // pice: '22'
}) // })
this.loading = false this.loading = false
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// const data = res.data.data; console.log(898989,res.data.result)
// this.page.total = data.total; this.data = res.data.result.list;
// this.data = data.records; this.loading = false;
// this.loading = false; this.page.total = res.data.result.total;
// this.selectionClear(); // this.selectionClear();
// }); });
} }
} }
}; };

Write Preview
Loading…
Cancel
Save