From 165d0abe696e5ef3152592f2431f155e0653c71d Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Fri, 12 Jan 2024 14:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../quality/Materialinspection/index.vue | 24 +++++++++++++++----
src/pages/quality/Materialinspection/model.ts | 4 +++-
src/pages/quality/Records/index.vue | 12 ++++++----
src/pages/quality/Records/model.ts | 2 +-
src/pages/shouye/me.vue | 2 +-
5 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 8fec9be..ec3623a 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -25,16 +25,20 @@
来料批次号:
{{ item.incomeBatchNo }}
+
+ 任务号:
+ {{ item.checkNo }}
+
订单号:
- {{ item.orderNo }}
+ {{ item.workorderCodeSap }}
物料号:
{{ item.materialCode }}
- 物料名称:
+ 物料名称:
{{ item.materialName }}
@@ -374,7 +378,9 @@ export default class PurchaseWHSRM extends BasePage {
belongTo: belongTo,
checkType: this.selectList.value,
};
+ console.log(this.model, '11111');
await this.model.getCheckTaskList(query);
+
this.detaillistceshi = this.model.CheckTaskList.qcCheckTaskDetails;
this.detaillistdefects = this.model.CheckTaskList.defects;
this.detaillistceshi.forEach((item) => {
@@ -402,6 +408,7 @@ export default class PurchaseWHSRM extends BasePage {
await this.model.getCheckTaskListall(query);
console.log(this.model.CheckTaskListall);
this.list = this.model.CheckTaskListall;
+ console.log(this.selectList, '222222');
// let params = {
// productionState: this.productCodelocList.value.toString(),
// };
@@ -463,6 +470,12 @@ export default class PurchaseWHSRM extends BasePage {
this.isvalue = false;
this.isquality = false;
console.log(this.selectList, this.detaillistceshi);
+ let typeCode = '';
+ this.nodelist.forEach((item) => {
+ if (this.selectList.value == item.orderCode) {
+ typeCode = item.typeCode;
+ }
+ });
this.detaillistceshi.forEach((item) => {
if (item.propertyCode == 1) {
if (item.actualValue == null || item.actualValue == '') {
@@ -522,7 +535,7 @@ export default class PurchaseWHSRM extends BasePage {
updateBy: session.userName,
factoryCode: session.PoolName,
updateByName: session.userName,
- typeCode: this.selectList.value,
+ typeCode: typeCode,
checkType: this.selectList.value,
orderCode: this.clickitem.orderNo,
workorderCodeSap: this.clickitem.workorderCodeSap,
@@ -603,8 +616,9 @@ export default class PurchaseWHSRM extends BasePage {
tempFilePaths.map((item) => {
uni.uploadFile({
- // url: 'http://192.168.202.20:9000/prod-api/file/upload',
- url: '/prod-api/file/upload',
+ url: 'http://192.168.202.20:9000/prod-api/file/upload',
+ // url: '/prod-api/file/upload',
+ // url: '/dev-api/file/upload',
fileType: 'image',
filePath: item,
header: {
diff --git a/src/pages/quality/Materialinspection/model.ts b/src/pages/quality/Materialinspection/model.ts
index cb90030..db7ef10 100644
--- a/src/pages/quality/Materialinspection/model.ts
+++ b/src/pages/quality/Materialinspection/model.ts
@@ -25,6 +25,7 @@ export class Materialinspection extends VuexModule {
const selectList = result.data.map((item: any) => ({
label: item.checkName,
value: item.orderCode,
+ typeCode: item.typeCode,
}));
return { orderNoItemList, selectList };
}
@@ -35,7 +36,7 @@ export class Materialinspection extends VuexModule {
//loginName: session.loginName,
params: query,
});
- const CheckTaskListall = result.rows;
+ const CheckTaskListall = result;
return { CheckTaskListall };
}
CheckTaskList: any = [];
@@ -45,6 +46,7 @@ export class Materialinspection extends VuexModule {
//loginName: session.loginName,
params: query,
});
+ console.log(result, '11111');
const CheckTaskList = result.data;
return { CheckTaskList };
}
diff --git a/src/pages/quality/Records/index.vue b/src/pages/quality/Records/index.vue
index 3319ca2..d81b61a 100644
--- a/src/pages/quality/Records/index.vue
+++ b/src/pages/quality/Records/index.vue
@@ -25,21 +25,25 @@
来料批次号:
{{ item.incomeBatchNo }}
+
+ 任务号:
+ {{ item.checkNo }}
+
订单号:
- {{ item.orderNo }}
+ {{ item.workorderCodeSap }}
物料号:
{{ item.materialCode }}
- 物料名称:
+ 物料名称:
{{ item.materialName }}
- 检验时间:
- {{ item.checkTime }}
+ 创建时间:
+ {{ item.createTime }}
diff --git a/src/pages/quality/Records/model.ts b/src/pages/quality/Records/model.ts
index 1f3edba..08dce12 100644
--- a/src/pages/quality/Records/model.ts
+++ b/src/pages/quality/Records/model.ts
@@ -35,7 +35,7 @@ export class Records extends VuexModule {
//loginName: session.loginName,
params: query,
});
- const CheckTaskListall = result.rows;
+ const CheckTaskListall = result;
return { CheckTaskListall };
}
CheckTaskList: any = [];
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index bbfaa66..9743e5c 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
model = model;
src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
today = dayjs().format('YYYY-MM-DD dddd');
- version = '0.0.32';
+ version = '0.0.33';
checkversion: any = {};
sessiondata: any = '';
onLoad() {