From 6fb1ff7b1703a682cd63d69c49bceb169426e59b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 24 Apr 2024 15:42:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=94=BE=E5=BC=80=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_rm/logDetail.vue  | 24 ++++++++++++++----------
 src/views/inm/mioitem.vue       |  5 +----
 src/views/inm/mioitem_check.vue | 16 +++++++---------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue
index 38b42d39..f078f607 100644
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@@ -89,16 +89,20 @@
 											placeholder="煤粉热值"
 										/>
 									</el-form-item>
-									<!-- 石灰石破碎 -->
-									<el-col :md="12" :sm="24">
-										<el-form-item label="电石渣干粉">
-											<el-input-number
-												v-model="form.pcoal_heat"
-												controls-position="right"
-												placeholder="电石渣干粉"
-											/>
-										</el-form-item>
-									</el-col>
+								</el-col>
+								<!-- 石灰石破碎 -->
+								<el-col
+									:md="12"
+									:sm="24"
+									v-if="mgroupId == '3555859873776693248'"
+								>
+									<el-form-item label="电石渣干粉">
+										<el-input-number
+											v-model="form.pcoal_heat"
+											controls-position="right"
+											placeholder="电石渣干粉"
+										/>
+									</el-form-item>
 								</el-col>
 							</el-row>
 						</el-form>
diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index 98d31957..cf69ec38 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -152,10 +152,7 @@
 								link
 								type="danger"
 								@click="check_reSet(scope.row)"
-								v-if="
-									scope.row.test_date !== null &&
-									type == 'do_in'
-								"
+								v-if="scope.row.test_date !== null"
 							>
 								撤回
 							</el-button>
diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue
index dc15245d..c4ebbfa0 100644
--- a/src/views/inm/mioitem_check.vue
+++ b/src/views/inm/mioitem_check.vue
@@ -607,7 +607,7 @@
 						<el-col :md="12" :sm="24">
 							<el-form-item label="总袋（桶）数:">
 								<el-input-number
-									v-model="form.count"
+									v-model="form.count_bag"
 									:min="0"
 									style="width: 100%"
 									controls-position="right"
@@ -804,7 +804,7 @@ export default {
 			console.log("objitem", that.objitem);
 			that.form.material_name = that.objitem.material_name;
 			that.form.batch = that.objitem.batch;
-			that.form.count = that.objitem.count;
+			that.form.count_bag = that.objitem.count_bag;
 		}
 		if (
 			(that.type == "do_in" && that.cate == "halfgood") ||
@@ -863,8 +863,8 @@ export default {
 		getUserList() {
 			let that = this;
 			this.$API.system.user.list
-				.req({ page: 0, belong_dept__name: "检验管理部" })
-				// .req({ page: 0 })
+				// .req({ page: 0, belong_dept__name: "检验管理部" })
+				.req({ page: 0 })
 				.then((res) => {
 					that.userList = res;
 				});
@@ -885,7 +885,7 @@ export default {
 				sum = sum + item.value;
 			});
 			that.form.count_bag_weight_all =
-				(sum / that.weight_kgs.length) * that.form.count;
+				(sum / that.weight_kgs.length) * that.form.count_bag;
 		},
 		countChange() {},
 		countNotOkSun() {
@@ -997,7 +997,7 @@ export default {
 							let obj = {};
 							obj.test_date = that.form.test_date;
 							obj.test_user = that.form.test_user;
-							obj.count = that.objitem.count;
+							obj.count_bag = that.form.count_bag;
 							obj.weight_kgs = arr;
 							obj.is_testok = that.form.is_testok;
 							console.log(obj);
@@ -1033,8 +1033,6 @@ export default {
 			Object.assign(that.form, data);
 			// that.form.test_group = that.form.split(',');
 			that.weight_kgs = [];
-			console.log(data.count);
-			console.log(data.weight_kgs);
 			if (data.weight_kgs.length > 0) {
 				that.form.count_sampling = data.weight_kgs.length;
 				let sum = 0;
@@ -1045,7 +1043,7 @@ export default {
 					that.weight_kgs.push(obj);
 				});
 				that.form.count_bag_weight_all =
-					(sum / data.weight_kgs.length) * data.count;
+					(sum / data.weight_kgs.length) * data.count_bag;
 			}
 		},
 		//设置过滤项