Skip to content

M
mes-ui
Commit c66e23ce authored by 佟礼's avatar 佟礼
Browse files
Options

Merge branch 'product' of 39.98.128.195:zhouyx/mes-ui into product

parents aac022b3 13a642ab
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2265 additions and 746 deletions
assets/css/base.less
View file @ c66e23ce
......@@ -15,6 +15,25 @@ html body {
ul,li{
list-style: none;
}
div::-webkit-scrollbar{
width:10px;
height:10px;
/**/
}
div::-webkit-scrollbar-track{
background: rgb(239, 239, 239);
border-radius:2px;
}
div::-webkit-scrollbar-thumb{
background:rgba(38,128,235,0.5);
border-radius:10px;
}
div::-webkit-scrollbar-thumb:hover{
background: rgba(38,128,235,0.8);
}
div::-webkit-scrollbar-corner{
background: rgba(38,128,235,1);
}
/*flex*/
.flex{
display: flex;
......@@ -23,6 +42,9 @@ ul,li{
.fc-m{
justify-content: center;
}
.fa-m{
align-items: center;
}
.fc-e{
justify-content: flex-end;
}
......@@ -38,6 +60,9 @@ ul,li{
.fg{
flex-grow: 1;
}
.fs{
flex-shrink: 0;
}
.fg2{
flex-grow: 2;
}
......@@ -1270,4 +1295,45 @@ html [type=button] {
//显示富文本框样式
.detail .ivu-row .filed-col p .html p{
margin: 0 10px 0 0;
}
\ No newline at end of file
}
.lay100 {
height: calc(100vh - 105px);
background-color: #f5f6fa;
.con {
padding: 5px 5px 0px 10px;
}
.con_bord {
// margin: 15px 32px;
box-shadow: #c7c7c7 1px 2px 7px 3px;
}
background: rgba(245, 246, 250, 1);
}
.menu_side{
background: #fff!important;
margin: 5px 0 0 0!important;
border: 1px solid #dcdee2!important;
}
.show_menu{
width: 30px;
height: 30px;
position: fixed;
top: 100px;
left: 0;
z-index: 9;
.menu_play{
width: 30px;
height: 30px;
line-height: 34px;
font-size: 14px;
text-align: center;
color: #515A6E;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
background: #ffffff;
box-shadow: #ccc 2px 2px 4px 1px;
}
.menu_play:hover{
background-color: #2d8cf0;
color: white;
}
}
\ No newline at end of file
components/page/files.vue
View file @ c66e23ce
......@@ -20,6 +20,7 @@
<p>将文件拖到此处，或点击上传</p>
</div>
<Button icon="ios-cloud-upload-outline" v-if="!cloudIco">上传文件</Button>
<span style="font-size:10px;color:#aaa" v-if="fileFormat">文件格式：{{JSON.stringify(formatList).replace('[', '').replace(']', '').replace(/\"/g, '')}}；文件最大：{{maxSize}}k</span>
</Upload>
<Progress :percent="per" :stroke-width="5" v-show="vshowPro" />
<Tag
......@@ -47,7 +48,7 @@ export default {
fileUrlPath: "",
nameList: [],
hbaseFileListNew: [],
formatList: ["png", "jpg", "gif"],
formatList: ["jpg","gif","png"],
multiple: true,
postUrl: "",
style: "",
......@@ -81,6 +82,10 @@ export default {
cloudIco: {
type: Boolean,
default: false
},
fileFormat:{
type: Boolean,
default: false
}
},
methods: {
......@@ -155,15 +160,15 @@ export default {
formatL() {
if (this.files) {
this.formatList = [
"jpg",
"gif",
"png",
"pdf",
"docx",
"doc",
"xls",
"xlsx",
"txt",
"png",
"jpg",
"gif"
];
}
return this.formatList;
......
components/page/productTree.vue
View file @ c66e23ce
......@@ -132,7 +132,7 @@ export default {
padding-left: 10px;
}
.tree {
height: calc(100vh - 200px);
height: calc(100vh - 215px);
overflow: auto;
}
}
......
components/page/userSelect.vue
View file @ c66e23ce
This diff is collapsed.
i18n/locale/zh-CN.js
View file @ c66e23ce
......@@ -1187,7 +1187,7 @@ export default {
isDeleted: '是否删除',
platesnum: '板数',
isEffect: '生效',
versionnotes: '版本',
versionnotes: '版本说明',
phase: '阶段',
versionid: '版本ID',
isSendPpm: '发送PPM',
......@@ -1251,7 +1251,8 @@ export default {
routingStepId: '工步ID',
quantity: '数量',
singlequantity: '总计数量',
routingDetailName: '工序名称',
routingDetailNo:'工序号',
materialId: '物料id',
materialType: '物料类型',
materialNumber: '物料编号',
......@@ -1323,7 +1324,8 @@ export default {
routingHeaderId: '工艺ID',
routingHeaderName: '工艺',
routingDetailId: '工序ID',
routingDetailName: '工序',
routingDetailName: '工序名称',
routingDetailNo:'工序号',
routingStepId: '工步ID',
checkContent: '检测内容',
checkType: '检测类型',
......@@ -1357,7 +1359,8 @@ export default {
routingHeaderId: '工艺ID',
routingHeaderName: '工艺',
routingDetailId: '工序ID',
routingDetailName: '工序',
routingDetailName: '工序名称',
routingDetailNo:'工序号',
routingStepId: '工步ID',
quantity: '数量',
materialId: '物料id',
......
layouts/basic-layout/product.vue
View file @ c66e23ce
......@@ -399,7 +399,8 @@ export default {
z-index: 99999;
left: 56%;
top: 57%;
min-width: 1084px;
// min-width: 1084px;
min-width: 777px;
min-height: 300px;
box-shadow: 0px 5px 17px 5px rgba(0, 0, 0, 0.28);
background: #f5f6fa;
......
package-lock.json
View file @ c66e23ce
......@@ -9538,7 +9538,8 @@
"dependencies": {
"deepmerge": {
"version": "2.2.1",
"bundled": true
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
}
}
},
......@@ -19890,7 +19891,8 @@
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true
"dev": true,
"optional": true
},
"rx-lite-aggregates": {
"version": "4.0.8",
......
pages/aps/complete/index.vue
View file @ c66e23ce
......@@ -5,9 +5,9 @@
<Col :span="10" class="chan-chi">整机排产-排产池</Col>
<Col :span="14" class="l-ringht">
<!-- <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
<Radio label="0">未排产</Radio> -->
<!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> -->
<Radio label="0">未排产</Radio>-->
<!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> -->
<!-- </RadioGroup> -->
</Col>
</Row>
......@@ -58,19 +58,8 @@
<Radio label="1">班组</Radio>
</RadioGroup>
</FormItem>
<FormItem label="人员" v-if="formItem.radio==0">
<UserSelect
ref="userSelected"
v-model="formItem.userIds"
style="width:300px"
:multiple="true"
/>
<!-- <Dictionary
disabled
code="aps.scheduling.groupingForm"
v-model="formItem.resourcesType"
type="radio"
></Dictionary>-->
<FormItem v-if="formItem.radio==0">
<UserSelect v-model="user" :multiple="true" theme="list" />
</FormItem>
<FormItem label="班组" v-if="formItem.radio==1">
<Select v-model="formItem.shopId" placeholder="请选择" style="width:300px">
......@@ -122,14 +111,10 @@
</div>
</template>
<script>
import CheckboxList from "./checkboxList";
import Api from "./api";
export default {
name: "list",
components: {
CheckboxList
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
......@@ -202,8 +187,8 @@ export default {
if (r.success) {
r.result.map(e => {
e.checked = false;
e.demandFinishDate = e.demandFinishDate.substr(0,10)
e.demandStartDate = e.demandStartDate.substr(0,10)
e.demandFinishDate = e.demandFinishDate.substr(0, 10);
e.demandStartDate = e.demandStartDate.substr(0, 10);
});
this.list = r.result;
}
......@@ -243,7 +228,7 @@ export default {
// }
let params1 = {
orderIds: this.orderIds,
userIds: this.formItem.userIds,
userIds: this.user,
beginTime: this.formItem.beginTime,
endTime: this.formItem.endTime,
remark: this.formItem.remark
......@@ -254,7 +239,7 @@ export default {
this.$Message.success("下发成功");
this.orderlist(this.status);
this.orderIds = [];
this.showSet = false;
this.showSet = false;
} else {
this.$Message.success("下发失败");
this.formItem = {};
......
pages/aps/dispatch/index.vue
View file @ c66e23ce
......@@ -66,7 +66,6 @@
</p>
<p>{{li.beginTime}}--{{li.endTime}}</p>
<p>人员 ：{{li.userNames}}</p>
<!-- <p>设备 ：{{item.equipCode}}</p> -->
</div>
</Card>
</Col>
......@@ -105,7 +104,6 @@
v-else-if="item.dispatchStatus!=2 && item.pid != 0"
@click="removeDetail(item,index)"
></op>
<!-- -->
</p>
<p>{{item.beginTime}}--{{item.endTime}}</p>
<p>人员 ：{{item.userNames}}</p>
......@@ -135,7 +133,8 @@
</span>
</p>
<div class="dispatch_part_body" :style="{height:byheight}">
<h4 class="tc" v-if="listMan.length==0 || listSheBei.length==0">暂无数据</h4>
<h4 class="tc" v-if="listSheBei.length==0 && button2 == '设备'">暂无数据</h4>
<h4 class="tc" v-else-if="listMan.length==0 && button2 == '人员'">暂无数据</h4>
<div class="shebei" v-if="button2 == '设备'">
<Row :gutter="15">
<!-- {{shebeiId}} -->
......@@ -200,8 +199,7 @@
:mask-closable="false"
ok-text="拆分"
@on-ok="okChai()"
>
拆分数量:
> 拆分数量:
<Tag>{{chaiNum}}</Tag>
<Slider v-model="chaiNum" :max="maxnum" show-stops :min="1"></Slider>
</Modal>
......@@ -232,8 +230,7 @@
v-model="entity.userIds"
:multiple="true"
style="width: 500px"
/>
<!-- :type="3" -->
/><!-- :type="3" -->
</FormItem>
</Col>
<Col span="24" class="drawer_midell">
......@@ -268,12 +265,9 @@
<FormItem label="工时" prop="taskTime">
<DatePicker
v-model="pentity.taskTime"
type="datetimerange"
placement="bottom-start"
:options="dateRange"
@on-change="handleChange"
placeholder="请选择时间段"
style="width: 330px"
type="datetimerange" placement="bottom-start"
:options="dateRange" @on-change="handleChange"
placeholder="请选择时间段" style="width: 330px"
></DatePicker>
</FormItem>
</Col>
......@@ -285,13 +279,9 @@
<Col span="24">
<FormItem label="备注" style="width:100%">
<Input
maxlength="200"
v-model="pentity.remark"
type="textarea"
:autosize="{minRows: 3,maxRows: 5}"
show-word-limit
class="drawer_row_textarea"
/>
maxlength="200" v-model="pentity.remark"
type="textarea" :autosize="{minRows: 3,maxRows: 5}"
show-word-limit class="drawer_row_textarea"/>
</FormItem>
</Col>
</Row>
......@@ -317,8 +307,7 @@ export default {
listShow: "订单",
shebei: "",
curTask:null,
dateRange: {
//禁选工时时间区间
dateRange: {//禁选工时时间区间
disabledDate(date) {
return date && date.valueOf() < Date.now() - 86400000;
}
......@@ -454,9 +443,7 @@ export default {
res.result.map(u => {
if (u.pid) {
pid = u.pid;
} else {
pid = 0;
}
} else { pid = 0;}
let detailnew = {
beginTime: u.beginTime, //开始时间
dispatchStatus: u.dispatchStatus, //
......@@ -499,7 +486,6 @@ export default {
},
// 过滤条件
changeStatus(a) {
// console.log(a)
this.getUserInfoFn();
},
// 打开抽屉
......@@ -509,7 +495,6 @@ export default {
let timebegin = formData[0].beginTime;
let timend = formData[0].endTime;
this.newList = [];
// console.log("选中的id",chekids)
chekids.forEach(v => {
var item = formData.filter(u => {
return u.id == v;
......@@ -523,24 +508,12 @@ export default {
this.facilityModal = true;
} else {
this.pentity.taskTime = [timebegin, timend];
// if (
// formData.map(t => {
// this.newList.filter(m => {
// if ((m.id = t.id)) {
// console.log(m.checked);
// }
// });
// })
// ) {
// }
this.manModal = true;
}
// console.log("选中的数据", this.newList);
}// console.log("选中的数据", this.newList);
},
// 设备派工
sendSheBei() {
let item = this.newList;
// console.log(item)
item.map(u => {
u.userIds = this.entity.userIds;
u.remark = this.entity.remark;
......@@ -569,7 +542,6 @@ export default {
// 人员派工
sendUser() {
let item = this.newList;
// console.log("派工的数据",item)
item.map(u => {
u.userIds = this.peploeId;
u.remark = this.pentity.remark;
......@@ -596,22 +568,20 @@ export default {
},
// 拆分方法
setChai(item, index) {
// console.log(item, index)
this.curTask=item;
this.chaiModal = true;
this.chaiNum = 1;
this.maxnum = item.quantity - 1;
this.rowIndex = index;
},
// 拆分保存
okChai() {
var old = this.$u.clone(this.curTask);
var add = this.$u.clone(this.curTask);
old.quantity -= this.chaiNum;
add.quantity = this.chaiNum;
add.id = 0;
add.pid = old.id;
old.quantity -= this.chaiNum;
add.quantity = this.chaiNum;
add.id = 0;
add.pid = old.id;
let params = {
isDispatch: 0, //派工是1，保存是0
entryList: [old, add]
......@@ -636,14 +606,9 @@ export default {
this.$Message.error("拆分项删除失败！");
}
});
// let oldList = this.listTask;
// let clickRow = oldList.filter(listRow=>listRow.process_name===item.process_name)[0];
// clickRow.quantity += this.chaiNum
// this.listTask.splice(index, 1)
// this.$Message.success('拆分项已删除。')
},
//取消
cancle() {
//取消
this.facilityModal = false;
this.manModal = false;
this.footerToolbar = false;
......@@ -653,20 +618,15 @@ export default {
ids() {
let ids = [];
this.listTask.map(u => {
if (u.checked) {
ids.push(u.id);
}
if (u.checked) { ids.push(u.id);}
});
if (ids.length > 0) {
this.footerToolbar = true;
}
if (ids.length > 0) {this.footerToolbar = true;}
return ids;
},
listOrder() {
let orders = this.$u.group(this.listTask, u => {
return u.mesCode;
});
// console.warn("listOrder", orders);
});// console.warn("listOrder", orders);
return orders;
},
peploeId() {
......@@ -687,6 +647,4 @@ export default {
},
watch: {}
};
</script>
<style lang="less">
</style>
\ No newline at end of file
</script>
\ No newline at end of file
pages/aps/stream/index.vue
View file @ c66e23ce
......@@ -5,9 +5,9 @@
<Col :span="9" class="chan-chi">流水排产-排产池</Col>
<Col :span="15" class="l-ringht">
<!-- <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
<Radio label="0">未排产</Radio> -->
<!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> -->
<Radio label="0">未排产</Radio>-->
<!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> -->
<!-- </RadioGroup> -->
</Col>
</Row>
......@@ -190,8 +190,8 @@ export default {
if (r.result) {
r.result.map(u => {
u.aps = 0;
u.demandFinishDate = u.demandFinishDate.substr(0,10)
u.demandStartDate = u.demandStartDate.substr(0,10)
u.demandFinishDate = u.demandFinishDate.substr(0, 10);
u.demandStartDate = u.demandStartDate.substr(0, 10);
});
this.list = r.result;
// if (r.result[0]) {
......@@ -268,7 +268,7 @@ export default {
this.indexId = index;
this.detailId = item.detailId;
this.active = index;
this.$refs.setObj.formItem={}
this.$refs.setObj.formItem = {};
// this.group.orderId = item.orderId;
// this.group.routingHeaderId = item.routingHeaderId;
// this.$refs.setObj.formItem = {};
......@@ -335,6 +335,7 @@ export default {
if (r.result) {
this.$Message.success("下发成功");
this.orderlist(this.status);
this.result = [];
} else {
this.$Message.info("下发失败");
}
......
pages/aps/stream/set.vue
View file @ c66e23ce
......@@ -18,12 +18,13 @@
</RadioGroup>
</FormItem>-->
<FormItem label="人员" v-if="mode==1" prop="userIds">
<UserSelect
<!-- <UserSelect
ref="userSelected"
v-model="formItem.userIds"
style="width:300px"
:multiple="true"
/>
/>-->
<UserSelect v-model="formItem.userIds" :multiple="true" theme="list" />
</FormItem>
<FormItem label="班组" v-if="mode==2" prop="shopId">
<Select v-model="formItem.shopId" placeholder="请选择" style="width:300px">
......@@ -73,7 +74,8 @@ export default {
remark: "",
departmentTitle: "",
shopId: "",
shopName: ""
shopName: "",
userIds: []
},
workShop: [],
listClass: [],
......@@ -90,14 +92,14 @@ export default {
}
}
],
userIds: [
{
required: true,
message: "请选择人员",
type: "array",
trigger: "change"
}
],
// user: [
// {
// required: true,
// message: "请选择人员",
// type: "array",
// trigger: "change"
// }
// ],
shopId: [
{
required: true,
......@@ -115,14 +117,18 @@ export default {
methods: {
//确定
Determine() {
this.$refs["formItem"].validate(valid => {
if (valid) {
this.formItem.detailId = this.detailId;
this.$emit("on-DetermineOk", this.formItem, this.indexId);
} else {
this.$Message.error("Fail!");
}
});
if (this.formItem.userIds.length == 0) {
this.$Message.error("人员不能为空");
} else {
this.$refs["formItem"].validate(valid => {
if (valid) {
this.formItem.detailId = this.detailId;
this.$emit("on-DetermineOk", this.formItem, this.indexId);
} else {
this.$Message.error("请填写完整");
}
});
}
},
closeOk() {
this.$emit("closeOk");
......@@ -172,8 +178,7 @@ export default {
this.listClass.push(obj);
this.formItem.shopId = this.listClass[0].value;
this.formItem.shopName = this.listClass[0].label;
},
}
},
watch: {
"formItem.radio"(v) {
......
pages/implement/table.less
View file @ c66e23ce
.transmit_box {
height: 100%;
height: 100%;
}
.transmit_title {
padding-top: 10px;
padding-top: 10px;
}
.border_bottom {
border-bottom: 1px solid #e4e6ed;
border-bottom: 1px solid #e4e6ed;
}
.transmit_content {
padding: 20px 0 0 0;
height : calc(100% - 108px);
padding: 20px 0 0 0;
height: calc(100% - 108px);
}
.select {
color : #a7b8cc;
font-size: 22px;
color: #a7b8cc;
font-size: 22px;
}
.wuliao_left {
float : left;
width : 310px;
margin-right: 15px;
// height : calc(100% - 16px);
height: 500px;
border : 1px solid #e4e6ed;
overflow-y : auto;
overflow-x : hidden;
float: left;
width: 310px;
margin-right: 15px;
// height : calc(100% - 16px);
height: 500px;
border: 1px solid #e4e6ed;
overflow-y: auto;
overflow-x: hidden;
}
.wuliao_right {
width : calc(100% - 325px);
height : calc(100% - 16px);
border : 1px solid #e4e6ed;
overflow-y: auto;
overflow-x: hidden;
width: calc(100% - 325px);
height: calc(100% - 16px);
border: 1px solid #e4e6ed;
overflow-y: auto;
overflow-x: hidden;
}
.card_title {
background : #f8f8f9;
padding : 8px 15px;
border-bottom: 1px solid #e4e6ed;
position : relative;
height: 46px;
background: #f8f8f9;
padding: 8px 15px;
border-bottom: 1px solid #e4e6ed;
position: relative;
height: 46px;
}
.state {
float : right;
color : #515a6e;
padding: 5px 5px;
float: right;
color: #515a6e;
padding: 5px 5px;
}
.transmit_cont {
position : absolute;
top : 28px;
right : 0px;
border-radius: 4px;
width : 105px;
height : 155px;
background : #fff;
box-shadow : 0px 0px 6px rgba(0, 0, 0, 0.2);
position: absolute;
top: 28px;
right: 0px;
border-radius: 4px;
width: 105px;
height: 155px;
background: #fff;
box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2);
}
.state_body {
padding : 10px 0px;
text-align : center;
line-height: 24px;
padding: 10px 0px;
text-align: center;
line-height: 24px;
}
.state_footer {
border-top: 1px solid #e4e6ed;
padding : 3px;
border-top: 1px solid #e4e6ed;
padding: 3px;
}
.title_btn02 {
padding: 0px 9px;
border : none;
padding: 0px 9px;
border: none;
}
.color02 {
color: #249e91;
color: #249e91;
}
.card_box {
cursor: pointer;
width : 270px;
height: 116px;
border: 1px solid #e4e6ed;
margin: 20px auto;
cursor: pointer;
width: 270px;
height: 116px;
border: 1px solid #e4e6ed;
margin: 20px auto;
}
.hover {
cursor : pointer;
width : 270px;
height : 116px;
border : 1px solid #e4e6ed;
margin : 20px auto;
background: #f5f7fd;
cursor: pointer;
width: 270px;
height: 116px;
border: 1px solid #e4e6ed;
margin: 20px auto;
background: #f5f7fd;
}
.card_body {
width : 230px;
float : left;
padding: 10px 0 0 10px;
width: 230px;
float: left;
padding: 10px 0 0 10px;
}
.card_right {
cursor : pointer;
background: #e4e6ed;
height : 114px;
text-align: center;
float : left;
width : 38px;
cursor: pointer;
background: #e4e6ed;
height: 114px;
text-align: center;
float: left;
width: 38px;
}
.yellow {
background: #ffc000;
background: #ffc000;
}
.pink {
background: #ff7a8b;
background: #ff7a8b;
}
.green {
background: #27c149;
background: #27c149;
}
.card_right>img {
margin-top: 48px;
margin-top: 48px;
}
.list_item {
height : 24px;
line-height: 24px;
height: 24px;
line-height: 24px;
img {
width : 16px;
height: 16px;
}
img {
width: 16px;
height: 16px;
}
}
.table01 {
padding: 0 10px;
padding: 0 10px;
}
.new_box {
.photo {
float : left;
margin : 0 20px 0 0;
width : calc(40% - 20px);
border-right: solid 1px #bebcbc;
text-align : center;
img {
width : 350px !important;
height: 300px !important;
}
// .photo_box{
// }
}
.photo {
float: left;
margin: 0 20px 0 0;
width: calc(40% - 20px);
border-right: solid 1px #bebcbc;
text-align: center;
.table {
float: left;
width: calc(60% - 20px);
img {
width: 350px !important;
height: 300px !important;
}
// .photo_box{
// }
}
.table {
float: left;
width: calc(60% - 20px);
}
}
.fixed_box {
// height : 658px;
overflow-y: auto;
overflow-x: hidden;
padding : 0 10px;
// height : 658px;
overflow-y: auto;
overflow-x: hidden;
padding: 0 10px;
}
// 工艺文件
.outP {
.iviewimg {
width : 100%;
height : 70px;
text-align: center;
margin : 0 0 60px;
}
.iviewimg {
width: 100%;
height: 70px;
text-align: center;
margin: 0 0 60px;
}
}
.table_box {
border: 1px solid #000;
.row_title{
height : 40px;
}
.table_row {
line-height : 40px;
border-bottom: 1px solid #000;
div {
text-align: center;
}
.box {
width : 100%;
height : 40px;
border-bottom: 1px solid #fff;
}
}
border: 1px solid #000;
.row_label {
border-right: 1px solid #000;
}
.row_title {
height: 40px;
}
.table_row {
line-height: 40px;
border-bottom: 1px solid #000;
.iview_cont {
border-right: 1px solid #000;
width : 100%;
height : 40px;
div {
text-align: center;
}
.table_row02 {
border-top : 1px solid #000;
border-bottom: 1px solid #000;
height : 42px;
line-height : 40px;
text-align : center;
margin-top : 10px;
.box {
width: 100%;
height: 40px;
border-bottom: 1px solid #fff;
}
}
.row_label {
border-right: 1px solid #000;
}
.iview_cont {
border-right: 1px solid #000;
width: 100%;
height: 40px;
}
.table_row02 {
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height: 42px;
line-height: 40px;
text-align: center;
margin-top: 10px;
}
}
.center {
text-align: center;
text-align: center;
}
.title_cont {
margin : 10px auto;
width : auto;
display: inline-block;
margin: 10px auto;
width: auto;
display: inline-block;
}
.iview_cont01 {
display : inline-block;
margin : 0 6px;
font-weight: bold;
display: inline-block;
margin: 0 6px;
font-weight: bold;
}
.f16 {
font-size: 16px;
font-size: 16px;
}
.h1 {
font-size : 36px;
display : inline-block;
width : auto;
padding : 0 8px;
height : 46px;
border-bottom: 1px solid #000;
margin : 40px auto;
font-size: 36px;
display: inline-block;
width: auto;
padding: 0 8px;
height: 46px;
border-bottom: 1px solid #000;
margin: 40px auto;
}
.outP table thead tr th,
.outP table tbody tr td {
padding : 2px 0;
// height : 30px;
line-height: 28px;
padding: 2px 0;
// height : 30px;
line-height: 28px;
}
.outP table tbody tr td {
padding: 0 5px;
padding: 0 5px;
}
.tit01 {
min-width: 70px;
min-width: 70px;
}
.tit02 {
min-width: 100px;
min-width: 100px;
}
.tit03 {
min-width: 300px;
min-width: 300px;
}
.tit04 {
min-width: 100px;
min-width: 100px;
}
.tit05 {
min-width: 100px;
min-width: 100px;
}
.title01 {
min-width: 110px;
min-width: 110px;
}
.title02 {
min-width: 300px;
min-width: 300px;
}
.title03 {
min-width: 100px;
min-width: 100px;
}
.title04 {
min-width: 100px;
min-width: 100px;
}
.title05 {
min-width: 100px;
min-width: 100px;
}
.title06 {
min-width: 100px;
min-width: 100px;
}
.outPdf table,
.outPdf table tr th,
.outPdf table tr td {
border-color: #000;
}
\ No newline at end of file
border-color: #000;
}
pages/mesPlan/index.vue
View file @ c66e23ce
<template>
<Layout class="full">
<Sider hide-trigger :style="{background: '#fff'}" width="260">
<!-- <Sider hide-trigger :style="{background: '#fff'}" width="260">
<div class="zh-tree" :style="{height:treeHeight+'px'}">
<h3 class="zh-title">产品结构</h3>
<div class="zh-box">
......@@ -13,8 +13,16 @@
></Tree>
</div>
</div>
</Sider> -->
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" />
</Sider>
<Content class="content">
<div v-if="!showMenu" class="show_menu">
<a class="menu_play fr" @click="showMenuFn" title="展开">
<Icon type="ios-arrow-forward" size="24" />
</a>
</div>
<Content class="content" :class="!showMenu?'con_bord':''">
<!--:data="dataT"-->
<DataGrid
:action="action"
......@@ -100,19 +108,21 @@ import Detail from "./detail";
import Search from "./search";
import Split from "./split";
import Send from "./send";
import ProductTree from "@/components/page/productTree.vue";
export default {
name: "list",
components: {
Add,
Add,
Edit,
Detail,
Search,
Split,
Send
Send,ProductTree,
},
data() {
return {
action: Api.index,
showMenu: true,
easySearch: {
keys: {
op: "mesCode,productName",
......@@ -763,6 +773,18 @@ export default {
this.$Message.error("数量为1，不能进行分解");
}
},
onHide() {
// this.$Message.info("收起左侧树")
this.showMenu = false;
},
showMenuFn() {
//this.$Message.info("展开左侧树")
this.showMenu = true;
},
productSearch(id, item, ids) {
let where = { productId: { op: "In", value: ids } };
this.$refs.grid.reload(where);
},
//确定分解
orderSplitOk() {
let returnDatalist = this.$refs.orderSplit.returnDataList();
......
pages/order/quotation/index.vue
View file @ c66e23ce
<template>
<Layout class="quotation">
<!-- 左侧树 -->
<Sider hide-trigger :style="{background: '#fff'}" width="260">
<!-- <Sider hide-trigger :style="{background: '#fff'}" width="260">
<Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type>
</Sider> -->
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" />
</Sider>
<div v-if="!showMenu" class="show_menu">
<a class="menu_play fr" @click="showMenuFn" title="展开">
<Icon type="ios-arrow-forward" size="24" />
</a>
</div>
<!-- 右侧内容 -->
<Content class="content">
<Content class="content" :class="!showMenu?'con_bord':''">
<Tabs v-model="selectName" @on-click="handleClick">
<TabPane label="订单报价" key="offer" name="offer">
<div class="search-form">
......@@ -140,7 +148,7 @@ import MetalQuotation from "./components/metalQuotation.vue"; //订单报价弹
import Photosensitive from "./components/photosensitive.vue"; //订单报价弹框光敏
import MetalDetails from "./components/metalDetails.vue"; //报价历史记录铺粉详情弹框
import PhotosensitiveDetails from "./components/photosensitiveDetails.vue"; //报价历史记录光敏详情弹框
import ProductTree from "@/components/page/productTree.vue";//左侧树列表
import MetalQuotationGeneration from "./components/metalQuotationGeneration.vue"; //生成报价单弹框
import PhotosensitiveGeneration from "./components/photosensitiveGeneration.vue"; //生成报价单弹框
export default {
......@@ -152,7 +160,7 @@ export default {
MetalQuotation,
Photosensitive,
MetalDetails,
PhotosensitiveDetails,
PhotosensitiveDetails,ProductTree,
MetalQuotationGeneration,
PhotosensitiveGeneration
},
......@@ -162,6 +170,7 @@ export default {
result: []
},
userId: 0,
showMenu: true,
model1: "",
rows: {},
modalDai: false, //待审核
......@@ -381,10 +390,23 @@ export default {
};
},
methods: {
onHide() {
this.showMenu = false;
},
showMenuFn() {
this.showMenu = true;
},
productSearch(id, item, ids) {
// console.log(item)
this.getMsgFormSon(ids)
// let where = { productId: { op: "In", value: ids } };
// this.$refs.grid.reload(where);
},
update() {
this.tableTata(this.selectName);
},
getMsgFormSon(data) {
// console.log(data)
this.productId = data.join(",");
this.tableTata(this.selectName);
},
......
pages/processManage/setProcess/index.vue
View file @ c66e23ce
<template>
<div>
<Layout class="lay100">
<!-- <div> -->
<!-- 左侧树 -->
<div class="zh-tree" :style="{height:treeHeight+'px'}">
<h3 class="zh-title">产品结构</h3>
<!-- <Sider hide-trigger v-if="showMenu" class="menu_side" width="300"> -->
<!-- <div class="zh-tree" :style="{height:treeHeight+'px'}"> -->
<!-- <h3 class="zh-title">产品结构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
......@@ -13,9 +15,18 @@
@on-select-change="selectTreeNode"
></Tree>
</div>
</Sider> -->
<!-- </div> -->
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" />
</Sider>
<div v-if="!showMenu" class="show_menu">
<a class="menu_play fr" @click="showMenuFn" title="展开">
<Icon type="ios-arrow-forward" size="24" />
</a>
</div>
<!-- 右侧内容 -->
<div class="content-right">
<Content class="con" :class="!showMenu?'con_bord':''">
<div class="title_box">
<div class="table_title">
<div style="width:100px; float:left">
......@@ -235,7 +246,7 @@
@on-page-size-change="pageSizeChange"
/>
</div>
</div>
</Content>
<Modal
v-model="modal1"
:title="gymodaltitle"
......@@ -339,19 +350,18 @@
>
<processview ref="processview"></processview>
</Modal>
</div>
</Layout>
</template>
<script>
import DrawerSet from "./components/drawerSet.vue"; //抽屉列表
import TreeType from "./components/treeType.vue"; //左侧树列表
import orderMaterial from "./components/orderMaterial.vue"; //料单
import processMain from "./processMain.vue";
import processNew from "../Process/processNew.vue";
import service from "@/plugins/request";
import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
import OrderSendReview from "./components/orderSendReview"; //送审页面
import processview from "../Process/processview.vue";
import sendAudit from "../Process/sendAudit.vue";
......@@ -359,7 +369,7 @@ import QS from "querystring";
export default {
components: {
DrawerSet,
TreeType,
ProductTree,
processMain,
processNew,
orderMaterial,
......@@ -369,6 +379,7 @@ export default {
},
data() {
return {
showMenu: true,
isview: false,
isdview: false,
ismview: false,
......@@ -687,7 +698,7 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
this.initTree();
// this.initTree();
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
......@@ -698,7 +709,7 @@ export default {
};
},
computed: {
searchList() {
searchList() {//产品树左侧
let nodeList = this.treeData;
var text = this.treeInputSearch;
var newNodeList = [];
......@@ -720,6 +731,21 @@ export default {
}
},
methods: {
onHide() {
this.showMenu = false;
},
showMenuFn() {
this.showMenu = true;
},
productSearch(id, item, ids) {
if (ids.length > 0) {
this.orderSearchForm.productId = ids.join(",");
} else {
this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = "";
}
this.easySearch(this.orderSearchForm);
},
// tab切换
tabChange(name) {
this.tabstatus = name;
......@@ -765,12 +791,9 @@ export default {
deleted() {},
// 分页
pageChange(num) {
//console.log(num);
this.page = num;
this.orderSearchForm.SkipCount =
(num - 1) * this.orderSearchForm.MaxResultCount;
console.log(this.orderSearchForm.SkipCount);
this.orderSearchForm.SkipCount = (num - 1) * this.orderSearchForm.MaxResultCount;
// console.log(this.orderSearchForm.SkipCount);
this.loaddata(this.orderSearchForm);
},
pageSizeChange(limit) {
......@@ -780,23 +803,15 @@ console.log(this.orderSearchForm.SkipCount);
this.loaddata(this.orderSearchForm);
},
loaddata(params) {
var url = "";
// if(params==1||params==2){
// url =
// `${PlanUrl}/mesorder/getpagedmesordersforpdefm?ProcessUserType=` + params
// }else{
var url = "";
this.orderSearchForm.simpleSearch= typeof params == "string" ? params : params.simpleSearch, //快速搜索
this.orderSearchForm.ProcessUserType= this.tabstatus,
this.orderSearchForm.ProductingPreparation= this.ProductingPreparationPeople,
this.orderSearchForm.RoutingSetStatus= this.orderSearchForm.RoutingSetStatus
url =
`${PlanUrl}/mesorder/getpagedmesordersforpdefm?` +
QS.stringify(this.orderSearchForm);
// }
service.get(`${url}`).then(response => {
// console.log(response)
......@@ -847,33 +862,34 @@ console.log(this.orderSearchForm.SkipCount);
}
}
},
initTree() {
var sumData = [];
this.$http.order.getallselecttree().then(res => {
if (res.result) {
for (var i = 0; i < res.result.length; i++) {
sumData = sumData.concat(res.result[i]);
}
this.treeData = sumData;
this.data2 = JSON.parse(JSON.stringify(sumData));
} else {
this.$Message.error("加载产品树失败!");
}
});
},
selectTreeNode(value) {
if (value.length > 0) {
this.ids = [];
this.getAllIds(value);
if (this.ids.length > 0) {
this.orderSearchForm.productId = this.ids.join(",");
} else {
this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = "";
}
this.easySearch(this.orderSearchForm);
}
},
// initTree() {
// var sumData = [];
// this.$http.order.getallselecttree().then(res => {
// if (res.result) {
// for (var i = 0; i < res.result.length; i++) {
// sumData = sumData.concat(res.result[i]);
// }
// this.treeData = sumData;
// this.data2 = JSON.parse(JSON.stringify(sumData));
// } else {
// this.$Message.error("加载产品树失败!");
// }
// });
// },
// selectTreeNode(value) {
// console.log(value)
// if (value.length > 0) {
// this.ids = [];
// this.getAllIds(value);
// if (this.ids.length > 0) {
// this.orderSearchForm.productId = this.ids.join(",");
// } else {
// this.orderSearchForm.productId = "-1";
// this.orderSearchForm.productName = "";
// }
// this.easySearch(this.orderSearchForm);
// }
// },
getAllIds(trees) {
trees.forEach((data, index) => {
var that = this;
......
pages/resourceManagement/deviceManagementCP/components/newEquipment.vue
View file @ c66e23ce
<template>
<div class="new-equipment">
<Modal v-model="modalShow" title="新增设备" width="1000" :mask-closable="false">
<Modal v-model="modalShow" :title="title" width="1000" :mask-closable="false">
<Form :model="formItem" :label-width="100" style="margin:10px;" :rules="ruleValidate">
<Row :gutter="16">
<Col span="11">
......@@ -55,39 +55,19 @@
<inputFile ref="refqcFile" v-model="imgName" :parms="qcfileparms" files />
</FormItem>
</Col>
<Col span="11" offset="1">
<FormItem label="是否关重" prop="isimportant">
<Select v-model="isimportant">
<Option :value="1">是</Option>
<Option :value="2">否</Option>
</Select>
<Col :span="12">
<FormItem label="属性">
<Checkbox v-model="property">排产资源</Checkbox>
</FormItem>
</Col>
</Row>
<Row :gutter="16">
<Col span="11">
<FormItem label="能力系数">
<InputNumber
:min="0"
v-model="formItem.capability_value"
size="large"
style="width:240px"
></InputNumber>
</FormItem>
</Col>
<Col span="11" offset="1">
<Col span="12">
<FormItem label="位置" prop="location">
<Input v-model="formItem.location" placeholder="请输入位置"></Input>
</FormItem>
</Col>
</Row>
<Row :gutter="16">
<Col :span="12">
<FormItem label="属性">
<Checkbox v-model="property">排产资源</Checkbox>
</FormItem>
</Col>
</Row>
</Form>
<div slot="footer">
<!-- class="footers" -->
......@@ -132,12 +112,12 @@ export default {
equip_ip: "",
shop_id: "",
shop_name: "",
isimportant: 2,
location: "",
capability_value: 1
// isimportant: 2,
location: ""
// capability_value: 1
},
property: true,
isimportant: 2,
// isimportant: 2,
ruleValidate: {
equip_id: [
{
......@@ -234,9 +214,9 @@ export default {
equip_ip: this.formItem.equip_ip,
shop_id: this.formItem.shop_id,
eqstyle: str,
isimportant: this.isimportant,
// isimportant: this.isimportant,
location: this.formItem.location,
capability_value: this.formItem.capability_value,
// capability_value: this.formItem.capability_value,
property: this.property,
shop_name: this.formItem.shop_name
};
......@@ -277,9 +257,9 @@ export default {
equip_ip: this.formItem.equip_ip,
shop_id: this.formItem.shop_id,
eqstyle: str,
isimportant: this.isimportant,
// isimportant: this.isimportant,
location: this.formItem.location,
capability_value: this.formItem.capability_value,
// capability_value: this.formItem.capability_value,
property: this.property,
shop_name: this.formItem.shop_name
};
......
pages/resourceManagement/deviceManagementCP/index.vue
View file @ c66e23ce
......@@ -5,10 +5,12 @@
<h3 class="zh-title">组织架构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" />
<Tree :data="searchList"
:style="{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode"></Tree>
<Tree
:data="searchList"
:style="{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode"
></Tree>
</div>
</div>
<!-- 右侧内容 -->
......@@ -535,23 +537,23 @@ export default {
title: "所属部门",
key: "shop_name"
},
{
title: "是否关重",
key: "isimportant",
render: (h, params) => {
let statuse = params.row.isimportant;
let text = statuse == 1 ? "是" : statuse == 2 ? "否" : "";
return h("span", {}, text);
}
},
// {
// title: "是否关重",
// key: "isimportant",
// render: (h, params) => {
// let statuse = params.row.isimportant;
// let text = statuse == 1 ? "是" : statuse == 2 ? "否" : "";
// return h("span", {}, text);
// }
// },
{
title: "位置",
key: "location"
},
{
title: "能力系数",
key: "capability_value"
},
// {
// title: "能力系数",
// key: "capability_value"
// },
{
title: "操作",
key: "action",
......@@ -577,7 +579,7 @@ export default {
attrs: {
oprate: "edit",
// class: "edit",
title: "编辑"
title: "编辑"
},
on: {
click: () => {
......@@ -591,7 +593,8 @@ export default {
"op",
{
attrs: {
oprate: "delete",title: "删除"
oprate: "delete",
title: "删除"
},
style: {
color: "red"
......@@ -608,7 +611,8 @@ export default {
"op",
{
attrs: {
oprate: "detail",title: "保养"
oprate: "detail",
title: "保养"
},
on: {
click: () => {
......@@ -622,7 +626,8 @@ export default {
"op",
{
attrs: {
oprate: "detail",title: "维修"
oprate: "detail",
title: "维修"
},
on: {
click: () => {
......
pages/resourceManagement/productionResources/index.vue
View file @ c66e23ce
......@@ -23,8 +23,8 @@
<Col span="8">
<FormItem :label="l('isimportant')" prop="isimportant">
<RadioGroup v-model="entity.isimportant">
<Radio label="0">是</Radio>
<Radio label="1">否</Radio>
<Radio label="1">是</Radio>
<Radio label="2">否</Radio>
</RadioGroup>
</FormItem>
</Col>
......@@ -132,6 +132,23 @@ export default {
easy: true,
high: true
},
{
key: "isimportant",
title: this.l("isimportant"),
align: "left",
render: (h, params) => {
let statuse = params.row.isimportant;
let text = statuse == 1 ? "是" : statuse == 2 ? "否" : "";
return h("span", {}, text);
}
},
{
key: "capabilityValue",
title: this.l("capabilityValue"),
align: "left",
easy: true,
high: true
},
{
key: "calId",
title: this.l("calId"),
......@@ -173,12 +190,12 @@ export default {
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) }
},
"设置日历"
"设置"
),
h(
"op",
{
attrs: { oprate: "remove",title: "删除" },
attrs: { oprate: "remove", title: "删除" },
on: { click: () => this.remove(params.row.id) }
},
"删除"
......@@ -257,6 +274,8 @@ export default {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$refs.grid.load();
this.$refs.grid.footerToolbar = false;
} else {
this.$Message.error("保存失败");
}
......
pages/resourceManagement/productionResources/set.vue
View file @ c66e23ce
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Form ref="form" :model="formItem" :rules="rules" :label-width="90">
<Row>
<Col span="12">
<FormItem label="资源名称" prop="equip_name">
......@@ -29,6 +29,19 @@
</Select>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="是否关重" prop="isimportant">
<RadioGroup v-model="formItem.isimportant">
<Radio label="1">是</Radio>
<Radio label="2">否</Radio>
</RadioGroup>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="能力值" prop="capabilityValue">
<Input v-model="formItem.capabilityValue" placeholder="请输入能力值"></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......@@ -47,7 +60,9 @@ export default {
overtimeList: [],
formItem: {
equip_name: "",
equip_id: ""
equip_id: "",
isimportant: "",
capabilityValue: ""
},
formItem1: {
id: 0,
......@@ -97,6 +112,8 @@ export default {
Api.get({ id: v }).then(r => {
this.formItem.equip_name = r.result.title;
this.formItem.equip_id = r.result.code;
this.formItem.capabilityValue = r.result.capabilityValue;
this.formItem.isimportant = r.result.isimportant + "";
this.formItem1.calendarwork_pk = r.result.calKey;
this.formItem2.calendarovertime_pk = r.result.holidayKey;
this.formItem1.equip_pk = r.result.id;
......@@ -109,7 +126,9 @@ export default {
this.disabled = true;
Api.update({
equipCalendarWork: this.formItem1,
equipCalendarOverTime: this.formItem2
equipCalendarOverTime: this.formItem2,
isimportant: this.formItem.isimportant,
capabilityValue: this.formItem.capabilityValue
})
.then(r => {
this.disabled = false;
......
pages/technology/add.vue
View file @ c66e23ce
......@@ -17,8 +17,11 @@
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('code')" prop="code">
<!-- <FormItem v-if="title=='新增'" :label="l('code')" prop="code">
<Input v-model="entity.code"></Input>
</FormItem> v-else-if="title=='克隆'"-->
<FormItem :label="l('code')" prop="code">
<Input disabled v-model="entity.code"></Input>
</FormItem>
</Col>
<Col :span="8">
......@@ -129,7 +132,7 @@
<Col :span="24">
<FormItem label="多媒体附件" prop="files">
<files ref="refFile" :parms="parms" files />
<files ref="refFile" :parms="parms" fileFormat/>
</FormItem>
</Col>
</Row>
......@@ -175,7 +178,8 @@ export default {
versionnotes: "",
phase: null,
versionid: null,
isSendPpm: 1
isSendPpm: 1,
fileId: ""
},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
......@@ -191,32 +195,33 @@ export default {
},
props: {
v: Object,
eid: Number
eid: Number,
title: String
},
mounted() {
this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles();
if (this.eid > 0) {
this.load(this.eid);
}else{
this.getCodNumber();
}
},
methods: {
handleSubmit() {
this.$refs.form.validate(v => {
if (v) {
this.disabled = true;
// this.entity.qualityTemplateName = ''
// this.entity.qualityTemplate=''
// if (this.$refs.refFile.nameList.length > 0) {
// let nameList=this.$refs.refFile.nameList
// let names=[]
// let url=[]
// nameList.forEach(e => {
// names.push(e.fileName)
// url.push(e.filePath)
// });
// this.entity.qualityTemplateName = JSON.stringify(names).replace('[','').replace(']','').replace(/\"/g,'')//附件本地库暂存文件名称
// this.entity.qualityTemplate=JSON.stringify(url).replace('[','').replace(']','').replace(/\"/g,'')
// }
Api.create(this.entity)
.then(r => {
if(this.title=='克隆'){
this.$Message.success("克隆");
this.getcloneData()
}else{
if (this.$refs.refFile.nameList.length > 0) {
this.entity.fileId = this.parms.eid;
} else {
this.entity.fileId = "";
}
Api.create(this.entity).then(r => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
......@@ -230,9 +235,31 @@ export default {
this.$Message.error("保存失败");
console.warn(err);
});
}
}
});
},
// 克隆工艺
getcloneData(){
let parmese = {
headerId: this.eid,
code: this.entity.code
};
Api.getCloneHeader(parmese).then(r => {
this.disabled = false;
if (r.success) {
this.$Message.success("克隆成功");
this.$emit("on-ok");
} else {
this.$Message.error("克隆失败");
}
})
.catch(err => {
this.disabled = false;
this.$Message.error("克隆失败");
console.warn(err);
});
},
handleClose() {
this.$emit("on-close");
},
......@@ -260,8 +287,19 @@ export default {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.entity.isEffect = parseInt(r.result.isEffect);
this.entity.id = 0;
});
this.getCodNumber();
},
getCodNumber(){
Api.getCodeNumber({code:'GY',count:'1'}).then( r => {
if(r.success){
this.entity.code = r.result[0]
}else{
this.$Message.error("生成编号失败");
}
})
},
l(key) {
key = "routingHeader" + "." + key;
......@@ -273,10 +311,11 @@ export default {
this.entity = this.$u.clone(this.v);
},
eid(v) {
if (v > 0) {
// console.log("id:",v)
if (v != 0) {
this.load(v);
}
}
},
}
};
</script>
\ No newline at end of file
pages/technology/api.js
View file @ c66e23ce
......@@ -13,6 +13,13 @@ export default {
update(params) {
return Api.put(`${technologyUrl}routingheader/update`, params);
},
getCloneHeader(params){
return Api.post(`${technologyUrl}routingheader/cloneheader`,params);
},
getCodeNumber(params){
return Api.post(`${systemUrl}/cache/generate_serialcode`,params);
},
delete(id) {
return Api.delete(`${technologyUrl}routingheader/delete`, {
params: {
......
pages/technology/details/add.vue
View file @ c66e23ce
......@@ -154,6 +154,7 @@
v-model="entity.taskContent"
:height="200"
v-paste="handleImg"
border
/>
</FormItem>
</Col>
......
pages/technology/details/edit.vue
View file @ c66e23ce
......@@ -84,7 +84,7 @@
</Col>
<Col :span="24">
<FormItem :label="l('taskContent')" prop="taskContent">
<i-quill v-model="entity.taskContent" :height="200" v-paste="handleImg" />
<i-quill v-model="entity.taskContent" :height="200" border v-paste="handleImg" />
</FormItem>
</Col>
</Row>
......
pages/technology/details/index.vue
View file @ c66e23ce
......@@ -37,7 +37,7 @@ export default {
action: Api.index,
easySearch: {
keys: {
op: "name,description,remark,resourceCode,equipType,note",
op: "name",
value: null
},
routingHeaderId: { op: "Equal", value: -1 }
......@@ -70,17 +70,18 @@ export default {
});
}
},
{ key: "taskSeq", title: this.l("taskSeq"), align: "left" },
{ key: "taskSeq", title: this.l("taskSeq"), align: "left",width:80 },
{
key: "name",
title: this.l("name"),
align: "left"
align: "left",
},
{
key: "equipType",
title: this.l("equipType"),
align: "left",
easy: true
easy: true,
hide:true,
},
{
key: "resourceType",
......@@ -117,32 +118,36 @@ export default {
key: "isParticipateIntime",
title: this.l("isParticipateIntime"),
align: "center",
code: "Process.state"
code: "Process.state",
hide: true,
},
{
key: "isImportant",
title: this.l("isImportant"),
align: "center",
code: "Process.state"
code: "Process.state",
width:100,
hide: true,
},
{
key: "isOutside",
title: this.l("isOutside"),
align: "left",
align: "center",
hide: true,
code: "Process.state"
code: "Process.state",
width:100
},
{
key: "efficiencyValue",
title: this.l("efficiencyValue"),
align: "left",
align: "right",
hide: true
},
{
key: "singleOut",
title: this.l("singleOut"),
align: "left",
align: "right",
hide: true
},
......@@ -394,53 +399,6 @@ export default {
this.load();
},
l(key) {
/*
routing_detail:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'最近修改时间',
lastModifierUserId:'最近修改人',
isDeleted:'是否删除',
deleterUserId:'删除人',
deletionTime:'删除时间',
classId:'',
routingHeaderId:'工艺规程id',
name:'工序名称',
taskSeq:'工序号',
description:'备注',
taskContent:'工序内容',
resourceId:'资源ID',
resourceType:'资源类型',
runtime:'单件排产工时',
setupTime:'工序准备工时',
transportTime:'转运工时',
checkTime:'检验工时',
checkFlag:'检验标识',
efficiencyValue:'效率系数',
singleOut:'单件产出',
isOutside:'是否外协',
departmentId:'工序的承制车间',
isImportant:'是否关键工序',
milestoneId:'里程碑',
phaseId:'阶段id',
status:'状态',
remark:'备注',
extend:'扩展字段',
outsideTime:'外协工期',
performanceHours:'绩效工时',
resourceCode:'资源编号',
isImportantResources:'关重资源',
schedulingWorkingHours:'排产准结工时',
realWorkingHours:'实作准结工时',
realRuntime:'实作单件工时',
performanceWorkingHours:'绩效准结工时',
isParticipateIntime:'是否参与工时分配',
equipType:'设备类型',
equipTypeId:'设备类型ID',
note:'备注',
}
*/
let vkey = "routing_detail" + "." + key;
return this.$t(vkey) || key;
}
......
pages/technology/details/routingStep/edit.vue
View file @ c66e23ce
......@@ -17,6 +17,7 @@
<i-quill
v-model="entity.stepContent"
:height="260"
border
v-paste="handleImg"
/>
<!-- <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> -->
......
pages/technology/details/routingqccard/index.vue
View file @ c66e23ce
<template>
<div>
<DataGrid :columns="columns" ref="grid" :conditions="easySearch" :action="action">
<DataGrid :columns="columns" ref="grid" :conditions="easySearch" :action="action">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入关键字检测要求/测量单位/模板/备注/生产要求/标准指标/模板名称/抽检批次"
placeholder="请输入检测要求/标准指标"
v-model="easySearch.keys.value"
/>
</FormItem>
......@@ -15,7 +15,7 @@
</Form>
</template>
<template slot="searchForm">
<Search :headid="hid"/>
<Search :headid="hid" />
</template>
<template slot="buttons">
<Button type="primary" @click="add">新增</Button>
......@@ -46,7 +46,7 @@ export default {
easySearch: {
keys: {
op:
"checkParams,measurementUnit,qualityTemplate,remark,productionRequirement,standard,qualityTemplateName,samplingBatch",
"checkParams,standard",
value: null
},
routingHeaderId: { op: "Equal", value: -1 }
......@@ -55,42 +55,34 @@ export default {
title: "新增",
detail: null,
curId: 0,
hid:0,
hid: 0,
columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
high: true
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
align: "left",
high: true
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
key: "routingHeaderId",
title: this.l("routingHeaderId"),
align: "left",
high: true
high: true,
hide: true
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
key: "routingDetailId",
title: this.l("routingDetailId"),
align: "left",
high: true
high: true,
hide: true
},
{
key: "routingHeaderId",
title: this.l("routingHeaderId"),
key: "routingDetailNo",
title: this.l("routingDetailNo"),
align: "left",
high: true
high: true,
width: 80
},
{
key: "routingDetailId",
title: this.l("routingDetailId"),
key: "routingDetailName",
title: this.l("routingDetailName"),
align: "left",
high: true
},
......@@ -98,14 +90,16 @@ export default {
key: "routingStepId",
title: this.l("routingStepId"),
align: "left",
high: true
high: true,
hide: true
},
{
key: "checkType",
title: this.l("checkType"),
align: "left",
high: true,
code: "QC.checktype"
code: "QC.checktype",
width:100,
},
{
key: "checkParams",
......@@ -119,48 +113,54 @@ export default {
title: this.l("measurementUnit"),
align: "left",
easy: true,
high: true
high: true,
hide:true,
},
{
key: "fillintype",
title: this.l("fillintype"),
align: "left",
align: "center",
high: true,
code: "QC.fillintype"
code: "QC.fillintype",
width:140,
},
{
key: "isphotograph",
title: this.l("isphotograph"),
align: "left",
align: "center",
high: true,
code: "Process.state"
code: "Process.state",
width:100,
},
{
key: "status",
title: this.l("status"),
align: "left",
align: "center",
high: true,
code: "Process.Status"
code: "Process.Status",
width:80,
},
{
key: "productionRequirement",
title: this.l("productionRequirement"),
align: "left",
easy: true,
high: true
high: true,
hide: true
},
{
key: "standard",
title: this.l("standard"),
align: "left",
easy: true,
high: true
high: true,
},
{
key: "qualityTemplateName",
title: this.l("qualityTemplateName"),
align: "left",
easy: true,
hide: true,
high: true,
render: (h, params) => {
return h("div", { class: "action" }, [
......@@ -178,43 +178,77 @@ export default {
{
key: "isImportant",
title: this.l("isImportant"),
align: "left",
align: "center",
high: true,
code: "Process.state"
code: "Process.state",
width:100,
},
{
key: "firstCheck",
title: this.l("firstCheck"),
align: "left",
align: "center",
high: true,
code: "Process.state"
code: "Process.state",
width:100,
},
{
key: "inspection",
title: this.l("inspection"),
align: "left",
align: "center",
high: true,
code: "Process.state"
code: "Process.state",
width:80,
},
{
key: "inspectionTime",
title: this.l("inspectionTime"),
align: "left",
high: true
high: true,
hide: true
},
{
key: "sampling",
title: this.l("sampling"),
align: "left",
align: "center",
high: true,
code: "Process.state"
code: "Process.state",
width:80,
},
{
key: "samplingBatch",
title: this.l("samplingBatch"),
align: "left",
easy: true,
high: true
high: true,
hide: true
},
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
high: true,
hide: true
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
align: "left",
high: true,
hide: true
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
align: "left",
high: true,
hide: true
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
align: "left",
high: true,
hide: true
},
{
title: "操作",
......@@ -256,17 +290,17 @@ export default {
fileUrlPath: ""
};
},
created() {
if(this.headerid!=-1){
this.easySearch.routingHeaderId.value = this.headerid;
}else{
this.easySearch.routingHeaderId.value=this.$route.query.id;
created() {
if (this.headerid != -1) {
this.easySearch.routingHeaderId.value = this.headerid;
} else {
this.easySearch.routingHeaderId.value = this.$route.query.id;
}
this.hid=Number(this.easySearch.routingHeaderId.value)
this.hid = Number(this.easySearch.routingHeaderId.value);
},
mounted() {
console.log(this);
this.search()
this.search();
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
......@@ -318,7 +352,7 @@ export default {
},
openTemplate(url) {
this.fileUrlPath = this.downUrl + path;
alert(this.fileUrlPath)
alert(this.fileUrlPath);
},
l(key) {
let vkey = "routing_qc_card" + "." + key;
......
pages/technology/details/routingsupporting/index.vue
View file @ c66e23ce
......@@ -5,7 +5,7 @@
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入关键字物料类型/物料编号/物料名称/牌号/规格/型号规格/材质/采购标准/质量等级/备注/产品图号"
placeholder="请输入关键字物料名称"
v-model="easySearch.keys.value"
/>
</FormItem>
......@@ -46,7 +46,7 @@ export default {
easySearch: {
keys: {
op:
"materialType,materialNumber,nameMaterial,brand,specifications,xhgg,texture,procurementStandards,qualityGrade,remark,drawNum",
"nameMaterial",
value: null
},
routingHeaderId: { op: "Equal", value: -1 }
......@@ -58,85 +58,63 @@ export default {
hid: 0,
columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: "creationTime",
title: this.l("creationTime"),
hide: true,
align: "left"
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: true,
align: "left"
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: "left"
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: "left"
},
{
key: "isDeleted",
title: this.l("isDeleted"),
hide: true,
align: "left"
},
{
key: "deletionTime",
title: this.l("deletionTime"),
hide: true,
align: "left"
},
{
key: "deleterUserId",
title: this.l("deleterUserId"),
hide: true,
align: "left"
},
{
key: "routingHeaderId",
title: this.l("routingHeaderId"),
align: "left",
high: true
high: true,
hide:true,
},
{
key: "routingDetailId",
title: this.l("routingDetailId"),
align: "left",
high: true,
hide:true,
},
{
key: "routingDetailNo",
title: this.l("routingDetailNo"),
align: "left",
high: true,
width: 80
},
{
key: "routingDetailName",
title: this.l("routingDetailName"),
align: "left",
high: true
},
{
key: "routingStepId",
title: this.l("routingStepId"),
align: "left",
high: true
high: true,
hide:true,
},
{
key: "quantity",
title: this.l("quantity"),
align: "left",
high: true
align: "right",
high: true,
width:80,
},
{
key: "materialId",
title: this.l("materialId"),
align: "left",
high: true
high: true,
hide:true,
},
{
key: "materialType",
title: this.l("materialType"),
align: "left",
align: "center",
easy: true,
high: true,
code: "mes_xingchi_resource.material.materialReType"
code: "mes_xingchi_resource.material.materialReType",
width:100,
},
{
key: "materialNumber",
......@@ -150,7 +128,7 @@ export default {
title: this.l("nameMaterial"),
align: "left",
easy: true,
high: true
high: true,
},
{
key: "brand",
......@@ -171,7 +149,8 @@ export default {
title: this.l("xhgg"),
align: "left",
easy: true,
high: true
high: true,
hide:true,
},
{
key: "texture",
......@@ -197,23 +176,66 @@ export default {
{
key: "state",
title: this.l("state"),
align: "left",
align: "center",
high: true,
code: "Process.Status"
code: "Process.Status",
width:80,
},
{
key: "remark",
title: this.l("remark"),
key: "drawNum",
title: this.l("drawNum"),
align: "left",
easy: true,
high: true
},
{
key: "creationTime",
title: this.l("creationTime"),
hide: true,
align: "left",
hide:true,
},
{
key: "drawNum",
title: this.l("drawNum"),
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: true,
align: "left",
easy: true,
high: true
hide:true,
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: "left",
hide:true,
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: "left",
hide:true,
},
{
key: "isDeleted",
title: this.l("isDeleted"),
hide: true,
align: "left",
hide:true,
},
{
key: "deletionTime",
title: this.l("deletionTime"),
hide: true,
align: "left",
hide:true,
},
{
key: "deleterUserId",
title: this.l("deleterUserId"),
hide: true,
align: "left",
hide:true,
},
{
title: "操作",
......
pages/technology/edit.vue
View file @ c66e23ce
......@@ -129,7 +129,7 @@
<Col :span="24">
<FormItem label="多媒体附件" prop="files">
<files />
<files ref="refFile" :parms="parms" fileFormat/>
</FormItem>
</Col>
</Row>
......@@ -154,11 +154,18 @@ export default {
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
},
parms: {
app: "technology",
eid: this.uid,
name: "",
field: ""
}
};
},
props: {
eid: Number
eid: Number,
uid: String,
},
mounted() {
if (this.eid > 0) {
......@@ -168,6 +175,8 @@ export default {
methods: {
load(v) {
Api.get({ id: v }).then(r => {
this.$refs.refFile.intFilesClone();
this.parms.eid = this.uid;
this.entity = r.result;
});
},
......@@ -175,6 +184,7 @@ export default {
this.$refs.form.validate(v => {
if (v) {
this.disabled = true;
this.entity.fileId = this.uid;
Api.update(this.entity)
.then(r => {
this.disabled = false;
......@@ -227,6 +237,8 @@ export default {
if (v != 0) {
this.load(v);
}
},
uid(v) {
}
}
};
......
pages/technology/index.vue
View file @ c66e23ce
<style lang="less">
@import "./technolog.less";
.lay100 {
height: calc(100vh - 105px);
background-color: #f5f6fa;
.con {
padding: 5px 5px 0px 10px;
}
.con_bord{
// margin: 15px 32px;
box-shadow: #c7c7c7 1px 2px 7px 3px;
}
background: rgba(245,246,250,1);
}
.fullWindow {
position: fixed;
width: 100%;
......@@ -20,7 +9,7 @@
bottom: 0;
right: 0;
// bottom:100%;
// right: 100%;
// right: 100%;
z-index: 898;
background-color: white;
// background: red;
......@@ -42,31 +31,38 @@
</a>
</div>
<Content class="con" :class="!showMenu?'con_bord':''">
<DataGrid :columns="columns" ref="grid" :action="action" class="card_box">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入工艺名称/工艺编号"
v-width="200"
v-model="easySearch.keys.value"
clearable
/>
</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" />
<DataGrid :columns="columns" ref="grid" :action="action" class="card_box">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入工艺名称/工艺编号"
v-width="200"
v-model="easySearch.keys.value"
clearable
/>
</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="1120" footer-hide>
<component
:is="detail"
:eid="curId"
:uid="uId"
:title="title"
@on-close="cancel"
@on-ok="ok"
/>
</Modal>
<div class="fullWindow flex fd" v-if="viewModal">
<div class="top flex">
......@@ -76,7 +72,7 @@
</a>
</div>
<div class="fg tc f14 fwBold blueTitle">
{{l('code')}}：
{{l('code')}}：
<span class="grayTitle mr10">{{titleObj.code}}</span>
{{l('name')}}：
<span class="grayTitle mr10">{{titleObj.name}}</span>
......@@ -85,7 +81,7 @@
{{l('version')}}：
<span class="grayTitle">{{titleObj.version}}</span>
<!-- {{l('departmentId')}}：
<span class="grayTitle">{{titleObj.departmentId}}</span> -->
<span class="grayTitle">{{titleObj.departmentId}}</span>-->
</div>
</div>
<div class="fg">
......@@ -122,6 +118,7 @@ export default {
src: null,
detail: null,
curId: 0,
uId: "",
columns: [
{ key: "id", title: this.$t("id"), hide: true, align: "left" },
{
......@@ -190,7 +187,7 @@ export default {
{
key: "isMain",
title: this.l("isMain"),
align: "left",
align: "center",
width: 80,
high: true,
code: "Process.state"
......@@ -214,7 +211,8 @@ export default {
{
key: "isEffect",
title: this.l("isEffect"),
align: "left",
align: "center",
width: 80,
high: true,
code: "Process.Status"
},
......@@ -222,7 +220,8 @@ export default {
key: "versionnotes",
title: this.l("versionnotes"),
align: "left",
high: true
high: true,
hide: true
},
{
key: "phase",
......@@ -241,18 +240,26 @@ export default {
{
key: "isSendPpm",
title: this.l("isSendPpm"),
align: "left",
width: 180,
align: "center",
width: 140,
high: true,
code: "Process.Status"
},
{
title: "操作",
key: "action",
width: 140,
width: 180,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
h(
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.viewprocess(params.row) }
},
"预览"
),
h(
"op",
{
......@@ -261,12 +268,19 @@ export default {
},
"查看"
),
//h('op', { attrs: { oprate: 'copy' }, on: { click: () => this.copy(params.row.id) } }, '克隆'),
h(
"op",
{
attrs: { oprate: "copy" },
on: { click: () => this.copy(params.row.id) }
},
"克隆"
),
h(
"op",
{
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) }
on: { click: () => this.edit(params.row) }
},
"编辑"
),
......@@ -288,7 +302,8 @@ export default {
routingType: 0, //工艺类型
version: "", //工艺版本
departmentId: null //车间
}
},
processviewModal: false
};
},
created() {
......@@ -364,8 +379,25 @@ export default {
// this.detail = () => import("./detail");
// this.modal = true;
// },
edit(id) {
this.curId = id;
viewprocess(row) {
this.curId = row.id;
if (row.fileId) {
this.uId = row.fileId;
} else {
this.uId = this.$u.guid(); //未上传过文件
}
this.title = "预览";
this.detail = () => import("./processview");
this.modal = true;
},
edit(row) {
this.curId = row.id;
if (row.fileId) {
this.uId = row.fileId;
} else {
this.uId = this.$u.guid(); //未上传过文件
}
this.title = "编辑";
this.detail = () => import("./edit");
this.modal = true;
......@@ -389,3 +421,24 @@ export default {
}
};
</script>
<style lang="less" scoped>
.order-quotation {
height: 100vh !important;
}
.table {
margin-top: 15px;
}
.topTitle {
height: 30px;
.table_title {
float: left;
width: 340px;
}
.title_btn {
margin-top: 1px;
}
}
.single-page-con {
overflow-y: hidden !important;
}
</style>
pages/technology/menu.less 0 → 100644
View file @ c66e23ce
.iview_cont{
border-right: 1px solid #000;
width: 100%;
// height: 60px;
// line-height: 60px;
}
.iview_cont6{
height: 60px;
line-height: 60px;
}
.title_cont{
margin: 10px auto;
width: auto;
display: inline-block;
}
.iview_cont01{
display: inline-block;
margin: 5px 6px;
font-weight: bold;
span{
display: inline;
}
.min120{
min-width: 120px;
}
}
.box{
width: 100%;
height: 40px;
border-bottom: 1px solid #fff;
}
.h1{
font-size: 36px;
display:inline-block;
width: auto;
padding: 0 8px;
height: 46px;
border-bottom: 1px solid #000;
margin: 40px auto;
}
.table_row02{
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height:62px;
line-height: 60px;
text-align: center;
margin-top: 10px;
}
.row03{
.tex_in10{
text-indent: 12px;
text-align: inherit!important;
}
}
.auto_row {
min-height: 60px!important;
height: auto!important;
padding: 5px;
}
.outP table thead tr th,.outP table tbody tr td{
padding: 2px 0;
// height: 30px;
line-height: 28px;
}
.outP table tbody tr td{
padding: 0 5px;
}
.tit01{ min-width: 70px; }
.tit02{ min-width: 100px; }
.tit03{ min-width: 300px; }
.tit04{ min-width: 100px; }
.tit05{ min-width: 100px; }
.title01{ min-width: 110px; }
.title02{ min-width: 300px; }
.title03{ min-width: 100px; }
.title04{ min-width: 100px; }
.title05{ min-width: 100px; }
.title06{ min-width: 100px; }
.outPdf table, .outPdf table tr th, .outPdf table tr td {
border-color: #000;
}
// 工艺文件
.outP {
.iviewimg {
width: 100%;
height: 70px;
text-align: center;
margin: 0 0 60px;
}
}
.table_box {
border: 1px solid #000;
.row_title {
height: 40px;
}
.table_row {
line-height: 40px;
border-bottom: 1px solid #000;
div {
text-align: center;
}
.box {
width: 100%;
height: 40px;
border-bottom: 1px solid #fff;
}
}
.row_label {
border-right: 1px solid #000;
}
.iview_cont {
border-right: 1px solid #000;
width: 100%;
height: 40px;
}
.table_row02 {
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height: 42px;
line-height: 40px;
text-align: center;
margin-top: 10px;
}
}
.center {
text-align: center;
}
.title_cont {
margin: 10px auto;
width: auto;
display: inline-block;
}
.iview_cont01 {
display: inline-block;
margin: 0 6px;
font-weight: bold;
}
.f16 {
font-size: 16px;
}
.h1 {
font-size: 36px;
display: inline-block;
width: auto;
padding: 0 8px;
height: 46px;
border-bottom: 1px solid #000;
margin: 40px auto;
}
.outP table thead tr th,
.outP table tbody tr td {
padding: 2px 0;
// height : 30px;
line-height: 28px;
}
.outP table tbody tr td {
padding: 0 5px;
}
.tit01 {
min-width: 70px;
}
.tit02 {
min-width: 100px;
}
.tit03 {
min-width: 300px;
}
.tit04 {
min-width: 100px;
}
.tit05 {
min-width: 100px;
}
.title01 {
min-width: 110px;
}
.title02 {
min-width: 300px;
}
.title03 {
min-width: 100px;
}
.title04 {
min-width: 100px;
}
.title05 {
min-width: 100px;
}
.title06 {
min-width: 100px;
}
.outPdf table,
.outPdf table tr th,
.outPdf table tr td {
border-color: #000;
}
\ No newline at end of file
pages/technology/processview.vue 0 → 100644
View file @ c66e23ce
This diff is collapsed.
pages/test.vue
View file @ c66e23ce
<style lang="less">
.test_layout {
height: 50%;
height: 100%;
.bg1{
background:#fefefe ;
}
.fg {
background-color: rgba(234,45,198, 1);
overflow: auto;
}
// &.fg {
// // overflow: auto;
// }
}
.layout-copy {
text-align: center;
......@@ -20,20 +19,15 @@
<div>
<Menu mode="horizontal" active-name="1">
<div class="layout-assistant">
<MenuItem name="1">Option 1</MenuItem>
<MenuItem name="1" to="/test/user">人员选择</MenuItem>
<MenuItem name="2">Option 2</MenuItem>
<MenuItem name="3">Option 3</MenuItem>
</div>
</Menu>
</div>
<div class="fg">
<h4 v-for="i in 200">
{{i}}内容部分
</h4>
</div>
<div>
这是一个问题
</div>
<nuxt-child></nuxt-child>
</div>
</div>
</template>
<script>
......
pages/test/user.vue
View file @ c66e23ce
<template>
<div>
<UserSelect v-model="user" :multiple="true" :type="1"/>
<DepartmentSelect v-model="dep" />
<div style="padding:50px;">
<UserSelect v-model="user" :multiple="true" theme="list"/>
<!-- <DepartmentSelect v-model="dep" />
<Button @click="setUser">Set</Button>{{dep}} -->
{{user}}
<Button @click="setUser">Set</Button>{{dep}}
</div>
</template>
<script>
......
src/assets/css/menu.css 0 → 100644
View file @ c66e23ce
.iview_cont {
border-right: 1px solid #000;
width: 100%;
}
.iview_cont6 {
height: 60px;
line-height: 60px;
}
.title_cont {
margin: 10px auto;
width: auto;
display: inline-block;
}
.iview_cont01 {
display: inline-block;
margin: 5px 6px;
font-weight: bold;
}
.iview_cont01 span {
display: inline;
}
.iview_cont01 .min120 {
min-width: 120px;
}
.box {
width: 100%;
height: 40px;
border-bottom: 1px solid #fff;
}
.h1 {
font-size: 36px;
display: inline-block;
width: auto;
padding: 0 8px;
height: 46px;
border-bottom: 1px solid #000;
margin: 40px auto;
}
.table_row02 {
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height: 62px;
line-height: 60px;
text-align: center;
margin-top: 10px;
}
.row03 .tex_in10 {
text-indent: 12px;
text-align: inherit!important;
}
.auto_row {
min-height: 60px!important;
height: auto!important;
padding: 5px;
}
.outP table thead tr th,
.outP table tbody tr td {
padding: 2px 0;
line-height: 28px;
}
.outP table tbody tr td {
padding: 0 5px;
}
.tit01 {
min-width: 70px;
}
.tit02 {
min-width: 100px;
}
.tit03 {
min-width: 300px;
}
.tit04 {
min-width: 100px;
}
.tit05 {
min-width: 100px;
}
.title01 {
min-width: 110px;
}
.title02 {
min-width: 300px;
}
.title03 {
min-width: 100px;
}
.title04 {
min-width: 100px;
}
.title05 {
min-width: 100px;
}
.title06 {
min-width: 100px;
}
.outPdf table,
.outPdf table tr th,
.outPdf table tr td {
border-color: #000;
}
.outP .iviewimg {
width: 100%;
height: 70px;
text-align: center;
margin: 0 0 60px;
}
.table_box {
border: 1px solid #000;
}
.table_box .row_title {
height: 40px;
}
.table_box .table_row {
line-height: 40px;
border-bottom: 1px solid #000;
}
.table_box .table_row div {
text-align: center;
}
.table_box .table_row .box {
width: 100%;
height: 40px;
border-bottom: 1px solid #fff;
}
.table_box .row_label {
border-right: 1px solid #000;
}
.table_box .iview_cont {
border-right: 1px solid #000;
width: 100%;
height: 40px;
}
.table_box .table_row02 {
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height: 42px;
line-height: 40px;
text-align: center;
margin-top: 10px;
}
.center {
text-align: center;
}
.title_cont {
margin: 10px auto;
width: auto;
display: inline-block;
}
.iview_cont01 {
display: inline-block;
margin: 0 6px;
font-weight: bold;
}
.f16 {
font-size: 16px;
}
.h1 {
font-size: 36px;
display: inline-block;
width: auto;
padding: 0 8px;
height: 46px;
border-bottom: 1px solid #000;
margin: 40px auto;
}
.outP table thead tr th,
.outP table tbody tr td {
padding: 2px 0;
line-height: 28px;
}
.outP table tbody tr td {
padding: 0 5px;
}
.tit01 {
min-width: 70px;
}
.tit02 {
min-width: 100px;
}
.tit03 {
min-width: 300px;
}
.tit04 {
min-width: 100px;
}
.tit05 {
min-width: 100px;
}
.title01 {
min-width: 110px;
}
.title02 {
min-width: 300px;
}
.title03 {
min-width: 100px;
}
.title04 {
min-width: 100px;
}
.title05 {
min-width: 100px;
}
.title06 {
min-width: 100px;
}
.outPdf table,
.outPdf table tr th,
.outPdf table tr td {
border-color: #000;
}
src/assets/css/table.css 0 → 100644
View file @ c66e23ce
.transmit_box {
height: 100%;
}
.transmit_title {
padding-top: 10px;
}
.border_bottom {
border-bottom: 1px solid #e4e6ed;
}
.transmit_content {
padding: 20px 0 0 0;
height: calc(100% - 108px);
}
.select {
color: #a7b8cc;
font-size: 22px;
}
.wuliao_left {
float: left;
width: 310px;
margin-right: 15px;
height: 500px;
border: 1px solid #e4e6ed;
overflow-y: auto;
overflow-x: hidden;
}
.wuliao_right {
width: calc(100% - 325px);
height: calc(100% - 16px);
border: 1px solid #e4e6ed;
overflow-y: auto;
overflow-x: hidden;
}
.card_title {
background: #f8f8f9;
padding: 8px 15px;
border-bottom: 1px solid #e4e6ed;
position: relative;
height: 46px;
}
.state {
float: right;
color: #515a6e;
padding: 5px 5px;
}
.transmit_cont {
position: absolute;
top: 28px;
right: 0px;
border-radius: 4px;
width: 105px;
height: 155px;
background: #fff;
box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2);
}
.state_body {
padding: 10px 0px;
text-align: center;
line-height: 24px;
}
.state_footer {
border-top: 1px solid #e4e6ed;
padding: 3px;
}
.title_btn02 {
padding: 0px 9px;
border: none;
}
.color02 {
color: #249e91;
}
.card_box {
cursor: pointer;
width: 270px;
height: 116px;
border: 1px solid #e4e6ed;
margin: 20px auto;
}
.hover {
cursor: pointer;
width: 270px;
height: 116px;
border: 1px solid #e4e6ed;
margin: 20px auto;
background: #f5f7fd;
}
.card_body {
width: 230px;
float: left;
padding: 10px 0 0 10px;
}
.card_right {
cursor: pointer;
background: #e4e6ed;
height: 114px;
text-align: center;
float: left;
width: 38px;
}
.yellow {
background: #ffc000;
}
.pink {
background: #ff7a8b;
}
.green {
background: #27c149;
}
.card_right > img {
margin-top: 48px;
}
.list_item {
height: 24px;
line-height: 24px;
}
.list_item img {
width: 16px;
height: 16px;
}
.table01 {
padding: 0 10px;
}
.new_box .photo {
float: left;
margin: 0 20px 0 0;
width: calc(40% - 20px);
border-right: solid 1px #bebcbc;
text-align: center;
}
.new_box .photo img {
width: 350px !important;
height: 300px !important;
}
.new_box .table {
float: left;
width: calc(60% - 20px);
}
.fixed_box {
overflow-y: auto;
overflow-x: hidden;
padding: 0 10px;
}
.outP .iviewimg {
width: 100%;
height: 70px;
text-align: center;
margin: 0 0 60px;
}
.table_box {
border: 1px solid #000;
}
.table_box .row_title {
height: 40px;
}
.table_box .table_row {
line-height: 40px;
border-bottom: 1px solid #000;
}
.table_box .table_row div {
text-align: center;
}
.table_box .table_row .box {
width: 100%;
height: 40px;
border-bottom: 1px solid #fff;
}
.table_box .row_label {
border-right: 1px solid #000;
}
.table_box .iview_cont {
border-right: 1px solid #000;
width: 100%;
height: 40px;
}
.table_box .table_row02 {
border-top: 1px solid #000;
border-bottom: 1px solid #000;
height: 42px;
line-height: 40px;
text-align: center;
margin-top: 10px;
}
.center {
text-align: center;
}
.title_cont {
margin: 10px auto;
width: auto;
display: inline-block;
}
.iview_cont01 {
display: inline-block;
margin: 0 6px;
font-weight: bold;
}
.f16 {
font-size: 16px;
}
.h1 {
font-size: 36px;
display: inline-block;
width: auto;
padding: 0 8px;
height: 46px;
border-bottom: 1px solid #000;
margin: 40px auto;
}
.outP table thead tr th,
.outP table tbody tr td {
padding: 2px 0;
line-height: 28px;
}
.outP table tbody tr td {
padding: 0 5px;
}
.tit01 {
min-width: 70px;
}
.tit02 {
min-width: 100px;
}
.tit03 {
min-width: 300px;
}
.tit04 {
min-width: 100px;
}
.tit05 {
min-width: 100px;
}
.title01 {
min-width: 110px;
}
.title02 {
min-width: 300px;
}
.title03 {
min-width: 100px;
}
.title04 {
min-width: 100px;
}
.title05 {
min-width: 100px;
}
.title06 {
min-width: 100px;
}
.outPdf table,
.outPdf table tr th,
.outPdf table tr td {
border-color: #000;
}
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