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="煤粉热值"
/>
-
-
-
-
-
-
+
+
+
+
+
+
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"
>
撤回
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 @@
{
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;
}
},
//设置过滤项