diff --git a/src/api/systemFinished/systemFinished.js b/src/api/systemFinished/systemFinished.js
index 4fc8420..84c8957 100644
--- a/src/api/systemFinished/systemFinished.js
+++ b/src/api/systemFinished/systemFinished.js
@@ -14,7 +14,8 @@ export function addOdsProductEmbryoInventory(data) {
return request({
url: '/wms/systemFinished/addOdsProductEmbryoInventory',
method: 'post',
- params: data
+ data: data,
+ contentType:'application/json',
});
}
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index b6bbf4d..aa75b32 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -21,6 +21,7 @@
@@ -879,23 +880,17 @@ export default {
},
/** 查询报工报表列表 */
getList() {
- /**
- if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){
- this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
- this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
- }
-
- if (
- this.queryParams.feedbackTimeArray != null &&
- this.queryParams.feedbackTimeArray.length > 0
- ) {
+ if (this.queryParams.feedbackTimeArray != null &&this.queryParams.feedbackTimeArray.length > 0) {
this.queryParams.feedbackTimeStart = moment(
this.queryParams.feedbackTimeArray[0]
).format("YYYY-MM-DD");
this.queryParams.feedbackTimeEnd = moment(
this.queryParams.feedbackTimeArray[1]
).format("YYYY-MM-DD");
- }**/
+ }else{
+ this.queryParams.feedbackTimeStart = null;
+ this.queryParams.feedbackTimeEnd = null;
+ }
this.loading = true;
listReportWork(this.queryParams).then((response) => {
this.reportWorkList = response.rows;
@@ -916,6 +911,7 @@ export default {
},
// 取消按钮
cancel() {
+ window.location.reload();
this.open = false;
this.openReport = false;
this.openReportSAP = false;
@@ -991,7 +987,7 @@ export default {
createTime: null,
updateTime: null,
updateBy: null,
- endReport: "0",
+ endReport: "0"
};
this.resetForm("form");
this.libTabs = [];
diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index c80efba..860481a 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -184,7 +184,7 @@
-
+
-
+
-
+
@@ -265,7 +265,7 @@
-
+
@@ -284,7 +284,7 @@
-
+
@@ -388,7 +388,7 @@ export default {
// 表单校验
rules: {
checkType:[
- { required: true, message: "检验类型不能为空", trigger: "blur" }
+ { required: true, message: "检验类型不能为空", trigger: "blur" }
],
incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" }
@@ -452,12 +452,12 @@ export default {
/** 查询库存检验列表 */
getList() {
this.loading = true;
-
+ console.log("--------"+this.queryParams)
if(this.queryParams.incomeTimeArray!=null && this.queryParams.incomeTimeArray.length>0){
this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{
- this.queryParams.incomeTimeStart = null;
+ this.queryParams.incomeTimeStart = null;
this.queryParams.incomeTimeEnd = null;
}
@@ -619,7 +619,7 @@ export default {
this.form.supplierCode = obj.code;
this.form.supplierName = obj.name;
},
-
+
/**人员选择弹出框**/
handleSelectUser() {
this.$refs.itemSelectUser.showFlag = true;
diff --git a/src/views/quality/qcMarket/index.vue b/src/views/quality/qcMarket/index.vue
index 3e3d01e..95be25d 100644
--- a/src/views/quality/qcMarket/index.vue
+++ b/src/views/quality/qcMarket/index.vue
@@ -185,7 +185,7 @@
-
+
0){
+ if(this.queryParams.incomeTimeArray != null && this.queryParams.incomeTimeArray.length>0){
this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
- }
+ }else{
+ this.queryParams.incomeTimeStart = null;
+ this.queryParams.incomeTimeEnd = null;
+ }
- if(this.queryParams.checkTimeArray.length>0){
+ if(this.queryParams.checkTimeArray != null && this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
- }
+ }else{
+ this.queryParams.checkTimeStart = null;
+ this.queryParams.checkTimeEnd = null;
+ }
listWarehousing(this.queryParams).then(response => {
this.warehousingList = response.rows;
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index db0bac7..78be986 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -85,6 +85,7 @@
+
0){
+ if(this.queryParams.checkTimeArray != null && this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
- }
+ }else {
+ this.queryParams.checkTimeStart = null;
+ this.queryParams.checkTimeEnd = null;
+ }
listUnqualified(this.queryParams).then(response => {
this.unqualifiedList = response.rows;
diff --git a/src/views/system/datasource/index.vue b/src/views/system/datasource/index.vue
index 13a7aa1..5aea8d8 100644
--- a/src/views/system/datasource/index.vue
+++ b/src/views/system/datasource/index.vue
@@ -128,7 +128,7 @@
-
+
+
+
+
diff --git a/src/views/wms/systemFinished/index.vue b/src/views/wms/systemFinished/index.vue
index 7b1b6d6..2e3377a 100644
--- a/src/views/wms/systemFinished/index.vue
+++ b/src/views/wms/systemFinished/index.vue
@@ -47,9 +47,9 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
-
+
@@ -567,7 +566,7 @@
const formData = Object.assign({}, this.form);
// 将addoutorderList数组赋值给formData对象
- formData.addoutorderList = this.addoutorderList;
+ formData.odsProductEmbryoInventoryCorrelationList = this.addoutorderList;
// 打印整合后的数据对象
console.log("Merged Data:", formData);