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>
<div class="h100 table-content1">
<div class="h100 table-content1">
<p class="mb10">
订单编号：{{mesCodes}}
<span class="ml20">产品名称：{{productNames}}</span>
<span class="ml20">生产数量：{{counts}}</span>
订单编号：{{ mesCodes }}
<span class="ml20">产品名称：{{ productNames }}</span>
<span class="ml20">生产数量：{{ counts }}</span>
<span class="fr mr20" v-if="false">
<a href="javascript:;">出库单</a>
</span>
......@@ -12,58 +12,120 @@
</span>
</p>
<div class="mb70" v-for="(item,i) in datas" :key="i">
<p class="fwBold">{{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">
<div class="mb70" v-for="(item, i) in datas" :key="i">
<p class="fwBold">
{{ 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">
<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 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>
</Table>
</div>
<FooterToolbar v-show="footerToolbar" class="ftball pt10">
<!--<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">
<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 l><Button type="primary" class="mr10 ml10" @click="application">申请配套</Button></FormItem>
<FormItem l
><Button type="primary" class="mr10 ml10" @click="application"
>申请配套</Button
></FormItem
>
</Form>
</FooterToolbar>
<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 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>
<Col span="12">
<FormItem label="工序">{{entity.routingDetailName}}</FormItem>
<FormItem label="工序">{{ entity.routingDetailName }}</FormItem>
</Col>
<Col span="12">
<FormItem label="物料名">{{entity.materialName}}</FormItem>
<FormItem label="物料名">{{ entity.materialName }}</FormItem>
</Col>
<Col span="12">
<FormItem label="物料编号">{{entity.materialNumber}}</FormItem>
<FormItem label="物料编号">{{ entity.materialNumber }}</FormItem>
</Col>
<Col span="12">
<FormItem label="需求数量">{{entity.needCount}}</FormItem>
<FormItem label="需求数量">{{ entity.needCount }}</FormItem>
</Col>
<Col span="12">
<FormItem label="已申请">{{entity.applicationNumber}}</FormItem>
<FormItem label="已申请">{{ entity.applicationNumber }}</FormItem>
</Col>
<Col span="12">
<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>
</Col>
<Col span="12">
<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>
</Col>
<Col span="24">
......@@ -73,14 +135,16 @@
</Col>
<Col span="24">
<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>
</p>
</Col>
</Row>
</Form>
</Modal>
</div>
</div>
</template>
<script>
......@@ -98,7 +162,8 @@ export default {
curId: 0,
editIndex: -1,
editNum: "",
cols: [{
cols: [
{
type: "selection",
width: 70,
align: "center",
......@@ -148,7 +213,8 @@ export default {
width: "120",
render: (h, params) => {
return h(
"op", {
"op",
{
attrs: {
oprate: "detail",
},
......@@ -157,9 +223,9 @@ export default {
},
},
params.row._disabled &&
params.row.totalCount - params.row.applicationNumber > 0 ?
"临时申请" :
""
params.row.totalCount - params.row.applicationNumber > 0
? "临时申请"
: ""
);
},
},
......@@ -177,22 +243,28 @@ export default {
counts: this.count,
curArr: 0, //标记当前操作工艺规程列表是否为空
ruleValidate: {
QuotationFinishDate: [{
QuotationFinishDate: [
{
required: true,
message: "_",
trigger: "change",
}, ],
finishDate: [{
},
],
finishDate: [
{
required: true,
message: "请选择齐套日期",
trigger: "change",
}, ],
count: [{
},
],
count: [
{
required: true,
message: "请输入申请数量",
type: "number",
trigger: "change",
}, ],
},
],
},
tempList: [],
cRow: null,
......@@ -219,20 +291,18 @@ export default {
productName: String,
drawnNumber: String,
count: Number,
productingPreparationPeople: Number,
},
mounted() {
this.load(this.eid);
},
async fetch({
store,
params
}) {
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
load(v) {
Api.matchdetaillist({
id: v
id: v,
}).then((r) => {
if (r.success) {
r.result.forEach((e) => {
......@@ -367,6 +437,7 @@ export default {
creator: this.$store.state.userInfo.userName,
finishDate: this.orderForm.QuotationFinishDate,
orderCode: this.mesCode,
productingPreparationPeople: this.productingPreparationPeople,
},
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'
export default {
index:`${resourceUrl}/materialpowder/itempaged`,
index:`${material}/material/paged`,
paged(params){
return Api.post(`${resourceUrl}/materialpowder/itempaged`,params);
return Api.post(`${material}/material/paged`,params);
},
get(params){
return Api.get(`${resourceUrl}/materialpowder/get`,params);
return Api.get(`${material}/materialpowder/get`,params);
},
create(params){
return Api.post(`${resourceUrl}/materialpowder/create`,params);
return Api.post(`${material}/materialpowder/create`,params);
},
update(params){
return Api.post(`${resourceUrl}/materialpowder/update`,params);
return Api.post(`${material}/materialpowder/update`,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>
<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>
</template>
<script>
import Api from '../api'
import Api from "../api";
export default {
// name: 'list',
// components:{
......@@ -18,145 +24,157 @@ export default {
detailModal: false,
deletelModal: false,
easySearch: {
keys: { op: 'brand,name', value: '',default:true },
reinspectionStatus: { op: 'Equal', value: 3 }
keys: { op: "brand,name", value: "", default: true },
reinspectionStatus: { op: "Equal", value: 1 },
},
curId: 0,
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{
key: 'brand',
title: this.l('brand'),
align: 'left',
easy: true,
high: true
},
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: 'name',
title: this.l('name'),
align: 'left',
easy: true,
high: true
},
key: "codeRuleType",
title: "类型",
align: "center",
code: "material.code.type",
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',
title: this.l('specifications'),
align: 'left',
easy: true,
high: true
},
key: "code",
title: "编码",
align: "left",
render: (h, params) => {
return h(
"div",
{
key: 'batchNo',
title: this.l('batchNo'),
align: 'left',
easy: true,
high: true,
hide:true,
props: {},
on: {
click: () => this.details(params.row),
},
{
key: 'originalManufacturer',
title: this.l('originalManufacturer'),
align: 'left',
easy: true,
high: true,
hide:true,
},
{
key: 'reinspectionDate',
title: this.l('reinspectionDate'),
align: 'left',
render: (h, paras) => {
return h('span', paras.row.reinspectionDate)
!params.row.code || params.row.code == 0
? "未分配"
: params.row.code
);
},
high: true,
width:180,
},
{
key: 'remainingAmount',
title: this.l('remainingAmount'),
align: 'left',
high: true
key: "name",
title: "名称",
align: "left",
},
{
key: 'storeId',
title: this.l('storeId'),
align: 'left',
render: (h, paras) => {
return h('span', paras.row.storeId)
key: "status",
title: "状态",
align: "center",
code: "material.main.status",
},
high: true
{
key: "version",
title: "版本",
align: "left",
code: "material.main.version",
},
{
key: 'location',
title: this.l('location'),
align: 'left',
easy: true,
high: true
key: "drawing",
title: "图号",
align: "left",
},
{
key: 'category',
title: this.l('category'),
align: 'center',
high: true,
code: 'mes_xingchi_resource.material.powderType'
key: "creationTime",
title: "创建时间",
hide: true,
align: "left",
type: "date",
},
{
key: 'reinspectionStatus',
title: this.l('reinspectionStatus'),
align: 'center',
code: 'mes_xingchi_resource.material.recheckState',
easy: true,
high: true
key: "creatorUserId",
title: "创建人",
hide: true,
align: "left",
type: "user",
},
// render:(h,paras)=>{return h('span',paras.row.reinspectionStatus)} ,
{
title: '操作',
key: 'id',
title: "操作",
key: "id",
width: 150,
align: 'center',
align: "center",
render: (h, params) => {
// let herfurl = params.row.certificateUploadPath;
return h('div', { class: 'action' }, [
return h("div", { class: "action" }, [
h(
'op',
"op",
{
attrs:{
oprate:'detail'
} ,
class: 'view',
on: { click: () => {
this.detail(params.row)
} }
attrs: {
oprate: "detail",
},
class: "view",
on: {
click: () => {
this.detail(params.row);
},
},
'查看复验单'
)
])
}
}
]
}
},
mounted() {
"查看复验单"
),
]);
},
},
],
};
},
mounted() {},
methods: {
reload(){
this.$refs.grid.load()
reload() {
this.$refs.grid.load();
},
detail(row) {
let ssdata = row.certificateUploadPath
if(this.$u.isNull(ssdata)){
this.$Message.warning('复验单为空！')
}else{
var item=JSON.parse(ssdata)[0]["filePath"],
let ssdata = row.certificateUploadPath;
if (this.$u.isNull(ssdata)) {
this.$Message.warning("复验单为空！");
} else {
var item = JSON.parse(ssdata)[0]["filePath"],
url = fileUrlDown + item;
window.open(url)
window.open(url);
// this.$Message.warning('文件格式不支持')
}
},
removeCancel() {
this.deletelModal = false
this.deletelModal = false;
},
l(key) {
/*
......@@ -186,11 +204,11 @@ export default {
lastModifierUserId:'',
}
*/
let vkey = 'waitReview' + '.' + key
return this.$t(vkey) || key
}
}
}
let vkey = "waitReview" + "." + key;
return this.$t(vkey) || key;
},
},
};
</script>
<style lang="less">
</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