diff --git a/src/api/storeManagement/matureSubmission.js b/src/api/storeManagement/matureSubmission.js
index 6e93804d..f4d2061d 100644
--- a/src/api/storeManagement/matureSubmission.js
+++ b/src/api/storeManagement/matureSubmission.js
@@ -8,4 +8,13 @@ export const getList = params => {
method: 'get',
params
});
+};
+
+// 确认送检 stExpireSubmission/submit
+export const save = params => {
+ return request({
+ url: '/api/blade-wms/stExpireSubmission/submit',
+ method: 'post',
+ data: params
+ });
};
\ No newline at end of file
diff --git a/src/views/inboundOutboundManagement/components/addEditDialog.vue b/src/views/inboundOutboundManagement/components/addEditDialog.vue
index c3fc855a..c674fd07 100644
--- a/src/views/inboundOutboundManagement/components/addEditDialog.vue
+++ b/src/views/inboundOutboundManagement/components/addEditDialog.vue
@@ -402,6 +402,7 @@ export default {
console.log('index--------', index);
getGlassPieList({
woCode: e.target.value,
+ goodsCode:this.tableData[index].goodsCode,
}).then(res => {
console.log('res--------', res);
});
diff --git a/src/views/inboundOutboundManagement/otherIssuing/index.vue b/src/views/inboundOutboundManagement/otherIssuing/index.vue
index 1f973c8a..b32cce9d 100644
--- a/src/views/inboundOutboundManagement/otherIssuing/index.vue
+++ b/src/views/inboundOutboundManagement/otherIssuing/index.vue
@@ -1,45 +1,77 @@
-
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ :before-open="beforeOpen"
+ >
-
+
新增
- 详情
- 审批
+ 详情
+ 审批
-
-
+
+
-
-
- 是
- 否
-
-
-
-
-
-
+
+
+ 是
+ 否
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue
index 3d166ded..1fa7ccf6 100644
--- a/src/views/orderManagement/components/exception/dataMissing.vue
+++ b/src/views/orderManagement/components/exception/dataMissing.vue
@@ -876,7 +876,6 @@ export default {
}
},
partCodeChange(val,value,item) {
- console.log(val, value,item,9090909090)
this.editForm.partName =item.partName
},
submitEdit() {
@@ -1011,3 +1010,9 @@ export default {
},
};
+
diff --git a/src/views/productionManagement/components/coatingMater/assayedContent.vue b/src/views/productionManagement/components/coatingMater/assayedContent.vue
index 080189e7..4001d56b 100644
--- a/src/views/productionManagement/components/coatingMater/assayedContent.vue
+++ b/src/views/productionManagement/components/coatingMater/assayedContent.vue
@@ -151,7 +151,6 @@ export default {
label: '化验时间',
prop: 'assayTime',
span: 24,
- type: 'datetime',
overflow: true,
search: false,
headerAlign: 'center',
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 7460ef4b..7c119acf 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -102,12 +102,12 @@ addBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
searchShowBtn:false,
- align: 'center',
+ // align: 'center',
column: [
{
label: '菜单名称',
prop: 'name',
- width: 300,
+ width: 240,
search: true,
rules: [
{
diff --git a/src/views/warehouseManagement/materialExpiration/InspectionDialog.vue b/src/views/warehouseManagement/materialExpiration/InspectionDialog.vue
new file mode 100644
index 00000000..aaad7cc5
--- /dev/null
+++ b/src/views/warehouseManagement/materialExpiration/InspectionDialog.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+ *送检数量
+
+
+
+
+
+
+
+
+ *送检部门
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/warehouseManagement/materialExpiration/matureSubmission.vue b/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
index 012eaa27..60e1ae33 100644
--- a/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
+++ b/src/views/warehouseManagement/materialExpiration/matureSubmission.vue
@@ -1,385 +1,371 @@
-
-
-
-
- 批量送检
-
-
-
- 即将到期
- 已到期
-
+ 批量送检
+
+
+
+ 即将到期
+ 已到期
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+
\ No newline at end of file