diff --git a/src/api/demandOrder/demandOrder.js b/src/api/demandOrder/demandOrder.js
new file mode 100644
index 0000000..fc6df43
--- /dev/null
+++ b/src/api/demandOrder/demandOrder.js
@@ -0,0 +1,15 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/smartpark/demandEnd/list',
+ method: 'get',
+ params: {
+ ...params,
+ pageSize:size,
+ pageNum:current,
+ },
+ cryptoToken: false,
+ cryptoData: false
+ })
+}
\ No newline at end of file
diff --git a/src/api/firstOrder/inbound.js b/src/api/firstOrder/inbound.js
index 84f3845..3e3cbf6 100644
--- a/src/api/firstOrder/inbound.js
+++ b/src/api/firstOrder/inbound.js
@@ -12,4 +12,43 @@ export const getList = (current, size, params) => {
cryptoToken: false,
cryptoData: false
})
+}
+export const getPutPurchaseList = (current, size, params) => {
+ return request({
+ url: '/smartpark/onePutStorage/getPutPurchaseList',
+ method: 'get',
+ params: {
+ ...params,
+ pageSize:size,
+ pageNum:current,
+ },
+ cryptoToken: false,
+ cryptoData: false
+ })
+}
+//下拉采购单数据
+export const getAllQuarter = () => {
+ return request({
+ url: '/smartpark/purchaseEnd/getAllQuarter',
+ method: 'get',
+ cryptoToken: false,
+ cryptoData: false
+ })
+}
+export const getPurchasesByIds = (ids) => {
+ return request({
+ url: '/smartpark/purchaseEnd/getPurchasesByIds',
+ method: 'get',
+ params: { ids },
+ cryptoToken: false,
+ cryptoData: false
+ })
+}
+export const getMaterialList = () => {
+ return request({
+ url: '/smartpark/material/getMaterialList',
+ method: 'get',
+ cryptoToken: false,
+ cryptoData: false
+ })
}
\ No newline at end of file
diff --git a/src/api/firstOrder/list.js b/src/api/firstOrder/list.js
index e22540c..12cf269 100644
--- a/src/api/firstOrder/list.js
+++ b/src/api/firstOrder/list.js
@@ -13,3 +13,16 @@ export const getList = (current, size, params) => {
cryptoData: false
})
}
+export const recordList = (current, size, params) => {
+ return request({
+ url: '/smartpark/inventoryRecord/list',
+ method: 'get',
+ params: {
+ ...params,
+ pageSize:size,
+ pageNum:current,
+ },
+ cryptoToken: false,
+ cryptoData: false
+ })
+}
\ No newline at end of file
diff --git a/src/views/demandOrder/index.vue b/src/views/demandOrder/index.vue
index 54a208f..6246e6b 100644
--- a/src/views/demandOrder/index.vue
+++ b/src/views/demandOrder/index.vue
@@ -13,7 +13,7 @@
diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue
index 9941060..1436e36 100644
--- a/src/views/firstOrder/inbound.vue
+++ b/src/views/firstOrder/inbound.vue
@@ -1,9 +1,14 @@
+ :permission="permissionList"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
新增入库单
@@ -11,9 +16,9 @@
入库单导出
-
- {{
- scope.row.caigoudanmingcheng }}
+
+ {{
+ scope.row.purchaseEndInfo }}
无
@@ -28,7 +33,7 @@
+ :purchaseTitle="purchaseTitle" :id='id'>
@@ -44,7 +49,8 @@ export default {
},
data() {
return {
- form: {},
+ // form: {},
+ form: { inDate: [], inOperatorName: '', inOperator: '' },
selectionList: [],
query: {},
loading: true,
@@ -77,7 +83,7 @@ export default {
column: [
{
label: "采购单名称",
- prop: "purchaseEneInfo",
+ prop: "purchaseEndInfo",
width: 180,
},
{
@@ -97,16 +103,17 @@ export default {
searchRange: true,
startPlaceholder: '开始时间',
endPlaceholder: "结束时间",
- format: 'yyyy-MM-DD HH:mm:ss',
- valueFormat: 'yyyy-MM-DD HH:mm:ss',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ valueFormat: 'yyyy-MM-dd HH:mm:ss',
width: 120,
- searchParam: 'startTime',
- searchEndParam: 'endTime'
+ // searchParam: 'startTime',
+ // searchEndParam: 'endTime'
},
{
label: "入库人",
prop: "inOperatorName",
search: true,
+ searchParam: 'inOperator'
},
{
label: "来源",
@@ -123,81 +130,80 @@ export default {
prop: "materialType",
search: false,
type: 'select',
- // dicData:[{
- // label: '办公物资',
- // value: '1'
- // },
- // {
- // label: '其他物资',
- // value: '2'
- // }]
+ dicData: [{
+ label: '办公物资',
+ value: '1'
+ },
+ {
+ label: '其他物资',
+ value: '2'
+ }]
},
{
label: "审批人员",
- prop: "approverName",
+ prop: "approvers",
},
-
-
-
{
label: "状态",
prop: "status",
type: 'select',
- // dicData:[
- // {
- // label:'暂存',
- // value:1
- // },
- // {
- // label:'待审批',
- // value:1
- // },
- // {
- // label:'已审批',
- // value:2
- // },
- // ]
+ dicData: [
+ {
+ label: '暂存',
+ value: 1
+ },
+ {
+ label: '待审批',
+ value: 1
+ },
+ {
+ label: '已审批',
+ value: 2
+ },
+ ]
},
]
},
- data: [{
- caigoudanmingcheng: "2025年第一季度采购单",
- str1: '类型一',
- str2: '00000001',
- str3: '2025-03-01',
- str4: '员工一',
- str5: '员工二',
- str6: '采购',
- str7: '1',
- }, {
- caigoudanmingcheng: "2025年第二季度采购单",
- str1: '类型二',
- str2: '00000002',
- str3: '2025-03-02',
- str4: '员工一',
- str5: '员工二',
- str6: '采购',
- str7: '2',
- }, {
- caigoudanmingcheng: "",
- str1: '类型三',
- str2: '00000002',
- str3: '2025-03-02',
- str4: '员工一',
- str5: '员工二',
- str6: '单项',
- str7: '3',
- }, {
- caigoudanmingcheng: "",
- str1: '类型三',
- str2: '00000002',
- str3: '2025-03-02',
- str4: '员工一',
- str5: '员工二',
- str6: '单项',
- str7: '1',
- }],
+ data: [
+ // {
+ // caigoudanmingcheng: "2025年第一季度采购单",
+ // str1: '类型一',
+ // str2: '00000001',
+ // str3: '2025-03-01',
+ // str4: '员工一',
+ // str5: '员工二',
+ // str6: '采购',
+ // str7: '1',
+ // }, {
+ // caigoudanmingcheng: "2025年第二季度采购单",
+ // str1: '类型二',
+ // str2: '00000002',
+ // str3: '2025-03-02',
+ // str4: '员工一',
+ // str5: '员工二',
+ // str6: '采购',
+ // str7: '2',
+ // }, {
+ // caigoudanmingcheng: "",
+ // str1: '类型三',
+ // str2: '00000002',
+ // str3: '2025-03-02',
+ // str4: '员工一',
+ // str5: '员工二',
+ // str6: '单项',
+ // str7: '3',
+ // }, {
+ // caigoudanmingcheng: "",
+ // str1: '类型三',
+ // str2: '00000002',
+ // str3: '2025-03-02',
+ // str4: '员工一',
+ // str5: '员工二',
+ // str6: '单项',
+ // str7: '1',
+ // }
+ ],
inDialogVisible: false,
inDialogTiltle: '入库',
inDialogType: '',//弹框类型
@@ -245,7 +251,9 @@ export default {
// 采购单
purchaseFn(row) {
this.purchaseOpen = true
- this.purchaseTitle = row.caigoudanmingcheng + '详情'
+ this.purchaseTitle = row.purchaseEndInfo + '采购单详情'
+ this.id = row.id
+ console.log(row, this.id,1)
},
closeDialog() {
this.purchaseOpen = false
@@ -268,9 +276,17 @@ export default {
},
searchReset() {
this.query = {};
+ this.form.inDate = []
+ this.form.inOperatorName = ''
+ this.form.inOperator = ''
this.onLoad(this.page);
+
},
searchChange(params, done) {
+ if (params && params.inOperatorName && !params.inOperator) {
+ params.inOperator = params.inOperatorName;
+ delete params.inOperatorName;
+ }
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
@@ -314,18 +330,6 @@ export default {
refreshChange() {
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 = {}) {
this.loading = true;
const queryParams = {
@@ -339,8 +343,8 @@ export default {
queryParams.endTime = queryParams.inDate[1];
delete queryParams.inDate;
}
- console.log("处理后的参数：", queryParams);
getList(page.currentPage, page.pageSize, queryParams).then(res => {
+ console.log('列表', res.data.result)
this.data = res.data.result.list;
this.loading = false;
this.page.total = res.data.result.total;
diff --git a/src/views/firstOrder/outbound.vue b/src/views/firstOrder/outbound.vue
index b4f69c9..eef9c9e 100644
--- a/src/views/firstOrder/outbound.vue
+++ b/src/views/firstOrder/outbound.vue
@@ -10,9 +10,10 @@
出库单导出
-
- {{scope.row.xuqiudanmingcheng}}
- 无
+
+ {{ scope.row.xuqiudanmingcheng }}
+ 无
@@ -21,7 +22,9 @@
-
+
+
@@ -71,7 +74,7 @@ export default {
{
label: "需求单名称",
prop: "xuqiudanmingcheng",
- width:180,
+ width: 180,
},
{
label: "部门",
@@ -108,18 +111,18 @@ export default {
{
label: "状态",
prop: "str7",
- type:'select',
- dicData:[
+ type: 'select',
+ dicData: [
{
- label:'暂存',
- value:1
+ label: '暂存',
+ value: 1
},
{
- label:'待确认',
- value:2
- },{
- label:'确认',
- value:3
+ label: '待确认',
+ value: 2
+ }, {
+ label: '确认',
+ value: 3
}
]
},
@@ -130,7 +133,7 @@ export default {
outDialogVisible: false,
outDialogTiltle: '出库',
outDialogType: '',
- purchaseOpen:false
+ purchaseOpen: false
};
},
computed: {
@@ -152,11 +155,11 @@ export default {
}
},
methods: {
- purchaseFn(row){
+ purchaseFn(row) {
this.purchaseOpen = true
- this.purchaseTitle = row.xuqiudanmingcheng+'详情'
+ this.purchaseTitle = row.xuqiudanmingcheng + '详情'
},
- closeDialog(){
+ closeDialog() {
this.purchaseOpen = false
},
handlePreview() {
@@ -250,8 +253,8 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
this.data.push({
- xuqiudanmingcheng:'20225年一季度需求单',
- bumen:'部门1',
+ xuqiudanmingcheng: '20225年一季度需求单',
+ bumen: '部门1',
str1: '类型一',
str2: '00000001',
str3: '2025-03-01',
@@ -260,8 +263,8 @@ export default {
str6: '采购',
str7: '1',
}, {
- xuqiudanmingcheng:'20225年二季度需求单',
- bumen:'部门2',
+ xuqiudanmingcheng: '20225年二季度需求单',
+ bumen: '部门2',
str1: '类型二',
str2: '00000002',
str3: '2025-03-02',
@@ -270,8 +273,8 @@ export default {
str6: '单项',
str7: '2',
}, {
- xuqiudanmingcheng:'',
- bumen:'部门3',
+ xuqiudanmingcheng: '',
+ bumen: '部门3',
str1: '类型二',
str2: '00000002',
str3: '2025-03-02',
@@ -280,8 +283,8 @@ export default {
str6: '单项',
str7: '3',
}, {
- xuqiudanmingcheng:'',
- bumen:'部门3',
+ xuqiudanmingcheng: '',
+ bumen: '部门3',
str1: '类型二',
str2: '00000002',
str3: '2025-03-02',