From b762ec097a64a08b4233ca278fb6d4b2463725d2 Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Mon, 17 Apr 2023 11:22:36 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=8D=8A=E6=88=90?=
=?UTF-8?q?=E5=93=81=E5=87=BA=E5=BA=93=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mes/qd/src/api/wms/st/out/semiProductOut.js | 351 +++++++++--------
mes/qd/src/views/wms/st/productOut/AddDtl.vue | 2 +-
.../views/wms/st/productOut/ViewDialog.vue | 150 +++----
.../views/wms/st/semiProductIn/AddDialog.vue | 245 ++++++++----
.../views/wms/st/semiProductOut/AddDialog.vue | 368 ++++++++++++------
.../views/wms/st/semiProductOut/AddDtl.vue | 114 ++++--
6 files changed, 714 insertions(+), 516 deletions(-)
diff --git a/mes/qd/src/api/wms/st/out/semiProductOut.js b/mes/qd/src/api/wms/st/out/semiProductOut.js
index 8d4c1e1c..caeea7c9 100644
--- a/mes/qd/src/api/wms/st/out/semiProductOut.js
+++ b/mes/qd/src/api/wms/st/out/semiProductOut.js
@@ -1,228 +1,261 @@
import request from '@/utils/request'
export function add(data) {
- return request({
- url: 'api/productOut',
- method: 'post',
- data
- })
+ return request({
+ url: 'api/semiProductOut',
+ method: 'post',
+ data
+ })
}
export function del(ids) {
- return request({
- url: 'api/productOut/',
- method: 'delete',
- data: ids
- })
+ return request({
+ url: 'api/semiProductOut/',
+ method: 'delete',
+ data: ids
+ })
}
export function edit(data) {
- return request({
- url: 'api/productOut',
- method: 'put',
- data
- })
+ return request({
+ url: 'api/semiProductOut',
+ method: 'put',
+ data
+ })
}
export function getOutBillDtl(data) {
- return request({
- url: '/api/productOut/getOutBillDtl',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/getOutBillDtl',
+ method: 'post',
+ data
+ })
}
export function getOutBillDis(data) {
- return request({
- url: '/api/productOut/getOutBillDis',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/getOutBillDis',
+ method: 'post',
+ data
+ })
}
export function getOutBillDisDtl(params) {
- return request({
- url: '/api/productOut/getOutBillDisDtl',
- method: 'get',
- params
- })
+ return request({
+ url: '/api/semiProductOut/getOutBillDisDtl',
+ method: 'get',
+ params
+ })
}
export function getOutBillTask(params) {
- return request({
- url: '/api/productOut/getOutBillTask',
- method: 'get',
- params
- })
+ return request({
+ url: '/api/semiProductOut/getOutBillTask',
+ method: 'get',
+ params
+ })
}
export function getInvTypes() {
- return request({
- url: '/api/productOut/getInvTypes',
- method: 'get'
- })
+ return request({
+ url: '/api/semiProductOut/getInvTypes',
+ method: 'get'
+ })
}
export function insertDtl(data) {
- return request({
- url: '/api/productOut/insertDtl',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/insertDtl',
+ method: 'post',
+ data
+ })
}
export function allDiv(data) {
- return request({
- url: '/api/productOut/allDiv',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/allDiv',
+ method: 'post',
+ data
+ })
}
export function allDivOne(data) {
- return request({
- url: '/api/productOut/allDivOne',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/allDivOne',
+ method: 'post',
+ data
+ })
}
export function allCancel(data) {
- return request({
- url: '/api/productOut/allCancel',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/allCancel',
+ method: 'post',
+ data
+ })
}
export function oneCancel(data) {
- return request({
- url: '/api/productOut/oneCancel',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/oneCancel',
+ method: 'post',
+ data
+ })
}
export function setPoint(data) {
- return request({
- url: '/api/productOut/setPoint',
- method: 'post',
- data
- })
+
+ return request({
+ url: '/api/semiProductOut/setPoint',
+ method: 'post',
+ data
+ })
}
export function oneSetPoint(data) {
- return request({
- url: '/api/productOut/oneSetPoint',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/oneSetPoint',
+ method: 'post',
+ data
+ })
}
export function getStructIvt(params) {
- return request({
- url: '/api/productOut/getStructIvt',
- method: 'get',
- params
- })
+ return request({
+ url: '/api/semiProductOut/getStructIvt',
+ method: 'get',
+ params
+ })
}
export function manualDiv(data) {
- return request({
- url: '/api/productOut/manualDiv',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/manualDiv',
+ method: 'post',
+ data
+ })
}
export function confirm(data) {
- return request({
- url: '/api/productOut/confirm',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/confirm',
+ method: 'post',
+ data
+ })
}
export function issueTask(data) {
- return request({
- url: '/api/productOut/issueTask',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/issueTask',
+ method: 'post',
+ data
+ })
}
export function finishTask(data) {
- return request({
- url: '/api/productOut/finishTask',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/finishTask',
+ method: 'post',
+ data
+ })
}
export function cancleTaskfinish(data) {
- return request({
- url: '/api/productOut/cancleTaskfinish',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/cancleTaskfinish',
+ method: 'post',
+ data
+ })
}
export function paramByCodeType(data) {
- return request({
- url: '/api/productOut/paramByCodeType',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/paramByCodeType',
+ method: 'post',
+ data
+ })
}
export function schAreaType(data) {
- return request({
- url: '/api/productOut/schAreaType',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/schAreaType',
+ method: 'post',
+ data
+ })
}
export function backConfirm(data) {
- return request({
- url: '/api/productOut/backConfirm',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/backConfirm',
+ method: 'post',
+ data
+ })
}
export function getType() {
- return request({
- url: '/api/productOut/getType',
- method: 'get'
- })
+ return request({
+ url: '/api/semiProductOut/getType',
+ method: 'get'
+ })
}
export function moneySubmit(data) {
- return request({
- url: '/api/productOut/moneySubmit',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/moneySubmit',
+ method: 'post',
+ data
+ })
}
export function getDisNum(data) {
- return request({
- url: '/api/productOut/getDisNum',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/getDisNum',
+ method: 'post',
+ data
+ })
}
export function queryBox(data) {
- return request({
- url: '/api/productOut/queryBox',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/queryBox',
+ method: 'post',
+ data
+ })
}
export function getOutBillTask2(data) {
- return request({
- url: '/api/productOut/getOutBillTask2',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/getOutBillTask2',
+ method: 'post',
+ data
+ })
}
export function cancelTask(data) {
- return request({
- url: '/api/productOut/cancelTask',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/cancelTask',
+ method: 'post',
+ data
+ })
}
export function allSetPoint(data) {
- return request({
- url: '/api/productOut/allSetPoint',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/allSetPoint',
+ method: 'post',
+ data
+ })
}
export function oneSetPoint2(data) {
- return request({
- url: '/api/productOut/oneSetPoint2',
- method: 'post',
- data
- })
+ return request({
+ url: '/api/semiProductOut/oneSetPoint2',
+ method: 'post',
+ data
+ })
+}
+export default {
+ add,
+ edit,
+ del,
+ allDiv,
+ allCancel,
+ getOutBillDtl,
+ getOutBillDis,
+ setPoint,
+ oneSetPoint,
+ getOutBillTask,
+ getStructIvt,
+ manualDiv,
+ confirm,
+ issueTask,
+ finishTask,
+ cancleTaskfinish,
+ getInvTypes,
+ paramByCodeType,
+ schAreaType,
+ backConfirm,
+ getOutBillDisDtl,
+ getType,
+ allDivOne,
+ moneySubmit,
+ getDisNum,
+ queryBox,
+ getOutBillTask2,
+ oneCancel,
+ cancelTask,
+ allSetPoint,
+ oneSetPoint2
}
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }
diff --git a/mes/qd/src/views/wms/st/productOut/AddDtl.vue b/mes/qd/src/views/wms/st/productOut/AddDtl.vue
index 2c67efa6..3dc1c400 100644
--- a/mes/qd/src/views/wms/st/productOut/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/productOut/AddDtl.vue
@@ -81,7 +81,7 @@ export default {
components: { rrOperation, pagination },
cruds() {
return CRUD({
- title: '用户', url: 'api/productOut/addDtl',
+ title: '用户', url: 'api/semiProductOut/addDtl',
optShow: {
add: false,
edit: false,
diff --git a/mes/qd/src/views/wms/st/productOut/ViewDialog.vue b/mes/qd/src/views/wms/st/productOut/ViewDialog.vue
index 6d2f6669..daea24ca 100644
--- a/mes/qd/src/views/wms/st/productOut/ViewDialog.vue
+++ b/mes/qd/src/views/wms/st/productOut/ViewDialog.vue
@@ -1,69 +1,28 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -72,17 +31,12 @@
-
+
-
+
@@ -92,19 +46,11 @@
出库明细
-
+
-
+
@@ -121,19 +67,11 @@
作业明细
-
+
-
+
@@ -155,7 +93,7 @@ import crudProductIn from '@/views/wms/st/productIn/productin'
export default {
name: 'ViewDialog',
- components: { },
+ components: {},
mixins: [crud()],
dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL', 'bill_type', 'product_area'],
props: {
@@ -167,7 +105,7 @@ export default {
type: Object
}
},
- data() {
+ data () {
return {
dialogVisible: false,
tableDtl: [],
@@ -180,26 +118,26 @@ export default {
},
watch: {
dialogShow: {
- handler(newValue) {
+ handler (newValue) {
this.dialogVisible = newValue
}
},
rowmst: {
- handler(newValue) {
+ handler (newValue) {
this.form = newValue
}
}
},
- created() {
+ created () {
crudProductIn.queryStor().then(res => {
this.storlist = res
})
},
methods: {
- open() {
+ open () {
this.queryTableDtl()
},
- close() {
+ close () {
this.$emit('update:dialogShow', false)
this.currentDis = {}
this.currentdtl = null
@@ -207,19 +145,19 @@ export default {
this.tabledis = []
this.$emit('AddChanged')
},
- bill_statusFormat(row) {
+ bill_statusFormat (row) {
return this.dict.label.io_bill_status[row.bill_status]
},
- taskdtl_typeFormat(row) {
+ taskdtl_typeFormat (row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
- task_statusFormat(row) {
+ task_statusFormat (row) {
return this.dict.label.task_status[row.task_status]
},
- work_statusFormat(row) {
+ work_statusFormat (row) {
return this.dict.label.work_status[row.work_status]
},
- handleDtlCurrentChange(current) {
+ handleDtlCurrentChange (current) {
if (current !== null) {
this.tabledis = []
this.currentdtl = current
@@ -229,22 +167,22 @@ export default {
this.currentdtl = {}
}
},
- invtypeFormat(row, column) {
+ invtypeFormat (row, column) {
for (const item of this.billtypelist) {
if (item.code === row.source_bill_type) {
return item.name
}
}
},
- handleDisCurrentChange(current) {
+ handleDisCurrentChange (current) {
this.currentDis = current
},
- queryTableDtl() {
+ queryTableDtl () {
productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.tableDtl = res
})
},
- queryTableDdis() {
+ queryTableDdis () {
if (this.currentdtl !== null) {
productOut.getOutBillDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
this.tabledis = res
@@ -267,15 +205,15 @@ export default {
.crud-opts2 .el-dialog__title2 {
line-height: 24px;
- font-size:20px;
- color:#303133;
+ font-size: 20px;
+ color: #303133;
}
.crud-opts2 .role-span2 {
padding: 0px 0px 20px 0px;
}
+
.crud-opts2 {
padding: 10px 0px 0px 50px;
}
-
diff --git a/mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue b/mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
index a0cc83c9..b131a868 100644
--- a/mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
@@ -15,16 +15,44 @@
- 保存
- 关闭
+ 保存
+ 关闭
-
+
-
+
@@ -79,7 +107,12 @@
-
+
@@ -93,11 +126,26 @@
/>
-
+
-
-
+
+
@@ -117,7 +165,6 @@
添加物料
-
-
-
-
+
+
+
-
+
-
diff --git a/mes/qd/src/views/wms/st/semiProductOut/AddDtl.vue b/mes/qd/src/views/wms/st/semiProductOut/AddDtl.vue
index 2c67efa6..9ecbf9de 100644
--- a/mes/qd/src/views/wms/st/semiProductOut/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/semiProductOut/AddDtl.vue
@@ -49,39 +49,74 @@
:data="crud.data"
style="width: 100%;"
border
- :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+ :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-