zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
caoqianming 2024-04-24 15:50:31 +08:00
parent d051748cf0 241f14c324
commit 6be5494f1a
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/enm_rm/logDetail.vue
View File

@ -89,16 +89,20 @@
placeholder="煤粉热值" placeholder="煤粉热值"
/> />
</el-form-item> </el-form-item>
<!-- 石灰石破碎 --> </el-col>
<el-col :md="12" :sm="24"> <!-- 石灰石破碎 -->
<el-form-item label="电石渣干粉"> <el-col
<el-input-number :md="12"
v-model="form.pcoal_heat" :sm="24"
controls-position="right" v-if="mgroupId == '3555859873776693248'"
placeholder="电石渣干粉" >
/> <el-form-item label="电石渣干粉">
</el-form-item> <el-input-number
</el-col> v-model="form.pcoal_heat"
controls-position="right"
placeholder="电石渣干粉"
/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>

5
src/views/inm/mioitem.vue
View File

@ -152,10 +152,7 @@
link link
type="danger" type="danger"
@click="check_reSet(scope.row)" @click="check_reSet(scope.row)"
v-if=" v-if="scope.row.test_date !== null"
scope.row.test_date !== null &&
type == 'do_in'
"
> >
撤回 撤回
</el-button> </el-button>

16
src/views/inm/mioitem_check.vue
View File

@ -607,7 +607,7 @@
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="总袋（桶）数:"> <el-form-item label="总袋（桶）数:">
<el-input-number <el-input-number
v-model="form.count" v-model="form.count_bag"
:min="0" :min="0"
style="width: 100%" style="width: 100%"
controls-position="right" controls-position="right"
@ -804,7 +804,7 @@ export default {
console.log("objitem", that.objitem); console.log("objitem", that.objitem);
that.form.material_name = that.objitem.material_name; that.form.material_name = that.objitem.material_name;
that.form.batch = that.objitem.batch; that.form.batch = that.objitem.batch;
that.form.count = that.objitem.count; that.form.count_bag = that.objitem.count_bag;
} }
if ( if (
(that.type == "do_in" && that.cate == "halfgood") || (that.type == "do_in" && that.cate == "halfgood") ||
@ -863,8 +863,8 @@ export default {
getUserList() { getUserList() {
let that = this; let that = this;
this.$API.system.user.list this.$API.system.user.list
.req({ page: 0, belong_dept__name: "检验管理部" }) // .req({ page: 0, belong_dept__name: "检验管理部" })
// .req({ page: 0 }) .req({ page: 0 })
.then((res) => { .then((res) => {
that.userList = res; that.userList = res;
}); });
@ -885,7 +885,7 @@ export default {
sum = sum + item.value; sum = sum + item.value;
}); });
that.form.count_bag_weight_all = that.form.count_bag_weight_all =
(sum / that.weight_kgs.length) * that.form.count; (sum / that.weight_kgs.length) * that.form.count_bag;
}, },
countChange() {}, countChange() {},
countNotOkSun() { countNotOkSun() {
@ -997,7 +997,7 @@ export default {
let obj = {}; let obj = {};
obj.test_date = that.form.test_date; obj.test_date = that.form.test_date;
obj.test_user = that.form.test_user; obj.test_user = that.form.test_user;
obj.count = that.objitem.count; obj.count_bag = that.form.count_bag;
obj.weight_kgs = arr; obj.weight_kgs = arr;
obj.is_testok = that.form.is_testok; obj.is_testok = that.form.is_testok;
console.log(obj); console.log(obj);
@ -1033,8 +1033,6 @@ export default {
Object.assign(that.form, data); Object.assign(that.form, data);
// that.form.test_group = that.form.split(','); // that.form.test_group = that.form.split(',');
that.weight_kgs = []; that.weight_kgs = [];
console.log(data.count);
console.log(data.weight_kgs);
if (data.weight_kgs.length > 0) { if (data.weight_kgs.length > 0) {
that.form.count_sampling = data.weight_kgs.length; that.form.count_sampling = data.weight_kgs.length;
let sum = 0; let sum = 0;
@ -1045,7 +1043,7 @@ export default {
that.weight_kgs.push(obj); that.weight_kgs.push(obj);
}); });
that.form.count_bag_weight_all = that.form.count_bag_weight_all =
(sum / data.weight_kgs.length) * data.count; (sum / data.weight_kgs.length) * data.count_bag;
} }
}, },
//设置过滤项 //设置过滤项