From b0efd66a75ead74cd9f8e9db74f8f439f9b3579f Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Mon, 27 Nov 2023 09:38:31 +0800
Subject: [PATCH 1/2] bug ui
---
src/api/equipment/base/inspection/settings.js | 30 ++++-
src/components/FileUpload/index.vue | 25 ++++-
.../base/coreDepartment/add-or-updata.vue | 77 +++++++------
.../base/coreHotMaterial/add-or-updata.vue | 8 +-
src/views/base/coreProduct/add-or-updata.vue | 6 +-
src/views/base/coreWorkOrder/index.vue | 12 +-
.../coreWorkshopSection/add-or-updata.vue | 6 +-
src/views/base/coreWorkshopSection/index.vue | 2 +-
src/views/base/material/add-or-updata.vue | 12 +-
src/views/base/material/index.vue | 32 +++---
.../base/materialProductBom/add-or-updata.vue | 94 ++++++++++------
src/views/core/base/factory/index.vue | 23 +++-
.../base/inspection/Record/addRecord.vue | 33 ++++--
.../base/inspection/Settings/add.vue | 105 ++++++++++++++++++
.../base/inspection/Settings/index.vue | 51 +++++----
.../base/repair/CustomDialogForm.vue | 20 +++-
16 files changed, 392 insertions(+), 144 deletions(-)
create mode 100644 src/views/equipment/base/inspection/Settings/add.vue
diff --git a/src/api/equipment/base/inspection/settings.js b/src/api/equipment/base/inspection/settings.js
index 306c092d..5f637a22 100644
--- a/src/api/equipment/base/inspection/settings.js
+++ b/src/api/equipment/base/inspection/settings.js
@@ -1,7 +1,7 @@
/*
* @Author: Do not edit
* @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-20 16:38:18
+ * @LastEditTime: 2023-11-25 16:22:49
* @LastEditors: DY
* @Description:
*/
@@ -73,4 +73,30 @@ export function deleteCheck(id) {
url: '/base/equipment-check/delete?id=' + id,
method: 'delete'
})
-}
\ No newline at end of file
+}
+
+// 获得设备巡检设置code
+export function getCode() {
+ return request({
+ url: '/base/equipment-check-config/getCode',
+ method: 'get'
+ })
+}
+
+// 创建巡检配置
+export function createCheckConfig(data) {
+ return request({
+ url: '/base/equipment-check-config/create',
+ method: 'post',
+ data: data
+ })
+}
+
+// 更新巡检配置
+export function updateCheckConfig(data) {
+ return request({
+ url: '/base/equipment-check-config/update',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 347d77f8..80a5c56e 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -29,10 +29,10 @@
- {{ getFileName(file.name) }}
+ {{ fileName }}
- 删除
+ 删除
@@ -71,6 +71,11 @@ export default {
disabled: {
type: Boolean,
default: false
+ },
+ //文件名称
+ fName: {
+ type: String,
+ default: ''
}
},
data() {
@@ -81,6 +86,7 @@ export default {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
fileList: [],
+ fileName: ''
};
},
watch: {
@@ -105,6 +111,14 @@ export default {
},
deep: true,
immediate: true
+ },
+ fName: {
+ handler(val) {
+ if (val) {
+ console.log('11', val)
+ this.fileName = val
+ }
+ }
}
},
computed: {
@@ -117,6 +131,7 @@ export default {
// 上传前校检格式和大小
handleBeforeUpload(file) {
// 校检文件类型
+ this.fileName = file.name
if (this.fileType) {
let fileExtension = "";
if (file.name.lastIndexOf(".") > -1) {
@@ -150,7 +165,7 @@ export default {
},
// 上传失败
handleUploadError(err) {
- this.$modal.msgError("上传图片失败，请重试");
+ this.$modal.msgError("上传文件失败，请重试");
this.$modal.closeLoading()
},
// 上传成功回调
@@ -180,8 +195,12 @@ export default {
this.number = 0;
this.$emit("input", this.listToString(this.fileList));
this.$modal.closeLoading();
+ this.returnFileName()
}
},
+ returnFileName() {
+ this.$emit('name', this.fileName)
+ },
// 获取文件名称
getFileName(name) {
console.log('你好', name)
diff --git a/src/views/base/coreDepartment/add-or-updata.vue b/src/views/base/coreDepartment/add-or-updata.vue
index b566fae9..a4959014 100644
--- a/src/views/base/coreDepartment/add-or-updata.vue
+++ b/src/views/base/coreDepartment/add-or-updata.vue
@@ -2,43 +2,45 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:32:10
+ * @LastEditTime: 2023-11-25 18:09:05
* @Description:
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/base/coreHotMaterial/add-or-updata.vue b/src/views/base/coreHotMaterial/add-or-updata.vue
index 975cd5a8..361e6d1e 100644
--- a/src/views/base/coreHotMaterial/add-or-updata.vue
+++ b/src/views/base/coreHotMaterial/add-or-updata.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
- * @LastEditTime: 2023-11-15 16:23:49
+ * @LastEditTime: 2023-11-25 11:25:23
* @Description:
-->
@@ -46,6 +46,9 @@
+
+
+
@@ -70,7 +73,8 @@ export default {
code: undefined,
name: undefined,
unit: undefined,
- dailyCost: undefined
+ dailyCost: undefined,
+ remark: undefined
},
departmentlList: [],
menuOptions: [],
diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/base/coreProduct/add-or-updata.vue
index 2344438c..57f2e71d 100644
--- a/src/views/base/coreProduct/add-or-updata.vue
+++ b/src/views/base/coreProduct/add-or-updata.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
- * @LastEditTime: 2023-11-15 15:41:44
+ * @LastEditTime: 2023-11-27 09:23:56
* @Description:
-->
@@ -253,8 +253,8 @@ export default {
isdetail: false,
idAttrShow: false,
dataRule: {
- code: [{ required: true, message: "物料编码不能为空", trigger: "blur" }],
- name: [{ required: true, message: "物料名称不能为空", trigger: "blur" }],
+ code: [{ required: true, message: "产品编码不能为空", trigger: "blur" }],
+ name: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }],
processTime: [{ required: true, message: "产线生产单位用时不能为空", trigger: "blur" }]
diff --git a/src/views/base/coreWorkOrder/index.vue b/src/views/base/coreWorkOrder/index.vue
index 5e5aed25..64ea24cd 100644
--- a/src/views/base/coreWorkOrder/index.vue
+++ b/src/views/base/coreWorkOrder/index.vue
@@ -143,12 +143,6 @@ export default {
}
}
: undefined,
- this.$auth.hasPermi(`base:core-work-order:material`)
- ? {
- type: 'material',
- btnName: '预使用原料信息',
- }
- : undefined,
this.$auth.hasPermi(`base:core-work-order:detail`)
? {
type: 'detail',
@@ -171,6 +165,12 @@ export default {
}
}
: undefined,
+ this.$auth.hasPermi(`base:core-work-order:material`)
+ ? {
+ type: 'material',
+ btnName: '预使用原料信息',
+ }
+ : undefined,
{
type: 'active',
btnName: '激活',
diff --git a/src/views/base/coreWorkshopSection/add-or-updata.vue b/src/views/base/coreWorkshopSection/add-or-updata.vue
index 2ba6c84c..de23a2a8 100644
--- a/src/views/base/coreWorkshopSection/add-or-updata.vue
+++ b/src/views/base/coreWorkshopSection/add-or-updata.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
- * @LastEditTime: 2023-11-22 08:55:37
+ * @LastEditTime: 2023-11-27 09:21:48
* @Description:
-->
@@ -43,7 +43,9 @@
+ controls-position="right"
+ placeholder="排序"
+ style="width: 100%" />
diff --git a/src/views/base/coreWorkshopSection/index.vue b/src/views/base/coreWorkshopSection/index.vue
index 493cf42e..11b6f4a7 100644
--- a/src/views/base/coreWorkshopSection/index.vue
+++ b/src/views/base/coreWorkshopSection/index.vue
@@ -29,7 +29,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
- width="50%">
+ width="40%">
diff --git a/src/views/base/material/add-or-updata.vue b/src/views/base/material/add-or-updata.vue
index 372a7a82..66df09d1 100644
--- a/src/views/base/material/add-or-updata.vue
+++ b/src/views/base/material/add-or-updata.vue
@@ -2,14 +2,14 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:22:38
+ * @LastEditTime: 2023-11-27 09:36:44
* @Description:
-->
@@ -156,12 +156,12 @@
@pagination="getList" />
-
-
{{ isdetail ? '关闭' : '取消' }}
+
+ 取消
- 确定
+ 确定
- 取消
-
+ {{ isdetail ? '关闭' : '取消' }}
+
+ 确定
@@ -184,6 +185,7 @@ export default {
total: 0,
},
file: '',
+ fileName: '',
dataRule: {
responsible: [{ required: true, message: "巡检人不能为空", trigger: "blur" }],
actualTime: [{ required: true, message: "巡检时间不能为空", trigger: "blur" }]
@@ -194,6 +196,9 @@ export default {
this.getDict()
},
methods: {
+ setFileName(val) {
+ this.fileName = val
+ },
async getDict() {
const res = await getEquipmentAll()
this.eqList = res.data
@@ -232,6 +237,8 @@ export default {
files: []
}
this.list = []
+ this.file = ''
+ this.fileName = ''
},
init(id, isdetail) {
this.initData();
@@ -239,6 +246,10 @@ export default {
this.dataForm.id = id || undefined;
this.visible = true;
+ // const scrollContainer = this.$refs.dataForm;
+ // const scrollPosition = scrollContainer.scrollTop;
+ // console.log('12', scrollPosition);
+
this.$nextTick(() => {
this.$refs['dataForm'].resetFields();
@@ -247,6 +258,11 @@ export default {
getEqCheckLog(this.dataForm.id).then(response => {
this.formLoading = false
this.dataForm = response.data;
+ if (this.dataForm.files.length > 0) {
+ this.file = this.dataForm.files[0].fileUrl
+ this.fileName = this.dataForm.files[0].fileName
+ }
+ this.setConfig()
});
} else {
// if (this.urlOptions.isGetCode) {
@@ -283,8 +299,9 @@ export default {
if (this.file) {
const temp = this.file.split(',') // 获取文件个数
let arry = []
- temp.forEach(item => {
+ temp.forEach((item, index) => {
arry.push({
+ fileName: this.fileName,
fileType: 2,
fileUrl: item
})
diff --git a/src/views/equipment/base/inspection/Settings/add.vue b/src/views/equipment/base/inspection/Settings/add.vue
new file mode 100644
index 00000000..bfc656d3
--- /dev/null
+++ b/src/views/equipment/base/inspection/Settings/add.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/equipment/base/inspection/Settings/index.vue b/src/views/equipment/base/inspection/Settings/index.vue
index 61aeaa4a..e3ce20b4 100644
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@@ -36,14 +36,10 @@
:dialogVisible="open"
@close="cancel"
@cancel="cancel"
- @confirm="submitForm">
-
+ @confirm="handleConfirm">
+
import basicPageMixin from '@/mixins/lb/basicPageMixin';
import addOrUpdata from './add-or-updata.vue';
+import add from './add.vue'
// import { publicFormatter } from '@/utils/dict';
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
export default {
name: 'EquipmentCheckSetting',
- components: { addOrUpdata },
+ components: { addOrUpdata, add },
mixins: [basicPageMixin],
data() {
return {
@@ -206,6 +203,13 @@ export default {
this.getList();
},
methods: {
+ handleConfirm() {
+ this.$refs.add.dataFormSubmit()
+ },
+ successSubmit() {
+ this.cancel()
+ this.getList()
+ },
initSearchBar() {
this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
this.$set(
@@ -230,9 +234,10 @@ export default {
},
/** 取消按钮 */
cancel() {
+ this.$refs.add.formClear()
this.open = false;
- this.mode = null;
- this.reset();
+ this.title = ''
+ // this.reset();
},
/** 表单重置 */
reset() {
@@ -257,18 +262,26 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
- this.reset();
+ // this.reset();
this.open = true;
this.title = '添加巡检设置';
+ this.$nextTick(() => {
+ this.$refs.add.init();
+ });
},
/** 修改按钮操作 */
handleUpdate(row) {
- this.reset();
- const id = row.id;
- this.info({ id }).then((response) => {
- this.form = response.data;
- this.open = true;
- this.title = '修改巡检设置';
+ // this.reset();
+ // const id = row.id;
+ // this.info({ id }).then((response) => {
+ // this.form = response.data;
+ // this.open = true;
+ // this.title = '修改巡检设置';
+ // });
+ this.open = true;
+ this.title = '修改巡检设置';
+ this.$nextTick(() => {
+ this.$refs.add.init(row.id);
});
},
/** 提交按钮 */
@@ -298,7 +311,7 @@ export default {
handleDelete(row) {
const id = row.id;
this.$modal
- .confirm('是否确认删除该巡检记录?')
+ .confirm('是否确认删除配置名为"' + row.name + '"的数据项?')
.then(() => {
return this.del({ id });
})
diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue
index 8e09da62..5de4775f 100644
--- a/src/views/equipment/base/repair/CustomDialogForm.vue
+++ b/src/views/equipment/base/repair/CustomDialogForm.vue
@@ -146,7 +146,7 @@
-
+
@@ -206,11 +206,15 @@ export default {
visible: false,
disabled: false,
dataForm: {},
- file: ''
+ file: '',
+ fileName: ''
};
},
mounted() {},
methods: {
+ setFileName(val) {
+ this.fileName = val
+ },
goback() {
this.$emit('refreshDataList');
this.visible = false;
@@ -225,12 +229,15 @@ export default {
resetFields(args) {
return this.$refs.form.resetFields(args);
},
+ initData() {
+ this.file = ''
+ this.fileName = ''
+ },
init(row, isdetail) {
- // this.initData();
+ this.initData();
this.disabled = isdetail || false;
this.dataForm.id = row.id || undefined;
this.visible = true;
- console.log('111', this.dataForm, row)
this.$nextTick(() => {
this.$refs['form'].resetFields();
@@ -241,6 +248,10 @@ export default {
this.formLoading = false
this.dataForm = response.data;
this.dataForm.maintenanceStatus = row.maintenanceStatus || 0
+ if (this.dataForm.files.length > 0) {
+ this.file = this.dataForm.files[0].fileUrl
+ this.fileName = this.dataForm.files[0].fileName
+ }
});
} else {
// if (this.urlOptions.isGetCode) {
@@ -261,6 +272,7 @@ export default {
let arry = []
temp.forEach(item => {
arry.push({
+ fileName: this.fileName,
fileType: 2,
fileUrl: item
})
From b86094c6307c6ade065e0e24dd44c2a92a9533f5 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 27 Nov 2023 16:41:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order/base/orderManage/index.vue | 2 +-
.../order/monitoring/orderCompletionMonitoring/index.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue
index 1635e089..b398b76e 100644
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -17,7 +17,7 @@
val ? val.join(',') : '',
minWidth: 180