diff --git a/src/api/mes/wm/package.js b/src/api/mes/wm/package.js
index 3eaea7c..ef7a446 100644
--- a/src/api/mes/wm/package.js
+++ b/src/api/mes/wm/package.js
@@ -42,3 +42,12 @@ export function delPackage(packageId) {
method: 'delete'
})
}
+
+//添加子箱
+export function addSubPackage(data){
+ return request({
+ url: '/mes/wm/package/addsub',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/src/api/mes/wm/packageline.js b/src/api/mes/wm/packageline.js
new file mode 100644
index 0000000..c383393
--- /dev/null
+++ b/src/api/mes/wm/packageline.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询装箱明细列表
+export function listPackageline(query) {
+ return request({
+ url: '/mes/wm/packageline/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询装箱明细详细
+export function getPackageline(lineId) {
+ return request({
+ url: '/mes/wm/packageline/' + lineId,
+ method: 'get'
+ })
+}
+
+// 新增装箱明细
+export function addPackageline(data) {
+ return request({
+ url: '/mes/wm/packageline',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改装箱明细
+export function updatePackageline(data) {
+ return request({
+ url: '/mes/wm/packageline',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除装箱明细
+export function delPackageline(lineId) {
+ return request({
+ url: '/mes/wm/packageline/' + lineId,
+ method: 'delete'
+ })
+}
diff --git a/src/api/mes/wm/rtsalseline.js b/src/api/mes/wm/rtsalseline.js
new file mode 100644
index 0000000..36c64f6
--- /dev/null
+++ b/src/api/mes/wm/rtsalseline.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询产品销售退货行列表
+export function listRtsalseline(query) {
+ return request({
+ url: '/mes/wm/rtsalseline/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询产品销售退货行详细
+export function getRtsalseline(lineId) {
+ return request({
+ url: '/mes/wm/rtsalseline/' + lineId,
+ method: 'get'
+ })
+}
+
+// 新增产品销售退货行
+export function addRtsalseline(data) {
+ return request({
+ url: '/mes/wm/rtsalseline',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改产品销售退货行
+export function updateRtsalseline(data) {
+ return request({
+ url: '/mes/wm/rtsalseline',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除产品销售退货行
+export function delRtsalseline(lineId) {
+ return request({
+ url: '/mes/wm/rtsalseline/' + lineId,
+ method: 'delete'
+ })
+}
diff --git a/src/components/package/single.vue b/src/components/package/single.vue
new file mode 100644
index 0000000..488ca61
--- /dev/null
+++ b/src/components/package/single.vue
@@ -0,0 +1,247 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ {{""}}
+
+
+
+
+
+ {{ parseTime(scope.row.packageDate, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/mes/wm/package/index.vue b/src/views/mes/wm/package/index.vue
index ea090f3..1b81131 100644
--- a/src/views/mes/wm/package/index.vue
+++ b/src/views/mes/wm/package/index.vue
@@ -59,34 +59,24 @@
v-hasPermi="['mes:wm:package:add']"
>新增
-
- 修改
-
-
- 删除
-
-
-
-
+
+
+
+ {{scope.row.packageCode}}
+
+
{{ parseTime(scope.row.packageDate, '{y}-{m}-{d}') }}
@@ -95,7 +85,7 @@
-
+
@@ -104,9 +94,9 @@
-
+
-
+
@@ -117,6 +107,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:wm:package:edit']"
+ v-if="scope.row.status =='PREPARE'"
>修改
删除
@@ -262,8 +254,18 @@
+
+
+
+
+
+
+
+
@@ -273,13 +275,17 @@
diff --git a/src/views/mes/wm/package/subpackge.vue b/src/views/mes/wm/package/subpackge.vue
new file mode 100644
index 0000000..88d8ec6
--- /dev/null
+++ b/src/views/mes/wm/package/subpackge.vue
@@ -0,0 +1,209 @@
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.packageDate, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue
index 7430a17..33a1066 100644
--- a/src/views/mes/wm/productrecpt/index.vue
+++ b/src/views/mes/wm/productrecpt/index.vue
@@ -438,6 +438,14 @@ export default {
}
});
},
+ //完成单据
+ doconfirm(){
+ let that = this;
+ this.$modal.confirm('是否完成入库单编制?【完成后将不能更改】').then(function(){
+ that.form.status = 'CONFIRMED';
+ that.submitForm();
+ });
+ },
/** 删除按钮操作 */
handleDelete(row) {
const recptIds = row.recptId || this.ids;
diff --git a/src/views/mes/wm/rtsalse/line.vue b/src/views/mes/wm/rtsalse/line.vue
new file mode 100644
index 0000000..1bc358e
--- /dev/null
+++ b/src/views/mes/wm/rtsalse/line.vue
@@ -0,0 +1,507 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+