Skip to content

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

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

parents e6203135 963b2aa4
Show whitespace changes
Inline Side-by-side
Showing with 1320 additions and 1372 deletions
components/page/userSelect.vue
View file @ 788836a2
<template>
<div>
<div>
<div v-if="theme == 'list'" class="flex fd userSelect">
<div class="fg1 users">
<dl v-for="(g, i) in group" :key="i">
......@@ -12,19 +12,10 @@
<span class="ml20">({{ g.children.length }}人)</span>
</div>
<a class="op" @click="toggle(i)">
<Icon
:type="g.opened ? 'ios-arrow-up' : 'ios-arrow-down'"
size="24"
/>
<Icon :type="g.opened ? 'ios-arrow-up' : 'ios-arrow-down'" size="24" />
</a>
</dt>
<dd
v-show="g.opened"
v-for="(li, j) in g.children"
:key="j"
@click="checkItem(i, j, li)"
:class="{ checked: li.checked }"
>
<dd v-show="g.opened" v-for="(li, j) in g.children" :key="j" @click="checkItem(i, j, li)" :class="{ checked: li.checked }">
{{ li.userName }}
</dd>
</dl>
......@@ -48,27 +39,11 @@
</div>
</div>
<Select
v-else
:placeholder="placeholder"
v-model="name"
@on-change="change"
:multiple="multiple"
:departmentId="departmentId"
clearable
filterable
>
<Option
v-for="item in datas ? datas : dic"
:value="item.value"
:key="item.value"
:label="item.label"
>
<Select v-else :placeholder="placeholder" v-model="name" @on-change="change" :multiple="multiple" :departmentId="departmentId" clearable filterable>
<Option v-for="item in datas ? datas : dic" :value="item.value" :key="item.value" :label="item.label">
<div>
{{ item.label }}
<span style="color: #c3c3c3" v-if="item.cardNo"
>({{ item.cardNo }})</span
>
<span style="color: #c3c3c3" v-if="item.cardNo">({{ item.cardNo }})</span>
<br />
<span style="color: #c3c3c3" v-if="item.departmentTitle">{{
item.departmentTitle
......@@ -76,8 +51,9 @@
</div>
</Option>
</Select>
</div>
</div>
</template>
<script>
export default {
model: {
......@@ -144,22 +120,20 @@ export default {
// 加载人员
getselectuser(id) {
let url = `${systemUrl}/user/getselectuser`;
var paras={
var paras = {
// pageIndex: 1,
departmentId: id,
type: this.type,
roleTitle: this.roleTitle,
// pageSize: 0
};
if(this.type=99){//开发组
paras={
conditions:[
{
if (this.type == 99) { //开发组
paras = {
conditions: [{
fieldName: "UserType",
fieldValue: "2",
conditionalType: "Equal",
},
]
}, ]
};
}
this.$api
......@@ -344,8 +318,10 @@ export default {
},
};
</script>
<style lang="less">
@import "../../assets/css/custom.less";
.userSelect {
.users {
width: 100%;
......@@ -354,14 +330,17 @@ export default {
overflow: auto;
font-size: 14px;
}
dl {
width: 100%;
margin-bottom: 2px;
dt,
dd {
list-style: none;
padding: 0 15px;
}
dt {
width: 100%;
background: rgba(38, 128, 235, 0.1);
......@@ -369,6 +348,7 @@ export default {
font-weight: bold;
line-height: 48px;
color: rgba(81, 90, 110, 1);
a.op {
height: 26px;
width: 26px;
......@@ -378,23 +358,28 @@ export default {
line-height: 100%;
margin-top: 12px;
}
a.op:hover {
color: white;
background: rgba(38, 128, 235, 1.5);
border-radius: 4px;
}
}
dt.checked {
background: rgba(38, 128, 235);
color: white;
a.op {
color: white;
}
a.op:hover {
background: white;
color: rgba(38, 128, 235);
}
}
dd {
min-width: 120px;
line-height: 32px;
......@@ -405,6 +390,7 @@ export default {
border: 2px solid transparent;
color: @table-color;
margin: 10px;
a {
display: inline-flex;
width: 20px;
......@@ -415,11 +401,13 @@ export default {
align-items: center;
margin-top: 5px;
}
a:hover {
background: rgb(241, 14, 14);
color: white;
}
}
dd:hover {
// background: rgba(38, 128, 235, 1);
// border:1px solid rgba(38,128,235,0.1);
......@@ -428,13 +416,16 @@ export default {
// color: white;
cursor: pointer;
}
dd.checked {
border: 2px solid rgba(38, 128, 235, 1);
}
}
.footer {
margin-top: 5px;
min-height: 68px;
dl {
background: rgba(245, 246, 250, 1);
border: 1px solid rgba(220, 223, 230, 1);
......
pages/handle/examine1/detail.vue
View file @ 788836a2
<template>
<div class="detail table-detail">
<div class="detail table-detail">
<Row>
<Filed :span="6" :name="l('productName')">{{entity.productName}}</Filed>
<Filed :span="6" :name="l('mesCode')">{{entity.mesCode}}</Filed>
<Filed :span="6" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed>
<Filed :span="6" :name="l('stage')"><state code="plan.order.stage" :value="entity.stage+''" type="text"></state></Filed>
<Filed :span="6" :name="l('taskType')"><state code="plan.order.taskType" :value="entity.taskType+''" type="text"></state></Filed>
<Filed :span="6" :name="l('stage')" v-if="false">
<state code="plan.order.stage" :value="entity.stage+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('taskType')">
<state code="plan.order.taskType" :value="entity.taskType+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('quantity')">{{entity.quantity}}</Filed>
<Filed :span="6" :name="l('materialId')"><state code="plan.order.material" :value="entity.materialId+''" type="text"></state></Filed>
<Filed :span="6" :name="l('routing_Method')"><state code="plan.order.routingMethod" :value="entity.routing_Method+''" type="text"></state></Filed>
<Filed :span="6" :name="l('outer_Envelope_Size')">{{entity.outer_Envelope_Size}}</Filed>
<Filed :span="6" :name="l('materialId')" v-if="false">
<state code="plan.order.material" :value="entity.materialId+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('routing_Method')" v-if="false">
<state code="plan.order.routingMethod" :value="entity.routing_Method+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('outer_Envelope_Size')" v-if="false">{{entity.outer_Envelope_Size}}</Filed>
<Filed :span="6" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed>
<Filed :span="6" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed>
<Filed :span="6" :name="l('printSupply')"><state code="plan.order.printSupply" :value="entity.printSupply+''" type="text"></state></Filed>
<Filed :span="6" :name="l('guestName')"><state code="plan.order.guestName" :value="entity.guestName+''" type="text"></state></Filed>
<Filed :span="6" :name="l('printSupply')" v-if="false">
<state code="plan.order.printSupply" :value="entity.printSupply+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('guestName')" v-if="false">
<state code="plan.order.guestName" :value="entity.guestName+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('functionaryOffice')">{{entity.functionaryOffice}}</Filed>
<Filed :span="6" :name="l('functionaryOffice')" v-if="false">{{entity.functionaryOffice}}</Filed>
<Filed :span="6" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
<Filed :span="6" :name="l('taskInputDate')">{{entity.taskInputDate}}</Filed>
<Filed :span="6" :name="l('mainDepartmentId')"><state code="plan.order.mainDepartment" :value="entity.mainDepartmentId+''" type="text"></state></Filed>
<Filed :span="6" :name="l('technologyDocmentCode')">{{entity.technologyDocmentCode}}</Filed>
<Filed :span="6" :name="l('putintDocmentCode')">{{entity.putintDocmentCode}}</Filed>
<Filed :span="6" :name="l('outerDrawnNumber')">{{entity.outerDrawnNumber}}</Filed>
<Filed :span="6" :name="l('modelVersion')">{{entity.modelVersion}}</Filed>
<Filed :span="6" :name="l('designer')">{{entity.designer}}</Filed>
<Filed :span="6" :name="l('taskCode')">{{entity.taskCode}}</Filed>
<Filed :span="6" :name="l('mainRoutingPeople')">{{entity.mainRoutingPeople}}</Filed>
<Filed :span="6" :name="l('officeFunctionary')">{{entity.officeFunctionary}}v</Filed>
<Filed :span="6" :name="l('taskInputDate')" v-if="false">{{entity.taskInputDate}}</Filed>
<Filed :span="6" :name="l('mainDepartmentId')" v-if="false">
<state code="plan.order.mainDepartment" :value="entity.mainDepartmentId+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('technologyDocmentCode')" v-if="false">{{entity.technologyDocmentCode}}</Filed>
<Filed :span="6" :name="l('putintDocmentCode')" v-if="false">{{entity.putintDocmentCode}}</Filed>
<Filed :span="6" :name="l('outerDrawnNumber')" v-if="false">{{entity.outerDrawnNumber}}</Filed>
<Filed :span="6" :name="l('modelVersion')" v-if="false">{{entity.modelVersion}}</Filed>
<Filed :span="6" :name="l('designer')" v-if="false">{{entity.designer}}</Filed>
<Filed :span="6" :name="l('taskCode')" v-if="false">{{entity.taskCode}}</Filed>
<Filed :span="6" :name="l('mainRoutingPeople')" v-if="false">{{entity.mainRoutingPeople}}</Filed>
<Filed :span="6" :name="l('officeFunctionary')" v-if="false">{{entity.officeFunctionary}}v</Filed>
<Filed :span="6" :name="l('projectNumber')">{{entity.projectNumber}}</Filed>
<Filed :span="6" :name="l('batchNumber')">{{entity.batchNumber}}</Filed>
<Filed :span="6" :name="l('urgencyLevel')">
<state code="plan.order.urgencyLevel" :value="entity.urgencyLevel+''" type="text"></state>
</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
</Row>
</div>
</div>
</template>
<script>
import Api from '../api'
export default {
name: 'detail',
components: {
},
components: {},
props: {
idVal: {
type: String,
default: ''
}
},
async fetch({ store, params }) {
async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典
},
data() {
return {
entity: {
state:'',
state: '',
},
}
},
......@@ -58,9 +81,11 @@ export default {
this.dataImmut = []
this.dataMut = []
Api.get({ Id: this.idVal }).then((r) => {
Api.get({
Id: this.idVal
}).then((r) => {
if (r.success) {
let formStr=r.result.formData.replace(/\"/g, '"')
let formStr = r.result.formData.replace(/\"/g, '"')
this.entity = JSON.parse(formStr)[0]
} else {
......
pages/handle/index.vue
View file @ 788836a2
<template>
<div class="myBug">
<div class="myBug">
<Tabs :animated="false" @on-click="tab" value="3">
<TabPane label="我发起的" name="0"></TabPane>
<TabPane label="待我审批的" name="1"></TabPane>
......@@ -9,71 +8,31 @@
<Task v-if="tabIndex == 4"></Task>
</TabPane>
</Tabs>
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:high="false"
v-show="tabIndex != 4"
:height="gridHeight"
>
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" v-show="tabIndex != 4" :height="gridHeight">
<template slot="easySearch">
<Row style="line-height: 32px; width: 1000px">
<Col span="5">
<Select
v-model="easySearch.schemaId.value"
style="width: 200px"
clearable
placeholder="请选择审批类别"
transfer
>
<Select v-model="easySearch.schemaId.value" style="width: 200px" clearable placeholder="请选择审批类别" transfer>
<Option value class="option-text">请选择审批类别</Option>
<Option
:value="item.id"
:label="item.name"
:key="index"
v-for="(item, index) in schemaList"
></Option>
<Option :value="item.id" :label="item.name" :key="index" v-for="(item, index) in schemaList"></Option>
</Select>
</Col>
<Col span="10">
<DTSearch
v-model="easySearch.range.value"
@on-change="setTime"
type="date"
></DTSearch>
<DTSearch v-model="easySearch.range.value" @on-change="setTime" type="date"></DTSearch>
</Col>
<Col span="9">
<Input
search
enter-button
placeholder="请输入编号"
@on-search="search"
v-model="easySearch.keys.value"
/>
<Input search enter-button placeholder="请输入编号" @on-search="search" v-model="easySearch.keys.value" />
</Col>
</Row>
</template>
</DataGrid>
<!-- 审批modal -->
<Modal
v-model="modalOrderExamine"
:title="titleOrderExamine"
footer-hide
fullscreen
@on-cancel="cancelModal"
>
<iframe
width="100%"
id="mainFrame"
:height="iframeHeight"
frameborder="0"
:src="srcUrl"
></iframe>
<Modal v-model="modalOrderExamine" :title="titleOrderExamine" footer-hide fullscreen @on-cancel="cancelModal">
<iframe width="100%" id="mainFrame" :height="iframeHeight" frameborder="0" :src="srcUrl"></iframe>
</Modal>
</div>
</div>
</template>
<script>
import Api from "./api";
import Task from "./task";
......@@ -87,18 +46,29 @@ export default {
show: false,
action: Api.index,
easySearch: {
type: { op: "Equal", value: 1 }, // 1我发起的 2待我审批的 3 我已审批的
keys: { op: "code", value: "" },
schemaId: { op: "Equal", value: null }, //审批类别
range: { op: "Range", value: null },
type: {
op: "Equal",
value: 1
}, // 1我发起的 2待我审批的 3 我已审批的
keys: {
op: "code",
value: ""
},
schemaId: {
op: "Equal",
value: null
}, //审批类别
range: {
op: "Range",
value: null
},
},
schemaList: [],
results: [],
footerBar: false,
modalInfo: false,
tabIndex: 4,
columns: [
{
columns: [{
key: "id",
width: 80,
title: this.l("id"),
......@@ -122,15 +92,10 @@ export default {
high: true,
code: "Handle.todoList.status",
},
{
title: this.l("creatorUserId"),
key: "creatorUserId",
hide: true,
},
{
title: this.l("creator"),
key: "creator",
align: "center",
key: "creatorUserId",
type: "user"
},
{
title: this.l("creationTime"),
......@@ -174,10 +139,11 @@ export default {
title: "操作",
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
return h("div", {
class: "action"
}, [
h(
"op",
{
"op", {
attrs: {
oprate: "detail",
title: this.tabIndex == 2 ? "审核" : "查看",
......@@ -227,7 +193,10 @@ export default {
this.getSchema();
},
computed: {},
async fetch({ store, params }) {
async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
......@@ -327,6 +296,7 @@ export default {
},
};
</script>
<style lang="less">
.ivu-modal-fullscreen-no-footer .ivu-modal-body {
padding: 0px;
......
pages/mesPlan/index.vue
View file @ 788836a2
......@@ -697,6 +697,7 @@ export default {
if (res.success) {
this.$Message.success("订单送审成功!");
this.$refs.grid.load();
this.sendViewModal = false;
} else {
this.$Message.error("订单送审失败!");
}
......
pages/resource/resource/index.vue
View file @ 788836a2
<template>
<Layout class="full">
<Layout class="full">
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<StoreTree @on-hide="onHide" @on-select="productSearch" />
</Sider>
......@@ -11,26 +11,11 @@
</div>
<Content class="content" :class="!showMenu?'con_bord':''">
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:batch="true"
:format="checkData"
@all-change="allchange"
@on-selection-change="onSelect"
exportTitle="制造资源"
>
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :batch="true" :format="checkData" @all-change="allchange" @on-selection-change="onSelect" exportTitle="制造资源">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
clearable
placeholder="请输入资源名称/资源编码/编码"
v-model.trim="easySearch.keys.value"
v-width="260"
/>
<Input clearable placeholder="请输入资源名称/资源编码/编码" v-model.trim="easySearch.keys.value" v-width="260" />
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
......@@ -43,7 +28,7 @@
<template slot="buttons">
<Button type="primary" @click="add">入库</Button>
<!-- <Button type="primary" @click="returnModel=true">归还</Button> -->
<Badge :count="this.$store.state.count" overflow-count="99" style="margin-right:5px;">
<Badge :count="this.$store.state.count" overflow-count="99" style="margin-right:5px;" :offset='postion'>
<Button icon="md-cart" @click="showCart">借出车</Button>
</Badge>
<Button @click="openModalIm">导入</Button>
......@@ -53,32 +38,11 @@
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide :fullscreen="fscreeen">
<component
:is="detail"
:eid="curId"
:rootName="rootName"
:storeTitle="storeTitle"
:materialType="materialType"
:codeRuleType="codeRuleType"
:storeId="storeId"
:mcode="mCode"
:cartList="this.$u.clone(this.$store.state.cart)"
@on-close="cancel"
@on-ok="ok"
@substr="substr"
/>
<component :is="detail" :eid="curId" :rootName="rootName" :storeTitle="storeTitle" :materialType="materialType" :codeRuleType="codeRuleType" :storeId="storeId" :mcode="mCode" :cartList="this.$u.clone(this.$store.state.cart)" @on-close="cancel" @on-ok="ok" @substr="substr" />
</Modal>
<ImportExcel
ref="importExcel"
@on-get-data="getData"
modalTitle="制造资源"
:columns="columns"
:open="ModalIm"
@on-cancel="ModalImCancel"
@on-ok="ok"
/>
<ImportExcel ref="importExcel" @on-get-data="getData" modalTitle="制造资源" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
</Content>
</Layout>
</Layout>
</template>
<script>
......@@ -104,6 +68,7 @@ export default {
value: null,
},
},
postion: [10, 10],
fscreeen: false,
modal: false,
title: "新增",
......@@ -114,8 +79,7 @@ export default {
storeTitle: "",
materialType: "",
mCode: "",
columns: [
{
columns: [{
key: "selection",
type: "selection",
width: 50,
......@@ -137,8 +101,7 @@ export default {
width: 60,
render: (h, params) => {
return h(
"div",
{
"div", {
class: "action",
},
[
......@@ -294,22 +257,18 @@ export default {
hide: false,
render: (h, params) => {
return h(
"div",
{
"div", {
class: "action",
},
[
h(
"op",
{
"op", {
attrs: {
oprate: "delete",
title: "删除",
},
class:
params.row.totalNum === params.row.numberAvailable
? "remove"
: "disable",
class: params.row.totalNum === params.row.numberAvailable ?
"remove" : "disable",
on: {
click: () => this.remove(params.row),
},
......@@ -317,8 +276,7 @@ export default {
"删除"
),
h(
"op",
{
"op", {
attrs: {
oprate: "detail",
title: "查看日志",
......@@ -359,7 +317,10 @@ export default {
})();
};
},
async fetch({ store, params }) {
async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
computed: {},
......
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