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:
shijing 2024-08-13 10:49:35 +08:00
parent 8e5a2f60ad 1a0b85b9a1
commit 4ee3242fa9
24 changed files with 78 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/assets/icons/Shebei.vue
View File

@ -1,8 +1,5 @@
<template> <template>
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 32 32"> <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
<g fill="currentColor"> <path fill="currentColor" d="M3.975 21v-3h3.1l-2.55-8.35q-.675-.375-1.112-1.1T2.975 7q0-1.25.875-2.125T5.975 4q.975 0 1.738.563T8.775 6h3.2V5q0-.425.288-.712T12.975 4q.225 0 .438.1t.362.3l1.7-1.6q.225-.225.538-.288t.612.088l3.9 1.8q.3.15.413.438t-.013.562q-.15.3-.437.388t-.563-.038l-3.6-1.65l-2.35 2.2v1.4l2.35 2.15l3.6-1.65q.275-.125.575-.025t.425.375q.15.3.025.575t-.425.425l-3.9 1.85q-.3.15-.612.087t-.538-.287l-1.7-1.6q-.15.15-.362.275t-.438.125q-.425 0-.712-.287T11.975 9V8h-3.2q-.075.2-.162.375t-.238.375l5 9.25h3.6v3zm2-13q.425 0 .713-.288T6.975 7t-.287-.712T5.975 6t-.712.288T4.975 7t.288.713t.712.287" />
<path d="M24.37 13.49a1.62 1.62 0 1 1-3.24 0a1.62 1.62 0 0 1 3.24 0M11.5 8.5a1.99 1.99 0 1 0 0-3.98a1.99 1.99 0 0 0 0 3.98m4.715 18a.75.75 0 1 0 0-1.5a.75.75 0 0 0 0 1.5" />
<path d="M6 6.462C6.025 3.444 8.512.976 11.538 1h.002a5.53 5.53 0 0 1 3.188 1.05l.006.006l.103.077l.02.02l10.48 7.9l.007.004l.031.025l.003.001a4.303 4.303 0 0 1 .968 5.764l-3.258 5.66a4.29 4.29 0 0 1-4.633 2.047l.024.03l3.774 3.317c.079.07.174.102.259.1H23c1.102 0 2 .897 2 2c0 1.101-.898 2-2 2h-7.89A2.107 2.107 0 0 1 13 28.89v-3.48c0-1.682 1.393-3 3.055-3q.153 0 .305.015a4.29 4.29 0 0 1-.715-5.216l1.531-2.65l-1.026-.809a.25.25 0 0 0-.193-.036l-.73.178h-.003a4.03 4.03 0 0 1-3.073-.503l-3.58-2.23l-.004-.003A5.5 5.5 0 0 1 6 6.464zm2 .015a3.5 3.5 0 0 0 1.631 2.986l.002.001l3.576 2.227a2.02 2.02 0 0 0 1.546.257h.001l.751-.183a2.25 2.25 0 0 1 1.835.379l.014.01l2.418 1.907l-.001.004l1.79 1.375c.281.207.661.395 1.044.53c.391.138.733.203.935.2q.165-.001.322-.02l.781-1.357l.019-.028a2.3 2.3 0 0 0-.49-3.083l-.08-.055l-.031-.03l-10.52-7.93l-.017-.017A3.53 3.53 0 0 0 11.521 3C9.608 2.985 8.016 4.557 8 6.477m9.376 11.734a2.293 2.293 0 0 0 .843 3.133a2.294 2.294 0 0 0 3.133-.831l1.932-3.356a4.6 4.6 0 0 1-1.01-.244a5.2 5.2 0 0 1-1.31-.672l-.007-.005l-1.69-1.298zM15 25.41v1.726c.29.179.63.303 1 .363c.336.055.234.5 0 .5h-1v.89c0 .062.046.11.11.11h7.342a2.4 2.4 0 0 1-1.523-.6h-.002l-3.932-3.457l-.067-.093a1.07 1.07 0 0 0-.873-.44c-.608 0-1.055.473-1.055 1" />
</g>
</svg> </svg>
</template> </template>

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

@ -66,6 +66,7 @@
>新增</el-button >新增</el-button
> >
</div> </div>
<div style="height: 8px"></div>
<scTable <scTable
ref="table" ref="table"
:apiObj="apiObj" :apiObj="apiObj"

2
src/views/inm/mioitem_form.vue
View File

@ -173,7 +173,7 @@
<el-button type="primary" :loading="isSaveing" @click="submit"> <el-button type="primary" :loading="isSaveing" @click="submit">
保存 保存
</el-button> </el-button>
<el-button @click="dialogVisible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>

2
src/views/pm/utask.vue
View File

@ -65,7 +65,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="生产工艺" label="工艺路线"
prop="material_" prop="material_"
min-width="150" min-width="150"
show-overflow-tooltip show-overflow-tooltip

8
src/views/pm/utask_form.vue
View File

@ -40,7 +40,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="生产路线" prop="route" v-else> <el-form-item label="工艺路线" prop="route" v-else>
<el-input <el-input
v-if="type == 'routepack'" v-if="type == 'routepack'"
disabled disabled
@ -150,15 +150,15 @@ export default {
setFiltersVisible: false, setFiltersVisible: false,
belong_dept_options: [], belong_dept_options: [],
group: [], group: [],
routeText: "生产工艺", routeText: "工艺路线",
}; };
}, },
mounted() { mounted() {
if (this.type == "routepack") { if (this.type == "routepack") {
this.routeText = "生产工艺"; this.routeText = "工艺路线";
this.getRoutePackes(); this.getRoutePackes();
} else { } else {
this.routeText = "生产路线"; this.routeText = "工艺路线";
this.getRouteOptions(); this.getRouteOptions();
} }
}, },

12
src/views/wpm/worktask_form.vue
View File

@ -17,11 +17,11 @@
> >
<el-row> <el-row>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="生产路线" v-if="mode == 'add'"> <el-form-item label="工艺路线" v-if="mode == 'add'">
<el-select <el-select
v-model="currentRoute" v-model="currentRoute"
value-key="id" value-key="id"
placeholder="生产路线" placeholder="工艺路线"
clearable clearable
filterable filterable
style="width: 100%" style="width: 100%"
@ -35,7 +35,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="生产路线" v-if="mode == 'edit'"> <el-form-item label="工艺路线" v-if="mode == 'edit'">
<span <span
>{{ form.material_in_name }}->{{ >{{ form.material_in_name }}->{{
form.material_out_name form.material_out_name
@ -149,11 +149,11 @@
> >
<el-row> <el-row>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="生产路线" v-if="mode == 'add'"> <el-form-item label="工艺路线" v-if="mode == 'add'">
<el-select <el-select
v-model="currentRoute" v-model="currentRoute"
value-key="id" value-key="id"
placeholder="生产路线" placeholder="工艺路线"
filterable filterable
clearable clearable
style="width: 100%" style="width: 100%"
@ -167,7 +167,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="生产路线" v-if="mode == 'edit'"> <el-form-item label="工艺路线" v-if="mode == 'edit'">
<span <span
>{{ form.material_in_name }}->{{ >{{ form.material_in_name }}->{{
form.material_out_name form.material_out_name

4
src/views/wpm_gx/chaoxi.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/chaoxi2.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/chaoxi3.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/daojiao.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

13
src/views/wpm_gx/handover.vue
View File

@ -70,18 +70,19 @@
<el-table-column <el-table-column
label="物料" label="物料"
prop="material_name" prop="material_name"
min-width="120" min-width="140"
></el-table-column> ></el-table-column>
<el-table-column label="批次" prop="batch" min-width="100"> <el-table-column label="批次" prop="batch" min-width="140">
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="count"></el-table-column> <el-table-column label="数量" prop="count" width="80"></el-table-column>
<el-table-column label="交接类型" prop="type"> <el-table-column label="交接类型" prop="type" width="100">
<template #default="scope"> <template #default="scope">
<el-text <el-text
v-if="scope.row.send_mgroup == mgroupId" v-if="scope.row.send_mgroup == mgroupId"
type="primary" type="primary"
>交送</el-text >交送</el-text
> >
<span style="width: 4px;"></span>
<el-text <el-text
v-if="scope.row.recive_mgroup == mgroupId" v-if="scope.row.recive_mgroup == mgroupId"
type="success" type="success"
@ -89,7 +90,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="交接类别" prop="type"> <el-table-column label="交接类别" prop="type" width="80">
<template #default="scope"> <template #default="scope">
<el-tag v-if="scope.row.type == 10" type="success" <el-tag v-if="scope.row.type == 10" type="success"
>正常</el-tag >正常</el-tag
@ -105,10 +106,12 @@
<el-table-column <el-table-column
label="交送人" label="交送人"
prop="send_user_name" prop="send_user_name"
width="80"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="接收人" label="接收人"
prop="recive_user_name" prop="recive_user_name"
width="80"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="交接日期" label="交接日期"

14
src/views/wpm_gx/handover_form.vue
View File

@ -19,6 +19,7 @@
<el-select <el-select
v-model="form.wm" v-model="form.wm"
placeholder="交接物料" placeholder="交接物料"
filterable
clearable clearable
style="width: 100%" style="width: 100%"
@change="materialChange" @change="materialChange"
@ -276,8 +277,19 @@ export default {
//获取车间物料 //获取车间物料
getMaterial() { getMaterial() {
let that = this; let that = this;
var req = {
mgroupx: that.mgroupId,
page: 0,
};
if (this.type == 10) {
req.notok_sign__isnull = 1;
} else if (this.type == 20) {
req.notok_sign__isnull = 0;}
else if (this.type == 30) {
req.notok_sign__isnull = 1;
}
this.$API.wpm.wmaterial.list this.$API.wpm.wmaterial.list
.req({ mgroupx: that.mgroupId, page: 0 }) .req(req)
.then((res) => { .then((res) => {
that.materialOptions = res; that.materialOptions = res;
}); });

4
src/views/wpm_gx/heihua.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/jianbo.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/jingdiao.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

1
src/views/wpm_gx/mlog_detail.vue
View File

@ -72,6 +72,7 @@
>新增</el-button >新增</el-button
> >
</div> </div>
<div style="height: 4px"></div>
<scTable <scTable
ref="tableIn" ref="tableIn"
:apiObj="apiObj" :apiObj="apiObj"

6
src/views/wpm_gx/mlog_form.vue
View File

@ -60,10 +60,10 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="生产路线" prop="route"> <el-form-item label="工艺路线" prop="route">
<el-select <el-select
v-model="form.route" v-model="form.route"
placeholder="生产路线" placeholder="工艺路线"
clearable clearable
style="width: 100%" style="width: 100%"
:disabled="mode == 'edit'" :disabled="mode == 'edit'"
@ -266,7 +266,7 @@ export default {
route: [ route: [
{ {
required: true, required: true,
message: "请选择生产路线", message: "请选择工艺路线",
trigger: "blur", trigger: "blur",
}, },
], ],

1
src/views/wpm_gx/mlogb_check.vue
View File

@ -55,6 +55,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-divider></el-divider>
<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

23
src/views/wpm_gx/mlogs.vue
View File

@ -39,19 +39,15 @@
width="50" width="50"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产路线" label="工艺路线"
prop="material_out_name" prop="material_out_name"
min-width="100" min-width="130"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="预计工时" label="预计工时"
prop="hour_work" prop="hour_work"
></el-table-column> width="80"
<el-table-column
label="工段名称"
prop="mgroup_name"
min-width="100"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产设备" label="生产设备"
@ -59,12 +55,17 @@
min-width="150" min-width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="所属部门" label="部门/工段"
prop="belong_dept_name" prop="belong_dept_name"
></el-table-column> >
<template #default="scope">
{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
</template>
</el-table-column>
<el-table-column <el-table-column
label="处理人" label="处理人"
prop="handle_user_name" prop="handle_user_name"
width="80"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="开始时间" label="开始时间"
@ -74,10 +75,10 @@
label="结束时间" label="结束时间"
prop="work_end_time" prop="work_end_time"
></el-table-column> ></el-table-column>
<el-table-column <!-- <el-table-column
label="创建时间" label="创建时间"
prop="create_time" prop="create_time"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
label="操作" label="操作"
fixed="right" fixed="right"

4
src/views/wpm_gx/mopao.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

18
src/views/wpm_gx/mtask.vue
View File

@ -1,8 +1,5 @@
<template> <template>
<el-container> <el-container>
<el-header>
<h2>任务列表</h2>
</el-header>
<el-main> <el-main>
<scTable <scTable
ref="table" ref="table"
@ -12,25 +9,16 @@
:params="params" :params="params"
> >
<el-table-column <el-table-column
label="#" label="任务列表"
type="index" type="index"
width="50" width="80"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="产品名称" label="产品名"
prop="material_out_name" prop="material_out_name"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="型号规格">
<template #default="scope">
<span v-if="scope.row.material_out_"
>{{ scope.row.material_out_.specification }}|{{
scope.row.material_out_.model
}}</span
>
</template>
</el-table-column>
<el-table-column <el-table-column
label="任务编号" label="任务编号"
prop="number" prop="number"

4
src/views/wpm_gx/qiepian.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/saobian.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover

4
src/views/wpm_gx/shaojie.vue
View File

@ -12,12 +12,12 @@
<mlogs <mlogs
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 60%"
></mlogs> ></mlogs>
<mtask <mtask
v-if="values == '日志'" v-if="values == '日志'"
:mgroupName="mgroupName" :mgroupName="mgroupName"
style="height: 50%" style="height: 40%"
></mtask> ></mtask>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover