Skip to content

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

搜索

parents 115ceb40 d5ba0e3c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1273 additions and 964 deletions
components/page/filed.vue
View file @ d74d48bb
<template>
<Col :span="span" class="filed-col">
<label v-text="name" class="label"></label>
<span>
<div v-text="name" class="label"></div>
<p>
<slot></slot>
</span>
</p>
</Col>
</template>
<script>
export default {
name: 'filed',
name: "filed",
props: {
name: {
type: String
......@@ -18,29 +18,51 @@ export default {
default: 12
}
}
}
};
</script>
<style lang="less">
.detail {
display: table;
height: 100%;
border-collapse: collapse;
.ivu-row {
display: table-row;
border-top: 1px solid #ddd;
border-left: 1px solid #ddd;
border: 1px solid #ddd;
border-top: none;
height: 100%;
.filed-col {
display: table-cell;
border-bottom: 1px solid #ddd;
border-right: 1px solid #ddd;
// margin: 0 0 -1px -1px;
line-height: 30px;
max-width: 970px;
border: 1px solid #ddd;
border-right: none;
margin: 0 -1px -1px -1px;
box-sizing: border-box;
line-height: 70px;
.label {
background: #e8eaf1;
display: inline-block;
width: 100px;
text-align: right;
padding: 0 5px;
line-height: 40px;
float: left;
height: 100%;
}
p {
max-width: 870px;
height: 100%;
word-break: break-all;
word-wrap: break-word;
margin: 0 10px 0 110px;
line-height: 20px;
padding-top: 10px;
}
}
.ivu-col-span-24 {
.label {
height: 100%;
padding: 0.5% 5px;
}
p {
padding-top: 1%;
}
}
}
......
pages/aps/aps/index.vue
View file @ d74d48bb
......@@ -400,12 +400,14 @@ export default {
});
parmsOrderpriority.alls = arryIds;
// alert(JSON.stringify(parmsOrderpriority));
Api.orderpriority(parmsOrderpriority).then(res => {
Api.orderpriority(parmsOrderpriority)
.then(res => {
if (res.success) {
if (res.result) {
//this.$Message.success("排序成功");
//apsp排产前检查
Api.apsdatachecked().then(res1 => {
Api.apsdatachecked()
.then(res1 => {
if (res1.success) {
if (res1.result.res) {
// this.$Message.success("数据校验成功");
......@@ -413,7 +415,8 @@ export default {
let paramsTime = {
setTime: this.entity.setTime
};
Api.apsprepareandcalc(paramsTime).then(res2 => {
Api.apsprepareandcalc(paramsTime)
.then(res2 => {
if (res2.success) {
if (res2.result.res) {
this.$Message.success("排产计算成功");
......@@ -423,26 +426,50 @@ export default {
// params: { customerId: id }
});
} else {
this.circleModal = false;
this.$Message.error(res2.result.msg);
}
} else {
this.circleModal = false;
this.$Message.error("操作失败：排产计算");
}
});
})
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
} else {
this.circleModal = false;
this.$Message.success("数据校验失败");
}
} else {
this.circleModal = false;
this.$Message.error("操作失败：数据校验");
}
});
})
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
} else {
this.circleModal = false;
this.$Message.error("排序失败，请重新APS排产操作");
}
} else {
this.circleModal = false;
this.$Message.error("操作失败：排序");
}
});
})
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
},
//打开设置参数
openAddModel(type, row) {
......
pages/aps/results/index.vue
View file @ d74d48bb
......@@ -175,6 +175,7 @@ export default {
if (r.success) {
this.$Message.success("清空列表成功");
this.orderlist();
this.data = [];
}
});
},
......@@ -192,6 +193,7 @@ export default {
if (r.result) {
this.$Message.success(r.result.retmsg);
this.orderlist();
this.data = [];
} else {
this.$Message.success("下发失败");
}
......
pages/crm/customer/detail.vue
View file @ d74d48bb
......@@ -15,49 +15,50 @@
<Filed :span="12" :name="l('status')">
<state code="crm.customer.status" :value="entity.status" type="text"></state>
</Filed>
<Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
<Filed :span="12" :name="l('code')">{{entity.code}}</Filed>
<Filed :span="12" :name="l('trade')">{{entity.trade}}</Filed>
<Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
<Filed :span="24" :name="l('trade')">{{entity.trade}}</Filed>
</Row>
</div>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Add',
name: "Add",
data() {
return {
entity: {},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: '必填', trigger: 'blur' }]
}
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }]
}
};
},
props: {
eid: Number
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
this.entity = r.result
this.$emit('on-load')
})
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.$emit("on-load");
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'Customer' + '.' + key
return this.$t(key)
key = "Customer" + "." + key;
return this.$t(key);
}
},
watch: {
eid(v) {
if (v != 0) {
this.load(v)
this.load(v);
}
}
}
}
};
</script>
pages/order/orderManager.vue
View file @ d74d48bb
......@@ -14,6 +14,7 @@
</div>
</div>
</Sider>
<Content class="content">
<CustomTable :tcolumn="ocolumn" :orderSearchForm="orderSearchForm" ref="CustomTable">
<!-- slot内容 -->
......
pages/processManage/Process/processMain.vue
View file @ d74d48bb
......@@ -183,9 +183,9 @@ export default {
RoutingList: {},
components: {},
ruleValidate: {
code: [
{ required: true, message: '工艺文件编号不能为空', trigger: 'blur' }
],
// code: [
// { required: true, message: '工艺文件编号不能为空', trigger: 'blur' }
// ],
// number:[{required: true,type:'number'}],
name: [
{ required: true, message: '工艺文件名称不能为空', trigger: 'blur' }
......
pages/processManage/setProcess/index.vue
View file @ d74d48bb
......@@ -63,7 +63,7 @@
</FormItem>
</Col>
<Col span="12">
<FormItem label="订单状态" style="width:100%">
<FormItem label="状态" style="width:100%">
<dictionary
code="plan.order.status"
v-model="orderSearchForm.status"
......@@ -74,6 +74,28 @@
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="项目号" style="width:100%">
<Input v-model="orderSearchForm.projectNumber" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="12">
<FormItem label="批次号" style="width:100%">
<Input v-model="orderSearchForm.batchNumber" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="紧急程度" style="width:100%">
<dictionary
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
style="width:240px"
></dictionary>
</FormItem>
</Col>
<Col span="12">
<FormItem label="任务类型" style="width:100%">
<dictionary
......@@ -83,6 +105,8 @@
></dictionary>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="阶段" style="width:100%">
<dictionary
......@@ -92,8 +116,6 @@
></dictionary>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="材料" style="width:100%">
<dictionary
......@@ -103,13 +125,13 @@
></dictionary>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="数量" style="width:100%">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="甲方客户" style="width:100%">
<dictionary
......@@ -119,15 +141,6 @@
></dictionary>
</FormItem>
</Col>
<Col span="12">
<FormItem label="3D打印承制单位" style="width:100%">
<dictionary
code="plan.order.printSupply"
v-model="orderSearchForm.printSupply"
style="width:240px"
></dictionary>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
......@@ -185,18 +198,6 @@
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="工艺状态" style="width:100%">
<Select v-model="orderSearchForm.RoutingSetStatus" style="width:200px">
<Option value>全部</Option>
<Option value="1">已设置</Option>
<Option value="0">未设置</Option>
</Select>
</FormItem>
</Col>
<Col span="12"></Col>
</Row>
</Form>
<div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button>
......@@ -413,12 +414,12 @@ export default {
}, //确定保存后返回数据
orderSearchForm: {
productId: null, //产品id
productId: "", //产品id
productName: "", //产品名称
taskType: "", //任务类型
stage: "", //阶段
materialId: "", //材料
quantity: 0, //数量
quantity: null, //数量
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
......@@ -437,9 +438,9 @@ export default {
demandStartDate: "", //开始时间
demandFinishDate: "", //完成时间
remark: "", //备注
MaxResultCount: 10,
SkipCount: 0,
RoutingSetStatus: ""
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
},
formValidate: {
id: "",
......
pages/produce/orderscheduling.vue
View file @ d74d48bb
This diff is collapsed.
pages/produce/scheduling.vue
View file @ d74d48bb
<template>
<Tabs :animated="false">
<orderscheduling :style="{ height: tabHeight }" ref="orderscheduling"></orderscheduling>
<!-- <Tabs :animated="false">
<TabPane label="排产派工" name="1">
<orderscheduling :style="{ height: tabHeight }" ref="orderscheduling"></orderscheduling>
</TabPane>
<TabPane label="料单确认" name="2">
<ordermaterial :style="{ height: tabHeight }" ref="ordermaterial"></ordermaterial>
</TabPane>
</Tabs>
</Tabs> -->
</template>
<script>
import ordermaterial from './ordermaterial.vue'
// import ordermaterial from './ordermaterial.vue'
import orderscheduling from './orderscheduling.vue'
export default {
components: { ordermaterial, orderscheduling },
components: { orderscheduling },
data() {
return {
tabHeight:""
......
pages/produce/taskList.vue
View file @ d74d48bb
......@@ -62,65 +62,106 @@
<Row>
<Col span="12">
<FormItem label="工艺编号" style="width:100%">
<dictionary code='plan.order.material' v-model="orderSearchForm.materialId" style="width:240px"></dictionary>
<Input
v-model="orderSearchForm.processcode"
placeholder="请输入工艺编号"
style="width: 240px"
/>
</FormItem>
</Col>
<Col span="12">
<FormItem label="工艺名称" style="width:100%">
<dictionary code='plan.order.material' v-model="orderSearchForm.materialId" style="width:240px"></dictionary>
<Input
v-model="orderSearchForm.processname"
placeholder="请输入工艺名称"
style="width: 240px"
/>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="任务类型" style="width:100%">
<dictionary code='plan.order.taskType' v-model="orderSearchForm.taskType" style="width:240px"></dictionary>
<FormItem label="项目号" style="width:100%">
<Input v-model="orderSearchForm.projectNumber" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="12">
<FormItem label="阶段" style="width:100%">
<dictionary code='plan.order.stage' v-model="orderSearchForm.stage" style="width:240px"></dictionary>
<FormItem label="批次号" style="width:100%">
<Input v-model="orderSearchForm.batchNumber" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="材料" style="width:100%">
<dictionary code='plan.order.material' v-model="orderSearchForm.materialId" style="width:240px"></dictionary>
<FormItem label="紧急程度" style="width:100%">
<dictionary
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
style="width:240px"
></dictionary>
</FormItem>
</Col>
<Col span="12">
<FormItem label="数量" style="width:100%">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
<FormItem label="任务类型" style="width:100%">
<dictionary
code="plan.order.taskType"
v-model="orderSearchForm.taskType"
style="width:240px"
></dictionary>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="甲方客户" style="width:100%">
<dictionary code='plan.order.guestName' v-model="orderSearchForm.guestName" style="width:240px"></dictionary>
<FormItem label="阶段" style="width:100%">
<dictionary
code="plan.order.stage"
v-model="orderSearchForm.stage"
style="width:240px"
></dictionary>
</FormItem>
</Col>
<Col span="12">
<FormItem label="3D打印承制单位" style="width:100%">
<dictionary code='plan.order.printSupply' v-model="orderSearchForm.printSupply" style="width:240px"></dictionary>
<FormItem label="材料" style="width:100%">
<dictionary
code="plan.order.material"
v-model="orderSearchForm.materialId"
style="width:240px"
></dictionary>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="厂内责任机关" style="width:100%">
<Input
v-model="orderSearchForm.functionaryOffice"
placeholder
<FormItem label="数量" style="width:100%">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
</FormItem>
</Col>
<Col span="12">
<FormItem label="甲方客户" style="width:100%">
<dictionary
code="plan.order.guestName"
v-model="orderSearchForm.guestName"
style="width:240px"
/>
></dictionary>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="厂内责任机关" style="width:100%">
<Input v-model="orderSearchForm.functionaryOffice" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="12">
<FormItem label="厂内责任主体部门" style="width:100%">
<dictionary code='plan.order.mainDepartment' v-model="orderSearchForm.mainDepartmentId" style="width:240px"></dictionary>
</Select>
<dictionary
code="plan.order.mainDepartment"
v-model="orderSearchForm.mainDepartmentId"
style="width:240px"
></dictionary>
</FormItem>
</Col>
</Row>
......@@ -132,11 +173,7 @@
</Col>
<Col span="12">
<FormItem label="甲方投产输入文件(编号)" style="width:100%">
<Input
v-model="orderSearchForm.putintDocmentCode"
placeholder
style="width:240px"
/>
<Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
......@@ -152,11 +189,7 @@
</Col>
<Col span="12">
<FormItem label="外部图号/模型号" style="width:100%">
<Input
v-model="orderSearchForm.outerDrawnNumber"
placeholder
style="width:240px"
/>
<Input v-model="orderSearchForm.outerDrawnNumber" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
......@@ -230,7 +263,11 @@ export default {
outer_Envelope_Size: '', //包装尺寸
demandStartDate: '', //开始时间
demandFinishDate: '', //完成时间
remark: '' //备注
remark: '', //备注,
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
},
mColumn:[
{ type: 'expand',width: 60,
......
pages/qc/dataTrace/index.vue
View file @ d74d48bb
This diff is collapsed.
pages/qc/taskList/index.vue
View file @ d74d48bb
This diff is collapsed.
pages/resource/resource/cart.vue
View file @ d74d48bb
......@@ -20,7 +20,7 @@
</Col>
<Col span="7">
<FormItem label="领料人" style="width:100%" prop="customerId">
<UserSelect ref="userSelected" v-model="resource.customerId" :type="1" />
<UserSelect ref="userSelected" v-model="resource.customerId" :type="0" />
</FormItem>
</Col>
</Row>
......
store/index.js
View file @ d74d48bb
import createVuexAlong from 'vuex-along'
import Api from '@/plugins/request'
export const state=()=>({
counter:0,
dictionary: new Map(),//所有字典项
userMap:[],//所有用户缓存;
userInfo:{
userId:0,
userName:""
}
export const state = () => ({
counter: 0,
dictionary: new Map(), //所有字典项
userMap: [], //所有用户缓存;
userInfo: {
userId: 0,
userName: ""
},
cart:[],
count: 0,
})
export const getters={
export const getters = {
dictionaryByKey: (state) => (key) => {
let result = [];
let items = state.dictionary.get(key);
......@@ -19,7 +21,7 @@ export const getters={
}
return result;
},
getUser:state=>key=>{
getUser: state => key => {
// try{
// if(state.userMap.has(key)){
// return state.userMap.get(key);
......@@ -27,16 +29,18 @@ export const getters={
// }catch(e){
// console.log(e);
// }
let user=state.userMap.filter(u=>{return u.id==key});
if(user.length>0){
let user = state.userMap.filter(u => {
return u.id == key
});
if (user.length > 0) {
return user[0]
}else{
} else {
return null;
}
}
}
export const mutations={
increment(state){
export const mutations = {
increment(state) {
state.counter++
},
setUserInfo(state, userInfo) {
......@@ -44,24 +48,40 @@ export const mutations={
// sessionStorage.setItem("userInfo", JSON.stringify(userInfo));
// sessionStorage.setItem("token", userInfo.token);
},
addUser(state,user){
addUser(state, user) {
state.userMap.push(user);
},
setDictionary(state, dictionary) {
state.dictionary = dictionary;
},
setCart(state, cart) {
state.cart = cart;
},
setCartCount(state, count) {
state.count = count;
}
}
export const actions={
async loadUser({commit},key){
export const actions = {
async loadUser({
commit
}, key) {
let { result } = await this.$api.get(`${systemUrl}/user/getuser`,{id:key});
console.warn("result",result)
commit("addUser",result);
let {
result
} = await this.$api.get(`${systemUrl}/user/getuser`, {
id: key
});
console.warn("result", result)
commit("addUser", result);
},
async loadDictionary({ commit }) {
async loadDictionary({
commit
}) {
let url = `${systemUrl}/Dictionary/GetAll`
let { result } = await Api.get(url);
let {
result
} = await Api.get(url);
var map = new Map();
......@@ -74,7 +94,7 @@ export const actions={
}
}
export const plugins= [
export const plugins = [
createVuexAlong({
// 设置保存的集合名字，避免同站点下的多项目数据冲突
name: "hyhmes",
......@@ -88,6 +108,6 @@ export const plugins= [
list: ["hyhmes.session"],
},
}),
]
//设置 strict 为不严格模式，即可在actions中修改state
export const strict=false;
\ No newline at end of file
]
//设置 strict 为不严格模式，即可在actions中修改state
export const strict = 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