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

styleAdjust

This commit is contained in:
shijing 2022-02-18 15:05:02 +08:00
parent 2c4f82d393
commit 76f6def36f
6 changed files with 606 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
hb_client/src/views/inm/product.vue
View File

@ -15,8 +15,8 @@
height="100" height="100"
v-el-height-adaptive-table="{bottomOffset: 42}" v-el-height-adaptive-table="{bottomOffset: 42}"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50"/>
<el-table-column label="成品编号"> <el-table-column label="成品编号">
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
@ -24,25 +24,18 @@
<el-table-column label="成品批次"> <el-table-column label="成品批次">
<template slot-scope="scope">{{ scope.row.batch }}</template> <template slot-scope="scope">{{ scope.row.batch }}</template>
</el-table-column> </el-table-column>
<el-table-column label="成品名称"> <el-table-column label="成品名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.material_.name }}</template> <template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="所在仓库"> <el-table-column label="所在仓库">
<template slot-scope="scope">{{ <template slot-scope="scope">{{scope.row.warehouse_.name}}</template>
scope.row.warehouse_.name
}}</template>
</el-table-column> </el-table-column>
<el-table-column label="订单"> <el-table-column label="订单">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.to_order_">{{ <span v-if="scope.row.to_order_">{{scope.row.to_order_.number}}</span>
scope.row.to_order_.number
}}</span>
<el-tag <el-tag
v-else-if=" v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
scope.row.to_order_ == null && scope.row.need_to_order == true
"
> >
需要确定订单 需要确定订单
</el-tag> </el-tag>
@ -51,13 +44,9 @@
</el-table-column> </el-table-column>
<el-table-column label="合同"> <el-table-column label="合同">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.to_order_">{{ <span v-if="scope.row.to_order_">{{scope.row.to_order_.contract_.name}}</span>
scope.row.to_order_.contract_.name
}}</span>
<span <span
v-else-if=" v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
scope.row.to_order_ == null && scope.row.need_to_order == true
"
> >
</span> </span>
<span v-else></span> <span v-else></span>
@ -65,25 +54,20 @@
</el-table-column> </el-table-column>
<el-table-column label="客户"> <el-table-column label="客户">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.to_order_">{{ <span v-if="scope.row.to_order_">{{scope.row.to_order_.customer_.name}}</span>
scope.row.to_order_.customer_.name
}}</span>
<span <span
v-else-if=" v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
scope.row.to_order_ == null && scope.row.need_to_order == true
"
> >
</span> </span>
<span v-else></span> <span v-else></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="军检"> <el-table-column label="军检">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.is_mtestok == false">不合格</el-tag> <el-tag v-if="scope.row.is_mtestok == false">不合格</el-tag>
<el-tag v-else-if="scope.row.is_mtestok == true">合格</el-tag> <el-tag v-else-if="scope.row.is_mtestok == true">合格</el-tag>
<span v-else></span <span v-else></span>
></template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="操作" width="220px"> <!-- <el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
@ -112,8 +96,8 @@
</el-form-item> </el-form-item>
<el-form-item label="军检备注" prop="name"> <el-form-item label="军检备注" prop="name">
<el-input <el-input
type="textarea"
v-model="mtestform.remark_mtest" v-model="mtestform.remark_mtest"
type="textarea"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -130,9 +114,8 @@
<el-descriptions :column="5" border style="margin-bottom: 20px"> <el-descriptions :column="5" border style="margin-bottom: 20px">
<el-descriptions-item label="原订单">{{ this.ordershow }}</el-descriptions-item> <el-descriptions-item label="原订单">{{ this.ordershow }}</el-descriptions-item>
<el-descriptions-item label="原客户">{{ this.customershow }}</el-descriptions-item> <el-descriptions-item label="原客户">{{ this.customershow }}</el-descriptions-item>
<el-descriptions-item label="原合同" >{{ this.contractshow }}</el-descriptions-item> <el-descriptions-item label="原合同">{{ this.contractshow }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-table <el-table
v-loading="listLoading" v-loading="listLoading"
:data="orderList" :data="orderList"
@ -143,20 +126,17 @@
height="100" height="100"
v-el-height-adaptive-table="{ bottomOffset: 42 }" v-el-height-adaptive-table="{ bottomOffset: 42 }"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50"/>
<el-table-column label="订单编号" width="160" show-overflow-tooltip> <el-table-column label="订单编号" width="160" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
<el-table-column label="客户" width="200" show-overflow-tooltip> <el-table-column label="客户" width="200" show-overflow-tooltip>
<template slot-scope="scope">{{ <template slot-scope="scope">{{scope.row.customer_.name}}
scope.row.customer_.name </template>
}}</template>
</el-table-column> </el-table-column>
<el-table-column label="所属合同" width="200" show-overflow-tooltip> <el-table-column label="所属合同" width="200" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.contract">{{ <template slot-scope="scope" v-if="scope.row.contract">{{scope.row.contract_.name}}
scope.row.contract_.name </template>
}}</template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="120"> <el-table-column align="center" label="操作" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
@ -168,7 +148,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisibleorder = false">取 消</el-button> <el-button @click="dialogFormVisibleorder = false">取 消</el-button>
</div> </div>
@ -177,15 +156,15 @@
</div> </div>
</template> </template>
<script> <script>
import { getiproductList } from "@/api/inm"; import {getiproductList} from "@/api/inm";
import checkPermission from "@/utils/permission"; import checkPermission from "@/utils/permission";
import { getOrderList } from "@/api/sam"; import {getOrderList} from "@/api/sam";
import { mtest, toorder } from "@/api/wpm"; import {mtest, toorder} from "@/api/wpm";
import { genTree } from "@/utils"; import {genTree} from "@/utils";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
export default { export default {
components: { Pagination }, components: {Pagination},
data() { data() {
return { return {
iproductData: { iproductData: {
@ -209,8 +188,8 @@ export default {
mutipID: [], mutipID: [],
mtmId: [], mtmId: [],
ordershow: "", ordershow: "",
customershow:"", customershow: "",
contractshow:"", contractshow: "",
materialshow: [], materialshow: [],
}; };
}, },
@ -258,9 +237,9 @@ export default {
_this.materialshow.push(item); _this.materialshow.push(item);
}); });
this.ordershow = _this.materialshow[0].order_.number; this.ordershow = _this.materialshow[0].order_.number;
this.customershow=_this.materialshow[0].order_.customer_.name; this.customershow = _this.materialshow[0].order_.customer_.name;
this.contractshow=_this.materialshow[0].order_.contract_.name; this.contractshow = _this.materialshow[0].order_.contract_.name;
getOrderList({ page: 0, material: _this.mtmId[0], tag:'not_done' }).then( getOrderList({page: 0, material: _this.mtmId[0], tag: 'not_done'}).then(
(response) => { (response) => {
if (response.data) { if (response.data) {
this.orderList = response.data; this.orderList = response.data;
@ -283,5 +262,5 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>

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

@ -79,26 +79,13 @@
<el-form-item label="表格名称" prop="name"> <el-form-item label="表格名称" prop="name">
<el-input v-model="recordform.name" placeholder="表格名称"/> <el-input v-model="recordform.name" placeholder="表格名称"/>
</el-form-item> </el-form-item>
<!--<el-form-item label="引用表单" prop="field_type">
<el-select
style="width: 100%"
v-model="recordform.number"
placeholder="请选择"
>
<el-option
v-for="item in fieldtypeoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>-->
<el-form-item label="表格类型" prop="formUsed"> <el-form-item label="表格类型" prop="formUsed">
<el-select <el-select
style="width: 100%"
v-model="recordform.type" v-model="recordform.type"
clearable
style="width: 100%"
placeholder="请选择" placeholder="请选择"
@change="formTypeChange"
> >
<el-option <el-option
v-for="item in typeOptions" v-for="item in typeOptions"
@ -109,6 +96,22 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="引用表单" prop="field_type">
<el-select
v-model="recordform.form"
style="width: 100%"
clearable
placeholder="请选择"
>
<el-option
v-for="item in formList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="name"> <el-form-item label="是否启用" prop="name">
<el-switch v-model="recordform.enabled"></el-switch> <el-switch v-model="recordform.enabled"></el-switch>
</el-form-item> </el-form-item>
@ -576,6 +579,7 @@
recordformList: { recordformList: {
count: 0, count: 0,
}, },
formList:[],
fieldList: { fieldList: {
count: 0, count: 0,
}, },
@ -696,6 +700,13 @@
this.material = this.$route.params.id; this.material = this.$route.params.id;
this.recordformLists(); this.recordformLists();
}, },
mounted(){
getrecordformList({page:0}).then((response) => {
if (response.data) {
this.formList = response.data;
}
});
},
methods: { methods: {
formFunc(value) { formFunc(value) {
this.dialogVisibleForm = value; this.dialogVisibleForm = value;
@ -882,6 +893,13 @@
// this.$refs["Forms"].resetFields(); // this.$refs["Forms"].resetFields();
// }); // });
}, },
formTypeChange(){
getrecordformList({type:this.recordform.type,page:0}).then((response) => {
if (response.data) {
this.formList = response.data;
}
});
},
//新增字段 //新增字段
handlefieldCreate() { handlefieldCreate() {
this.field_choice = [""]; this.field_choice = [""];
@ -903,6 +921,8 @@
}); });
}, },
handleEdit(scope) { handleEdit(scope) {
debugger;
console.log( scope.row);
this.recordform = Object.assign({}, scope.row); // copy obj this.recordform = Object.assign({}, scope.row); // copy obj
this.dialogType = "edit"; this.dialogType = "edit";
this.dialogVisible = true; this.dialogVisible = true;
@ -959,6 +979,7 @@
obj.type=this.recordform.type; obj.type=this.recordform.type;
obj.enabled=this.recordform.enabled; obj.enabled=this.recordform.enabled;
if (isEdit) { if (isEdit) {
obj.form=this.recordform.form?this.recordform.form:null;
updaterecordform(this.recordform.id, obj).then( updaterecordform(this.recordform.id, obj).then(
(res) => { (res) => {
if (res.code >= 200) { if (res.code >= 200) {
@ -970,6 +991,7 @@
); );
} else { } else {
obj.material=parseInt(this.material); obj.material=parseInt(this.material);
obj.form=this.recordform.form!==''?this.recordform.form:null;
createrecordform(obj).then((res) => { createrecordform(obj).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.recordformLists(); this.recordformLists();

70
hb_client/src/views/procurement/vendor.vue
View File

@ -2,10 +2,9 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate" 新增供应商
>新增供应商</el-button > </el-button>
<el-input <el-input
v-model="listQuery.search" v-model="listQuery.search"
placeholder="供应商名称" placeholder="供应商名称"
@ -18,17 +17,18 @@
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="handleFilter" @click="handleFilter"
>搜索</el-button
> >
搜索
</el-button>
<el-button <el-button
class="filter-item" class="filter-item"
type="primary" type="primary"
icon="el-icon-refresh-left" icon="el-icon-refresh-left"
@click="resetFilter" @click="resetFilter"
>重置</el-button
> >
重置
</el-button>
</div> </div>
</el-card> </el-card>
<el-card style="margin-top: 2px"> <el-card style="margin-top: 2px">
<el-table <el-table
@ -42,7 +42,7 @@
height="100" height="100"
v-el-height-adaptive-table="{bottomOffset: 50}" v-el-height-adaptive-table="{bottomOffset: 50}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50"/>
<el-table-column label="供应商名"> <el-table-column label="供应商名">
<template slot-scope="scope">{{ scope.row.name }}</template> <template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column> </el-table-column>
@ -53,17 +53,16 @@
<el-table-column label="联系电话"> <el-table-column label="联系电话">
<template slot-scope="scope">{{ scope.row.contact_phone }}</template> <template slot-scope="scope">{{ scope.row.contact_phone }}</template>
</el-table-column> </el-table-column>
<el-table-column label="地址"> <el-table-column label="地址" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.address }}</template> <template slot-scope="scope">{{ scope.row.address }}</template>
</el-table-column> </el-table-column>
<el-table-column label="供应物料"> <el-table-column label="供应物料">
<template slot-scope="scope">{{ scope.row.material }}</template> <template slot-scope="scope">{{ scope.row.material }}</template>
</el-table-column> </el-table-column>
<el-table-column label="备注"> <el-table-column label="备注">
<template slot-scope="scope">{{ scope.row.description }}</template> <template slot-scope="scope">{{ scope.row.description }}</template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间"> <el-table-column label="创建时间" width="160">
<template slot-scope="scope">{{ scope.row.create_time }}</template> <template slot-scope="scope">{{ scope.row.create_time }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -72,19 +71,20 @@
width="220px" width="220px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
v-if="checkPermission(['vendor_update'])" v-if="checkPermission(['vendor_update'])"
type="primary" type="primary"
@click="handleEdit(scope)" @click="handleEdit(scope)"
>编辑</el-link
> >
编辑
</el-link>
<el-link <el-link
v-if="checkPermission(['vendor_delete'])" v-if="checkPermission(['vendor_delete'])"
type="danger" type="danger"
@click="handleDelete(scope)" @click="handleDelete(scope)"
>删除</el-link
> >
删除
</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -108,22 +108,20 @@
:rules="rule1" :rules="rule1"
> >
<el-form-item label="供应商名称" prop="name"> <el-form-item label="供应商名称" prop="name">
<el-input v-model="vendor.name" placeholder="供应商名称" /> <el-input v-model="vendor.name" placeholder="供应商名称"/>
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人" prop="contact">
<el-input v-model="vendor.contact" placeholder="联系人" /> <el-input v-model="vendor.contact" placeholder="联系人"/>
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="contact_phone"> <el-form-item label="联系电话" prop="contact_phone">
<el-input v-model="vendor.contact_phone" placeholder="联系电话" /> <el-input v-model="vendor.contact_phone" placeholder="联系电话"/>
</el-form-item> </el-form-item>
<el-form-item label="地址" prop="address"> <el-form-item label="地址" prop="address">
<el-input v-model="vendor.address" placeholder="地址" /> <el-input v-model="vendor.address" placeholder="地址"/>
</el-form-item> </el-form-item>
<el-form-item label="供应物料" prop="material"> <el-form-item label="供应物料" prop="material">
<el-input v-model="vendor.material" placeholder="供应物料" /> <el-input v-model="vendor.material" placeholder="供应物料"/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="description"> <el-form-item label="备注" prop="description">
<el-input <el-input
type="textarea" type="textarea"
@ -141,18 +139,18 @@
</div> </div>
</template> </template>
<script> <script>
import { getpVendorList, createVendor,updateVendor,deleteVendor } from "@/api/vendor"; import {getpVendorList, createVendor, updateVendor, deleteVendor} from "@/api/vendor";
import { getUserList } from "@/api/user"; import {getUserList} from "@/api/user";
import checkPermission from "@/utils/permission"; import checkPermission from "@/utils/permission";
import { genTree } from "@/utils"; import {genTree} from "@/utils";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
const defaultvendor = { const defaultvendor = {
name: "", name: "",
number: "", number: "",
}; };
export default { export default {
components: { Pagination }, components: {Pagination},
data() { data() {
return { return {
vendor: defaultvendor, vendor: defaultvendor,
@ -173,15 +171,15 @@ export default {
page: 1, page: 1,
page_size: 20, page_size: 20,
}, },
keeperOptions:[], keeperOptions: [],
listLoading: true, listLoading: true,
dialogVisible: false, dialogVisible: false,
dialogType: "new", dialogType: "new",
rule1: { rule1: {
name: [{ required: true, message: "请输入", trigger: "blur" }], name: [{required: true, message: "请输入", trigger: "blur"}],
number: [{ required: true, message: "请输入", trigger: "blur" }], number: [{required: true, message: "请输入", trigger: "blur"}],
model: [{ required: true, message: "请输入", trigger: "blur" }], model: [{required: true, message: "请输入", trigger: "blur"}],
state: [{ required: true, message: "请选择", trigger: "blur" }], state: [{required: true, message: "请选择", trigger: "blur"}],
}, },
}; };
}, },
@ -274,5 +272,5 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>

105
hb_client/src/views/qm/processtest.vue
View File

@ -15,56 +15,56 @@
<el-table-column label="任务编号" align="center"> <el-table-column label="任务编号" align="center">
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
<el-table-column label="产品名称" align="center"> <el-table-column label="产品名称" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.product_.name }}</template> {{scope.row.product_.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="规格型号" align="center"> <el-table-column label="规格型号" align="center">
<template slot-scope="scope">{{ <template slot-scope="scope">
scope.row.product_.specification {{scope.row.product_.specification }}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合格率" align="center"> <el-table-column label="合格率" align="center">
<el-table-column label="冷加工" align="center"> <el-table-column label="冷加工" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['01']" <template slot-scope="scope" v-if="scope.row.process_json['01']">
>{{ scope.row.process_json["01"].rate }}%</template {{ scope.row.process_json["01"].rate }}%
> </template>
</el-table-column> </el-table-column>
<el-table-column label="热弯" align="center"> <el-table-column label="热弯" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['02']" <template slot-scope="scope" v-if="scope.row.process_json['02']">
>{{ scope.row.process_json["02"].rate }}%</template {{ scope.row.process_json["02"].rate }}%
> </template>
</el-table-column> </el-table-column>
<el-table-column label="化学钢化" align="center"> <el-table-column label="化学钢化" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['03']" <template slot-scope="scope" v-if="scope.row.process_json['03']">
>{{ scope.row.process_json["03"].rate }}%</template {{ scope.row.process_json["03"].rate }}%
> </template>
</el-table-column> </el-table-column>
<el-table-column label="镀膜" align="center"> <el-table-column label="镀膜" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['05']" <template slot-scope="scope" v-if="scope.row.process_json['05']">
>{{ scope.row.process_json["05"].rate }}%</template {{ scope.row.process_json["05"].rate }}%
> </template>
</el-table-column> </el-table-column>
<el-table-column label="夹层" align="center"> <el-table-column label="夹层" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['06']" <template slot-scope="scope" v-if="scope.row.process_json['06']">
>{{ scope.row.process_json["06"].rate }}%</template {{ scope.row.process_json["06"].rate }}%
> </template>
</el-table-column> </el-table-column>
<el-table-column label="包边" align="center"> <el-table-column label="包边" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['07']" <template slot-scope="scope" v-if="scope.row.process_json['07']">
>{{ scope.row.process_json["07"].rate }}%</template {{ scope.row.process_json["07"].rate }}%
> </template>
</el-table-column> </el-table-column>
<el-table-column label="装框" align="center"> <el-table-column label="装框" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['08']" <template slot-scope="scope" v-if="scope.row.process_json['08']">
>{{ scope.row.process_json["08"].rate }}%</template {{ scope.row.process_json["08"].rate }}%
> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center"> <el-table-column label="创建时间" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">{{ <template slot-scope="scope">
scope.row.create_time {{scope.row.create_time }}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -72,8 +72,9 @@
v-if="checkPermission(['material_update'])" v-if="checkPermission(['material_update'])"
type="primary" type="primary"
@click="handledetail(scope)" @click="handledetail(scope)"
>详情</el-link
> >
详情
</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -100,34 +101,34 @@
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
<el-table-column label="订单编号"> <el-table-column label="订单编号">
<template slot-scope="scope" v-if="scope.row.order_">{{ <template slot-scope="scope" v-if="scope.row.order_">
scope.row.order_.number {{scope.row.order_.number}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品名称"> <el-table-column label="产品名称" min-width="110" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.product_">{{ <template slot-scope="scope" v-if="scope.row.product_">
scope.row.product_.name {{scope.row.product_.name}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格型号"> <el-table-column label="规格型号">
<template slot-scope="scope" v-if="scope.row.product_">{{ <template slot-scope="scope" v-if="scope.row.product_">
scope.row.product_.specification {{scope.row.product_.specification}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="责任工序"> <el-table-column label="责任工序">
<template slot-scope="scope" v-if="scope.row.resp_process_">{{ <template slot-scope="scope" v-if="scope.row.resp_process_">
scope.row.resp_process_.name {{scope.row.resp_process_.name}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理结果"> <el-table-column label="处理结果">
<template slot-scope="scope">{{ <template slot-scope="scope">
decision_[scope.row.decision] {{decision_[scope.row.decision]}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间"> <el-table-column label="创建时间" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">{{ <template slot-scope="scope">
scope.row.create_time {{scope.row.create_time}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
@ -135,8 +136,9 @@
v-if="checkPermission(['material_update'])" v-if="checkPermission(['material_update'])"
type="primary" type="primary"
@click="handledetailbhg(scope)" @click="handledetailbhg(scope)"
>查看</el-link
> >
查看
</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -147,7 +149,6 @@
:limit.sync="listQuery2.page_size" :limit.sync="listQuery2.page_size"
@pagination="getList2" @pagination="getList2"
/> />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-card> </el-card>

2
hb_client/src/views/qm/producttest.vue
View File

@ -17,7 +17,7 @@
<template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }} <template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品名称"> <el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template> <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="型号规格"> <el-table-column label="型号规格">

82
hb_client/src/views/qm/unproduct.vue
View File

@ -16,16 +16,16 @@
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
<el-table-column label="任务编号"> <el-table-column label="任务编号">
<template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }} <template slot-scope="scope" v-if="scope.row.subproduction_plan_">
{{ scope.row.subproduction_plan_.number}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品名称"> <el-table-column label="产品名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template> <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
</el-table-column> </el-table-column>
<el-table-column label="型号规格"> <el-table-column label="型号规格">
<template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.specification }}</template> <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.specification }}</template>
</el-table-column> </el-table-column>
<el-table-column label="军检结论"> <el-table-column label="军检结论">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag> <el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag>
@ -73,39 +73,39 @@
height="620" height="620"
v-el-height-adaptive-table="{ bottomOffset: 40 }" v-el-height-adaptive-table="{ bottomOffset: 40 }"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50"/>
<el-table-column label="玻璃编号"> <el-table-column label="玻璃编号">
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
<el-table-column label="订单编号"> <el-table-column label="订单编号">
<template slot-scope="scope" v-if="scope.row.order_">{{ <template slot-scope="scope" v-if="scope.row.order_">
scope.row.order_.number {{scope.row.order_.number}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品名称"> <el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.product_">{{ <template slot-scope="scope" v-if="scope.row.product_">
scope.row.product_.name {{scope.row.product_.name}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格型号"> <el-table-column label="规格型号">
<template slot-scope="scope" v-if="scope.row.product_">{{ <template slot-scope="scope" v-if="scope.row.product_">
scope.row.product_.specification {{scope.row.product_.specification}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="责任工序"> <el-table-column label="责任工序">
<template slot-scope="scope" v-if="scope.row.resp_process_">{{ <template slot-scope="scope" v-if="scope.row.resp_process_">
scope.row.resp_process_.name {{scope.row.resp_process_.name}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理结果"> <el-table-column label="处理结果">
<template slot-scope="scope">{{ <template slot-scope="scope">
decision_[scope.row.decision] {{decision_[scope.row.decision]}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间"> <el-table-column label="创建时间">
<template slot-scope="scope">{{ <template slot-scope="scope">
scope.row.create_time {{scope.row.create_time}}
}}</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
@ -113,8 +113,9 @@
v-if="checkPermission(['material_update'])" v-if="checkPermission(['material_update'])"
type="primary" type="primary"
@click="handledetailbhg(scope)" @click="handledetailbhg(scope)"
>查看</el-link
> >
查看
</el-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -125,7 +126,6 @@
:limit.sync="listQuery2.page_size" :limit.sync="listQuery2.page_size"
@pagination="getList2" @pagination="getList2"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="入厂不合格" name="4"> <el-tab-pane label="入厂不合格" name="4">
<el-table <el-table
@ -138,7 +138,7 @@
height="620" height="620"
v-el-height-adaptive-table="{bottomOffset: 40}" v-el-height-adaptive-table="{bottomOffset: 40}"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50"/>
<el-table-column label="物料批次"> <el-table-column label="物料批次">
<template slot-scope="scope">{{ scope.row.batch }}</template> <template slot-scope="scope">{{ scope.row.batch }}</template>
</el-table-column> </el-table-column>
@ -148,7 +148,8 @@
<el-table-column label="规格型号"> <el-table-column label="规格型号">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.material_.specification scope.row.material_.specification
}}</template> }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="物料单位"> <el-table-column label="物料单位">
<template slot-scope="scope">{{ scope.row.material_.unit }}</template> <template slot-scope="scope">{{ scope.row.material_.unit }}</template>
@ -172,15 +173,15 @@
</div> </div>
</template> </template>
<script> <script>
import { getProductionplanList } from "@/api/pm"; import {getProductionplanList} from "@/api/pm";
import { getwproductticketList,getwproductList } from "@/api/wpm"; import {getwproductticketList, getwproductList} from "@/api/wpm";
import { ticketread } from "@/api/workflow"; import {ticketread} from "@/api/workflow";
import { getfifodetailList} from "@/api/inm"; import {getfifodetailList} from "@/api/inm";
import checkPermission from "@/utils/permission"; import checkPermission from "@/utils/permission";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
export default { export default {
components: { Pagination }, components: {Pagination},
data() { data() {
return { return {
wproductList: { wproductList: {
@ -226,7 +227,7 @@ export default {
page: 1, page: 1,
page_size: 20, page_size: 20,
}, },
fifodetailList4:{ fifodetailList4: {
count: 0, count: 0,
}, },
}; };
@ -247,7 +248,7 @@ export default {
this.listQuery.material__type = 1; this.listQuery.material__type = 1;
this.listQuery.tag='notok'; this.listQuery.tag = 'notok';
getwproductList(this.listQuery).then((response) => { getwproductList(this.listQuery).then((response) => {
if (response.data) { if (response.data) {
this.wproductList = response.data; this.wproductList = response.data;
@ -265,10 +266,9 @@ export default {
}); });
}, },
//不合格玻璃审理单查看 //不合格玻璃审理单查看
handledetailbhg(scope) handledetailbhg(scope) {
{
this.$router.push({name:"ticketDetail",params:{ticketId:scope.row.ticket}}) this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket}})
}, },
//入场检验不合格 //入场检验不合格
//不合格物料 //不合格物料
@ -286,5 +286,5 @@ export default {
}, },
}, },
}; };
</script> </script>