From ef7045b751da29b344d5ccfcdc1cb62d3218a4cf Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 10 Feb 2022 16:33:53 +0800
Subject: [PATCH 1/2] chakanyuandingdan
---
hb_client/src/views/inm/product.vue | 2 +-
hb_client/src/views/personnel/attendance.vue | 2 +-
hb_client/src/views/procurement/puorder.vue | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hb_client/src/views/inm/product.vue b/hb_client/src/views/inm/product.vue
index f31e3e6..fed1966 100644
--- a/hb_client/src/views/inm/product.vue
+++ b/hb_client/src/views/inm/product.vue
@@ -257,7 +257,7 @@ export default {
_this.mtmId.push(item.material_.id);
_this.materialshow.push(item);
});
- this.ordershow = _this.materialshow[0].number;
+ this.ordershow = _this.materialshow[0].to_order_.number;
this.customershow=_this.materialshow[0].order_.customer_.name;
this.contractshow=_this.materialshow[0].order_.contract_.name;
getOrderList({ page: 0, material: _this.mtmId[0], tag:'not_done' }).then(
diff --git a/hb_client/src/views/personnel/attendance.vue b/hb_client/src/views/personnel/attendance.vue
index e986619..a04152b 100644
--- a/hb_client/src/views/personnel/attendance.vue
+++ b/hb_client/src/views/personnel/attendance.vue
@@ -53,7 +53,7 @@
type="month"
placeholder="选择年月">
- 主要按钮
+ 查询
已审核
-
+
+ {{ scope.row.create_time }}
+
Date: Thu, 10 Feb 2022 16:35:13 +0800
Subject: [PATCH 2/2] dumoCheck
---
hb_client/src/api/mtm.js | 7 +
hb_client/src/components/customForm/index.vue | 8 +-
.../src/components/customForm/review.vue | 3 +-
hb_client/src/views/mtm/productprocess.vue | 2451 ++++++++---------
hb_client/src/views/wpm/need.vue | 4 +-
5 files changed, 1230 insertions(+), 1243 deletions(-)
diff --git a/hb_client/src/api/mtm.js b/hb_client/src/api/mtm.js
index bac34b9..e1adb34 100644
--- a/hb_client/src/api/mtm.js
+++ b/hb_client/src/api/mtm.js
@@ -272,6 +272,13 @@ export function createUsedstep(data) {
data
})
}
+export function updateUsedstep(id,data) {
+ return request({
+ url: `/mtm/usedstep/${id}/`,
+ method: 'put',
+ data
+ })
+}
export function deleteUsedstep(id, data) {
return request({
url: `/mtm/usedstep/${id}/`,
diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue
index fc336cf..961af55 100644
--- a/hb_client/src/components/customForm/index.vue
+++ b/hb_client/src/components/customForm/index.vue
@@ -196,10 +196,6 @@
isDisabled:{
type:Boolean,
default:false
- },
- isMidTesting:{
- type:Boolean,
- default:false
}
},
mounted() {
@@ -235,13 +231,11 @@
let listJudge = this.formData.filter(item => {
return item.need_judge === true;
});
- debugger;
listJudge.forEach(item => {
let obj = new Object();
obj = item;
that.judgeList.push(obj)
});
- debugger;
let imag= this.formData.filter(item => {
return item.field_type === 'draw';
});
@@ -727,7 +721,7 @@
that.testrecord.record_data = that.field;//检查项列表
that.testrecord.is_testok = that.is_testok;//检查表检查结果
that.testrecord.id = that.recordId;//记录id
- if(submit&&that.isMidTesting!==true){//提交
+ if(submit){//提交
this.$emit('recordSubmit',that.testrecord);
}else {//保存
this.$emit('recordSave',that.testrecord);
diff --git a/hb_client/src/components/customForm/review.vue b/hb_client/src/components/customForm/review.vue
index dd598af..91cc206 100644
--- a/hb_client/src/components/customForm/review.vue
+++ b/hb_client/src/components/customForm/review.vue
@@ -818,7 +818,8 @@
that.testrecord.is_testok = that.is_testok;//检查表检查结果
that.testrecord.id = that.recordId;
// debugger;
- if(submit&&that.isMidTesting!==true){//提交
+ // if(submit&&that.isMidTesting!==true){//提交
+ if(submit){//提交
this.$emit('recordSubmit',that.testrecord);
}else {//保存
this.$emit('recordSave',that.testrecord);
diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue
index 5c7811f..02184bb 100644
--- a/hb_client/src/views/mtm/productprocess.vue
+++ b/hb_client/src/views/mtm/productprocess.vue
@@ -1,1297 +1,1280 @@
-
-
-
-
-
+
+
+
+
产品列表
-
-
-
-
-
-
- {{ scope.row.number }}
-
-
- {{ scope.row.name }}
-
-
-
- {{ scope.row.specification }}
-
-
-
-
+
+
+
+
+ {{ scope.row.number }}
+
+
+ {{ scope.row.name }}
+
+
+
+ {{ scope.row.specification }}
+
+
+
+
+
+
+
+
+
+
+
+
+
工艺流程
-
-
-
+
+
+
+
+
+
流程分解
-
- 新增
-
-
-
- {{scope.row.name}}
-
-
- {{ scope.row.process_.name }}
-
-
-
- 是
- 否
-
-
-
- {{ scope.row.sort }}
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
-
-
- 新增
-
-
-
-
- {{scope.row.material_.number}}
-
-
-
- {{scope.row.material_.name}}
-
-
-
- {{ scope.row.material_.unit }}
-
-
-
- {{ scope.row.count }}
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.specification }}
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
-
-
-
- 新增
-
-
-
- {{scope.row.material_.number}}
-
-
-
- {{scope.row.material_.name}}
-
-
-
- {{ scope.row.material_.unit }}
-
-
-
- {{ scope.row.count }}
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.specification }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
- 新增
-
-
-
-
- {{scope.row.material_.number}}
-
-
-
- {{scope.row.material_.name}}
-
-
-
- {{ scope.row.material_.unit }}
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.specification }}
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
- 新增
+
- 取消
- 确认
-
-
-
-
-
- 新增
-
-
-
- {{ scope.row.name }}
-
-
-
- 否
- 是
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+ 新增
+
+
+
+
+ {{scope.row.material_.number}}
-
-
-
- {{scope.row.file_.name}}
-
-
-
-
-
-
- 编辑
+ {{scope.row.material_.name}}
+
+
+ {{ scope.row.material_.unit }}
+
+
+ {{ scope.row.count }}
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
- 删除
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.specification }}
+
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+ 新增
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 上传文件
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
-
-
-
+ 取消
+ 确认
+
+
+
+
+ 新增
+
+
+
+
+ {{scope.row.material_.number}}
+
+
+ {{scope.row.material_.name}}
+
+
+ {{ scope.row.material_.unit }}
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.specification }}
+
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+ 新增
+
+
+
+
+ {{ scope.row.step_.name }}
+
+
+
+
+ 检验
+ 不检验
+
+
+
+ {{ scope.row.remark }}
+
+
+
+ 编辑
+
+ 查看
+
+ 删除
+
+
+
+
+
+
+
+
+ 检验
+ 不检验
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+ 新增
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+ 否
+ 是
+
+
+
+
+ {{scope.row.file_.name}}
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传文件
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index fec2f23..2af65be 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -1011,7 +1011,9 @@
this.innerIndex = index;
// this.outerVisible = true;
this.wproduct = scope.row.id;//半成品ID
- this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material_.id;//
+ debugger;
+ console.log(scope.row.material_check);
+ this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material;//
this.listQueryrecordform.type = 2;
this.listQueryrecordform.enabled = true;
this.recordform = null;