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

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
caoqianming 2022-01-04 16:43:42 +08:00
parent 4538c32834 1bc22240b7
commit 7370544395
5 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_client/src/router/index.js
View File

@ -343,7 +343,7 @@ export const asyncRoutes = [
path: 'admissiontest',
name: 'admissiontest',
component: () => import('@/views/qm/admissiontest'),
meta: { title: '入场检验', icon: 'example', perms: ['index_manage'] }
meta: { title: '入厂检验', icon: 'example', perms: ['index_manage'] }
}
,
{

13
hb_client/src/views/mtm/materialdo.vue
View File

@ -34,6 +34,14 @@
<el-table-column label="表名称">
<template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column>
<el-table-column label="是否启用">
<template slot-scope="scope">
<el-tag v-if="scope.row.enabled==false">否</el-tag>
<el-tag v-if="scope.row.enabled==true">是</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<el-link
@ -73,6 +81,9 @@
<el-form-item label="表格名称" prop="name">
<el-input v-model="recordform.name" placeholder="表格名称"/>
</el-form-item>
<el-form-item label="是否启用" prop="name">
<el-switch v-model="recordform.enabled"></el-switch>
</el-form-item>
</el-form>
<div style="text-align: right">
<el-button type="danger" @click="dialogVisible = false"
@ -546,7 +557,7 @@
number: "",
};
const defaultrecordform = {};
const defaultrecordform = {enabled:false};
const defaultfield = {};
let preDrawAry = [];
export default {

18
hb_client/src/views/mtm/productprocess.vue
View File

@ -566,7 +566,13 @@
<el-table-column label="文件名称">
<template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column>
<el-table-column label="是否启用">
<template slot-scope="scope">
<el-tag v-if="scope.row.enabled==false">否</el-tag>
<el-tag v-if="scope.row.enabled==true">是</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="文件">
<template slot-scope="scope" v-if="scope.row.file_">
@ -611,12 +617,14 @@
<el-input v-model="techdoc.name" placeholder="文件名称" />
</el-form-item>
<el-form-item label="内容" prop="content" style="height:350px">
<quill-editor ref="text" v-model="techdoc.content" style="height:250px" :options="editorOption" />
</el-form-item>
<el-form-item label="是否启用" prop="name">
<el-switch v-model="techdoc.enabled"></el-switch>
</el-form-item>
<el-form-item label="文件" prop="template" v-if="dialogVisiblet">
<el-upload
ref="upload"
@ -671,9 +679,7 @@ const defaultother = {};
const defaultusedstep = {
};
const defaulttechdoc = {
};
const defaulttechdoc = {enabled:false};
const defaultsubproducation = {
};

3
hb_client/src/views/wpm/need.vue
View File

@ -955,6 +955,7 @@
this.wproduct = scope.row.id;//半成品ID
this.listQueryrecordform.material = scope.row.material_.id;//
this.listQueryrecordform.type = 2;
this.listQueryrecordform.enabled = true;
this.recordform = null;
getrecordformList(this.listQueryrecordform).then((response) => {
if (response.data) {
@ -1003,7 +1004,7 @@
that.recordform = scope.row.form;
that.formName = scope.row.form_.name;
if(that.innerIndex==='1'){//非复检
getrffieldList({form: this.recordform, page: 1, page_size: 100}).then((response) => {
getrffieldList({form: this.recordform,enabled:true, page: 1, page_size: 100}).then((response) => {
if (response.data) {
that.hasPicture = false;
let fieldList = response.data.results;

2
hb_client/src/views/wpm/operationdo.vue
View File

@ -787,7 +787,7 @@ export default {
},
//操作自定义表
getrecordLists() {
getrecordList({ operation: this.id, page: 0 }).then((response) => {
getrecordList({ operation: this.id, page: 0,enabled:true }).then((response) => {
if (response.data) {
this.recordData = response.data;
}