Skip to content

M
mes-ui
Commit c7f160fa authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

复验ok

parent 7df5be74
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1687 additions and 1485 deletions
pages/aps/plan/editAccessory.vue
View file @ c7f160fa
<template> <template>
<div class="h100 table-content1"> <div class="h100 table-content1">
<p class="mb10"> <p class="mb10">
订单编号：{{mesCodes}} 订单编号：{{ mesCodes }}
<span class="ml20">产品名称：{{productNames}}</span> <span class="ml20">产品名称：{{ productNames }}</span>
<span class="ml20">生产数量：{{counts}}</span> <span class="ml20">生产数量：{{ counts }}</span>
<span class="fr mr20" v-if="false"> <span class="fr mr20" v-if="false">
<a href="javascript:;">出库单</a> <a href="javascript:;">出库单</a>
</span> </span>
...@@ -12,58 +12,120 @@ ...@@ -12,58 +12,120 @@
</span> </span>
</p> </p>
<div class="mb70" v-for="(item,i) in datas" :key="i"> <div class="mb70" v-for="(item, i) in datas" :key="i">
<p class="fwBold">{{item.routingHeader}}------{{item.routingHeaderCode}}</p> <p class="fwBold">
<Table border :columns="cols" :data="item.suport" :ref="'table'+item.routingHeaderId" class="tableCommon" @on-selection-change="selectionChange(i)" @on-select-cancel="selectListCancel" @on-select-all-cancel="selectAllCancel" @on-select="selectList" @on-select-all="selectListAll"> {{ item.routingHeader }}------{{ item.routingHeaderCode }}
</p>
<Table
border
:columns="cols"
:data="item.suport"
:ref="'table' + item.routingHeaderId"
class="tableCommon"
@on-selection-change="selectionChange(i)"
@on-select-cancel="selectListCancel"
@on-select-all-cancel="selectAllCancel"
@on-select="selectList"
@on-select-all="selectListAll"
>
<template slot-scope="{ row, index }" slot="counts"> <template slot-scope="{ row, index }" slot="counts">
<InputNumber :max="row.totalCount-row.applicationNumber" :min="0" v-model="row.count" @on-change="inputChange1(i,row,index)" :disabled="row._disabled" /> <InputNumber
:max="row.totalCount - row.applicationNumber"
:min="0"
v-model="row.count"
@on-change="inputChange1(i, row, index)"
:disabled="row._disabled"
/>
</template> </template>
<template slot-scope="{ row, index }" slot="remarks"> <template slot-scope="{ row, index }" slot="remarks">
<Input type="text" v-model="row.remark" @on-change="inputChange1(i,row,index)" :disabled="row._disabled" /> <Input
type="text"
v-model="row.remark"
@on-change="inputChange1(i, row, index)"
:disabled="row._disabled"
/>
</template> </template>
</Table> </Table>
</div> </div>
<FooterToolbar v-show="footerToolbar" class="ftball pt10"> <FooterToolbar v-show="footerToolbar" class="ftball pt10">
<!--<div class="tip">已选{{selectItems.length}}项</div>--> <!--<div class="tip">已选{{selectItems.length}}项</div>-->
<Form :model="orderForm" :inline="true" :label-width="0" ref="formValidate" :rules="ruleValidate"> <Form
:model="orderForm"
:inline="true"
:label-width="0"
ref="formValidate"
:rules="ruleValidate"
>
<FormItem prop="QuotationFinishDate"> <FormItem prop="QuotationFinishDate">
<DatePicker v-model="orderForm.QuotationFinishDate" type="date" style="color:black" placeholder="请选择齐套日期" @on-change="getTimeQuotationFD"></DatePicker> <DatePicker
v-model="orderForm.QuotationFinishDate"
type="date"
style="color: black"
placeholder="请选择齐套日期"
@on-change="getTimeQuotationFD"
></DatePicker>
</FormItem> </FormItem>
<FormItem l><Button type="primary" class="mr10 ml10" @click="application">申请配套</Button></FormItem> <FormItem l
><Button type="primary" class="mr10 ml10" @click="application"
>申请配套</Button
></FormItem
>
</Form> </Form>
</FooterToolbar> </FooterToolbar>
<Modal v-model="modalAccessoryList" :title="title" fullscreen footer-hide> <Modal v-model="modalAccessoryList" :title="title" fullscreen footer-hide>
<component :is="detailAcc" :eid="orderId" :mesCode="mesCodes" :productName="productNames" :drawnNumber="drawnNumber" :count="counts" @on-close="cancel" @on-ok="onOk" /> <component
:is="detailAcc"
:eid="orderId"
:mesCode="mesCodes"
:productName="productNames"
:drawnNumber="drawnNumber"
:count="counts"
@on-close="cancel"
@on-ok="onOk"
/>
</Modal> </Modal>
<Modal v-model="modalAccSet" title="临时设置" footer-hide width="800"> <Modal v-model="modalAccSet" title="临时设置" footer-hide width="800">
<Form :model="entity" :label-width="110" ref="formValidateSet" :rules="ruleValidate"> <Form
:model="entity"
:label-width="110"
ref="formValidateSet"
:rules="ruleValidate"
>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="工序">{{entity.routingDetailName}}</FormItem> <FormItem label="工序">{{ entity.routingDetailName }}</FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="物料名">{{entity.materialName}}</FormItem> <FormItem label="物料名">{{ entity.materialName }}</FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="物料编号">{{entity.materialNumber}}</FormItem> <FormItem label="物料编号">{{ entity.materialNumber }}</FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="需求数量">{{entity.needCount}}</FormItem> <FormItem label="需求数量">{{ entity.needCount }}</FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="已申请">{{entity.applicationNumber}}</FormItem> <FormItem label="已申请">{{ entity.applicationNumber }}</FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="可再申请" prop="count"> <FormItem label="可再申请" prop="count">
<InputNumber :max="entity.needCount-entity.applicationNumber" :min="0" v-model="entity.count" /> <InputNumber
:max="entity.needCount - entity.applicationNumber"
:min="0"
v-model="entity.count"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="齐套日期" prop="finishDate"> <FormItem label="齐套日期" prop="finishDate">
<DatePicker v-model="entity.finishDate" type="date" placeholder="请选择齐套日期" @on-change="getTimeFinish"></DatePicker> <DatePicker
v-model="entity.finishDate"
type="date"
placeholder="请选择齐套日期"
@on-change="getTimeFinish"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
...@@ -73,14 +135,16 @@ ...@@ -73,14 +135,16 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<p class="fr"> <p class="fr">
<Button type="primary" class="mr10 ml10" @click="application1">申请配套</Button> <Button type="primary" class="mr10 ml10" @click="application1"
>申请配套</Button
>
<Button @click="canelSet">取消</Button> <Button @click="canelSet">取消</Button>
</p> </p>
</Col> </Col>
</Row> </Row>
</Form> </Form>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
...@@ -98,7 +162,8 @@ export default { ...@@ -98,7 +162,8 @@ export default {
curId: 0, curId: 0,
editIndex: -1, editIndex: -1,
editNum: "", editNum: "",
cols: [{ cols: [
{
type: "selection", type: "selection",
width: 70, width: 70,
align: "center", align: "center",
...@@ -148,7 +213,8 @@ export default { ...@@ -148,7 +213,8 @@ export default {
width: "120", width: "120",
render: (h, params) => { render: (h, params) => {
return h( return h(
"op", { "op",
{
attrs: { attrs: {
oprate: "detail", oprate: "detail",
}, },
...@@ -157,9 +223,9 @@ export default { ...@@ -157,9 +223,9 @@ export default {
}, },
}, },
params.row._disabled && params.row._disabled &&
params.row.totalCount - params.row.applicationNumber > 0 ? params.row.totalCount - params.row.applicationNumber > 0
"临时申请" : ? "临时申请"
"" : ""
); );
}, },
}, },
...@@ -177,22 +243,28 @@ export default { ...@@ -177,22 +243,28 @@ export default {
counts: this.count, counts: this.count,
curArr: 0, //标记当前操作工艺规程列表是否为空 curArr: 0, //标记当前操作工艺规程列表是否为空
ruleValidate: { ruleValidate: {
QuotationFinishDate: [{ QuotationFinishDate: [
{
required: true, required: true,
message: "_", message: "_",
trigger: "change", trigger: "change",
}, ], },
finishDate: [{ ],
finishDate: [
{
required: true, required: true,
message: "请选择齐套日期", message: "请选择齐套日期",
trigger: "change", trigger: "change",
}, ], },
count: [{ ],
count: [
{
required: true, required: true,
message: "请输入申请数量", message: "请输入申请数量",
type: "number", type: "number",
trigger: "change", trigger: "change",
}, ], },
],
}, },
tempList: [], tempList: [],
cRow: null, cRow: null,
...@@ -219,20 +291,18 @@ export default { ...@@ -219,20 +291,18 @@ export default {
productName: String, productName: String,
drawnNumber: String, drawnNumber: String,
count: Number, count: Number,
productingPreparationPeople: Number,
}, },
mounted() { mounted() {
this.load(this.eid); this.load(this.eid);
}, },
async fetch({ async fetch({ store, params }) {
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
load(v) { load(v) {
Api.matchdetaillist({ Api.matchdetaillist({
id: v id: v,
}).then((r) => { }).then((r) => {
if (r.success) { if (r.success) {
r.result.forEach((e) => { r.result.forEach((e) => {
...@@ -367,6 +437,7 @@ export default { ...@@ -367,6 +437,7 @@ export default {
creator: this.$store.state.userInfo.userName, creator: this.$store.state.userInfo.userName,
finishDate: this.orderForm.QuotationFinishDate, finishDate: this.orderForm.QuotationFinishDate,
orderCode: this.mesCode, orderCode: this.mesCode,
productingPreparationPeople: this.productingPreparationPeople,
}, },
items: temItems, items: temItems,
}; };
......
pages/aps/plan/index.vue
View file @ c7f160fa
This diff is collapsed.
pages/qc/check/api.js
View file @ c7f160fa
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index:`${resourceUrl}/materialpowder/itempaged`, index:`${material}/material/paged`,
paged(params){ paged(params){
return Api.post(`${resourceUrl}/materialpowder/itempaged`,params); return Api.post(`${material}/material/paged`,params);
}, },
get(params){ get(params){
return Api.get(`${resourceUrl}/materialpowder/get`,params); return Api.get(`${material}/materialpowder/get`,params);
}, },
create(params){ create(params){
return Api.post(`${resourceUrl}/materialpowder/create`,params); return Api.post(`${material}/materialpowder/create`,params);
}, },
update(params){ update(params){
return Api.post(`${resourceUrl}/materialpowder/update`,params); return Api.post(`${material}/materialpowder/update`,params);
}, },
//删除： //删除：
delete(params) { delete(params) {
return Api.delete(`${resourceUrl}/materialpowder/delete`,{params:params}); return Api.delete(`${material}/materialpowder/delete`,{params:params});
}, },
} }
\ No newline at end of file
pages/qc/check/endReview/index.vue
View file @ c7f160fa
<template> <template>
<div> <div>
<DataGrid :columns="columns" ref="grid" :high='false' :action="action" :conditions="easySearch"></DataGrid> <DataGrid
:columns="columns"
ref="grid"
:high="false"
:action="action"
:conditions="easySearch"
></DataGrid>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from "../api";
export default { export default {
// name: 'list', // name: 'list',
// components:{ // components:{
...@@ -18,145 +24,157 @@ export default { ...@@ -18,145 +24,157 @@ export default {
detailModal: false, detailModal: false,
deletelModal: false, deletelModal: false,
easySearch: { easySearch: {
keys: { op: 'brand,name', value: '',default:true }, keys: { op: "brand,name", value: "", default: true },
reinspectionStatus: { op: 'Equal', value: 3 } reinspectionStatus: { op: "Equal", value: 1 },
}, },
curId: 0, curId: 0,
columns: [ columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' }, { key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: 'brand',
title: this.l('brand'),
align: 'left',
easy: true,
high: true
},
{ {
key: 'name', key: "codeRuleType",
title: this.l('name'), title: "类型",
align: 'left', align: "center",
easy: true, code: "material.code.type",
high: true import: true,
}, hide: true,
},
// {
// key: "codeRuleId",
// title: "编码名称",
// materialKey: "3",
// import: true,
// hide: true,
// render: (h, params) => {
// return h("span", {}, this.getType3(params.row.codeRuleId));
// },
// },
// {
// key: "rootCategoryId",
// title: "大类",
// align: "right",
// materialKey: "1",
// import: true,
// hide: true,
// render: (h, params) => {
// return h("span", {}, this.getType1(params.row.rootCategoryId));
// },
// },
// {
// key: "categoryId",
// title: "子类",
// align: "right",
// materialKey: "2",
// import: true,
// hide: true,
// render: (h, params) => {
// return h("span", {}, this.getType2(params.row.categoryId));
// },
// },
{ {
key: 'specifications', key: "code",
title: this.l('specifications'), title: "编码",
align: 'left', align: "left",
easy: true, render: (h, params) => {
high: true return h(
}, "div",
{ {
key: 'batchNo', props: {},
title: this.l('batchNo'), on: {
align: 'left', click: () => this.details(params.row),
easy: true,
high: true,
hide:true,
}, },
{
key: 'originalManufacturer',
title: this.l('originalManufacturer'),
align: 'left',
easy: true,
high: true,
hide:true,
}, },
{ !params.row.code || params.row.code == 0
key: 'reinspectionDate', ? "未分配"
title: this.l('reinspectionDate'), : params.row.code
align: 'left', );
render: (h, paras) => {
return h('span', paras.row.reinspectionDate)
}, },
high: true,
width:180,
}, },
{ {
key: 'remainingAmount', key: "name",
title: this.l('remainingAmount'), title: "名称",
align: 'left', align: "left",
high: true
}, },
{ {
key: 'storeId', key: "status",
title: this.l('storeId'), title: "状态",
align: 'left', align: "center",
render: (h, paras) => { code: "material.main.status",
return h('span', paras.row.storeId)
}, },
high: true {
key: "version",
title: "版本",
align: "left",
code: "material.main.version",
}, },
{ {
key: 'location', key: "drawing",
title: this.l('location'), title: "图号",
align: 'left', align: "left",
easy: true,
high: true
}, },
{ {
key: 'category', key: "creationTime",
title: this.l('category'), title: "创建时间",
align: 'center', hide: true,
high: true, align: "left",
code: 'mes_xingchi_resource.material.powderType' type: "date",
}, },
{ {
key: 'reinspectionStatus', key: "creatorUserId",
title: this.l('reinspectionStatus'), title: "创建人",
align: 'center', hide: true,
code: 'mes_xingchi_resource.material.recheckState', align: "left",
easy: true, type: "user",
high: true
}, },
// render:(h,paras)=>{return h('span',paras.row.reinspectionStatus)} , // render:(h,paras)=>{return h('span',paras.row.reinspectionStatus)} ,
{ {
title: '操作', title: "操作",
key: 'id', key: "id",
width: 150, width: 150,
align: 'center', align: "center",
render: (h, params) => { render: (h, params) => {
// let herfurl = params.row.certificateUploadPath; // let herfurl = params.row.certificateUploadPath;
return h('div', { class: 'action' }, [ return h("div", { class: "action" }, [
h( h(
'op', "op",
{ {
attrs:{ attrs: {
oprate:'detail' oprate: "detail",
} , },
class: 'view', class: "view",
on: { click: () => { on: {
this.detail(params.row) click: () => {
} } this.detail(params.row);
},
}, },
'查看复验单'
)
])
}
}
]
}
}, },
mounted() { "查看复验单"
),
]);
}, },
},
],
};
},
mounted() {},
methods: { methods: {
reload(){ reload() {
this.$refs.grid.load() this.$refs.grid.load();
}, },
detail(row) { detail(row) {
let ssdata = row.certificateUploadPath let ssdata = row.certificateUploadPath;
if(this.$u.isNull(ssdata)){ if (this.$u.isNull(ssdata)) {
this.$Message.warning('复验单为空！') this.$Message.warning("复验单为空！");
}else{ } else {
var item=JSON.parse(ssdata)[0]["filePath"], var item = JSON.parse(ssdata)[0]["filePath"],
url = fileUrlDown + item; url = fileUrlDown + item;
window.open(url) window.open(url);
// this.$Message.warning('文件格式不支持') // this.$Message.warning('文件格式不支持')
} }
}, },
removeCancel() { removeCancel() {
this.deletelModal = false this.deletelModal = false;
}, },
l(key) { l(key) {
/* /*
...@@ -186,11 +204,11 @@ export default { ...@@ -186,11 +204,11 @@ export default {
lastModifierUserId:'', lastModifierUserId:'',
} }
*/ */
let vkey = 'waitReview' + '.' + key let vkey = "waitReview" + "." + key;
return this.$t(vkey) || key return this.$t(vkey) || key;
} },
} },
} };
</script> </script>
<style lang="less"> <style lang="less">
</style> </style>
\ No newline at end of file
pages/qc/check/waitReview/index.vue
View file @ c7f160fa
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment