From 6490fe3f45543dda9c2fc526040adf3c1dc89e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 27 Feb 2024 16:12:21 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/quality/monitoring/statisticalData/index.vue | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue
index be6ec9c3..3c493efc 100644
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -286,6 +286,7 @@ export default {
// this.searchBarFormConfig[0].defaultSelect = [];
// }
this.getList()
+ this.getDict()
},
methods: {
/** 获取搜索栏的产线列表 */
@@ -320,7 +321,7 @@ export default {
// },
getList() {
this.getDataList()
- this.getDict()
+ // this.getDict()
},
/** 查询列表 */
async getDataList() {
@@ -330,7 +331,7 @@ export default {
const {
data: { data, otherList, otherMap, nameData },
} = await getStatisticalDataPage(this.queryParams)
- console.log(this.queryParams);
+ // console.log(this.queryParams);
this.dynamicProps = this.filterNameData(nameData)
this.list = this.filterData(data);
},
@@ -373,7 +374,7 @@ export default {
this.getList()
}
- console.log(val);
+ // console.log(val);
}
/** 搜索按钮操作 */
// handleQuery() {
From dbbccc7d72e644fed2461c7a73a946b3177c1d82 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Wed, 28 Feb 2024 09:28:34 +0800
Subject: [PATCH 02/10] bug
---
.../base/inspection/Confirm/add-or-updata.vue | 11 ++++++-----
src/views/equipment/base/inspection/Confirm/index.vue | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
index 6073cb12..898747c9 100644
--- a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
+++ b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
- * @LastEditTime: 2024-02-27 09:41:00
+ * @LastEditTime: 2024-02-28 09:15:02
* @Description:
-->
@@ -27,13 +27,14 @@
-
+
diff --git a/src/views/equipment/base/inspection/Confirm/index.vue b/src/views/equipment/base/inspection/Confirm/index.vue
index fcf6c044..8420f091 100644
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@@ -328,7 +328,7 @@ export default {
// },
getConfirmed() {
- return this.$confirm('是否直接确认保养记录', '提示', {
+ return this.$confirm('是否直接确认巡检记录', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
From afd6e68d9bfc03835fe265af528e29a63a922654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 28 Feb 2024 10:54:44 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../base/packagingPrintLog/add-or-updata.vue | 102 +++++++++--------
src/views/base/packagingPrintLog/index.vue | 8 +-
.../base/qualityScrapLog/add-or-updata.vue | 91 ++++++++++-----
.../quality/base/qualityScrapLog/basic-add.js | 106 ++++++++++++++++++
.../base/qualityScrapLog/detail-or-updata.vue | 102 ++++++++++-------
.../quality/base/qualityScrapLog/index.vue | 41 ++++---
6 files changed, 316 insertions(+), 134 deletions(-)
create mode 100644 src/views/quality/base/qualityScrapLog/basic-add.js
diff --git a/src/views/base/packagingPrintLog/add-or-updata.vue b/src/views/base/packagingPrintLog/add-or-updata.vue
index 625ac6cc..4f5524db 100644
--- a/src/views/base/packagingPrintLog/add-or-updata.vue
+++ b/src/views/base/packagingPrintLog/add-or-updata.vue
@@ -1,72 +1,79 @@
-
+
{{ !dataForm.id ? '新增' : '编辑' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
@@ -55,7 +55,11 @@ const tableProps = [
{
prop: 'packagingCode',
label: '包装流水号'
- },
+ },
+ {
+ prop: 'packagingBarCode',
+ label: '包装条码'
+ },
{
prop: 'workOrderName',
label: '所属工单'
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index 0370339e..48866b9e 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,7 +1,7 @@
@@ -15,35 +15,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,7 +68,7 @@
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index d1be26a5..4ba3dce6 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -30,32 +30,41 @@ import {
} from '@/api/base/qualityScrapLog';
const tableProps = [
- {
- prop: 'createTime',
- label: '添加时间',
- filter: parseTime
+ // {
+ // prop: 'createTime',
+ // label: '添加时间',
+ // filter: parseTime
+ // },
+ {
+ prop: 'logTime',
+ label: '报废时间',
+ filter: parseTime
+ },
+ {
+ prop: 'lineName',
+ label: '产线名称'
+ },
+ {
+ prop: 'sectionName',
+ label: '工段'
},
{
prop: 'workOrderName',
- label: '工单'
+ label: '工单名称'
},
{
- prop: 'teamName',
- label: '班组'
+ prop: 'num',
+ label: '数量'
},
{
prop: 'detContent',
label: '报废原因'
},
- {
- prop: 'logTime',
- label: '报废时间',
- filter: parseTime
- },
- {
- prop: 'num',
- label: '数量'
- },
+ {
+ prop: 'source',
+ label: '来源',
+ filter: (val) => val == 1 ? '平板端' : '网页端'
+ },
];
export default {
From 1a622dc4d3c5c5f4a1f64db6c20fa71a190927ae Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Wed, 28 Feb 2024 15:03:21 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../base/inspection/Confirm/add-or-updata.vue | 35 ++-
.../base/inspection/Confirm/index.vue | 36 +--
.../Confirm/WaitingListUnplanned--edit.vue | 210 +++++++++++++-----
.../equipment/base/maintain/Confirm/index.vue | 70 ++++--
4 files changed, 252 insertions(+), 99 deletions(-)
diff --git a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
index 898747c9..6472b32a 100644
--- a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
+++ b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
- * @LastEditTime: 2024-02-28 09:15:02
+ * @LastEditTime: 2024-02-28 14:45:58
* @Description:
-->
@@ -143,7 +143,8 @@
取消
- 确定
+ 保存
+ 保存
{
+ this.$axios({
+ url:
+ '/base/equipment-check-order/confirm?confirmPerson=' +
+ this.$store.getters.userId,
+ method: 'put',
+ data: [this.dataForm.id],
+ }).then(res =>{
+ if (res.code == 0) {
+ this.visible = false;
+ this.$emit("refreshDataList");
+ this.$message.success('已确认');
+ }
+ }).catch(() => {
+ this.visible = false;
+ this.$emit("refreshDataList");
+ this.$message.success('取消确认');
+ })
+ })
+ },
// 表单提交
dataFormSubmit() {
this.$refs["dataForm"].validate((valid) => {
@@ -430,6 +460,7 @@ export default {
}).then(response => {
this.$modal.msgSuccess("新增成功");
this.idAttrShow = true
+ this.isshowConfirm = true
this.dataForm.id = response.data
// this.visible = false;
this.$emit("refreshDataList");
diff --git a/src/views/equipment/base/inspection/Confirm/index.vue b/src/views/equipment/base/inspection/Confirm/index.vue
index 8420f091..9ec93f55 100644
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@@ -172,24 +172,27 @@ export default {
async searchBarClicked(btn) {
switch (btn.btnName) {
case 'batchConfirm':
- const ids = this.$refs['waiting-list-table'].selectedPlan.map(
- (item) => item.id
- )
if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
this.$message.warning('请选择待确认的设备巡检单');
return;
}
- const res = await this.$axios({
- url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId + '&ids=' + ids,
- method: 'put',
- // data: this.$refs['waiting-list-table'].selectedPlan.map(
- // (item) => item.id
- // ),
- });
- if (res.code == 0) {
- this.$message.success('确认成功');
- this.getList();
- }
+ this.$modal
+ .confirm('是否确认所有选中保养单"?')
+ .then(() => {
+ return this.$axios({
+ url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId,
+ method: 'put',
+ data: this.$refs['waiting-list-table'].selectedPlan.map(
+ (item) => item.id
+ ),
+ });
+ })
+ .then((res) => {
+ this.getList();
+ res.code == 0 && this.$modal.msgSuccess('确认成功');
+ res.code != 0 && this.$modal.msgError('确认失败');
+ })
+ .catch(() => {});
break;
}
},
@@ -388,17 +391,16 @@ export default {
},
/** 确认 */
async handleConfirm(row) {
- console.log('111', this.$store.getters.userId)
this.$modal
.confirm('是否确认巡检单"' + row.name + '"?')
.then(() => {
return this.$axios({
url:
'/base/equipment-check-order/confirm?confirmPerson=' +
- this.$store.getters.userId + '&ids=' + [row.id],
+ this.$store.getters.userId,
// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
method: 'put',
- // data: [row.id],
+ data: [row.id],
});
})
.then((res) => {
diff --git a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
index bc786dc3..2fdcfc8a 100644
--- a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
@@ -14,7 +14,7 @@
custom-class="mes-drawer"
size="60%"
@closed="$emit('destroy')">
- 编辑
+ {{ showTable ? '编辑' : '新增' }}
@@ -184,49 +184,53 @@
-
保养内容
+
+
保养内容
-
-
-
-
-
-
-
-
- 添加属性
-
+
+
-
-
-
-
-
+
+
+
+
+ 添加属性
+
+
+
+
+
+
+
+
+
取消
-
保存
+
+
保存
+
保存
@@ -409,25 +409,32 @@ export default {
});
},
async confirmIns() {
- await this.getConfirmed().then(confirm => {
- this.$axios({
- url:
- '/base/equipment-check-order/confirm?confirmPerson=' +
- this.$store.getters.userId,
- method: 'put',
- data: [this.dataForm.id],
- }).then(res =>{
- if (res.code == 0) {
+ this.$refs['dataForm'].validate((valid) => {
+ if (!valid) {
+ return;
+ }
+ this.$nextTick(() => {
+ this.getConfirmed().then(confirm => {
+ this.$axios({
+ url:
+ '/base/equipment-check-order/confirm?confirmPerson=' +
+ this.$store.getters.userId,
+ method: 'put',
+ data: [this.dataForm.id],
+ }).then(res =>{
+ if (res.code == 0) {
+ this.visible = false;
+ this.$emit("refreshDataList");
+ this.$message.success('已确认');
+ }
+ })
+ }).catch(() => {
this.visible = false;
this.$emit("refreshDataList");
- this.$message.success('已确认');
- }
- }).catch(() => {
- this.visible = false;
- this.$emit("refreshDataList");
- this.$message.success('取消确认');
+ this.$message.success('取消确认');
+ })
})
- })
+ });
},
// 表单提交
dataFormSubmit() {
diff --git a/src/views/equipment/base/inspection/Confirm/index.vue b/src/views/equipment/base/inspection/Confirm/index.vue
index 9ec93f55..eed73765 100644
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@@ -177,7 +177,7 @@ export default {
return;
}
this.$modal
- .confirm('是否确认所有选中保养单"?')
+ .confirm('是否确认所有选中巡检单"?')
.then(() => {
return this.$axios({
url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId,
From ce1971727ae65b123daa124c70d5517a81fb2f57 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 28 Feb 2024 16:56:47 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order/base/orderGroup/index.vue | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue
index c14e840b..a531e16e 100644
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@@ -383,9 +383,9 @@ export default {
},
// 完成,终止，作废
handleEditStatus(val, tip, status) {
- console.log(val)
+ let _this = this
if (val.orderIdNum > 0) {// 有下级订单
- this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
+ _this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
type: 'warning',
distinguishCancelAndClose: true,
confirmButtonText: '同步',
@@ -393,26 +393,26 @@ export default {
}).then(function() {
console.log('同步')
groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
- this.getList();
- this.$modal.msgSuccess("操作成功");
+ _this.getList();
+ _this.$modal.msgSuccess("操作成功");
})
}).catch(action => {
if (action === 'cancel') {
console.log('不同步')
groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
- this.getList();
- this.$modal.msgSuccess("操作成功");
+ _this.getList();
+ _this.$modal.msgSuccess("操作成功");
})
}else {
return console.log('关闭')
}
})
}else{// 无下级订单
- this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
+ _this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
return groupOrderStatusSet({ id: val.id, status: status})
}).then(() => {
- this.getList();
- this.$modal.msgSuccess("操作成功");
+ _this.getList();
+ _this.$modal.msgSuccess("操作成功");
}).catch(() => {});
}
},
From d750cbe0f896626be7c6e4409b081d40826994ee Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 29 Feb 2024 09:20:34 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E5=AF=B9=E4=BA=8E=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev | 4 ++--
.../energy/base/energyType/components/energyTypeAdd.vue | 8 --------
src/views/order/base/orderGroup/index.vue | 2 +-
src/views/order/base/orderManage/index.vue | 2 +-
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/.env.dev b/.env.dev
index e6eafbc1..4df551ac 100644
--- a/.env.dev
+++ b/.env.dev
@@ -20,10 +20,10 @@ VUE_APP_TITLE = MES系统
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-VUE_APP_BASE_API = 'http://192.168.1.47:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
# socket地址
VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue
index e9f085c0..1b808543 100644
--- a/src/views/energy/base/energyType/components/energyTypeAdd.vue
+++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue
@@ -233,10 +233,6 @@ export default {
// 增加
emitButtonClick1() {
let n = this.tableData1.length
- if (n >=3) {
- this.$modal.msgWarning('最多可添加3档计价')
- return false
- }
let obj = {}
obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
obj.endTime = ''
@@ -245,10 +241,6 @@ export default {
},
emitButtonClick2() {
let n = this.tableData2.length
- // if (n >=3) {
- // this.$modal.msgWarning('最多可添加3档计价')
- // return false
- // }
let obj = {}
obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
obj.endUsed = 0
diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue
index a531e16e..79316f63 100644
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@@ -283,7 +283,7 @@ export default {
{
type: 'less',
name: 'status',
- value: 3
+ value: 2
}
]
}
diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue
index b3c722ed..ae99032f 100644
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -293,7 +293,7 @@ export default {
{
type: 'less',
name: 'status',
- value: 3
+ value: 2
}
]
}
From 93eb12aeb71e9740558ffea9c1e02da19fc53a39 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Thu, 29 Feb 2024 15:54:23 +0800
Subject: [PATCH 08/10] bugs
---
.env.dev | 6 +-
src/api/base/coreWorkOrder.js | 9 +++
src/api/equipment/base/inspection/record.js | 13 +++-
.../base/coreEquipmentLineBind/dialogForm.vue | 16 ++---
src/views/base/coreProduct/add-or-updata.vue | 4 +-
src/views/base/coreWorkOrder/addWorkOrder.vue | 4 +-
src/views/base/coreWorkOrder/allocation.vue | 17 ++---
src/views/base/coreWorkOrder/detail.vue | 27 +++++---
src/views/base/coreWorkOrder/index.vue | 49 +++++++--------
.../base/inspection/Confirm/add-or-updata.vue | 30 ++++++---
.../base/inspection/Record/index.vue | 62 +++++++++++--------
.../base/inspection/Settings/add.vue | 42 +++++++++++--
.../base/inspection/Settings/index.vue | 16 +++--
.../Confirm/WaitingList--add--unplanned.vue | 13 ++--
.../Confirm/WaitingListUnplanned--edit.vue | 8 +++
.../equipment/base/maintain/Monitor/index.vue | 7 ++-
.../maintain/PlanConfig/add-or-updata.vue | 15 +++--
.../base/maintain/PlanConfig/addContent.vue | 30 +++++++--
.../equipment/base/maintain/Record/index.vue | 50 ++++++++-------
.../equipment/base/repair/Repair--add.vue | 3 +-
src/views/equipment/base/repair/index.vue | 6 +-
21 files changed, 277 insertions(+), 150 deletions(-)
diff --git a/.env.dev b/.env.dev
index e6eafbc1..78b9f3e6 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-26 08:45:43
+ # @LastEditTime: 2024-02-29 15:53:50
# @LastEditors: DY
# @Description:
###
@@ -20,10 +20,10 @@ VUE_APP_TITLE = MES系统
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-VUE_APP_BASE_API = 'http://192.168.1.47:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
# socket地址
VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
diff --git a/src/api/base/coreWorkOrder.js b/src/api/base/coreWorkOrder.js
index 656d4a69..84d69b54 100644
--- a/src/api/base/coreWorkOrder.js
+++ b/src/api/base/coreWorkOrder.js
@@ -153,3 +153,12 @@ export function createConCoreWOr(data) {
data: data
})
}
+
+// 修改分配产量
+export function updateConCoreWOr(data) {
+ return request({
+ url: '/base/core-order-con-work-order/update',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/src/api/equipment/base/inspection/record.js b/src/api/equipment/base/inspection/record.js
index 40b48b73..c89e2152 100644
--- a/src/api/equipment/base/inspection/record.js
+++ b/src/api/equipment/base/inspection/record.js
@@ -1,7 +1,7 @@
/*
* @Author: Do not edit
* @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2024-02-26 09:29:53
+ * @LastEditTime: 2024-02-28 18:16:56
* @LastEditors: DY
* @Description:
*/
@@ -52,6 +52,17 @@ export function exportCheckLogExcel(query) {
})
}
+// 导出设备巡检单记录
+export function exportCheckOrderExcel(query) {
+ return request({
+ url: '/base/equipment-check-order/export-excel',
+ method: 'get',
+ params: query,
+ responseType: 'blob'
+ })
+}
+
+
// 根据设备获得所有巡检配置列表
export function getcheckConfigByEqList(query) {
return request({
diff --git a/src/views/base/coreEquipmentLineBind/dialogForm.vue b/src/views/base/coreEquipmentLineBind/dialogForm.vue
index dd6e76a4..10a1e991 100644
--- a/src/views/base/coreEquipmentLineBind/dialogForm.vue
+++ b/src/views/base/coreEquipmentLineBind/dialogForm.vue
@@ -83,20 +83,14 @@
-
+
+ placeholder="请输入工段排序"
+ style="width: 100%" />
diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/base/coreProduct/add-or-updata.vue
index 9c4c5808..c39e7584 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: 2024-02-27 15:38:04
+ * @LastEditTime: 2024-02-29 15:01:25
* @Description:
-->
@@ -325,7 +325,7 @@ export default {
init(row, isdetail) {
this.initData();
this.isdetail = isdetail || false;
- this.dataForm.id = row.id || undefined;
+ this.dataForm.id = row?.id || undefined;
this.isedit = row?.id && row?.externalCode ? true : false;
console.log('你好', this.isedit)
this.visible = true;
diff --git a/src/views/base/coreWorkOrder/addWorkOrder.vue b/src/views/base/coreWorkOrder/addWorkOrder.vue
index 374d4f74..646047e0 100644
--- a/src/views/base/coreWorkOrder/addWorkOrder.vue
+++ b/src/views/base/coreWorkOrder/addWorkOrder.vue
@@ -253,7 +253,9 @@ export default {
if (this.dataForm.priority !== undefined) {
this.dataForm.priority = String(this.dataForm.priority)
}
- this.dataForm.priority
+ if (this.dataForm.roomNameDict !== undefined) {
+ this.dataForm.roomNameDict = String(this.dataForm.roomNameDict)
+ }
});
} else {
if (this.urlOptions.isGetCode) {
diff --git a/src/views/base/coreWorkOrder/allocation.vue b/src/views/base/coreWorkOrder/allocation.vue
index 24f3f5cc..79e43ad2 100644
--- a/src/views/base/coreWorkOrder/allocation.vue
+++ b/src/views/base/coreWorkOrder/allocation.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
- * @LastEditTime: 2023-11-16 09:14:35
+ * @LastEditTime: 2024-02-29 10:01:52
* @Description:
-->
@@ -41,12 +41,12 @@
-
+
-
+
@@ -104,7 +104,7 @@
+
+
\ No newline at end of file
diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue
index 45cbb569..be06f52d 100644
--- a/src/views/group/monitoring/teamProduction/index.vue
+++ b/src/views/group/monitoring/teamProduction/index.vue
@@ -1,11 +1,12 @@
-
+