diff --git a/src/api/factory/snm/staorderPackages.js b/src/api/factory/snm/staorderPackages.js
new file mode 100644
index 00000000..a6acc40b
--- /dev/null
+++ b/src/api/factory/snm/staorderPackages.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/logpm-factory/snm/staorderPackages/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getDetail = (id) => {
+ return request({
+ url: '/logpm-factory/snm/staorderPackages/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/logpm-factory/snm/staorderPackages/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/logpm-factory/snm/staorderPackages/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/logpm-factory/snm/staorderPackages/submit',
+ method: 'post',
+ data: row
+ })
+}
+
diff --git a/src/api/factory/snm/stationOrder.js b/src/api/factory/snm/stationOrder.js
new file mode 100644
index 00000000..a481e8e2
--- /dev/null
+++ b/src/api/factory/snm/stationOrder.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/logpm-factory/snm/stationOrder/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getDetail = (id) => {
+ return request({
+ url: '/logpm-factory/snm/stationOrder/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/logpm-factory/snm/stationOrder/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/logpm-factory/snm/stationOrder/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/logpm-factory/snm/stationOrder/submit',
+ method: 'post',
+ data: row
+ })
+}
+
diff --git a/src/api/factory/snm/stationlinenum.js b/src/api/factory/snm/stationlinenum.js
index 56a16a1b..69bb6bf6 100644
--- a/src/api/factory/snm/stationlinenum.js
+++ b/src/api/factory/snm/stationlinenum.js
@@ -48,3 +48,10 @@ export const update = (row) => {
})
}
+export const getDictionary = () => {
+ return request({
+ url: '/logpm-factory/snm/stationlinenum/dictionary',
+ method: 'get',
+ })
+}
+
diff --git a/src/option/basic/basicPda.js b/src/option/basic/basicPda.js
index 92f5410a..5c56ab4c 100644
--- a/src/option/basic/basicPda.js
+++ b/src/option/basic/basicPda.js
@@ -140,7 +140,6 @@ export default {
width:"100px",
align:'center',
span:11,
-
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_pad_state',
props: {
label: 'dictValue',
diff --git a/src/option/basic/basicPdarecords.js b/src/option/basic/basicPdarecords.js
index e40428ea..b42936d4 100644
--- a/src/option/basic/basicPdarecords.js
+++ b/src/option/basic/basicPdarecords.js
@@ -105,12 +105,12 @@ export default {
search: true,
width:"100px"
},
- {
- label: "维修品牌",
- prop: "brand",
- search: true,
- width:"100px"
- },
+ // {
+ // label: "维修品牌",
+ // prop: "brand",
+ // search: true,
+ // width:"100px"
+ // },
{
label: "采买经销商",
prop: "dealer",
diff --git a/src/option/basic/basicPdarecordslist.js b/src/option/basic/basicPdarecordslist.js
index 711e8d8e..f84175ea 100644
--- a/src/option/basic/basicPdarecordslist.js
+++ b/src/option/basic/basicPdarecordslist.js
@@ -111,12 +111,12 @@ export default {
search: true,
width:"100px"
},
- {
- label: "维修品牌",
- prop: "brand",
- search: true,
- width:"100px"
- },
+ // {
+ // label: "维修品牌",
+ // prop: "brand",
+ // search: true,
+ // width:"100px"
+ // },
{
label: "采买经销商",
prop: "dealer",
diff --git a/src/option/factory/snm/staorderPackages.js b/src/option/factory/snm/staorderPackages.js
new file mode 100644
index 00000000..4cd534b4
--- /dev/null
+++ b/src/option/factory/snm/staorderPackages.js
@@ -0,0 +1,123 @@
+export default {
+ height:'auto',
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: false,
+ deBtn: false,
+ addBtn:false,
+ editBtn: false,
+ menu:false,
+ selection: false,
+ menuWidth: 300,
+ column: [
+ {
+ label: "主键",
+ prop: "id",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "订单id",
+ prop: "orderId",
+ type: "input",
+ width:"250px",
+ align:'center',
+ },
+ {
+ label: "包件号",
+ prop: "packagenum",
+ type: "input",
+ width:"250px",
+ align:'center',
+ },
+ {
+ label: "包件类型",
+ prop: "lx",
+ type: "input",
+ width:"200px",
+ align:'center',
+ },
+ {
+ label: "派车单号",
+ prop: "tcWlb001",
+ type: "input",
+ width:"240px",
+ align:'center',
+ },
+ {
+ label: "分包标识",
+ prop: "tcWld011",
+ type: "input",
+ width:"200px",
+ align:'center',
+ },
+ {
+ label: "客户订单号",
+ prop: "tcPoa014",
+ type: "input",
+ width:"240px",
+ align:'center',
+ },
+ {
+ label: "客户订单号?",
+ prop: "tcPoa046",
+ type: "input",
+ width:"150px",
+ align:'center',
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "创建人",
+ prop: "createdUser",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "创建时间",
+ prop: "createTime",
+ type: "date",
+ format: "YYYY-MM-DD",
+ valueFormat: "YYYY-MM-DD",
+ width:"200px",
+ align:'center',
+ },
+ // {
+ // label: "更新人",
+ // prop: "updatedUser",
+ // type: "input",
+ // },
+ // {
+ // label: "更新时间",
+ // prop: "updatedTime",
+ // type: "input",
+ // },
+ // {
+ // label: "状态",
+ // prop: "status",
+ // type: "input",
+ // },
+ // {
+ // label: "创建部门",
+ // prop: "createdDept",
+ // type: "input",
+ // },
+ // {
+ // label: "是否已删除",
+ // prop: "isDeleted",
+ // type: "input",
+ // },
+ ]
+}
diff --git a/src/option/factory/snm/stationOrder.js b/src/option/factory/snm/stationOrder.js
new file mode 100644
index 00000000..f3d0a135
--- /dev/null
+++ b/src/option/factory/snm/stationOrder.js
@@ -0,0 +1,346 @@
+export default {
+ height:'auto',
+ calcHeight: 30,
+ tip: false,
+ addBtn:false,
+ editBtn: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ delBtn: false, // 行删除按钮
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: false,
+ menuWidth: 300,
+ column: [
+ {
+ label: "主键",
+ prop: "id",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "派车单",
+ prop: "tcWla001",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "产地",
+ prop: "tcPoa061",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ // dicUrl: '/logpm-factory/snm/stationlinenum/dictionary',
+ // props: {
+ // label: 'logisticsLineName',
+ // value: 'logisticsLineNumber',
+ // },
+ },
+ {
+ label: "线路编码",
+ prop: "tcWla005",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ search: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "线路名称",
+ prop: "tcCmb003",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ search: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "物流公司编码",
+ prop: "tcWlb006",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ // search: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "物流公司名称",
+ prop: "tcBmb003",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ // search: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "货运站编码",
+ prop: "tcWlb005",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ // search: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "货运站编码名称",
+ prop: "tcDmb003",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ // search: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "派车时间",
+ prop: "tcWla002",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "客户单号",
+ prop: "tcWlb008",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ search: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "系统单号",
+ prop: "tcWlb007",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ search: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "出货总包数",
+ prop: "tcWlb009",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "柜体包数",
+ prop: "tcWlb019",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "五金包数",
+ prop: "tcWlb020",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "背板包数",
+ prop: "tcWlb021",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "背板2包数",
+ prop: "tcWlb035",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "门包数",
+ prop: "tcWlb022",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "特排包数",
+ prop: "tcWlb033",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "标抽包数",
+ prop: "tcWlb034",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "分批出货类别",
+ prop: "tcWlb037",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "门店名称",
+ prop: "occ02",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "收货人",
+ prop: "tcWlb010",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "收货人手机号",
+ prop: "tcWlb011",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ width:"150px",
+ align:'center',
+ },
+ {
+ label: "状态",
+ prop: "status",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ width:"80px",
+ align:'center',
+ },
+ {
+ label: "是否已删除",
+ prop: "isDeleted",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "创建部门",
+ prop: "createDept",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "更新时间",
+ prop: "updateTime",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "更新人",
+ prop: "updateUser",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "创建时间",
+ prop: "createTime",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "创建人",
+ prop: "createUser",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "是否更新到老系统",
+ prop: "identification",
+ type: "input",
+ width:"180px",
+ align:'center',
+ dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
+ props: {
+ label: 'dictValue',
+ value: 'dictKey',
+ },
+ },
+ ]
+}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 05b168ca..7b34f703 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -178,4 +178,19 @@ export default [
},
],
},
+ {
+ path: '/factory/snm/staorderPackages',
+ component: Layout,
+ redirect: '/factory/snm',
+ children: [
+ {
+ path: '/factory/snm/staorderPackages',
+ name: '运单包件信息',
+ meta: {
+ data: 'data',
+ },
+ component: () => import('@/views/factory/snm/staorderPackages.vue'),
+ },
+ ],
+ },
];
diff --git a/src/views/basic/line/basicLineform.vue b/src/views/basic/line/basicLineform.vue
index fb91fad4..a2033fa6 100644
--- a/src/views/basic/line/basicLineform.vue
+++ b/src/views/basic/line/basicLineform.vue
@@ -44,7 +44,8 @@ name: "basicLineform",
// tableData: [],
// },
form: {
- linenode: [{}]
+ linenode: [{}],
+ state:'2',
},
// 分页信息
nodepage: {
diff --git a/src/views/factory/snm/staorderPackages.vue b/src/views/factory/snm/staorderPackages.vue
new file mode 100644
index 00000000..5c0cb3f2
--- /dev/null
+++ b/src/views/factory/snm/staorderPackages.vue
@@ -0,0 +1,250 @@
+
+
+
+
+
+
+
+
+
+
+ 返 回
+
+
+
+
+
+
+
+
+
diff --git a/src/views/factory/snm/stationOrder.vue b/src/views/factory/snm/stationOrder.vue
new file mode 100644
index 00000000..30523441
--- /dev/null
+++ b/src/views/factory/snm/stationOrder.vue
@@ -0,0 +1,295 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看包件信息
+
+
+
+
+
+
+
+