diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 879be45..21dc411 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -16,7 +16,7 @@
@edit="editPage">
{{ page.meta.title }}
- {{page.params.merchandiseName}}
+ {{page.query.merchandiseName}}
diff --git a/src/views/accessrecords/LndustrialExplosiveCome.vue b/src/views/accessrecords/LndustrialExplosiveCome.vue
new file mode 100644
index 0000000..cd173cb
--- /dev/null
+++ b/src/views/accessrecords/LndustrialExplosiveCome.vue
@@ -0,0 +1,412 @@
+
+
+
+
+
+
+
+
+
导出
+
查询
+
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/LndustrialExplosiveEnter.vue b/src/views/accessrecords/LndustrialExplosiveEnter.vue
new file mode 100644
index 0000000..4250005
--- /dev/null
+++ b/src/views/accessrecords/LndustrialExplosiveEnter.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
导出
+
查询
+
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
new file mode 100644
index 0000000..2bda2c6
--- /dev/null
+++ b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
@@ -0,0 +1,401 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
导出
+
查询
+
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
new file mode 100644
index 0000000..c8f4763
--- /dev/null
+++ b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
@@ -0,0 +1,415 @@
+
+
+
+
+
+
+
+
+
导出
+
查询
+
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/flowchart/LndustrialExplosiveComeFlowChart.vue b/src/views/accessrecords/flowchart/LndustrialExplosiveComeFlowChart.vue
new file mode 100644
index 0000000..dd14c54
--- /dev/null
+++ b/src/views/accessrecords/flowchart/LndustrialExplosiveComeFlowChart.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/flowchart/LndustrialExplosiveEnterFlowChart.vue b/src/views/accessrecords/flowchart/LndustrialExplosiveEnterFlowChart.vue
new file mode 100644
index 0000000..348827f
--- /dev/null
+++ b/src/views/accessrecords/flowchart/LndustrialExplosiveEnterFlowChart.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue b/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue
new file mode 100644
index 0000000..24f7f67
--- /dev/null
+++ b/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/flowchart/ProcessMaterialsDeliveryFlowChart.vue b/src/views/accessrecords/flowchart/ProcessMaterialsDeliveryFlowChart.vue
new file mode 100644
index 0000000..be05968
--- /dev/null
+++ b/src/views/accessrecords/flowchart/ProcessMaterialsDeliveryFlowChart.vue
@@ -0,0 +1,386 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue b/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
new file mode 100644
index 0000000..148d376
--- /dev/null
+++ b/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue b/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
new file mode 100644
index 0000000..a35391f
--- /dev/null
+++ b/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
@@ -0,0 +1,458 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
new file mode 100644
index 0000000..514d424
--- /dev/null
+++ b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
@@ -0,0 +1,473 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
导出
+
查询
+
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
new file mode 100644
index 0000000..b0faed5
--- /dev/null
+++ b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
@@ -0,0 +1,446 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
导出
+
查询
+
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/plan/LndustrialExplosiveComePlan.vue b/src/views/accessrecords/plan/LndustrialExplosiveComePlan.vue
new file mode 100644
index 0000000..44058f6
--- /dev/null
+++ b/src/views/accessrecords/plan/LndustrialExplosiveComePlan.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/plan/LndustrialExplosiveEnterPlan.vue b/src/views/accessrecords/plan/LndustrialExplosiveEnterPlan.vue
new file mode 100644
index 0000000..f69f26d
--- /dev/null
+++ b/src/views/accessrecords/plan/LndustrialExplosiveEnterPlan.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue b/src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue
new file mode 100644
index 0000000..bddbab3
--- /dev/null
+++ b/src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue b/src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue
new file mode 100644
index 0000000..95292e7
--- /dev/null
+++ b/src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/statement/LndustrialExplosiveComeStatement.vue b/src/views/accessrecords/statement/LndustrialExplosiveComeStatement.vue
new file mode 100644
index 0000000..32bd948
--- /dev/null
+++ b/src/views/accessrecords/statement/LndustrialExplosiveComeStatement.vue
@@ -0,0 +1,15 @@
+
+
+ 出爆报表
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/statement/LndustrialExplosiveEnterStatement.vue b/src/views/accessrecords/statement/LndustrialExplosiveEnterStatement.vue
new file mode 100644
index 0000000..fb6e664
--- /dev/null
+++ b/src/views/accessrecords/statement/LndustrialExplosiveEnterStatement.vue
@@ -0,0 +1,15 @@
+
+
+ 入爆报表
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue b/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
new file mode 100644
index 0000000..c4b6a85
--- /dev/null
+++ b/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
@@ -0,0 +1,15 @@
+
+
+ 入报表
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue b/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
new file mode 100644
index 0000000..72c6a86
--- /dev/null
+++ b/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
@@ -0,0 +1,15 @@
+
+
+ 出报表
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index e0464dc..195048a 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -156,12 +156,12 @@
{
title:'规格',
align:"center",
- dataIndex: 'merchandiseName1'
+ dataIndex: 'specification'
},
{
title:'型号',
align:"center",
- dataIndex: 'merchandiseName2'
+ dataIndex: 'type'
},
{
@@ -172,12 +172,15 @@
{
title:'总库数量',
align:"center",
- dataIndex: 'materialQuantity'
+ dataIndex: 'materialQuantity1',
+ customRender:function (t,r,index) {
+ return 0;
+ }
},
{
title:'项目部数量',
align:"center",
- dataIndex: 'materialQuantity1'
+ dataIndex: 'materialQuantity'
},
{
title:'核算属性',
@@ -215,24 +218,16 @@
methods: {
handleDetaills(record){
console.log(record);
-
- // var temomen = {
- // name: 'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
- // hidden: true,
- // meta: {
- // title: 'title',
- // keepAlive: true,
- // hiddenHeaderContent: true,
- // }
- // }
- // this.$router.push(temomen);
- // console.log(record)
- // console.log("下标为",record.merchandiseName.substring(record.merchandiseName.lastIndexOf(" ")))
this.$router.push({
- name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
- params:{
- item: record.merchandiseNewsId,
- merchandiseName : ' - '+record.merchandiseName.substring(0,record.merchandiseName.lastIndexOf(" "))
+ // name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
+ // params:{
+ // item: record.merchandiseNewsId,
+ // merchandiseName : ' - '+record.merchandiseName.substring(0,record.merchandiseName.lastIndexOf(" "))
+ // }
+ path:'/materials/suppliesstronger_detail',
+ query:{
+ item: record.merchandiseNewsId,
+ merchandiseName : ' - '+record.merchandiseName.substring(0,record.merchandiseName.lastIndexOf(" "))
}
})
},
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index ff90888..da9aef4 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -36,6 +36,7 @@
format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']"
@change="onDateChange"
+ v-model="productLicenseDate"
/>
@@ -70,41 +71,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -112,7 +78,13 @@
-
+
+
@@ -122,6 +94,7 @@
format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']"
@change="onDateChangestorageTime"
+ v-model="inboundLicenseDate"
/>
@@ -224,10 +197,12 @@
},
data () {
return {
+ productLicenseDate:[],
+ inboundLicenseDate:[],
queryParam: {
supplier: null,
itemGroup: null,
- merchandiseNewsId: this.$route.params.item,
+ merchandiseNewsId: this.$route.query.item,
itemDescription: null,
unitWasteWarehouseCodeId: null,
freightSpace: null,
@@ -237,7 +212,7 @@
storageTime: null,
librarySign: null,
},
- merchandiseNewsId: this.$route.params.item,
+ merchandiseNewsId: this.$route.query.item,
description: '物资总库管理详情页面',
columns: [
{
@@ -276,10 +251,20 @@
dataIndex: 'materialsNumber'
},
{
- title:'物料描述',
+ title:'物料名称',
align:"center",
dataIndex: 'merchandiseName'
},
+ {
+ title:'规格',
+ align:"center",
+ dataIndex: 'specification'
+ },
+ {
+ title:'型号',
+ align:"center",
+ dataIndex: 'type'
+ },
{
title:'计量单位',
align:"center",
@@ -305,11 +290,11 @@
align:"center",
dataIndex: 'unitWasteWarehouseCodeId'
},
- {
- title:'存储仓位',
- align:"center",
- dataIndex: 'freightSpace'
- },
+ // {
+ // title:'存储仓位',
+ // align:"center",
+ // dataIndex: 'freightSpace'
+ // },
{
title:'生产时间',
align:"center",
@@ -381,7 +366,7 @@
},
watch: {
$route() {
- this.queryParam.merchandiseNewsId = this.$route.params.item
+ this.queryParam.merchandiseNewsId = this.$route.query.item
this.loadData()
}
},
@@ -392,19 +377,22 @@
},
methods: {
onDateChange: function (value, dateString) {
+ this.productLicenseDate = value;
this.queryParam.productDateBegin=dateString[0];
this.queryParam.productDateEnd=dateString[1];
- console.log()
},
onDateChangestorageTime: function (value, dateString) {
+ this.inboundLicenseDate = value;
this.queryParam.inboundDateBegin=dateString[0];
this.queryParam.inboundDateEnd=dateString[1];
},
searchReset(){
+ this.productLicenseDate=[];
+ this.inboundLicenseDate=[];
this.queryParam = {
supplier: null,
itemGroup: null,
- item: this.$route.params.item,
+ merchandiseNewsId: this.$route.query.item,
itemDescription: null,
unitWasteWarehouseCodeId: null,
freightSpace: null,
@@ -423,7 +411,7 @@
});
},
judgeRouterParam(){
- if (this.$route.params.item == null){
+ if (this.$route.query.item == null){
this.$router.go(-1);
}
},
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index 801ab45..f97142d 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -199,10 +199,17 @@
methods: {
handleDetail(record){
console.log(record);
- this.$router.push({name:'src-views-wastematerials-ProcessWasteMaterialsLists',
- params:{
+ this.$router.push({
+ // name:'src-views-wastematerials-ProcessWasteMaterialsLists',
+ // params:{
+ // merchandiseNewsId: record.merchandiseNewsId,
+ // materialStorageId : record.materialStorageId
+ // }
+ path:'/materials/wastematerials_detail',
+ query:{
merchandiseNewsId: record.merchandiseNewsId,
- materialStorageId : record.materialStorageId
+ materialStorageId : record.materialStorageId,
+ merchandiseName : ' - '+record.materialDescription.substring(0,record.materialDescription.lastIndexOf(" "))
}
})
},
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index dacf077..6523e81 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -148,7 +148,7 @@
},
data () {
return {
- descriptionId: this.$route.params.materialStorageId,
+ descriptionId: this.$route.query.materialStorageId,
queryParam:{
supplier: null,
supplierDescription: null,
@@ -160,8 +160,8 @@
expirationDate: null,
storageTime: null,
materialsState: null,
- merchandiseNewsId: this.$route.params.merchandiseNewsId,
- materialStorageId: this.$route.params.materialStorageId,
+ merchandiseNewsId: this.$route.query.merchandiseNewsId,
+ materialStorageId: this.$route.query.materialStorageId,
descriptionId: null,
del_flag: 0
},
@@ -294,8 +294,8 @@
},
watch: {
$route() {
- this.queryParam.merchandiseNewsId = this.$route.params.merchandiseNewsId;
- this.queryParam.materialStorageId = this.$route.params.materialStorageId;
+ this.queryParam.merchandiseNewsId = this.$route.query.merchandiseNewsId;
+ this.queryParam.materialStorageId = this.$route.query.materialStorageId;
this.loadData()
}
},
@@ -316,7 +316,7 @@
this.queryParam.inboundDateEnd=dateString[1];
},
judgeRouterParam(){
- if (this.$route.params.merchandiseNewsId == null){
+ if (this.$route.query.merchandiseNewsId == null){
this.$router.go(-1);
}
},
@@ -336,7 +336,7 @@
this.createProductTime = [],
this.createInnerTime = [],
this.queryParam = {
- descriptionId: this.$route.params.descriptionId,
+ descriptionId: this.$route.query.descriptionId,
del_flag: 0
},
getAction(this.url.list,this.queryParam).then((res)=>{