Skip to content

M
mes-ui
Commit 2162b618 authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents c9336584 bcace170
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 70 deletions
i18n/locale/zh-CN.js
View file @ 2162b618
......@@ -1442,6 +1442,7 @@ export default {
order_list:{
mesCode:'订单编号',
status:'工单状态',
statusOrder:'订单状态',
productName:'产品名称',
drawnNumber:'图号',
quantity:'生产数量',
......@@ -1487,9 +1488,9 @@ export default {
type:'类型',
status:'状态',
description:'描述',
levelNum:'编码分类层数',
codeLength:'编码分类位数',
materialCodeLength:'物料编码位数'
levelNum:'分类层数',
codeLength:'分类位数',
materialCodeLength:'流水位数'
},
//转续列表
order_execute_handon:{
......
pages/handle/examine7/detail.vue
View file @ 2162b618
<template>
<div class="detail" style="width:90%;margin:0 auto">
<Row>
<Filed :span="8" :name="l('unqualifiedCode')">{{entity.unqualified_order_code}}</Filed>
<!-- <Filed :span="8" :name="l('unqualifiedCode')">{{entity.unqualified_order_code}}</Filed>
<Filed :span="8" :name="l('department')">{{entity.department_name}}</Filed>
<Filed :span="8" :name="l('customer')">{{entity.customer_name}}</Filed>
<Filed :span="8" :name="l('outsourcing')">{{entity.outsourcing_name}}</Filed>
......@@ -11,7 +11,21 @@
<Filed :span="8" :name="l('code')">{{entity.code}}</Filed>
<Filed :span="8" :name="l('problemDesc')">{{entity.problem_desc}}</Filed>
<Filed :span="8" :name="l('inspectionPerson')">{{entity.inspection_person_name}}</Filed>
<Filed :span="8" :name="l('inspectionDate')">{{entity.inspection_date}}</Filed>
<Filed :span="8" :name="l('inspectionDate')">{{entity.inspection_date}}</Filed> -->
<Filed :span="12" :name="l('productName')">{{entity.productName}}</Filed>
<Filed :span="12" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed>
<Filed :span="12" :name="l('status')">
<state code="plan.order.status" ref="state" :value="entity.status" type="text" ></state>
</Filed>
<Filed :span="12" :name="l('mesCode')">{{entity.mesCode}}</Filed>
<Filed :span="12" name="批次号">{{entity.batchNumber}}</Filed>
<Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed>
<Filed :span="12" name="节点日期">{{entity.demandFinishDate}}</Filed>
<Filed :span="12" name="工序名称">{{entity.seqName}}</Filed>
<Filed :span="12" name="问题原因">{{entity.reason}}</Filed>
<Filed :span="12" name="责任归属">{{entity.personLiableId}}</Filed>
<Filed :span="24" name="不合格产品">{{entity.strOder}}</Filed>
<Filed :span="24" name="审理单号">{{entity.code}}</Filed>
</Row>
</div>
</template>
......@@ -44,6 +58,7 @@ export default {
Api.get({ Id: this.idVal }).then((r) => {
if (r.success) {
console.log(r)
let formStr = r.result.formData.replace(/\"/g, '"')
let formStr01 = JSON.parse(formStr)
// console.log(formStr01)
......@@ -58,7 +73,7 @@ export default {
methods: {
load(v) {},
l(key) {
key = 'Unqualified' + '.' + key
key = 'order_list' + '.' + key
return this.$t(key)
}
},
......
pages/materiel/codeRule/add.vue
View file @ 2162b618
......@@ -21,11 +21,7 @@
<Dictionary code="material.code.status" v-model="entity.status"></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('levelNum')" prop="levelNum">
<InputNumber v-model="entity.levelNum" :max="10" :min="1"></InputNumber>
......@@ -41,6 +37,11 @@
<InputNumber v-model="entity.materialCodeLength" :max="10" :min="1"></InputNumber>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......@@ -66,7 +67,7 @@ export default {
code: "",
name: "",
type: null,
status: null,
status: 0,
description: "",
levelNum: null,
codeLength: null,
......
pages/materiel/codeRule/detail.vue
View file @ 2162b618
......@@ -11,10 +11,11 @@
<Filed :span="12" :name="l('status')">
<state code="material.code.status" :value="entity.status" type="text"></state>
</Filed> -->
<Filed :span="24" :name="l('description')">{{entity.description}}</Filed>
<Filed :span="12" :name="l('levelNum')">{{entity.levelNum}}</Filed>
<Filed :span="12" :name="l('codeLength')">{{entity.codeLength}}</Filed>
<Filed :span="12" :name="l('materialCodeLength')">{{entity.materialCodeLength}}</Filed>
<Filed :span="24" :name="l('description')">{{entity.description}}</Filed>
</Row>
</div>
......
pages/materiel/codeRule/edit.vue
View file @ 2162b618
......@@ -21,11 +21,7 @@
<Dictionary code="material.code.status" v-model="entity.status"></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('levelNum')" prop="levelNum">
<InputNumber v-model="entity.levelNum" disabled :max="10" :min="1"></InputNumber>
......@@ -41,6 +37,11 @@
<InputNumber v-model="entity.materialCodeLength" disabled :max="10" :min="1"></InputNumber>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......
pages/produce/execute/judgment/index.vue
View file @ 2162b618
......@@ -626,7 +626,8 @@ export default {
let orderIds = []
this.feilist.map(item=>{
orderse.push(item.prefix+'.'+item.code)
orderIds.push(item.id)
// orderIds.push(item.id)
orderIds.push(item.code)//工作流获取数据，暂时传code数组
})
let strOder = orderse.join(",")
this.entity.cause = this.orderForm.question;
......@@ -677,13 +678,14 @@ export default {
.batchOrderStart(parmese)
.then(response => {
if (response.success) {
this.loadchangelist();
// this.loadFun();
this.$Message.info("送审成功!");
this.dataListRetrunNew.idList = [];
// this.dataListRetrunNew.idList = [];
this.ModalOrder = false;
} else {
this.$Message.error("送审失败!");
this.ModalOrder = false;
}
this.modalInfo = false;
});
},
// 取消 返回工单列表
......
pages/produce/execute/taskTime/add.vue
View file @ 2162b618
......@@ -65,8 +65,8 @@
</Col>
<Col span="24">
<FormItem label="分配工时" prop="setTime">
<!-- <InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; -->
<InputNumber :max="maxHour" :min="1" v-model="entity.workHour" @on-change="testChange"></InputNumber>&nbsp;&nbsp;&nbsp;&nbsp;工时
<!-- <InputNumber :max="30" :min="0" :step="1" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; -->
<InputNumber :max="maxHour" :min="1" :editable="false" v-model="entity.workHour" @on-change="testChange"></InputNumber>&nbsp;&nbsp;&nbsp;&nbsp;工时
<!-- <InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟 &nbsp;&nbsp;&nbsp;&nbsp; -->
</FormItem>
</Col>
......@@ -121,10 +121,9 @@ export default {
this.entity.cardNo = item.cardNo
}
})
console.log(this.entity);
// console.log(this.entity);
this.$emit("on-ok", this.entity);
this.showSelect = true
// this.entity={}
},
//单选框
radioChange(val) {
......@@ -172,25 +171,13 @@ export default {
}
},
// 选择新增人员
changeUser(data){
// console.log(data)
let alloterInfo = this.$refs.userSelected.getSelectItems();
if(data&&data!=undefined){
this.userflag = true
}
if(data==undefined){
this.userflag = false
}
// if (!userInfo || userInfo.length == 0) {
// this.$Message.error("请选择人员！");
// return;
// }
// console.log(alloterInfo)
if(alloterInfo.length>0){
this.entity.cardNo = alloterInfo[0].cardNo
this.entity.userName = alloterInfo[0].userName
this.entity.userId = alloterInfo[0].id
}
changeUser(data){
this.$nextTick(()=>{
let alloterInfo = this.$refs.userSelected.getSelectItems();
this.entity.cardNo = alloterInfo[0].cardNo
this.entity.userName = alloterInfo[0].userName
this.entity.userId = alloterInfo[0].id
})
},
testChange() {
// 该方法在input内容改变是就会触发进行检测
......
pages/produce/execute/taskTime/index.vue
View file @ 2162b618
......@@ -143,6 +143,12 @@ export default {
});
this.$refs.addview.listMan = result;
});
this.$refs.addview.entity = {
cardNo: "",
oldUserse: null,
userse: null,
workHour: 1,
}
},
editItem() {
this.$Message.success("编辑工时...");
......
pages/produce/orderlist.vue
View file @ 2162b618
......@@ -11,21 +11,25 @@
:conditions="easySearch"
:action="action"
:gutter="40"
:high="false"
>
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入订单编号/产品名称/图号" v-model="easySearch.keys.value" v-width="260" clearable/>
<Input
placeholder="请输入订单编号/产品名称/图号"
v-model="easySearch.keys.value"
v-width="260"
clearable
/>
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
</Form>
</template>
<template slot="searchForm">
<Search />
</template>
<template slot="searchForm">
<Search />
</template>
<template slot="buttons">
<Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
</template>
......@@ -117,8 +121,8 @@ import Api from "./api";
import Search from "./search";
export default {
name: "starOrder",
components: {
Search,
components: {
Search
},
data() {
return {
......
pages/produce/search.vue
View file @ 2162b618
......@@ -12,7 +12,7 @@
<Input v-model="condition.mesCode.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.productName.show">
<Col :span="12" >
<FormItem :label="l('productName')" prop="productName">
<Input v-model="condition.productName.value"></Input>
</FormItem>
......@@ -24,26 +24,27 @@
</Col>
<Col :span="12" v-if="condition.quantity.show">
<FormItem :label="l('quantity')" prop="quantity">
<Input v-model="condition.quantity.value"></Input>
<InputNumber :min="1" v-model="condition.quantity.value"></InputNumber>
</FormItem>
</Col>
<Col :span="12" v-if="condition.status.show">
<FormItem :label="l('status')" prop="status">
<Dictionary code="taskList.status" v-model="condition.status.value"></Dictionary>
<Col :span="12" v-if="condition.dispatchStatus.show">
<FormItem :label="l('status')" prop="dispatchStatus">
<Dictionary code="taskList.status" v-model="condition.dispatchStatus.value"></Dictionary>
</FormItem>
</Col>
<Col :span="12" v-if="condition.status.show">
<FormItem :label="l('statusOrder')" prop="status">
<Dictionary code="plan.order.status" v-model="condition.status.value"></Dictionary>
</FormItem>
</Col>
<Col :span="12" v-if="condition.beginTime.show">
<FormItem :label="l('beginTime')" prop="beginTime">
<DatePicker type="daterange" v-model="condition.beginTime.value"></DatePicker>
<DatePicker type="daterange" v-model="condition.beginTime.value" v-width="284"></DatePicker>
</FormItem>
</Col>
<Col :span="12" v-if="condition.endTime.show">
<FormItem :label="l('endTime')" prop="endTime">
<DatePicker type="endTime" v-model="condition.endTime.value"></DatePicker>
<DatePicker type="daterange" v-model="condition.endTime.value" v-width="284"></DatePicker>
</FormItem>
</Col>
</Row>
......@@ -58,17 +59,18 @@ export default {
condition: {
id: { op: "Equal", value: null, show: false },
executeId: { op: "Equal", value: null, show: false },
drawnNumber: { op: "Equal", value: null, show: true },
drawnNumber: { op: "Like", value: null, show: true },
mesCode: { op: "Equal", value: null, show: true },
orderId: { op: "Equal", value: null, show: false },
productId: { op: "Equal", value: null, show: false },
productName: { op: "Equal", value: null, show: true },
quantity: { op: "Equal", value: null, show: false },
productName: { op: 'Like', value: null, show: true },
quantity: { op: "Equal", value: null, show: true },
routingHeaderId: { op: "Equal", value: null, show: false },
routingDetailId: { op: "Equal", value: null, show: false },
status: { op: "Equal", value: null, show: true },
beginTime: { op: "Range", value: null, show: false },
endTime: { op: "Range", value: null, show: false },
dispatchStatus:{ op: "Equal", value: null, show: true },//工单状态
status: { op: "Equal", value: null, show: true },//订单状态
beginTime: { op: "Range", value: null, show: true },
endTime: { op: "Range", value: null, show: true },
}
};
},
......
pages/test/u.vue
View file @ 2162b618
......@@ -20,7 +20,10 @@
<Button @click="getFileInfo">得到多文件上传信息</Button>
<h2>人员选择</h2>
<UserSelect v-model="user" :multiple="true" />
<UserSelect v-model="user" />
<p>
{{user}}
</p>
<h2>时间展示</h2>
<DTSpan type="date" v-model="testDate"></DTSpan>
<h2>时间段展示</h2><!-- 默认为datetime类型，可设置为date型，type="date";默认展示快捷时间段，包括当天、本周、本月，如不需要:showFast="false" -->
......
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