Skip to content

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

搜索

parents 115ceb40 d5ba0e3c
Show whitespace changes
Inline Side-by-side
Showing with 1273 additions and 964 deletions
components/page/filed.vue
View file @ d74d48bb
<template> <template>
<Col :span="span" class="filed-col"> <Col :span="span" class="filed-col">
<label v-text="name" class="label"></label> <div v-text="name" class="label"></div>
<span> <p>
<slot></slot> <slot></slot>
</span> </p>
</Col> </Col>
</template> </template>
<script> <script>
export default { export default {
name: 'filed', name: "filed",
props: { props: {
name: { name: {
type: String type: String
...@@ -18,29 +18,51 @@ export default { ...@@ -18,29 +18,51 @@ export default {
default: 12 default: 12
} }
} }
} };
</script> </script>
<style lang="less"> <style lang="less">
.detail { .detail {
display: table; display: table;
height: 100%;
border-collapse: collapse; border-collapse: collapse;
.ivu-row { .ivu-row {
display: table-row; border: 1px solid #ddd;
border-top: 1px solid #ddd; border-top: none;
border-left: 1px solid #ddd; height: 100%;
.filed-col { .filed-col {
display: table-cell; max-width: 970px;
border-bottom: 1px solid #ddd; border: 1px solid #ddd;
border-right: 1px solid #ddd; border-right: none;
// margin: 0 0 -1px -1px; margin: 0 -1px -1px -1px;
line-height: 30px;
box-sizing: border-box; box-sizing: border-box;
line-height: 70px;
.label { .label {
background: #e8eaf1; background: #e8eaf1;
display: inline-block; display: inline-block;
width: 100px; width: 100px;
text-align: right; text-align: right;
padding: 0 5px; 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 { ...@@ -400,12 +400,14 @@ export default {
}); });
parmsOrderpriority.alls = arryIds; parmsOrderpriority.alls = arryIds;
// alert(JSON.stringify(parmsOrderpriority)); // alert(JSON.stringify(parmsOrderpriority));
Api.orderpriority(parmsOrderpriority).then(res => { Api.orderpriority(parmsOrderpriority)
.then(res => {
if (res.success) { if (res.success) {
if (res.result) { if (res.result) {
//this.$Message.success("排序成功"); //this.$Message.success("排序成功");
//apsp排产前检查 //apsp排产前检查
Api.apsdatachecked().then(res1 => { Api.apsdatachecked()
.then(res1 => {
if (res1.success) { if (res1.success) {
if (res1.result.res) { if (res1.result.res) {
// this.$Message.success("数据校验成功"); // this.$Message.success("数据校验成功");
...@@ -413,7 +415,8 @@ export default { ...@@ -413,7 +415,8 @@ export default {
let paramsTime = { let paramsTime = {
setTime: this.entity.setTime setTime: this.entity.setTime
}; };
Api.apsprepareandcalc(paramsTime).then(res2 => { Api.apsprepareandcalc(paramsTime)
.then(res2 => {
if (res2.success) { if (res2.success) {
if (res2.result.res) { if (res2.result.res) {
this.$Message.success("排产计算成功"); this.$Message.success("排产计算成功");
...@@ -423,26 +426,50 @@ export default { ...@@ -423,26 +426,50 @@ export default {
// params: { customerId: id } // params: { customerId: id }
}); });
} else { } else {
this.circleModal = false;
this.$Message.error(res2.result.msg); this.$Message.error(res2.result.msg);
} }
} else { } else {
this.circleModal = false;
this.$Message.error("操作失败：排产计算"); this.$Message.error("操作失败：排产计算");
} }
}); })
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
} else { } else {
this.circleModal = false;
this.$Message.success("数据校验失败"); this.$Message.success("数据校验失败");
} }
} else { } else {
this.circleModal = false;
this.$Message.error("操作失败：数据校验"); this.$Message.error("操作失败：数据校验");
} }
}); })
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
} else { } else {
this.circleModal = false;
this.$Message.error("排序失败，请重新APS排产操作"); this.$Message.error("排序失败，请重新APS排产操作");
} }
} else { } else {
this.circleModal = false;
this.$Message.error("操作失败：排序"); this.$Message.error("操作失败：排序");
} }
}); })
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
}, },
//打开设置参数 //打开设置参数
openAddModel(type, row) { openAddModel(type, row) {
......
pages/aps/results/index.vue
View file @ d74d48bb
...@@ -175,6 +175,7 @@ export default { ...@@ -175,6 +175,7 @@ export default {
if (r.success) { if (r.success) {
this.$Message.success("清空列表成功"); this.$Message.success("清空列表成功");
this.orderlist(); this.orderlist();
this.data = [];
} }
}); });
}, },
...@@ -192,6 +193,7 @@ export default { ...@@ -192,6 +193,7 @@ export default {
if (r.result) { if (r.result) {
this.$Message.success(r.result.retmsg); this.$Message.success(r.result.retmsg);
this.orderlist(); this.orderlist();
this.data = [];
} else { } else {
this.$Message.success("下发失败"); this.$Message.success("下发失败");
} }
......
pages/crm/customer/detail.vue
View file @ d74d48bb
...@@ -15,49 +15,50 @@ ...@@ -15,49 +15,50 @@
<Filed :span="12" :name="l('status')"> <Filed :span="12" :name="l('status')">
<state code="crm.customer.status" :value="entity.status" type="text"></state> <state code="crm.customer.status" :value="entity.status" type="text"></state>
</Filed> </Filed>
<Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
<Filed :span="12" :name="l('code')">{{entity.code}}</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> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Add', name: "Add",
data() { data() {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }], name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: '必填', trigger: 'blur' }] code: [{ required: true, message: "必填", trigger: "blur" }]
}
} }
};
}, },
props: { props: {
eid: Number eid: Number
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({ id: v }).then(r => {
this.entity = r.result this.entity = r.result;
this.$emit('on-load') this.$emit("on-load");
}) });
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = 'Customer' + '.' + key key = "Customer" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v != 0) { if (v != 0) {
this.load(v) this.load(v);
} }
} }
} }
} };
</script> </script>
pages/order/orderManager.vue
View file @ d74d48bb
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
</div> </div>
</div> </div>
</Sider> </Sider>
<Content class="content"> <Content class="content">
<CustomTable :tcolumn="ocolumn" :orderSearchForm="orderSearchForm" ref="CustomTable"> <CustomTable :tcolumn="ocolumn" :orderSearchForm="orderSearchForm" ref="CustomTable">
<!-- slot内容 --> <!-- slot内容 -->
......
pages/processManage/Process/processMain.vue
View file @ d74d48bb
...@@ -183,9 +183,9 @@ export default { ...@@ -183,9 +183,9 @@ export default {
RoutingList: {}, RoutingList: {},
components: {}, components: {},
ruleValidate: { ruleValidate: {
code: [ // code: [
{ required: true, message: '工艺文件编号不能为空', trigger: 'blur' } // { required: true, message: '工艺文件编号不能为空', trigger: 'blur' }
], // ],
// number:[{required: true,type:'number'}], // number:[{required: true,type:'number'}],
name: [ name: [
{ required: true, message: '工艺文件名称不能为空', trigger: 'blur' } { required: true, message: '工艺文件名称不能为空', trigger: 'blur' }
......
pages/processManage/setProcess/index.vue
View file @ d74d48bb
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="订单状态" style="width:100%"> <FormItem label="状态" style="width:100%">
<dictionary <dictionary
code="plan.order.status" code="plan.order.status"
v-model="orderSearchForm.status" v-model="orderSearchForm.status"
...@@ -74,6 +74,28 @@ ...@@ -74,6 +74,28 @@
</Col> </Col>
</Row> </Row>
<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"> <Col span="12">
<FormItem label="任务类型" style="width:100%"> <FormItem label="任务类型" style="width:100%">
<dictionary <dictionary
...@@ -83,6 +105,8 @@ ...@@ -83,6 +105,8 @@
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="12"> <Col span="12">
<FormItem label="阶段" style="width:100%"> <FormItem label="阶段" style="width:100%">
<dictionary <dictionary
...@@ -92,8 +116,6 @@ ...@@ -92,8 +116,6 @@
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="12"> <Col span="12">
<FormItem label="材料" style="width:100%"> <FormItem label="材料" style="width:100%">
<dictionary <dictionary
...@@ -103,13 +125,13 @@ ...@@ -103,13 +125,13 @@
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="12"> <Col span="12">
<FormItem label="数量" style="width:100%"> <FormItem label="数量" style="width:100%">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber> <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="12"> <Col span="12">
<FormItem label="甲方客户" style="width:100%"> <FormItem label="甲方客户" style="width:100%">
<dictionary <dictionary
...@@ -119,15 +141,6 @@ ...@@ -119,15 +141,6 @@
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </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>
<Row> <Row>
<Col span="12"> <Col span="12">
...@@ -185,18 +198,6 @@ ...@@ -185,18 +198,6 @@
</FormItem> </FormItem>
</Col> </Col>
</Row> </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> </Form>
<div slot="footer"> <div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button> <Button @click="close" style="margin-left:20px;">取消</Button>
...@@ -413,12 +414,12 @@ export default { ...@@ -413,12 +414,12 @@ export default {
}, //确定保存后返回数据 }, //确定保存后返回数据
orderSearchForm: { orderSearchForm: {
productId: null, //产品id productId: "", //产品id
productName: "", //产品名称 productName: "", //产品名称
taskType: "", //任务类型 taskType: "", //任务类型
stage: "", //阶段 stage: "", //阶段
materialId: "", //材料 materialId: "", //材料
quantity: 0, //数量 quantity: null, //数量
guestName: "", //甲方客户 guestName: "", //甲方客户
printSupply: "", //3D打印承制单位 printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关 functionaryOffice: "", //厂内责任机关
...@@ -437,9 +438,9 @@ export default { ...@@ -437,9 +438,9 @@ export default {
demandStartDate: "", //开始时间 demandStartDate: "", //开始时间
demandFinishDate: "", //完成时间 demandFinishDate: "", //完成时间
remark: "", //备注 remark: "", //备注
MaxResultCount: 10, projectNumber: "", //项目号
SkipCount: 0, batchNumber: "", //批次号
RoutingSetStatus: "" urgencyLevel: null //紧急程度
}, },
formValidate: { formValidate: {
id: "", id: "",
......
pages/produce/orderscheduling.vue
View file @ d74d48bb
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</template> </template>
</template> </template>
</div> </div>
</template> --> </template>-->
</Table> </Table>
<Page <Page
class="mr15 mt10 fr" class="mr15 mt10 fr"
...@@ -116,55 +116,129 @@ ...@@ -116,55 +116,129 @@
</FormItem> </FormItem>
</Col> </Col>
</Row> </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> <Row>
<Col span="12"> <Col span="12">
<FormItem label="订单类型" style="width:100%"> <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 <dictionary
code="plan.order.taskType" code="plan.order.taskType"
v-model="orderSearchForm.TaskType" v-model="orderSearchForm.taskType"
style="width:240px" style="width:240px"
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="12"> <Col span="12">
<FormItem label="阶段" style="width:100%"> <FormItem label="阶段" style="width:100%">
<dictionary <dictionary
code="plan.order.stage" code="plan.order.stage"
v-model="orderSearchForm.Stage" v-model="orderSearchForm.stage"
style="width:240px" style="width:240px"
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="12"> <Col span="12">
<FormItem label="材料" style="width:100%"> <FormItem label="材料" style="width:100%">
<dictionary <dictionary
code="plan.order.material" code="plan.order.material"
v-model="orderSearchForm.MaterialId" v-model="orderSearchForm.materialId"
style="width:240px" style="width:240px"
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="12"> <Col span="12">
<FormItem label="数量" style="width:100%"> <FormItem label="数量" style="width:100%">
<InputNumber :min="0" v-model="orderSearchForm.Quantity" style="width:240px"></InputNumber> <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
</Row>
<Row>
<Col span="12"> <Col span="12">
<FormItem label="甲方客户" style="width:100%"> <FormItem label="甲方客户" style="width:100%">
<dictionary <dictionary
code="plan.order.guestName" code="plan.order.guestName"
v-model="orderSearchForm.GuestName" v-model="orderSearchForm.guestName"
style="width:240px" style="width:240px"
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </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>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="任务节点要求" style="width:100%">
<Input v-model="orderSearchForm.taskRequire" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="12">
<FormItem label="甲方投产输入文件(编号)" style="width:100%">
<Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="甲方技术输入文件(编号)" style="width:100%">
<Input
v-model="orderSearchForm.technologyDocmentCode"
placeholder
style="width:240px"
/>
</FormItem>
</Col>
<Col span="12">
<FormItem label="外部图号/模型号" style="width:100%">
<Input v-model="orderSearchForm.outerDrawnNumber" placeholder style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="模型版本" style="width:100%">
<Input v-model="orderSearchForm.modelVersion" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="12"> <Col span="12">
<FormItem label="甲方任务号" style="width:100%"> <FormItem label="甲方任务号" style="width:100%">
<Input v-model="orderSearchForm.TaskCode" placeholder style="width:240px" /> <Input v-model="orderSearchForm.taskCode" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -185,9 +259,9 @@ ...@@ -185,9 +259,9 @@
</div> </div>
</template> </template>
<script> <script>
import expandRow from './components/table-expand.vue' import expandRow from "./components/table-expand.vue";
import consume from './components/expend.vue' import consume from "./components/expend.vue";
import service from '@/plugins/request' import service from "@/plugins/request";
export default { export default {
components: { expandRow, consume }, components: { expandRow, consume },
data() { data() {
...@@ -199,254 +273,275 @@ export default { ...@@ -199,254 +273,275 @@ export default {
conditions: [] conditions: []
}, },
showPagesize: [10, 20, 40], showPagesize: [10, 20, 40],
searchIterms: '', //搜索内容 searchIterms: "", //搜索内容
showModel: false, //高级搜索弹框 showModel: false, //高级搜索弹框
matchingModal: false, //配套确认弹框 matchingModal: false, //配套确认弹框
rowData: null, //配套确认行暂存数据 rowData: null, //配套确认行暂存数据
list: [], list: [],
data1: [], data1: [],
selectdata: [], selectdata: [],
tbHeight: '', //表格高度 tbHeight: "", //表格高度
orderSearchForm: { orderSearchForm: {
ProductId: '', //产品id ProductId: "", //产品id
productName: '', //产品名称 productName: "", //产品名称
Status: '', //订单状态 Status: "", //订单状态
processcode: '', //工艺编号 processcode: "", //工艺编号
processname: '', // 工艺名称 processname: "", // 工艺名称
TaskType: '', //订单类型 TaskType: "", //订单类型
Stage: '', //阶段 Stage: "", //阶段
MaterialId: '', //材料 MaterialId: "", //材料
Quantity: null, //数量 Quantity: null, //数量
GuestName: '', //甲方客户 GuestName: "", //甲方客户
TaskCode: '', //甲方任务号 TaskCode: "", //甲方任务号
SkipCount: 0, SkipCount: 0,
MaxResultCount: 10, MaxResultCount: 10,
DispatchStatus:1//排产状态 DispatchStatus: 1, //排产状态,
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: "", //工艺方法
outer_Envelope_Size: "", //包装尺寸
demandStartDate: "", //开始时间
demandFinishDate: "", //完成时间
remark: "", //备注
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
}, },
orderMaterial: [], //配套确认返回数组 orderMaterial: [], //配套确认返回数组
mColumn: [ mColumn: [
{ {
type: 'expand', type: "expand",
width: 60, width: 60,
render: (h, params) => { render: (h, params) => {
return h(expandRow, { return h(expandRow, {
props: { props: {
row: params.row row: params.row
} }
}) });
} }
}, },
{ title: '工艺编号', key: 'processcode' }, { title: "工艺编号", key: "processcode" },
{ title: '工艺名称', key: 'processname' }, { title: "工艺名称", key: "processname" },
{ title: '料单板数', key: 'platesnum', width: '110' }, { title: "料单板数", key: "platesnum", width: "110" },
{ {
title: '状态', title: "状态",
key: 'status', key: "status",
width: '120', width: "120",
slot: 'status', slot: "status",
filters: this.getArry( filters: this.getArry(
this.$store.getters.dictionaryByKey('Scheduling.production.status') this.$store.getters.dictionaryByKey("Scheduling.production.status")
), ),
filterMultiple: false, filterMultiple: false,
filterMethod(value, row) { filterMethod(value, row) {
let statusChar = row.status + '' let statusChar = row.status + "";
return statusChar.indexOf(value) > -1 return statusChar.indexOf(value) > -1;
} }
}, },
// { title: '料单', width: '130', key: 'action', slot: 'ld' }, // { title: '料单', width: '130', key: 'action', slot: 'ld' },
{ title: '操作', width: '120', key: 'action', slot: 'action' } { title: "操作", width: "120", key: "action", slot: "action" }
], ],
mDatas: [] //表格数据 mDatas: [] //表格数据
} };
}, },
created() { created() {
this.laoed() this.laoed();
this.tbHeight = window.innerHeight - 280 this.tbHeight = window.innerHeight - 280;
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
// 初始数据列表 ?SimpleSearch=`+ parmes; // 初始数据列表 ?SimpleSearch=`+ parmes;
laoed(parmes) { laoed(parmes) {
if (parmes == undefined && parmes == null) { if (parmes == undefined && parmes == null) {
parmes = '' parmes = "";
} }
let url = `${designUrl}/orderrouting/getwaitorderlist` let url = `${designUrl}/orderrouting/getwaitorderlist`;
service.get(`${url}`, parmes).then((res) => { service.get(`${url}`, parmes).then(res => {
this.mDatas = res.result.items this.mDatas = res.result.items;
this.search.total = res.result.totalCount this.search.total = res.result.totalCount;
}) });
}, },
initTree() { initTree() {
var sumData = [] //暂存产品树数据 var sumData = []; //暂存产品树数据
this.$http.order.getallselecttree().then((res) => { this.$http.order.getallselecttree().then(res => {
if (res.result) { if (res.result) {
for (var i = 0; i < res.result.length; i++) { for (var i = 0; i < res.result.length; i++) {
sumData = sumData.concat(res.result[i]) sumData = sumData.concat(res.result[i]);
} }
this.treeData = sumData this.treeData = sumData;
this.data1 = JSON.parse(JSON.stringify(sumData)) this.data1 = JSON.parse(JSON.stringify(sumData));
} else { } else {
this.$Message.error('加载产品树失败!') this.$Message.error("加载产品树失败!");
} }
}) });
}, },
renderContent(h, { root, node, data }) { renderContent(h, { root, node, data }) {
//渲染树的样式 //渲染树的样式
return h( return h(
'span', "span",
{ {
style: { style: {
color: data.isProduct != '1' ? '#249E91' : '#333', //根据选中状态设置样式 color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
cursor: 'pointer' cursor: "pointer"
}, },
on: { on: {
click: () => { click: () => {
let arrTree = [] let arrTree = [];
arrTree.push(data) arrTree.push(data);
this.handleSelect(arrTree) //手动选择树节点 this.handleSelect(arrTree); //手动选择树节点
} }
} }
}, },
data.title data.title
) );
}, },
handleSelect(data) { handleSelect(data) {
if (data.length > 0) { if (data.length > 0) {
this.selectdata = [] this.selectdata = [];
this.selectdata = data this.selectdata = data;
this.list = [] this.list = [];
this.list.push({ label: data[0].title, value: data[0].id }) this.list.push({ label: data[0].title, value: data[0].id });
if (data[0].isProduct == '1') { if (data[0].isProduct == "1") {
this.orderSearchForm.productName = data[0].id this.orderSearchForm.productName = data[0].id;
this.orderSearchForm.productId = data[0].productId this.orderSearchForm.productId = data[0].productId;
} else { } else {
this.$Message.error('此节点不是产品,请选择产品节点!') this.$Message.error("此节点不是产品,请选择产品节点!");
} }
} }
}, },
//得到数据字典对应的label和value，用于table排序、筛选 //得到数据字典对应的label和value，用于table排序、筛选
getArry(arryList) { getArry(arryList) {
let arry = [] let arry = [];
arryList.forEach((data) => { arryList.forEach(data => {
var that = this var that = this;
let arryObj = {} let arryObj = {};
arryObj['label'] = data.name arryObj["label"] = data.name;
arryObj['value'] = data.code arryObj["value"] = data.code;
arry.push(arryObj) arry.push(arryObj);
}) });
return arry return arry;
}, },
// 搜索 // 搜索
tableSearch() { tableSearch() {
let parmes = this.searchIterms let parmes = this.searchIterms;
this.laoed(parmes) this.laoed(parmes);
}, },
searchModel() { searchModel() {
this.showModel = true this.showModel = true;
}, },
// 分页 // 分页
pageChange(pageNum) { pageChange(pageNum) {
let pageData = this.search let pageData = this.search;
pageData.SkipCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount pageData.SkipCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount;
pageData.MaxResultCount = pageData.MaxResultCount =
(pageNum - 1) * this.orderSearchForm.MaxResultCount (pageNum - 1) * this.orderSearchForm.MaxResultCount;
this.laoedPage(pageData) this.laoedPage(pageData);
}, },
pageSizeChange(val) { pageSizeChange(val) {
let pageData = this.search let pageData = this.search;
pageData.SkipCount = 0 pageData.SkipCount = 0;
pageData.MaxResultCount = val pageData.MaxResultCount = val;
this.laoedPage(pageData) this.laoedPage(pageData);
}, },
// 分页查询数据列表 // 分页查询数据列表
laoedPage(pageData) { laoedPage(pageData) {
let url = let url =
`${designUrl}/orderrouting/getwaitorderlist?SkipCount=` + `${designUrl}/orderrouting/getwaitorderlist?SkipCount=` +
pageData.SkipCount + pageData.SkipCount +
'&MaxResultCount=' + "&MaxResultCount=" +
pageData.MaxResultCount pageData.MaxResultCount;
service.get(`${url}`).then((res) => { service.get(`${url}`).then(res => {
if(res.success){ if (res.success) {
this.mDatas = res.result.items this.mDatas = res.result.items;
this.search.total = res.result.totalCount this.search.total = res.result.totalCount;
}else{ } else {
this.$Message.error("查询失败") this.$Message.error("查询失败");
} }
}) });
}, },
columnChange(item, i) { columnChange(item, i) {
//列设置 //列设置
item.hide = !item.hide item.hide = !item.hide;
}, },
// 排产派工 // 排产派工
openDetails(lemData) { openDetails(lemData) {
if (lemData.routing_type == 2) { if (lemData.routing_type == 2) {
this.$router.push({ this.$router.push({
name: 'dispatched', name: "dispatched",
params: { transmitData: lemData } params: { transmitData: lemData }
}) });
} else { } else {
this.$router.push({ this.$router.push({
name: 'mainProcess', name: "mainProcess",
params: { transmitData: lemData } params: { transmitData: lemData }
}) });
} }
}, },
// 配套确认 // 配套确认
openModels(data) { openModels(data) {
let id = data.materialbillId let id = data.materialbillId;
let url02 = `${designUrl}/ordermaterial/getbyid?id=` + id let url02 = `${designUrl}/ordermaterial/getbyid?id=` + id;
service.get(`${url02}`).then((res) => { service.get(`${url02}`).then(res => {
this.orderMaterial = res.result.orderMaterialList this.orderMaterial = res.result.orderMaterialList;
this.rowData = res.data this.rowData = res.data;
}) });
this.matchingModal = true this.matchingModal = true;
}, },
// 配套确认--更改确认按钮 // 配套确认--更改确认按钮
modalOk() { modalOk() {
let getnewData = this.$refs['consume'].orderMaterial let getnewData = this.$refs["consume"].orderMaterial;
this.rowData.orderMaterialList = getnewData this.rowData.orderMaterialList = getnewData;
let parmes = this.rowData let parmes = this.rowData;
let url = `${designUrl}/ordermaterial/updateordermaterialactualquantity` let url = `${designUrl}/ordermaterial/updateordermaterialactualquantity`;
service.put(`${url}`, parmes).then((res) => {}) service.put(`${url}`, parmes).then(res => {});
this.matchingModal = false this.matchingModal = false;
}, },
Cancel() { Cancel() {
this.matchingModal = false this.matchingModal = false;
}, },
close() { close() {
this.showModel = false this.showModel = false;
}, },
// 高级查询 // 高级查询
complexSearch() { complexSearch() {
let params = this.orderSearchForm let params = this.orderSearchForm;
params.SkipCount = params.SkipCount || 0 params.SkipCount = params.SkipCount || 0;
params.MaxResultCount = params.MaxResultCount || 10 params.MaxResultCount = params.MaxResultCount || 10;
this.$http.order.getScheduling(params).then((res) => { this.$http.order.getScheduling(params).then(res => {
if (res.result) { if (res.result) {
this.mDatas = res.result.items this.mDatas = res.result.items;
this.search.total = res.result.totalCount this.search.total = res.result.totalCount;
} else { } else {
this.$Message.error('查询失败...') this.$Message.error("查询失败...");
} }
}) });
this.close() this.close();
} }
}, },
mounted() { mounted() {
this.initTree() //获取产品树 this.initTree(); //获取产品树
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
return (() => { return (() => {
// window.screenHeight = window.innerHeight // window.screenHeight = window.innerHeight
this.tbHeight = window.innerHeight - 280 this.tbHeight = window.innerHeight - 280;
})() })();
};
} }
} };
}
</script> </script>
<style scoped> <style scoped>
.table_title { .table_title {
......
pages/produce/scheduling.vue
View file @ d74d48bb
<template> <template>
<Tabs :animated="false"> <orderscheduling :style="{ height: tabHeight }" ref="orderscheduling"></orderscheduling>
<!-- <Tabs :animated="false">
<TabPane label="排产派工" name="1"> <TabPane label="排产派工" name="1">
<orderscheduling :style="{ height: tabHeight }" ref="orderscheduling"></orderscheduling> <orderscheduling :style="{ height: tabHeight }" ref="orderscheduling"></orderscheduling>
</TabPane> </TabPane>
<TabPane label="料单确认" name="2"> <TabPane label="料单确认" name="2">
<ordermaterial :style="{ height: tabHeight }" ref="ordermaterial"></ordermaterial> <ordermaterial :style="{ height: tabHeight }" ref="ordermaterial"></ordermaterial>
</TabPane> </TabPane>
</Tabs> </Tabs> -->
</template> </template>
<script> <script>
import ordermaterial from './ordermaterial.vue' // import ordermaterial from './ordermaterial.vue'
import orderscheduling from './orderscheduling.vue' import orderscheduling from './orderscheduling.vue'
export default { export default {
components: { ordermaterial, orderscheduling }, components: { orderscheduling },
data() { data() {
return { return {
tabHeight:"" tabHeight:""
......
pages/produce/taskList.vue
View file @ d74d48bb
...@@ -62,65 +62,106 @@ ...@@ -62,65 +62,106 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="工艺编号" style="width:100%"> <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> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="工艺名称" style="width:100%"> <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> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="任务类型" style="width:100%"> <FormItem label="项目号" style="width:100%">
<dictionary code='plan.order.taskType' v-model="orderSearchForm.taskType" style="width:240px"></dictionary> <Input v-model="orderSearchForm.projectNumber" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="阶段" style="width:100%"> <FormItem label="批次号" style="width:100%">
<dictionary code='plan.order.stage' v-model="orderSearchForm.stage" style="width:240px"></dictionary> <Input v-model="orderSearchForm.batchNumber" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="材料" style="width:100%"> <FormItem label="紧急程度" style="width:100%">
<dictionary code='plan.order.material' v-model="orderSearchForm.materialId" style="width:240px"></dictionary> <dictionary
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="数量" style="width:100%"> <FormItem label="任务类型" style="width:100%">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber> <dictionary
code="plan.order.taskType"
v-model="orderSearchForm.taskType"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="甲方客户" style="width:100%"> <FormItem label="阶段" style="width:100%">
<dictionary code='plan.order.guestName' v-model="orderSearchForm.guestName" style="width:240px"></dictionary> <dictionary
code="plan.order.stage"
v-model="orderSearchForm.stage"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="3D打印承制单位" style="width:100%"> <FormItem label="材料" style="width:100%">
<dictionary code='plan.order.printSupply' v-model="orderSearchForm.printSupply" style="width:240px"></dictionary> <dictionary
code="plan.order.material"
v-model="orderSearchForm.materialId"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="厂内责任机关" style="width:100%"> <FormItem label="数量" style="width:100%">
<Input <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
v-model="orderSearchForm.functionaryOffice" </FormItem>
placeholder </Col>
<Col span="12">
<FormItem label="甲方客户" style="width:100%">
<dictionary
code="plan.order.guestName"
v-model="orderSearchForm.guestName"
style="width:240px" 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> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="厂内责任主体部门" style="width:100%"> <FormItem label="厂内责任主体部门" style="width:100%">
<dictionary code='plan.order.mainDepartment' v-model="orderSearchForm.mainDepartmentId" style="width:240px"></dictionary> <dictionary
</Select> code="plan.order.mainDepartment"
v-model="orderSearchForm.mainDepartmentId"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -132,11 +173,7 @@ ...@@ -132,11 +173,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="甲方投产输入文件(编号)" style="width:100%"> <FormItem label="甲方投产输入文件(编号)" style="width:100%">
<Input <Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
v-model="orderSearchForm.putintDocmentCode"
placeholder
style="width:240px"
/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -152,11 +189,7 @@ ...@@ -152,11 +189,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="外部图号/模型号" style="width:100%"> <FormItem label="外部图号/模型号" style="width:100%">
<Input <Input v-model="orderSearchForm.outerDrawnNumber" placeholder style="width:240px" />
v-model="orderSearchForm.outerDrawnNumber"
placeholder
style="width:240px"
/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -230,7 +263,11 @@ export default { ...@@ -230,7 +263,11 @@ export default {
outer_Envelope_Size: '', //包装尺寸 outer_Envelope_Size: '', //包装尺寸
demandStartDate: '', //开始时间 demandStartDate: '', //开始时间
demandFinishDate: '', //完成时间 demandFinishDate: '', //完成时间
remark: '' //备注 remark: '', //备注,
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
}, },
mColumn:[ mColumn:[
{ type: 'expand',width: 60, { type: 'expand',width: 60,
......
pages/qc/dataTrace/index.vue
View file @ d74d48bb
...@@ -4,43 +4,41 @@ ...@@ -4,43 +4,41 @@
<div class="title_box mb10"> <div class="title_box mb10">
<div class="table_title"> <div class="table_title">
<Input <Input
search enter-button style="width:300px;" search
v-model="orderSearchForm.SimpleSearch" placeholder="请输入查询条件" enter-button
@on-search="tableSearch" ></Input> style="width:300px;"
v-model="orderSearchForm.SimpleSearch"
placeholder="请输入查询条件"
@on-search="tableSearch"
></Input>
</div> </div>
<Button type="primary" class="title_btn" @click='searchModel'>高级查询</Button> <Button type="primary" class="title_btn" @click="searchModel">高级查询</Button>
</div> </div>
<div class="tableBox mb10" :style="{height:tbHeight}"> <div class="tableBox mb10" :style="{height:tbHeight}">
<div class="table"> <div class="table">
<div v-if="listTask.length==0" class="wu_data">暂无数据</div> <div v-if="listTask.length==0" class="wu_data">暂无数据</div>
<Card class="card" v-for="(item,index) in listTask" <Card class="card" v-for="(item,index) in listTask" :key="index">
:key="index"> <h3 slot="title">订单编号：{{item.mesCode}}</h3>
<h3 slot="title">
订单编号：{{item.mesCode}}
</h3>
<ul class="card_body01"> <ul class="card_body01">
<li class="card_line"> <li class="card_line">产品名称：{{item.productName}}</li>
产品名称：{{item.productName}} <li class="card_line">任务类型：{{item.equipment}}</li>
</li>
<li class="card_line">
任务类型：{{item.equipment}}
</li>
</ul> </ul>
<p class="footer01"> <p class="footer01">
<a class="footer_btn" href="#" @click.event="reviewFn(item)"> <a class="footer_btn" href="#" @click.event="reviewFn(item)">追 溯</a>
追 溯
</a>
</p> </p>
</Card> </Card>
</div> </div>
<div v-show="noData" class="no_data"> <div v-show="noData" class="no_data">
<h3> 暂无数据</h3> <h3>暂无数据</h3>
</div> </div>
</div> </div>
<Page <Page
class="mr10 fr" id="pageComent" class="mr10 fr"
show-total size="small" id="pageComent"
show-elevator show-sizer show-total
size="small"
show-elevator
show-sizer
:total="search.total" :total="search.total"
:current="search.pageIndex" :current="search.pageIndex"
:page-size="search.pageSize" :page-size="search.pageSize"
...@@ -54,11 +52,7 @@ ...@@ -54,11 +52,7 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="产品名称" style="width:100%"> <FormItem label="产品名称" style="width:100%">
<Select <Select v-model="orderSearchForm.productName" placeholder="请选择" style="width:240px;">
v-model="orderSearchForm.productName"
placeholder="请选择"
style="width:240px;"
>
<Option <Option
v-for="(item,index) in list" v-for="(item,index) in list"
:key="index" :key="index"
...@@ -71,7 +65,11 @@ ...@@ -71,7 +65,11 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="状态" style="width:100%"> <FormItem label="状态" style="width:100%">
<dictionary code='plan.order.status' v-model="orderSearchForm.status" style="width:240px"></dictionary> <dictionary
code="plan.order.status"
v-model="orderSearchForm.status"
style="width:240px"
></dictionary>
<Input v-model="orderSearchForm.productId" style="width:240px" v-if="false" /> <Input v-model="orderSearchForm.productId" style="width:240px" v-if="false" />
</FormItem> </FormItem>
</Col> </Col>
...@@ -79,65 +77,106 @@ ...@@ -79,65 +77,106 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="工艺编号" style="width:100%"> <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> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="工艺名称" style="width:100%"> <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> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="任务类型" style="width:100%"> <FormItem label="项目号" style="width:100%">
<dictionary code='plan.order.taskType' v-model="orderSearchForm.taskType" style="width:240px"></dictionary> <Input v-model="orderSearchForm.projectNumber" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="阶段" style="width:100%"> <FormItem label="批次号" style="width:100%">
<dictionary code='plan.order.stage' v-model="orderSearchForm.stage" style="width:240px"></dictionary> <Input v-model="orderSearchForm.batchNumber" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="材料" style="width:100%"> <FormItem label="紧急程度" style="width:100%">
<dictionary code='plan.order.material' v-model="orderSearchForm.materialId" style="width:240px"></dictionary> <dictionary
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="数量" style="width:100%"> <FormItem label="任务类型" style="width:100%">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber> <dictionary
code="plan.order.taskType"
v-model="orderSearchForm.taskType"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="甲方客户" style="width:100%"> <FormItem label="阶段" style="width:100%">
<dictionary code='plan.order.guestName' v-model="orderSearchForm.guestName" style="width:240px"></dictionary> <dictionary
code="plan.order.stage"
v-model="orderSearchForm.stage"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="3D打印承制单位" style="width:100%"> <FormItem label="材料" style="width:100%">
<dictionary code='plan.order.printSupply' v-model="orderSearchForm.printSupply" style="width:240px"></dictionary> <dictionary
code="plan.order.material"
v-model="orderSearchForm.materialId"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="厂内责任机关" style="width:100%"> <FormItem label="数量" style="width:100%">
<Input <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
v-model="orderSearchForm.functionaryOffice" </FormItem>
placeholder </Col>
<Col span="12">
<FormItem label="甲方客户" style="width:100%">
<dictionary
code="plan.order.guestName"
v-model="orderSearchForm.guestName"
style="width:240px" 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> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="厂内责任主体部门" style="width:100%"> <FormItem label="厂内责任主体部门" style="width:100%">
<dictionary code='plan.order.mainDepartment' v-model="orderSearchForm.mainDepartmentId" style="width:240px"></dictionary> <dictionary
</Select> code="plan.order.mainDepartment"
v-model="orderSearchForm.mainDepartmentId"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -149,11 +188,7 @@ ...@@ -149,11 +188,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="甲方投产输入文件(编号)" style="width:100%"> <FormItem label="甲方投产输入文件(编号)" style="width:100%">
<Input <Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
v-model="orderSearchForm.putintDocmentCode"
placeholder
style="width:240px"
/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -169,11 +204,7 @@ ...@@ -169,11 +204,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="外部图号/模型号" style="width:100%"> <FormItem label="外部图号/模型号" style="width:100%">
<Input <Input v-model="orderSearchForm.outerDrawnNumber" placeholder style="width:240px" />
v-model="orderSearchForm.outerDrawnNumber"
placeholder
style="width:240px"
/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -190,15 +221,15 @@ ...@@ -190,15 +221,15 @@
</Col> </Col>
</Row> </Row>
</Form> </Form>
<div slot="footer" > <div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button> <Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="primary" class="ml10">查询</Button> <Button @click="complexSearch" type="primary" class="ml10">查询</Button>
</div> </div>
</Modal> </Modal>
<!-- 数据包追溯 --> <!-- 数据包追溯 -->
<Modal v-model="reviewModal" title="数据包追溯" :width="1280" :mask-closable="false"> <Modal v-model="reviewModal" title="数据包追溯" :width="1280" :mask-closable="false">
<reviewCount ref='reviewCount' :basicData="itemData" :actValue="actValue"/> <reviewCount ref="reviewCount" :basicData="itemData" :actValue="actValue" />
<div slot="footer" > <div slot="footer">
<!-- <Button @click="close" style="margin-left:20px;">取消</Button> --> <!-- <Button @click="close" style="margin-left:20px;">取消</Button> -->
<Button @click="reviewOk" type="primary" style="margin-left:10px;">确定</Button> <Button @click="reviewOk" type="primary" style="margin-left:10px;">确定</Button>
</div> </div>
...@@ -206,20 +237,20 @@ ...@@ -206,20 +237,20 @@
</div> </div>
</template> </template>
<script> <script>
import service from '@/plugins/request'; import service from "@/plugins/request";
import reviewCount from './components/reviewCount.vue'; import reviewCount from "./components/reviewCount.vue";
export default { export default {
components:{reviewCount}, components: { reviewCount },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
data(){ data() {
return { return {
search: { search: {
pageIndex: 1,//当前页数 pageIndex: 1, //当前页数
pageSize: 20,//分页数 pageSize: 20, //分页数
total:0,//总数 total: 0, //总数
conditions: [], conditions: []
}, },
showPagesize: [20, 50, 100], showPagesize: [20, 50, 100],
showModel: false, showModel: false,
...@@ -227,68 +258,75 @@ export default { ...@@ -227,68 +258,75 @@ export default {
data1: [], data1: [],
noData: false, noData: false,
selectdata: [], selectdata: [],
tbHeight:"550px", tbHeight: "550px",
itemData:{},//追溯传的数据 itemData: {}, //追溯传的数据
actValue:1,//追溯传的选中meniu actValue: 1, //追溯传的选中meniu
orderSearchForm: { //高级搜索字段内容 orderSearchForm: {
//高级搜索字段内容
MaxResultCount: 20, MaxResultCount: 20,
SkipCount: 1, SkipCount: 1,
SimpleSearch:'',//搜索框内容 SimpleSearch: "", //搜索框内容
productId: null, //产品id productId: null, //产品id
productName: '', //产品名称 productName: "", //产品名称
taskType: '', //任务类型 taskType: "", //任务类型
stage: '', //阶段 stage: "", //阶段
materialId: '', //材料 materialId: "", //材料
quantity: 0, //数量 quantity: 0, //数量
guestName: '', //甲方客户 guestName: "", //甲方客户
printSupply: '', //3D打印承制单位 printSupply: "", //3D打印承制单位
functionaryOffice: '', //厂内责任机关 functionaryOffice: "", //厂内责任机关
mainDepartmentId: '', //厂内责任主体部门ID mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: '', //任务接点要求 taskRequire: "", //任务接点要求
putintDocmentCode: '', //甲方投产输入文件编号 putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: '', //甲方技术输入文件编号 technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: '', //外部图号/模型号 outerDrawnNumber: "", //外部图号/模型号
modelVersion: '', //模型版本 modelVersion: "", //模型版本
taskCode: '', //甲方任务号 taskCode: "", //甲方任务号
designer: '', //甲方设计人员 designer: "", //甲方设计人员
officeFunctionary: '', //厂内机关负责人 officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: '', //厂内主工艺人员 mainRoutingPeople: "", //厂内主工艺人员
routing_Method: '', //工艺方法 routing_Method: "", //工艺方法
outer_Envelope_Size: '', //包装尺寸 outer_Envelope_Size: "", //包装尺寸
demandStartDate: '', //开始时间 demandStartDate: "", //开始时间
demandFinishDate: '', //完成时间 demandFinishDate: "", //完成时间
remark: '' //备注 remark: "", //备注
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
}, },
listTask:[],//card数据 listTask: [], //card数据
reviewModal:false,//追溯弹框 reviewModal: false //追溯弹框
} };
}, },
created(){ created() {
this.laode(); this.laode();
this.tbHeight = window.innerHeight - 208 + 'px' this.tbHeight = window.innerHeight - 208 + "px";
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
// 加载数据 // 加载数据
laode(){ laode() {
let url = `${PlanUrl}/orderexecute/pageddatamesorders`; let url = `${PlanUrl}/orderexecute/pageddatamesorders`;
service.post(`${url}`,{ service
"MaxResultCount": 20, .post(`${url}`, {
"SkipCount": 1, MaxResultCount: 20,
}).then(res => { SkipCount: 1
})
.then(res => {
// console.log(res) // console.log(res)
this.listTask = res.result.items this.listTask = res.result.items;
this.search.total = res.result.totalCount this.search.total = res.result.totalCount;
}); });
}, },
reviewFn(item){ //追溯 reviewFn(item) {
//追溯
this.reviewModal = true; this.reviewModal = true;
this.itemData = item; this.itemData = item;
this.$refs.reviewCount.actNum = '1' this.$refs.reviewCount.actNum = "1";
}, },
reviewOk(){ reviewOk() {
this.reviewModal = false; this.reviewModal = false;
// 手动更新选中的菜单 // 手动更新选中的菜单
// menuChange(){ // menuChange(){
...@@ -297,23 +335,24 @@ export default { ...@@ -297,23 +335,24 @@ export default {
// this.$refs.reviewCount.$refs.menus.updateActiveName(); // this.$refs.reviewCount.$refs.menus.updateActiveName();
// }) // })
// } // }
this.$refs.reviewCount.actNum = '' this.$refs.reviewCount.actNum = "";
}, },
// 分页 // 分页
pageChange(pageNum) { pageChange(pageNum) {
this.orderSearchForm.SkipCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount this.orderSearchForm.SkipCount =
this.laodePage(this.orderSearchForm) (pageNum - 1) * this.orderSearchForm.MaxResultCount;
this.laodePage(this.orderSearchForm);
}, },
pageSizeChange(val) { pageSizeChange(val) {
this.orderSearchForm.SkipCount = 0 this.orderSearchForm.SkipCount = 0;
this.orderSearchForm.MaxResultCount = val this.orderSearchForm.MaxResultCount = val;
this.laodePage(this.orderSearchForm) this.laodePage(this.orderSearchForm);
}, },
laodePage(pageData){ laodePage(pageData) {
let url = `${PlanUrl}/orderexecute/pageddatamesorders`; let url = `${PlanUrl}/orderexecute/pageddatamesorders`;
service.post(`${url}`,pageData).then(res => { service.post(`${url}`, pageData).then(res => {
this.listTask = res.result.items this.listTask = res.result.items;
this.search.total = res.result.totalCount this.search.total = res.result.totalCount;
}); });
}, },
...@@ -321,157 +360,160 @@ export default { ...@@ -321,157 +360,160 @@ export default {
tableSearch(searchData) { tableSearch(searchData) {
let MaxResultCount = this.orderSearchForm.MaxResultCount; let MaxResultCount = this.orderSearchForm.MaxResultCount;
let url = `${PlanUrl}/orderexecute/pageddatamesorders`; let url = `${PlanUrl}/orderexecute/pageddatamesorders`;
service.post(`${url}`,{ service
"MaxResultCount": MaxResultCount, .post(`${url}`, {
"SkipCount": 0, MaxResultCount: MaxResultCount,
"SimpleSearch": searchData SkipCount: 0,
}).then(res => { SimpleSearch: searchData
this.listTask = res.result.items })
this.search.total = res.result.totalCount .then(res => {
this.listTask = res.result.items;
this.search.total = res.result.totalCount;
}); });
}, },
searchModel(){ searchModel() {
this.showModel = true; this.showModel = true;
}, },
async openDetails(lemData){ async openDetails(lemData) {
this.$router.push({
this.$router.push({ name: 'qcimplement', params: { transmitData: lemData }}) name: "qcimplement",
params: { transmitData: lemData }
});
}, },
renderContent(h, { root, node, data }) { renderContent(h, { root, node, data }) {
//渲染树的样式 //渲染树的样式
return h( return h(
'span', "span",
{ {
style: { style: {
color: data.isProduct != '1' ? '#249E91' : '#333', //根据选中状态设置样式 color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
cursor: 'pointer' cursor: "pointer"
}, },
on: { on: {
click: () => { click: () => {
let arrTree = [] let arrTree = [];
arrTree.push(data) arrTree.push(data);
this.handleSelect(arrTree) //手动选择树节点 this.handleSelect(arrTree); //手动选择树节点
} }
} }
}, },
data.title data.title
) );
}, },
handleSelect(data) { handleSelect(data) {
if (data.length > 0) { if (data.length > 0) {
this.selectdata = [] this.selectdata = [];
this.selectdata = data this.selectdata = data;
this.list = [] this.list = [];
this.list.push({ label: data[0].title, value: data[0].id }) this.list.push({ label: data[0].title, value: data[0].id });
if (data[0].isProduct == '1') { if (data[0].isProduct == "1") {
this.orderSearchForm.productName = data[0].id this.orderSearchForm.productName = data[0].id;
this.orderSearchForm.productId = data[0].productId this.orderSearchForm.productId = data[0].productId;
} } else {
else this.$Message.error("此节点不是产品,请选择产品节点!");
{
this.$Message.error('此节点不是产品,请选择产品节点!')
} }
} }
}, },
close(){ close() {
this.showModel = false; this.showModel = false;
}, },
complexSearch(){ complexSearch() {
// this.$emit('easySearch',this.orderSearchForm); // this.$emit('easySearch',this.orderSearchForm);
let parmes = this.orderSearchForm let parmes = this.orderSearchForm;
parmes.SimpleSearch = '' parmes.SimpleSearch = "";
let url = `${PlanUrl}/orderexecute/pageddatamesorders`; let url = `${PlanUrl}/orderexecute/pageddatamesorders`;
// console.log(parmes) // console.log(parmes)
service.post(`${url}`,parmes).then(res => { service.post(`${url}`, parmes).then(res => {
// console.log(res) // console.log(res)
this.listTask = res.result.items this.listTask = res.result.items;
this.search.total = res.result.totalCount this.search.total = res.result.totalCount;
if(this.search.total == 0){ if (this.search.total == 0) {
this.noData = true this.noData = true;
}else{ } else {
this.noData = false this.noData = false;
} }
}); });
this.close(); this.close();
}, },
//得到数据字典对应的label和value，用于table排序、筛选 //得到数据字典对应的label和value，用于table排序、筛选
getArry(arryList) { getArry(arryList) {
let arry = [] let arry = [];
arryList.forEach((data) => { arryList.forEach(data => {
var that = this var that = this;
let arryObj = {} let arryObj = {};
arryObj['label'] = data.name arryObj["label"] = data.name;
arryObj['value'] = data.code arryObj["value"] = data.code;
arry.push(arryObj) arry.push(arryObj);
}) });
return arry return arry;
}, }
}, },
mounted() { mounted() {
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
return (() => { return (() => {
this.tbHeight = window.innerHeight - 208 + 'px' this.tbHeight = window.innerHeight - 208 + "px";
})() })();
};
} }
}, };
}
</script> </script>
<style scoped> <style scoped>
#pageComent .ivu-select-dropdown{ #pageComent .ivu-select-dropdown {
top: 0!important; top: 0 !important;
bottom: 36px; bottom: 36px;
} }
ul,li{ ul,
li {
list-style: none; list-style: none;
} }
.table_title{ .table_title {
width: 320px; width: 320px;
float: left; float: left;
} }
.title_btn{ .title_btn {
margin-top: 1px; margin-top: 1px;
} }
.tableBox{ .tableBox {
/* height: 582px; 笔记本高度*/ /* height: 582px; 笔记本高度*/
/* height: 778px; */ /* height: 778px; */
border: #ddd solid 1px; border: #ddd solid 1px;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
} }
.table{ .table {
margin: 10px 0 0 0; margin: 10px 0 0 0;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.no_data{ .no_data {
height: 800px; height: 800px;
text-align: center; text-align: center;
line-height: 800px; line-height: 800px;
} }
.card{ .card {
width: 375px; width: 375px;
margin: 10px 0 10px 20px; margin: 10px 0 10px 20px;
} }
.wu_data{ .wu_data {
margin: 200px auto; margin: 200px auto;
font-size: 18px; font-size: 18px;
} }
/* .card_body01{ /* .card_body01{
margin: 0 0 10px 0; margin: 0 0 10px 0;
} */ } */
.card_line{ .card_line {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
.footer01{ .footer01 {
text-align: center; text-align: center;
} }
.footer_btn{ .footer_btn {
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
display: block; display: block;
padding: 10px 0 0 0; padding: 10px 0 0 0;
color: #0099FF; color: #0099ff;
} }
</style> </style>
\ No newline at end of file
pages/qc/taskList/index.vue
View file @ d74d48bb
...@@ -4,16 +4,25 @@ ...@@ -4,16 +4,25 @@
<div class="title_box"> <div class="title_box">
<div class="table_title"> <div class="table_title">
<Input <Input
search enter-button style="width:300px;" search
v-model="searchIterms" placeholder="请输入查询条件" enter-button
@on-search="tableSearch" ></Input> style="width:300px;"
v-model="searchIterms"
placeholder="请输入查询条件"
@on-search="tableSearch"
></Input>
</div> </div>
<Button type="primary" class="title_btn" v-show="false" @click='searchModel'>高级查询</Button> <Button type="primary" class="title_btn" v-show="false" @click="searchModel">高级查询</Button>
</div> </div>
<div class="table"> <div class="table">
<Table <Table
border class="tableCommon" :height="tbHeight" border
ref="table" :columns="mColumn" :data="mDatas" > class="tableCommon"
:height="tbHeight"
ref="table"
:columns="mColumn"
:data="mDatas"
>
<template slot-scope="{ row,index }" slot="status"> <template slot-scope="{ row,index }" slot="status">
<state code="taskList.status" type="text" class="bold" :value="row.status"></state> <state code="taskList.status" type="text" class="bold" :value="row.status"></state>
</template> </template>
...@@ -21,8 +30,10 @@ ...@@ -21,8 +30,10 @@
<!-- @on-row-click="(row,index)=>clickRow(row,index)" --> <!-- @on-row-click="(row,index)=>clickRow(row,index)" -->
<Page <Page
class="mr15 mt10 fr" class="mr15 mt10 fr"
show-total size="small" show-total
show-elevator show-sizer size="small"
show-elevator
show-sizer
:total="search.total" :total="search.total"
:current="search.pageIndex" :current="search.pageIndex"
:page-size="search.pageSize" :page-size="search.pageSize"
...@@ -37,11 +48,7 @@ ...@@ -37,11 +48,7 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="产品名称" style="width:100%"> <FormItem label="产品名称" style="width:100%">
<Select <Select v-model="orderSearchForm.productName" placeholder="请选择" style="width:240px;">
v-model="orderSearchForm.productName"
placeholder="请选择"
style="width:240px;"
>
<Option <Option
v-for="(item,index) in list" v-for="(item,index) in list"
:key="index" :key="index"
...@@ -54,7 +61,11 @@ ...@@ -54,7 +61,11 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="状态" style="width:100%"> <FormItem label="状态" style="width:100%">
<dictionary code='plan.order.status' v-model="orderSearchForm.status" style="width:240px"></dictionary> <dictionary
code="plan.order.status"
v-model="orderSearchForm.status"
style="width:240px"
></dictionary>
<Input v-model="orderSearchForm.productId" style="width:240px" v-if="false" /> <Input v-model="orderSearchForm.productId" style="width:240px" v-if="false" />
</FormItem> </FormItem>
</Col> </Col>
...@@ -62,65 +73,106 @@ ...@@ -62,65 +73,106 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="工艺编号" style="width:100%"> <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> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="工艺名称" style="width:100%"> <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> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="任务类型" style="width:100%"> <FormItem label="项目号" style="width:100%">
<dictionary code='plan.order.taskType' v-model="orderSearchForm.taskType" style="width:240px"></dictionary> <Input v-model="orderSearchForm.projectNumber" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="阶段" style="width:100%"> <FormItem label="批次号" style="width:100%">
<dictionary code='plan.order.stage' v-model="orderSearchForm.stage" style="width:240px"></dictionary> <Input v-model="orderSearchForm.batchNumber" placeholder style="width:240px" />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="材料" style="width:100%"> <FormItem label="紧急程度" style="width:100%">
<dictionary code='plan.order.material' v-model="orderSearchForm.materialId" style="width:240px"></dictionary> <dictionary
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="数量" style="width:100%"> <FormItem label="任务类型" style="width:100%">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber> <dictionary
code="plan.order.taskType"
v-model="orderSearchForm.taskType"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="甲方客户" style="width:100%"> <FormItem label="阶段" style="width:100%">
<dictionary code='plan.order.guestName' v-model="orderSearchForm.guestName" style="width:240px"></dictionary> <dictionary
code="plan.order.stage"
v-model="orderSearchForm.stage"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="3D打印承制单位" style="width:100%"> <FormItem label="材料" style="width:100%">
<dictionary code='plan.order.printSupply' v-model="orderSearchForm.printSupply" style="width:240px"></dictionary> <dictionary
code="plan.order.material"
v-model="orderSearchForm.materialId"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="厂内责任机关" style="width:100%"> <FormItem label="数量" style="width:100%">
<Input <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
v-model="orderSearchForm.functionaryOffice" </FormItem>
placeholder </Col>
<Col span="12">
<FormItem label="甲方客户" style="width:100%">
<dictionary
code="plan.order.guestName"
v-model="orderSearchForm.guestName"
style="width:240px" 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> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="厂内责任主体部门" style="width:100%"> <FormItem label="厂内责任主体部门" style="width:100%">
<dictionary code='plan.order.mainDepartment' v-model="orderSearchForm.mainDepartmentId" style="width:240px"></dictionary> <dictionary
</Select> code="plan.order.mainDepartment"
v-model="orderSearchForm.mainDepartmentId"
style="width:240px"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -132,11 +184,7 @@ ...@@ -132,11 +184,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="甲方投产输入文件(编号)" style="width:100%"> <FormItem label="甲方投产输入文件(编号)" style="width:100%">
<Input <Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
v-model="orderSearchForm.putintDocmentCode"
placeholder
style="width:240px"
/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -152,11 +200,7 @@ ...@@ -152,11 +200,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="外部图号/模型号" style="width:100%"> <FormItem label="外部图号/模型号" style="width:100%">
<Input <Input v-model="orderSearchForm.outerDrawnNumber" placeholder style="width:240px" />
v-model="orderSearchForm.outerDrawnNumber"
placeholder
style="width:240px"
/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -173,255 +217,271 @@ ...@@ -173,255 +217,271 @@
</Col> </Col>
</Row> </Row>
</Form> </Form>
<div slot="footer" > <div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button> <Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button> <Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div> </div>
</Modal> </Modal>
<!-- 配套确认弹框-材料消耗单 --> <!-- 配套确认弹框-材料消耗单 -->
<Modal v-model="showModel02" title="材料消耗单" :width="1600" :mask-closable="false"> <Modal v-model="showModel02" title="材料消耗单" :width="1600" :mask-closable="false"></Modal>
</Modal>
</div> </div>
</template> </template>
<script> <script>
import expandRow from '../../produce/components/table-list.vue'; import expandRow from "../../produce/components/table-list.vue";
import service from '@/plugins/request'; import service from "@/plugins/request";
export default { export default {
components:{expandRow,}, components: { expandRow },
data(){ data() {
return { return {
search: { search: {
pageIndex: 1,//当前页数 pageIndex: 1, //当前页数
pageSize: 10,//分页数 pageSize: 10, //分页数
total:0,//总数 total: 0, //总数
conditions: [] conditions: []
}, },
showPagesize: [10, 20, 40], showPagesize: [10, 20, 40],
searchIterms:'', searchIterms: "",
showModel: false, showModel: false,
showModel02: false, showModel02: false,
list: [], list: [],
data1: [], data1: [],
tbHeight: '',//表格高度 tbHeight: "", //表格高度
selectdata: [], selectdata: [],
SkipCount: 1, SkipCount: 1,
MaxResultCount: 10, MaxResultCount: 10,
orderSearchForm: { orderSearchForm: {
productId: null, //产品id productId: null, //产品id
productName: '', //产品名称 productName: "", //产品名称
taskType: '', //任务类型 taskType: "", //任务类型
stage: '', //阶段 stage: "", //阶段
materialId: '', //材料 materialId: "", //材料
quantity: 1, //数量 quantity: 1, //数量
guestName: '', //甲方客户 guestName: "", //甲方客户
printSupply: '', //3D打印承制单位 printSupply: "", //3D打印承制单位
functionaryOffice: '', //厂内责任机关 functionaryOffice: "", //厂内责任机关
mainDepartmentId: '', //厂内责任主体部门ID mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: '', //任务接点要求 taskRequire: "", //任务接点要求
putintDocmentCode: '', //甲方投产输入文件编号 putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: '', //甲方技术输入文件编号 technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: '', //外部图号/模型号 outerDrawnNumber: "", //外部图号/模型号
modelVersion: '', //模型版本 modelVersion: "", //模型版本
taskCode: '', //甲方任务号 taskCode: "", //甲方任务号
designer: '', //甲方设计人员 designer: "", //甲方设计人员
officeFunctionary: '', //厂内机关负责人 officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: '', //厂内主工艺人员 mainRoutingPeople: "", //厂内主工艺人员
routing_Method: '', //工艺方法 routing_Method: "", //工艺方法
outer_Envelope_Size: '', //包装尺寸 outer_Envelope_Size: "", //包装尺寸
demandStartDate: '', //开始时间 demandStartDate: "", //开始时间
demandFinishDate: '', //完成时间 demandFinishDate: "", //完成时间
remark: '' //备注 remark: "", //备注
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
}, },
mColumn:[ mColumn: [
{ type: 'expand',width: 60, {
render: (h, params)=>{ type: "expand",
width: 60,
render: (h, params) => {
return h(expandRow, { return h(expandRow, {
props: { props: {
row: params.row row: params.row
} }
}) });
}}, }
{ title: '工艺编号', key: 'processcode', }, },
{ title: '工艺名称', key: 'processname', }, { title: "工艺编号", key: "processcode" },
{ title: '状态', key: 'status', width:'120', { title: "工艺名称", key: "processname" },
slot:"status", {
filters:this.getArry( title: "状态",
this.$store.getters.dictionaryByKey( key: "status",
'taskList.status' width: "120",
) slot: "status",
filters: this.getArry(
this.$store.getters.dictionaryByKey("taskList.status")
), ),
filterMultiple: false, filterMultiple: false,
filterMethod(value, row) { filterMethod(value, row) {
let statusChar = row.status + '' let statusChar = row.status + "";
return statusChar.indexOf(value) > -1 return statusChar.indexOf(value) > -1;
}, }
}, },
{ title: '计划数量', key: 'quantity', width:'160',}, { title: "计划数量", key: "quantity", width: "160" },
{ title: '操作', width:'100', {
render:(h, params)=>{ title: "操作",
return h('div', { class: 'action' },[ width: "100",
render: (h, params) => {
return h("div", { class: "action" }, [
h( h(
'op', "op",
{ {
attrs:{ attrs: {
oprate:'detail' oprate: "detail"
} , },
on: { click: () => {this.openDetails(params.row)}} on: {
click: () => {
this.openDetails(params.row);
}
}
}, },
'检验' "检验"
) )
]) ]);
}},
],
mDatas:[],//表格数据
} }
}
],
mDatas: [] //表格数据
};
}, },
created(){ created() {
this.laode(); this.laode();
this.tbHeight = window.innerHeight - 200 this.tbHeight = window.innerHeight - 200;
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
// 加载数据 // 加载数据
laode(){ laode() {
let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`; let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`;
service.post(`${url}`,{ service
"status": 0, .post(`${url}`, {
"skipCount":0, status: 0,
"maxResultCount": 10 skipCount: 0,
}).then(res => { maxResultCount: 10
this.mDatas = res.result.items })
this.search.total = res.result.totalCount .then(res => {
this.mDatas = res.result.items;
this.search.total = res.result.totalCount;
}); });
}, },
// 分页 // 分页
pageChange(pageNum) { pageChange(pageNum) {
let pageData = this.search; let pageData = this.search;
pageData.SkipCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount pageData.SkipCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount;
pageData.MaxResultCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount pageData.MaxResultCount =
(pageNum - 1) * this.orderSearchForm.MaxResultCount;
// pageData.pageIndex = pageNum // pageData.pageIndex = pageNum
this.laodePage(pageData) this.laodePage(pageData);
}, },
pageSizeChange(val) { pageSizeChange(val) {
let pageData = this.search; let pageData = this.search;
pageData.SkipCount = 0 pageData.SkipCount = 0;
pageData.MaxResultCount = val pageData.MaxResultCount = val;
this.laodePage(pageData) this.laodePage(pageData);
}, },
laodePage(pageData){ laodePage(pageData) {
let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`; let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`;
service.post(`${url}`,pageData).then(res => { service.post(`${url}`, pageData).then(res => {
this.mDatas = res.result.items this.mDatas = res.result.items;
this.search.total = res.result.totalCount this.search.total = res.result.totalCount;
}); });
}, },
// 搜索 // 搜索
tableSearch() { tableSearch() {
console.warn("查询数据") console.warn("查询数据");
let val = this.searchIterms; let val = this.searchIterms;
console.log(val) console.log(val);
let parmes = { let parmes = {
"status": 0, status: 0,
"simpleSearch": val, simpleSearch: val,
"skipCount":0, skipCount: 0,
"maxResultCount": 10 maxResultCount: 10
} };
this.searchlaode(parmes) this.searchlaode(parmes);
}, },
searchlaode(parmes){ searchlaode(parmes) {
let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`; let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`;
service.post(`${url}`,parmes).then(res => { service.post(`${url}`, parmes).then(res => {
console.warn(res) console.warn(res);
this.mDatas = res.result.items this.mDatas = res.result.items;
this.search.total = res.result.totalCount this.search.total = res.result.totalCount;
}); });
}, },
searchModel(){ searchModel() {
this.showModel = true; this.showModel = true;
}, },
async openDetails(lemData){ async openDetails(lemData) {
this.$router.push({
this.$router.push({ name: 'qcimplement', params: { transmitData: lemData }}) name: "qcimplement",
params: { transmitData: lemData }
});
}, },
renderContent(h, { root, node, data }) { renderContent(h, { root, node, data }) {
//渲染树的样式 //渲染树的样式
return h( return h(
'span', "span",
{ {
style: { style: {
color: data.isProduct != '1' ? '#249E91' : '#333', //根据选中状态设置样式 color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
cursor: 'pointer' cursor: "pointer"
}, },
on: { on: {
click: () => { click: () => {
let arrTree = [] let arrTree = [];
arrTree.push(data) arrTree.push(data);
this.handleSelect(arrTree) //手动选择树节点 this.handleSelect(arrTree); //手动选择树节点
} }
} }
}, },
data.title data.title
) );
}, },
handleSelect(data) { handleSelect(data) {
if (data.length > 0) { if (data.length > 0) {
this.selectdata = [] this.selectdata = [];
this.selectdata = data this.selectdata = data;
this.list = [] this.list = [];
this.list.push({ label: data[0].title, value: data[0].id }) this.list.push({ label: data[0].title, value: data[0].id });
//this.formValidate.classType=data[0].id; //this.formValidate.classType=data[0].id;
if (data[0].isProduct == '1') { if (data[0].isProduct == "1") {
this.orderSearchForm.productName = data[0].id this.orderSearchForm.productName = data[0].id;
this.orderSearchForm.productId = data[0].productId this.orderSearchForm.productId = data[0].productId;
} } else {
else this.$Message.error("此节点不是产品,请选择产品节点!");
{
this.$Message.error('此节点不是产品,请选择产品节点!')
} }
} }
}, },
close(){ close() {
this.showModel = false; this.showModel = false;
}, },
complexSearch(){ complexSearch() {
// this.$emit('easySearch',this.orderSearchForm); // this.$emit('easySearch',this.orderSearchForm);
this.close(); this.close();
}, },
//得到数据字典对应的label和value，用于table排序、筛选 //得到数据字典对应的label和value，用于table排序、筛选
getArry(arryList) { getArry(arryList) {
let arry = [] let arry = [];
arryList.forEach((data) => { arryList.forEach(data => {
var that = this var that = this;
let arryObj = {} let arryObj = {};
arryObj['label'] = data.name arryObj["label"] = data.name;
arryObj['value'] = data.code arryObj["value"] = data.code;
arry.push(arryObj) arry.push(arryObj);
}) });
return arry return arry;
}, }
}, },
mounted() { mounted() {
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
return (() => { return (() => {
window.screenHeight = window.innerHeight window.screenHeight = window.innerHeight;
this.tbHeight = window.screenHeight - 200 this.tbHeight = window.screenHeight - 200;
})() })();
};
} }
}, };
}
</script> </script>
<style scoped> <style scoped>
.table_title{ .table_title {
width: 320px; width: 320px;
/* float: left; */ /* float: left; */
} }
.table{ .table {
margin: 10px 0 0 0; margin: 10px 0 0 0;
} }
.title_btn{ .title_btn {
margin-top: 1px; margin-top: 1px;
} }
</style> </style>
\ No newline at end of file
pages/resource/resource/cart.vue
View file @ d74d48bb
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</Col> </Col>
<Col span="7"> <Col span="7">
<FormItem label="领料人" style="width:100%" prop="customerId"> <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> </FormItem>
</Col> </Col>
</Row> </Row>
......
store/index.js
View file @ d74d48bb
import createVuexAlong from 'vuex-along' import createVuexAlong from 'vuex-along'
import Api from '@/plugins/request' import Api from '@/plugins/request'
export const state=()=>({ export const state = () => ({
counter:0, counter: 0,
dictionary: new Map(),//所有字典项 dictionary: new Map(), //所有字典项
userMap:[],//所有用户缓存; userMap: [], //所有用户缓存;
userInfo:{ userInfo: {
userId:0, userId: 0,
userName:"" userName: ""
} },
cart:[],
count: 0,
}) })
export const getters={ export const getters = {
dictionaryByKey: (state) => (key) => { dictionaryByKey: (state) => (key) => {
let result = []; let result = [];
let items = state.dictionary.get(key); let items = state.dictionary.get(key);
...@@ -19,7 +21,7 @@ export const getters={ ...@@ -19,7 +21,7 @@ export const getters={
} }
return result; return result;
}, },
getUser:state=>key=>{ getUser: state => key => {
// try{ // try{
// if(state.userMap.has(key)){ // if(state.userMap.has(key)){
// return state.userMap.get(key); // return state.userMap.get(key);
...@@ -27,16 +29,18 @@ export const getters={ ...@@ -27,16 +29,18 @@ export const getters={
// }catch(e){ // }catch(e){
// console.log(e); // console.log(e);
// } // }
let user=state.userMap.filter(u=>{return u.id==key}); let user = state.userMap.filter(u => {
if(user.length>0){ return u.id == key
});
if (user.length > 0) {
return user[0] return user[0]
}else{ } else {
return null; return null;
} }
} }
} }
export const mutations={ export const mutations = {
increment(state){ increment(state) {
state.counter++ state.counter++
}, },
setUserInfo(state, userInfo) { setUserInfo(state, userInfo) {
...@@ -44,24 +48,40 @@ export const mutations={ ...@@ -44,24 +48,40 @@ export const mutations={
// sessionStorage.setItem("userInfo", JSON.stringify(userInfo)); // sessionStorage.setItem("userInfo", JSON.stringify(userInfo));
// sessionStorage.setItem("token", userInfo.token); // sessionStorage.setItem("token", userInfo.token);
}, },
addUser(state,user){ addUser(state, user) {
state.userMap.push(user); state.userMap.push(user);
}, },
setDictionary(state, dictionary) { setDictionary(state, dictionary) {
state.dictionary = dictionary; state.dictionary = dictionary;
}, },
setCart(state, cart) {
state.cart = cart;
},
setCartCount(state, count) {
state.count = count;
}
} }
export const actions={ export const actions = {
async loadUser({commit},key){ async loadUser({
commit
}, key) {
let { result } = await this.$api.get(`${systemUrl}/user/getuser`,{id:key}); let {
console.warn("result",result) result
commit("addUser",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 url = `${systemUrl}/Dictionary/GetAll`
let { result } = await Api.get(url); let {
result
} = await Api.get(url);
var map = new Map(); var map = new Map();
...@@ -74,7 +94,7 @@ export const actions={ ...@@ -74,7 +94,7 @@ export const actions={
} }
} }
export const plugins= [ export const plugins = [
createVuexAlong({ createVuexAlong({
// 设置保存的集合名字，避免同站点下的多项目数据冲突 // 设置保存的集合名字，避免同站点下的多项目数据冲突
name: "hyhmes", name: "hyhmes",
...@@ -88,6 +108,6 @@ export const plugins= [ ...@@ -88,6 +108,6 @@ export const plugins= [
list: ["hyhmes.session"], list: ["hyhmes.session"],
}, },
}), }),
] ]
//设置 strict 为不严格模式，即可在actions中修改state //设置 strict 为不严格模式，即可在actions中修改state
export const strict=false; export const strict = false;
\ No newline at end of file
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