Skip to content

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

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents fb0ffe0e ec14afb1
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 52 deletions
i18n/locale/zh-CN.js
View file @ 02e981c2
......@@ -1568,5 +1568,33 @@ export default {
unitPrice: '单价',
originalManufacturer: '原厂家',
remark: '备注',
}
materialCode:'物料编码',
},
stock_item:{
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'更新时间',
lastModifierUserId:'更新人',
isDeleted:'删除人',
deletionTime:'删除时间',
deleterUserId:'删除人',
name:'名称',
materialType:'类型',
brand:'牌号',
specifications:'规格',
originalManufacturer:'原厂家',
batch:'批次',
unitPrice:'单价',
certificateOfApproval:'合格证',
storeId:'',
storeTitle:'库位',
creator:'',
stockId:'物料库存主键',
total:'入库数量',
remark:'备注',
code:'入库编号',
materialId:'物料id',
materialCode:'物料编码',
nowTotal:'剩余数量',
}
}
package-lock.json
View file @ 02e981c2
......@@ -21585,9 +21585,9 @@
"dev": true
},
"throttle-debounce": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.1.0.tgz",
"integrity": "sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg=="
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.2.1.tgz",
"integrity": "sha512-i9hAVld1f+woAiyNGqWelpDD5W1tpMroL3NofTz9xzwq6acWBlO2dC8k5EFSZepU6oOINtV5Q3aSPoRg7o4+fA=="
},
"through": {
"version": "2.3.8",
......@@ -22179,9 +22179,9 @@
}
},
"viewerjs": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.5.0.tgz",
"integrity": "sha512-ZiJ0vrXDvomLSY3ixaZCJtmdenomsvPPQwZKwvtXUMCiO2HHtFGoB/KqpS9QzABSeKaRLfcENp1uRYJ7l1MkYQ=="
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.6.1.tgz",
"integrity": "sha512-2c6hURX1kaHNCluP0l+7nkI26/GBcQqpMRA4PGC3EsJ48lSpjYXK8C1pHC84q9kf4otANwxH2Nw8HAOk69ZTig=="
},
"vm-browserify": {
"version": "1.1.2",
......
pages/material/api.js
View file @ 02e981c2
......@@ -26,4 +26,8 @@ export default {
setminnum(params) {
return Api.post(`${resourceUrl}/stock/setminnum`, params);
},
indexStockitem: `${resourceUrl}/stockitem/paged`,
pagedStockitem(params) {
return Api.post(`${resourceUrl}/stockitem/paged`, params);
},
}
pages/material/edit.vue
View file @ 02e981c2
......@@ -177,6 +177,7 @@ export default {
},
watch: {
eid(v) {
alert(v)
if (v != 0) {
this.load(v);
}
......
pages/material/index.vue
View file @ 02e981c2
......@@ -13,22 +13,19 @@
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入物料名称/库位名称" v-model="easySearch.keys.value" v-width="240" />
<Input placeholder="请输入物料名称/物料编码/库位名称" v-model="easySearch.keys.value" v-width="260" />
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
</Form>
</template>
<template slot="searchForm">
<Search />
</template>
<template slot="buttons">
<Button type="primary" @click="add">入库</Button>
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
<Modal v-model="modal" :title="title" width="1200" footer-hide :fullscreen="fscreeen">
<component :is="detail" :eid="curId" :storeId="storeId" :mcode="mCode" @on-close="cancel" @on-ok="ok" />
</Modal>
</Content>
</Layout>
......@@ -51,12 +48,15 @@ export default {
action: Api.index,
showMenu: true,
easySearch: {
keys: { op: "name,storeTitle", value: null }
keys: { op: "name,storeTitle,materialCode", value: null }
},
fscreeen: false,
modal: false,
title: "新增",
detail: null,
curId: 0,
storeId:null,
mCode: "",
columns: [
{
key: "name",
......@@ -64,6 +64,13 @@ export default {
align: "left",
easy: true,
high: true
},
{
key: "materialCode",
title: this.l("materialCode"),
align: "left",
easy: true,
high: true
},
{
key: "total",
......@@ -71,10 +78,9 @@ export default {
align: "right",
high: true,
render: (h, params) => {
let minNum=0
if(params.row.minNum)
{
minNum=params.row.minNum
let minNum = 0;
if (params.row.minNum) {
minNum = params.row.minNum;
}
return h(
"Tooltip",
......@@ -84,7 +90,7 @@ export default {
placement: "top",
disabled: params.row.total > minNum ? true : false
},
class:params.row.total > minNum ? "" : "red"
class: params.row.total > minNum ? "" : "red"
},
params.row.total
);
......@@ -118,7 +124,6 @@ export default {
{
attrs: {
oprate: "detail",
title: "设置最低库存"
},
on: { click: () => this.setNum(params.row) }
},
......@@ -128,7 +133,7 @@ export default {
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.view(params.row.id) }
on: { click: () => this.view(params.row) }
},
"查看"
)
......@@ -181,6 +186,7 @@ export default {
ok() {
this.$refs.grid.load();
this.modal = false;
this.fscreeen = false;
this.curId = 0;
},
search() {
......@@ -190,6 +196,7 @@ export default {
this.curId = 0;
this.title = "新增";
this.detail = () => import("./add");
this.fscreeen = false;
this.modal = true;
},
copy(id) {
......@@ -198,10 +205,13 @@ export default {
this.detail = () => import("./add");
this.modal = true;
},
view(id) {
this.curId = id;
view(row) {
this.curId = row.id;
this.storeId=row.storeId;
this.mCode = row.materialCode;
this.title = "详情";
this.detail = () => import("./detail");
this.detail = () => import("./itemIndex");
this.fscreeen = true;
this.modal = true;
},
edit(id) {
......@@ -238,6 +248,7 @@ export default {
this.curId = row.id;
this.title = "设置最低库存";
this.detail = () => import("./setNum");
this.fscreeen = false;
this.modal = true;
},
l(key) {
......
pages/material/itemIndex.vue 0 → 100644
View file @ 02e981c2
<template>
<div>
<span class="mr20">物料名称：{{materialName}}</span>
<span class="mr20">物料编码：{{mcode}}</span>
<span>库位：{{storeTitle}}</span>
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:tool="false"
:height="treeHeight"
></DataGrid>
</div>
</template>
<script>
import Api from "./api";
export default {
name: "list",
head: {
title: "入库明细",
author: "henq",
description: "stock_item 7/13/2020 6:04:18 PM"
},
data() {
return {
action: Api.indexStockitem,
easySearch: {
materialCode: { op: "Equal", value: this.mcode },
storeId: { op: "In", value: this.storeId }
},
data: [],
treeHeight: 300,
curId: 0,
columns: [
{
key: "code",
title: this.l("code"),
align: "left",
easy: true,
high: true
},
{ key: "total", title: this.l("total"), align: "right", high: true },
{
key: "nowTotal",
title: this.l("nowTotal"),
align: "right",
high: true
},
{ key: "batch", title: this.l("batch"), align: "left", high: true },
{
key: "certificateOfApproval",
title: this.l("certificateOfApproval"),
align: "left",
high: true
},
{
key: "unitPrice",
title: this.l("unitPrice"),
align: "right",
high: true
},
{
key: "originalManufacturer",
title: this.l("originalManufacturer"),
align: "left",
high: true
},
{
key: "creationTime",
title: this.l("creationTime"),
align: "center",
high: true
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
align: "left",
high: true,
type: "user"
},
{
key: "remark",
title: this.l("remark"),
align: "left",
high: true,
tooltip: true
}
],
materialName: "",
storeTitle: ""
};
},
props: {
eid: Number,
storeId: Number,
mcode: String
},
created() {
this.treeHeight = window.innerHeight - 150;
},
mounted() {
this.load();
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.treeHeight = window.screenHeight - 150;
})();
};
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
load() {
Api.get({ id: this.eid }).then(r => {
this.materialName = r.result.name;
this.storeTitle = r.result.storeTitle;
});
},
ok() {
this.$refs.grid.load();
this.modal = false;
this.curId = 0;
},
search() {
this.$refs.grid.reload(this.easySearch);
},
cancel() {
this.curId = 0;
this.modal = false;
},
l(key) {
let vkey = "stock_item" + "." + key;
return this.$t(vkey) || key;
}
},
watch: {
eid(v) {
if (v != 0) {
// this.load(v);
}
}
}
};
</script>
<style lang="less">
</style>
\ No newline at end of file
pages/material/setNum.vue
View file @ 02e981c2
......@@ -13,7 +13,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('minNum')" prop="minNum">
<InputNumber v-model="entity.minNum"></InputNumber>
<InputNumber v-model="entity.minNum" :min="0"></InputNumber>
</FormItem>
</Col>
</Row>
......@@ -53,6 +53,11 @@ export default {
},
methods: {
handleSubmit() {
if(this.entity.minNum==0)
{
this.$Message.error("设置最低库存不能小于1");
return
}
let params = {
id: this.entity.id,
minNum: this.entity.minNum
......@@ -80,6 +85,9 @@ export default {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
if (!r.result.minNum) {
this.entity.minNum = 0;
}
});
},
l(key) {
......
pages/order/quotation/components/generateQuotation.vue
View file @ 02e981c2
......@@ -13,7 +13,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>报价单编号：XCHD-BJ-20191025001</p>
......
pages/order/quotation/components/metalDetails.vue
View file @ 02e981c2
......@@ -24,7 +24,7 @@
<div class="dan-hao">报价单号：{{resultDetils.length>0?resultDetils[0].code:""}}</div>
<div class="ri-qi">报价日期：{{resultDetils.length>0?resultDetils[0].creationTime:""}}</div>
</div>
<div class="title-name">北京星驰恒动科技发展有限公司</div>
<div class="title-name">北京××科技发展有限公司</div>
<div class="js-title">{{resultDetils.length>0?resultDetils[0].quotationTypeName:""}}</div>
<div class="box-title">
<Row type="flex" justify="space-between" class="code-row-bg">
......@@ -42,7 +42,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>报价单编号：{{resultDetils.length>0?resultDetils[0].code:""}}</p>
......@@ -116,7 +116,7 @@
</Row>
</div>
<div class="footers">
<div>北京星驰恒动科技发展有限公司</div>
<div>北京××科技发展有限公司</div>
<div>地址：北京海淀区中关村南三街18号 &nbsp; &nbsp; &nbsp; 邮编：100190</div>
<div>网址：http://www.bs-xchd.com/</div>
</div>
......
pages/order/quotation/components/metalDetailsExamine.vue
View file @ 02e981c2
......@@ -10,7 +10,7 @@
<div class="dan-hao">报价单号：{{resultDetils.length>0?resultDetils[0].code:""}}</div>
<div class="ri-qi">报价日期：{{resultDetils.length>0?resultDetils[0].creationTime:""}}</div>
</div>
<div class="title-name">北京星驰恒动科技发展有限公司</div>
<div class="title-name">北京××科技发展有限公司</div>
<div class="js-title">{{resultDetils.length>0?resultDetils[0].quotationTypeName:""}}</div>
<div class="box-title">
<Row type="flex" justify="space-between" class="code-row-bg">
......@@ -28,7 +28,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>报价单编号：{{resultDetils.length>0?resultDetils[0].code:""}}</p>
......
pages/order/quotation/components/metalQuotationGeneration.vue
View file @ 02e981c2
......@@ -58,7 +58,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>
......
pages/order/quotation/components/photosensitiveDetails.vue
View file @ 02e981c2
......@@ -24,7 +24,7 @@
<div class="ri-qi">报价日期：{{resultDetils.length>0?resultDetils[0].creationTime:""}}</div>
</div>
<div class="title-name">北京星驰恒动科技发展有限公司</div>
<div class="title-name">北京××科技发展有限公司</div>
<div class="js-title">{{resultDetils.length>0?resultDetils[0].quotationTypeName:""}}</div>
<div class="box-title">
<Row type="flex" justify="space-between" class="code-row-bg">
......@@ -42,7 +42,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>报价单编号：{{resultDetils.length>0?resultDetils[0].code:""}}</p>
......@@ -109,7 +109,7 @@
</Row>
</div>
<div class="footers">
<div>北京星驰恒动科技发展有限公司</div>
<div>北京××科技发展有限公司</div>
<div>地址：北京海淀区中关村南三街18号 &nbsp; &nbsp; &nbsp; 邮编：100190</div>
<div>网址：http://www.bs-xchd.com/</div>
</div>
......
pages/order/quotation/components/photosensitiveDetailsExamine.vue
View file @ 02e981c2
......@@ -10,7 +10,7 @@
<div class="ri-qi">报价日期：{{resultDetils.length>0?resultDetils[0].creationTime:""}}</div>
</div>
<div class="title-name">北京星驰恒动科技发展有限公司</div>
<div class="title-name">北京××科技发展有限公司</div>
<div class="js-title">{{resultDetils.length>0?resultDetils[0].quotationTypeName:""}}</div>
<div class="box-title">
<Row type="flex" justify="space-between" class="code-row-bg">
......@@ -28,7 +28,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>报价单编号：{{resultDetils.length>0?resultDetils[0].code:""}}</p>
......
pages/order/quotation/components/photosensitiveGeneration.vue
View file @ 02e981c2
......@@ -58,7 +58,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>
......
pages/processDesign/Process/processview.vue
View file @ 02e981c2
......@@ -5,9 +5,9 @@
<Button class="fr" v-if="isoutpdf" type="primary" @click="$u.outPdf('.outP','工艺规程')">导出pdf</Button>
</div>
<div class="outP">
<div class="iviewimg">
<img class="imglogo" src="./image/logo.jpg" alt />
</div>
<!--<div class="iviewimg">
<img class="imglogo" src="./image/logo.jpg" alt />
</div>-->
<div v-if="formValidate.routingType==1" class="table_box part01" style="min-height:400px">
<Row class="table_row" style="width:100%">
<Col span="3">
......
pages/processDesign/Process/tan.vue
View file @ 02e981c2
......@@ -209,7 +209,7 @@ export default {
.logoimg{
width: 100%;
height: 80px;
background: url(./image/logo.jpg) no-repeat center;
// background: url(./image/logo.jpg) no-repeat center;
}
.h3title{
......
pages/processDesign/setProcess/components/generateQuotation.vue
View file @ 02e981c2
......@@ -6,7 +6,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>报价单编号：XCHD-BJ-20191025001</p>
......
pages/processManage/Process/tan.vue
View file @ 02e981c2
......@@ -209,7 +209,7 @@ export default {
.logoimg{
width: 100%;
height: 80px;
background: url(./image/logo.jpg) no-repeat center;
// background: url(./image/logo.jpg) no-repeat center;
}
.h3title{
......
pages/processManage/setProcess/components/generateQuotation.vue
View file @ 02e981c2
......@@ -6,7 +6,7 @@
<div class="box-dz">
<Row>
<Col span="12">
<p>供方名称：北京星驰恒动科技发展有限公司</p>
<p>供方名称：北京××科技发展有限公司</p>
</Col>
<Col span="12" style="text-align:right;">
<p>报价单编号：XCHD-BJ-20191025001</p>
......
pages/technology/productMix/product/index.vue
View file @ 02e981c2
......@@ -32,17 +32,19 @@
<template slot="card" slot-scope="{row}">
<div class="body-card">
<Row class="title-i">
<Col :span="12">名称：{{row.name}}</Col>
<Col :span="12" class="btn-click">物料编号：{{row.mmcode}}</Col>
<Col :span="16">
<Ellipsis :text="row.name" :length="12" tooltip />
</Col>
<Col :span="8" class="btn-click">{{row.mmcode}}</Col>
</Row>
<Row class="row-down" :gutter="20">
<Row class="row-down" :gutter="10">
<Col span="7">
<div class="img-i">
<img :src="downUrl +row.productUrl" />
</div>
</Col>
<Col span="17" class="c">
<div>产品分类：{{row.levelTitle}}</div>
<div>分类：{{row.levelTitle}}</div>
<div>图号：{{row.drawingNo}}</div>
<div>主制单位：{{row.madeCompanyTitle}}</div>
<p class="a-icon">
......
static/config.js
View file @ 02e981c2
......@@ -22,7 +22,8 @@ window.workflowUrl = `http://${address}:10000/workflow`; // 工作流地址
window.certificateUrl = `http://${address}:10000/qms`; //质量
window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管理
// window.apsUrl = `http://${address}:10000/aps`;//aps排产
window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产
//window.apsUrl = `http://${systemApi.aps}:10000/api/services/app`;//aps排产(168)
window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产(61)
window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口
window.iconImg = `/imgicon/`;
window.material = `http://${address}:10000/material`; //物料管理
......
static/static/base.css
View file @ 02e981c2
......@@ -1015,8 +1015,8 @@ html [type=button] {
.outP .logoimg {
width: 100%;
height: 80px;
background: url(/static/logo.jpg) no-repeat center -22px;
/* height: 80px;
background: url(/static/logo.jpg) no-repeat center -22px;*/
}
.outP .h3title {
......
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