diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue
index f9b66e4..fb28122 100644
--- a/src/pages/equipment/Inspection/index.vue
+++ b/src/pages/equipment/Inspection/index.vue
@@ -11,7 +11,7 @@
-
工单号: {{ item.planCode }}
+
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
-
工单号: {{ item.planCode }}
+
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
-
工单号: {{ item.planCode }}
+
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
设备名称:{{ item.equipmentName }}
车间编码: {{ item.planWorkshop }}
周期: {{ item.planLoop }}{{ item.planLoopType == 'month' ? '月' : item.planLoopType == 'day' ? '日' : item.planLoopType == 'year' ? '年' : '周' }}
+ 创建时间: {{ item.createTime }}
循环执行时间开始: {{ item.planLoopStart }}
-
工单号: {{ item.planCode }}
+
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
设备名称:{{ item.equipmentName }}
车间编码: {{ item.planWorkshop }}
周期: {{ item.planLoop }}{{ item.planLoopType == 'month' ? '月' : item.planLoopType == 'day' ? '日' : item.planLoopType == 'year' ? '年' : '周' }}
- 循环执行时间开始: {{ item.planLoopStart }}
+ 创建时间: {{ item.createTime }}
+ 点检时间: {{ item.orderStart }}
diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue
index 4ed2c32..cec6b30 100644
--- a/src/pages/equipment/Upkeep/index.vue
+++ b/src/pages/equipment/Upkeep/index.vue
@@ -26,7 +26,7 @@
循环结束时间 2023-12-30 执行开始时间
执行结束时间 保养类型 内部
是否停机保养 开机保养 保养人 -->
- 计划编码: {{ item.planCode }}
+ 计划编码: {{ item.orderCode }}
设备编码:{{ item.equipmentCode }}
设备名称:{{ item.equipmentName }}
车间编码: {{ item.planWorkshop }}
@@ -44,7 +44,7 @@
{{ item.orderStatus == 0 ? '待处理' : item.orderStatus == 1 ? '已完成' : item.orderStatus == 2 ? '已逾期' : '进行中' }}
- 计划编码: {{ item.planCode }}
+ 计划编码: {{ item.orderCode }}
设备编码:{{ item.equipmentCode }}
设备名称:{{ item.equipmentName }}
车间编码: {{ item.planWorkshop }}
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 758fa2f..b14e69e 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -110,27 +110,26 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加照片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -336,6 +335,16 @@ export default class PurchaseWHSRM extends BasePage {
console.log(query, this.detailsinfo);
await this.model.getCheckTaskList(query);
this.detaillistceshi = this.model.CheckTaskList.qcCheckTaskDetails;
+ this.detaillistceshi.forEach((item) => {
+ item.fileList = [];
+ if (item.files == null) {
+ item.files = [];
+ } else {
+ item.files.forEach((n) => {
+ item.fileList.push(n.fileAddress);
+ });
+ }
+ });
this.detaillistdefects = this.model.CheckTaskList.defects;
this.show = true;
}
@@ -430,6 +439,89 @@ export default class PurchaseWHSRM extends BasePage {
this.isshow = false;
this.tagsvalue = null;
}
+ scrollLeft(files) {
+ return 222 * (files.length + 1);
+ }
+ showScreenImg(i, files) {
+ let list = files;
+ uni.previewImage({
+ current: i,
+ urls: list,
+ // loop: true
+ });
+ }
+ chooseImg(index, files) {
+ uni.chooseImage({
+ count: 9, //默认9
+ // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+ sourceType: ['album', 'camera'],
+ success: (res) => {
+ // uni.showLoading();
+ //console.log('/////',res);
+ let tempFilePaths: any = res.tempFilePaths;
+ console.log(res.tempFilePaths);
+
+ // (this.$refs.uToast as any).show({
+ // title: '成功',
+ // type: 'success',
+ // });
+ // uni.navigateBack({});
+ // } else {
+ // (this.$refs.uToast as any).show({
+ // title: '失败',
+ // type: 'error',
+ // });
+
+ tempFilePaths.map((item) => {
+ uni.uploadFile({
+ // url: 'http://192.168.202.20:9000/prod-api/file/upload',
+ url: '/prod-api/file/upload',
+ fileType: 'image',
+ filePath: item,
+ header: {
+ Authorization: 'Bearer ' + session.user?.access_token,
+ // 'cosmo-env-sitecode': this.$store.state.siteCode
+ },
+ name: 'file',
+ // formData: {
+ // materialCode: this.materialObj.materialCode,
+ // },
+ success: (res) => {
+ uni.hideLoading();
+ if (!res.data) {
+ // this.$refs.toastRef.show({
+ // type:"error",
+ // text:res.msg
+ // })
+ return;
+ }
+ let data = JSON.parse(res.data);
+ files = [...files, data.data.url];
+ this.detaillistceshi[index].files = files;
+ this.detaillistceshi[index].fileListStr = files.join(',');
+ //this.filesName = [...this.filesName,data.fileName];
+ //this.picUrls = this.files.join(",");
+ //this.picNames = this.filesName.join(",");
+ console.log(files, this.detaillistceshi[index]);
+ uni.hideLoading();
+ },
+ fail: (err) => {
+ console.log(err);
+ // this.$refs.toastRef.show({
+ // type:"error",
+ // text:"上传失败！"
+ // })
+ uni.hideLoading();
+ },
+ });
+ });
+ },
+ });
+ }
+ deleteImg(index) {
+ this.detaillistceshi[index].files.splice(index, 1);
+ this.detaillistceshi[index].fileListStr = this.detaillistceshi[index].files.join(',');
+ }
//查询货单关联采购单信息
}
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 7dcb4ab..46f9e87 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.30';
+ version = '0.0.31';
checkversion: any = {};
sessiondata: any = '';
onLoad() {