diff --git a/src/views/Query/StockQuery/Invoice/index.vue b/src/views/Query/StockQuery/Invoice/index.vue
index 694d5b1..2517bb9 100644
--- a/src/views/Query/StockQuery/Invoice/index.vue
+++ b/src/views/Query/StockQuery/Invoice/index.vue
@@ -16,29 +16,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -47,6 +24,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -55,6 +42,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
导出
-
@@ -151,22 +151,14 @@ const queryFormRef = ref(ElForm);
const state = reactive({
formDataRefData: [] as any,
documentType: [
- {LABEL:"01", VALUE:"01"},
- {LABEL:"02", VALUE:"02" },
- {LABEL:"06", VALUE:"06"},
- {LABEL:"07", VALUE:"07"},
- {LABEL:"Z008", VALUE:"Z008"},
- {LABEL:"ZLF0", VALUE:"ZLF0"},
- {LABEL:"ZLF1", VALUE:"ZLF1"},
- {LABEL:"ZLF2", VALUE:"ZLF2"},
- {LABEL:"ZLF3", VALUE:"ZLF3"},
- {LABEL:"ZLF4", VALUE:"ZLF4"},
- {LABEL:"ZLF5", VALUE:"ZLF5"},
- {LABEL:"ZLF6", VALUE:"ZLF6"},
- {LABEL:"ZLF7", VALUE:"ZLF7"},
- {LABEL:"ZLF8", VALUE:"ZLF8"},
- {LABEL:"ZLF9", VALUE:"ZLF9"},
- {LABEL:"NLCC", VALUE:"NLCC"}
+ {LABEL:"全部", VALUE:""},
+ {LABEL:"采购退货订单", VALUE:"采购退货订单"},
+ {LABEL:"销售发货单", VALUE:"销售发货单"},
+ {LABEL:"生产领料单", VALUE:"生产领料单"},
+ {LABEL:"生产补料单", VALUE:"生产补料单"},
+ {LABEL:"成本中心领料单", VALUE:"成本中心领料单"},
+ {LABEL:"成本中心补料单", VALUE:"成本中心补料单"},
+ {LABEL:"调拨单", VALUE:"调拨单"},
],
queryParams: {
ERPLOCATION: '',
@@ -213,13 +205,13 @@ const { loading, list, column, queryParams, page, page_d, loading_d, list_d, col
onMounted(() => {
state.column = [
- { header: "组织", field: "ERPFACTORYNAME", hide: false },
- { header: "发货单", field: "SHIPREQUESTNAME", hide: false },
- { header: "发货单类型", field: "SHIPREQUESTTYPE", hide: false},
- { header: "发货单状态", field: "SHIPREQUESTSTATE", hide: false },
- { header: "客户编号", field: "CUSTOMERNO", hide: false },
+ { header: "组织", field: "ERPFACTORYNAME", hide: false, width: 70 },
+ { header: "发货单", field: "SHIPREQUESTNAME", hide: false, width: 120 },
+ { header: "发货单类型", field: "SHIPREQUESTTYPE", hide: false, width: 100},
+ { header: "发货单状态", field: "SHIPREQUESTSTATE", hide: false, width: 100 },
+ { header: "客户编号", field: "CUSTOMERNO", hide: false, width: 100 },
{header: "供应商编号", field: "SUPPLIERNO", hide: true},
- {header: "单据日期", field: "ORDERDATE", hide: false},
+ {header: "单据日期", field: "ORDERDATE", hide: false, width: 150},
{header: "备注", field: "REMARK", hide: false},
{ header: "料号", field: "MATERIALSPECNAME", hide: true },
{ header: "品名", field: "DESC_CN", hide: true },
@@ -238,13 +230,15 @@ onMounted(() => {
state.column_d = [
{ header: "发货单", field: "SHIPREQUESTNAME", hide: false },
{ header: "行号", field: "SHIPREQUESTDETAILNAME", hide: false },
- { header: "发出组织", field: "OUTERPFACTORY", hide: false },
+ // 修改
+ { header: "发出组织", field: "ERPFACTORY", hide: false },
{ header: "发出仓库", field: "ERPLOCATION", hide: false },
{ header: "接收组织", field: "ERPRECEIVEFACTORY", hide: false },
- { header: "接收仓库", field: "ERPRECEIVELOCATIONNAME", hide: false },
+ // 修改
+ { header: "接收仓库", field: "ERPRECEIVELOCATION", hide: false },
{ header: "料号", field: "MATERIALSPECNAME", hide: false },
{ header: "品名", field: "DESC_CN", hide: false },
- { header: "物料规格", field: "DESCRIPTION ", hide: false },
+ { header: "物料规格", field: "DESCRIPTION", hide: false },
{ header: "SDK规格", field: "SPECNAME", hide: false },
{ header: "阶段", field: "PHASE", hide: false },
{ header: "请求数量", field: "REQUESTQUANTITY", hide: false },
@@ -252,12 +246,15 @@ onMounted(() => {
{ header: "已出库数量", field: "SALEOUTQUANTITY", hide: false },
{ header: "剩余数量", field: "REALQUANTITY", hide: false },
{ header: "单位", field: "UNIT", hide: false },
- { header: "生产订单", field: "PRODUCTORDER", hide: false },
- { header: "销售订单号", field: "DN", hide: false },
- { header: "发出销售订单行号", field: "SENDSALESORDERDETAILNO", hide: false, width:120 },
- { header: "接收销售订单行号", field: "RECEIVESALESORDERDETAILNO", hide: false, width:120 },
+ // // PRODUCTORDER修改
+ { header: "生产订单", field: "RECEIVEPRODUCTIONORDERNUMBER", hide: false },
+ // DN 修改 saleorder
+ { header: "销售订单号", field: "RECEIVESALESORDER", hide: false },
+ { header: "销售订单行号", field: "SENDSALESORDERDETAILNO", hide: false, width:120 },
+ // { header: "接收销售订单行号", field: "RECEIVESALESORDERDETAILNO", hide: false, width:120 },
{ header: "备注", field: "REMARK", hide: false},
- { header: "生产订单类型", field: "PRODUCTORDERTYPE", hide: false, width:100 },
+ //PRODUCTORDERTYPE修改
+ { header: "生产订单类型", field: "AUART", hide: false, width:100 },
{ header: "客户编码", field: "CUSTOMERNO", hide: false },
{ header: "是否通用料", field: "COMMONMATERIALFLAG", hide: false },
{ header: "最小收卷米数", field: "SJMS", hide: false, width:100 },
@@ -302,14 +299,14 @@ function handleQuery() {
state.page.total = res.data.total;
state.loading = false
if (state.list.length > 0) {
- for (const element of state.list) {
- let dates = new Date(element.ORDERDATE).toJSON()
- element.ORDERDATE = new Date(+new Date(dates) + 8 * 3600 * 1000)
- .toISOString()
- .replace(/T/g, ' ')
- .replace(/\.[\d]{3}Z/, '')
- console.log(element.ORDERDATE)
- }
+ // for (const element of state.list) {
+ // let dates = new Date(element.ORDERDATE).toJSON()
+ // element.ORDERDATE = new Date(+new Date(dates) + 8 * 3600 * 1000)
+ // .toISOString()
+ // .replace(/T/g, ' ')
+ // .replace(/\.[\d]{3}Z/, '')
+ // console.log(element.ORDERDATE)
+ // }
state.active_row = state.list[0]
if (state.active_row) {
handleQuery_d()
diff --git a/src/views/Query/StockQuery/StockIn/index.vue b/src/views/Query/StockQuery/StockIn/index.vue
index 015bb99..6838571 100644
--- a/src/views/Query/StockQuery/StockIn/index.vue
+++ b/src/views/Query/StockQuery/StockIn/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
@@ -37,7 +37,7 @@
-
+
@@ -66,6 +66,13 @@
+
+
+
+
+
+
+
搜索
@@ -83,7 +90,7 @@
导出
-
@@ -150,40 +157,11 @@ const state = reactive({
LABEL:"完成",
VALUE:"Completed"
}],
- documentType: [{
- LABEL:"Z001",
- VALUE:"Z001"
- },{
- LABEL:"Z002",
- VALUE:"Z002"
- },{
- LABEL:"Z003",
- VALUE:"Z003"
- },{
- LABEL:"Z004",
- VALUE:"Z004"
- },{
- LABEL:"Z005",
- VALUE:"Z005"
- },{
- LABEL:"Z006",
- VALUE:"Z006"
- },{
- LABEL:"Z007",
- VALUE:"Z007"
- },{
- LABEL:"ZLR1",
- VALUE:"ZLR1"
- },{
- LABEL:"ZLR2",
- VALUE:"ZLR2"
- },{
- LABEL:"ZLR3",
- VALUE:"ZLR3"
- },{
- LABEL:"NLCC",
- VALUE:"NLCC"
- }],
+ documentType: [
+ {LABEL:"全部", VALUE:""},
+ {LABEL:"采购订单", VALUE:"采购订单" },
+ {LABEL:"调拨单", VALUE:"调拨单"},
+ ],
queryParams: {
RECEIVEREQUESTNAME: '',
ERPFACTORY: '',
@@ -193,7 +171,7 @@ const state = reactive({
TODATE : '',
DESC_CN: "",
MATERIALSPECNAME: "",
- RECEIVEREQUESTTYPE: ''
+ RECEIVEREQUESTTYPE: '',
},
page: {
pageNum: 1,
@@ -220,16 +198,16 @@ const { loading, list, column, queryParams, orderStatus, page, page_d, loading_d
onMounted(() => {
state.column = [
- { header: "组织", field: "ERPFACTORY", hide: false },
- { header: "组织(CN)", field: "ORGNAME", hide: false },
- { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false },
+ { header: "组织", field: "ERPFACTORY", hide: false, width: 70 },
+ { header: "组织(CN)", field: "ORGNAME", hide: false, width: 80 },
+ { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false, width: 100 },
{ header: "料号", field: "MATERIALSPECNAME", hide: true },
{ header: "品名", field: "DESC_CN", hide: true },
- { header: "出入库类型编码", field: "RECEIVEREQUESTTYPE", hide: false },
- { header: "订单状态", field: "RECEIVEREQUESTSTATE", hide: false },
- { header: "供应商编号", field: "SUPPLIERNO", hide: false },
- { header: "供应商名称", field: "SUPPLIERNAME", hide: false },
- { header: "单据日期" , field: "ORDERDATE", hide: false},
+ { header: "出入库类型编码", field: "RECEIVEREQUESTTYPE", hide: false, width: 110 },
+ { header: "订单状态", field: "RECEIVEREQUESTSTATE", hide: false, width: 80 },
+ { header: "供应商编号", field: "SUPPLIERNO", hide: false, width: 80 },
+ { header: "供应商名称", field: "SUPPLIERNAME", hide: true },
+ { header: "单据日期" , field: "ORDERDATE", hide: false, width: 150},
{ header: "备注" , field: "REMARK", hide: false},
{ header: "创建日期", field: "CREATETIME", hide: true },
{ header: "最后操作名称", field: "LASTEVENTNAME", hide: true },
@@ -241,8 +219,9 @@ onMounted(() => {
{ header: "工厂", field: "SITENAME", hide: true },
{ header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false },
{ header: "行号", field: "RECEIVEREQUESTDETAILNAME", hide: false },
- { header: "发出仓库", field: "ERPLOCATION", hide: false },
- { header: "接收仓库", field: "ERPRECEIVELOCATION", hide: false },
+ { header: "发出仓库", field: "ERPLOCATION", hide: true },
+ // ERPRECEIVELOCATION
+ { header: "接收仓库", field: "ERPLOCATION", hide: false },
{ header: "料号", field: "MATERIALSPECNAME", hide: false },
{ header: "品名", field: "DESC_CN", hide: false },
{ header: "物料规格", field: "DESCRIPTION ", hide: false },