Skip to content

M
mes-ui
Commit fb575232 authored by renjintao's avatar renjintao
Browse files
Options

routingchangeorder

parent b5258a06
Show whitespace changes
Inline Side-by-side
Showing with 826 additions and 506 deletions
i18n/locale/zh-CN.js
View file @ fb575232
...@@ -1397,7 +1397,7 @@ export default { ...@@ -1397,7 +1397,7 @@ export default {
printData: '发行日期', printData: '发行日期',
executiveBranch: '执行部门', executiveBranch: '执行部门',
executiveBranchId: '执行部门Id', executiveBranchId: '执行部门Id',
handlingOpinionsId: '', handlingOpinionsId: '在制品处理意见Id',
handlingOpinions: '在制品处理意见', handlingOpinions: '在制品处理意见',
beforeChangeContent: '变更前内容描述（附图）', beforeChangeContent: '变更前内容描述（附图）',
afterChangeContent: '变更后内容描述（附图）', afterChangeContent: '变更后内容描述（附图）',
......
pages/processDesign/Process/routingchangeorder.vue
View file @ fb575232
<style lang="less"> <style lang="less">
@import './menu.less'; @import "./menu.less";
</style> </style>
<template> <template>
<Modal v-model="modelChange" title="工艺更改单" :mask-closable="false" width="1020px"> <Modal v-model="modelChange" title="工艺更改单" :mask-closable="false" width="1020px">
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<Input <Input
size="large" size="large"
v-model.trim="this.changeorder_code" v-model.trim="this.changeorder_code"
style="width:240px" style="width:240px"
readonly readonly
/> />
...@@ -30,8 +29,15 @@ ...@@ -30,8 +29,15 @@
style="width:240px;" style="width:240px;"
placeholder="请选择" placeholder="请选择"
format="yyyy/MM/dd" format="yyyy/MM/dd"
></DatePicker> --> ></DatePicker>-->
<DatePicker :value="formValidate.print_data" @on-change="handleChange" format="yyyy/MM/dd" type="date" placeholder="请选择" style="width: 240px"></DatePicker> <DatePicker
:value="formValidate.print_data"
@on-change="handleChange"
format="yyyy/MM/dd"
type="date"
placeholder="请选择"
style="width: 240px"
></DatePicker>
</FormItem> </FormItem>
</Row> </Row>
<Row> <Row>
...@@ -53,7 +59,6 @@ ...@@ -53,7 +59,6 @@
readonly readonly
/> />
</FormItem> </FormItem>
</Row> </Row>
<Row> <Row>
<FormItem label="技术文件名称"> <FormItem label="技术文件名称">
...@@ -84,7 +89,7 @@ ...@@ -84,7 +89,7 @@
></dictionary> ></dictionary>
</FormItem> </FormItem>
<FormItem label="数量"> <FormItem label="数量">
<InputNumber :min="0" v-model="formValidate.quantity" style="width:240px" ></InputNumber> <InputNumber :min="0" v-model="formValidate.quantity" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Row> </Row>
<Row> <Row>
...@@ -93,7 +98,8 @@ ...@@ -93,7 +98,8 @@
v-model="formValidate.executive_branch" v-model="formValidate.executive_branch"
readonly readonly
placeholder="请选择..." placeholder="请选择..."
style="width:240px" > style="width:240px"
>
<Button slot="append" @click="selectDepart">选择</Button> <Button slot="append" @click="selectDepart">选择</Button>
</Input> </Input>
</FormItem> </FormItem>
...@@ -115,7 +121,14 @@ ...@@ -115,7 +121,14 @@
/> />
</FormItem> </FormItem>
<FormItem label="有效日期"> <FormItem label="有效日期">
<DatePicker :value="formValidate.effective_date" @on-change="handleChange1" format="yyyy/MM/dd" type="date" placeholder="请选择" style="width: 240px"></DatePicker> <DatePicker
:value="formValidate.effective_date"
@on-change="handleChange1"
format="yyyy/MM/dd"
type="date"
placeholder="请选择"
style="width: 240px"
></DatePicker>
</FormItem> </FormItem>
</Row> </Row>
<!-- <Row> --> <!-- <Row> -->
...@@ -126,7 +139,7 @@ ...@@ -126,7 +139,7 @@
placeholder="请输入..." placeholder="请输入..."
style="width:240px" style="width:240px"
/> />
</FormItem> --> </FormItem>-->
<!-- <FormItem label="批准人"> <!-- <FormItem label="批准人">
<Input <Input
size="large" size="large"
...@@ -134,27 +147,36 @@ ...@@ -134,27 +147,36 @@
placeholder="请输入..." placeholder="请输入..."
style="width:240px" style="width:240px"
/> />
</FormItem> --> </FormItem>-->
<!-- </Row> --> <!-- </Row> -->
<Row> <Row>
<FormItem label="变更前内容描述（附图）："> <FormItem label="变更前内容描述（附图）：">
<!-- <VueUeditorWrap :config="editorConfig" v-model.trim="formValidate.before_change_content" /> --> <!-- <VueUeditorWrap :config="editorConfig" v-model.trim="formValidate.before_change_content" /> -->
<Card :bordered="false" dis-hover class="ivu-mt"> <Card :bordered="false" dis-hover class="ivu-mt">
<i-quill v-model="formValidate.before_change_content" :height="400" style="width:700px" v-paste="handleImg" /> <i-quill
v-model="formValidate.before_change_content"
:height="400"
style="width:700px"
v-paste="handleImg"
/>
<Divider /> <Divider />
<!-- <Button @click="handleAddText">增加文本</Button> <!-- <Button @click="handleAddText">增加文本</Button>
<Button @click="handleAddImg" class="ivu-ml">增加图片</Button> --> <Button @click="handleAddImg" class="ivu-ml">增加图片</Button>-->
<!-- <textarea id="abc" cols="30" rows="10" v-paste="handleImg"></textarea> --> <!-- <textarea id="abc" cols="30" rows="10" v-paste="handleImg"></textarea> -->
</Card> </Card>
</FormItem> </FormItem>
<FormItem label="变更后内容描述（附图）："> <FormItem label="变更后内容描述（附图）：">
<!-- <VueUeditorWrap :config="editorConfig" v-model.trim="formValidate.after_change_content" /> --> <!-- <VueUeditorWrap :config="editorConfig" v-model.trim="formValidate.after_change_content" /> -->
<Card :bordered="false" dis-hover class="ivu-mt"> <Card :bordered="false" dis-hover class="ivu-mt">
<i-quill v-model="formValidate.after_change_content" :height="400" style="width:700px" v-paste="handleImg" /> <i-quill
v-model="formValidate.after_change_content"
:height="400"
style="width:700px"
v-paste="handleImg"
/>
<Divider /> <Divider />
<!-- <Button @click="handleAddText">增加文本</Button> <!-- <Button @click="handleAddText">增加文本</Button>
<Button @click="handleAddImg" class="ivu-ml">增加图片</Button> --> <Button @click="handleAddImg" class="ivu-ml">增加图片</Button>-->
<!-- <textarea id="abc" cols="30" rows="10" v-paste="handleImg"></textarea> --> <!-- <textarea id="abc" cols="30" rows="10" v-paste="handleImg"></textarea> -->
</Card> </Card>
</FormItem> </FormItem>
...@@ -179,33 +201,37 @@ ...@@ -179,33 +201,37 @@
</Modal> </Modal>
</template> </template>
<script> <script>
import Department from '@/components/modalTree/department.vue' import Department from "@/components/modalTree/department.vue";
import service from '@/plugins/request' import service from "@/plugins/request";
import VueUeditorWrap from 'vue-ueditor-wrap' import VueUeditorWrap from "vue-ueditor-wrap";
import iQuill from "@/components/quill"; import iQuill from "@/components/quill";
import Process from '@/components/orderOperator/process' import Process from "@/components/orderOperator/process";
import changeSendReview from './changeSendReview.vue' import changeSendReview from "./changeSendReview.vue";
export default { export default {
components: { components: {
Department,VueUeditorWrap,iQuill,Process,changeSendReview Department,
VueUeditorWrap,
iQuill,
Process,
changeSendReview
}, },
name: 'routingchangeorder', name: "routingchangeorder",
data() { data() {
return { return {
submitShow: true,//送审按钮显隐 submitShow: true, //送审按钮显隐
checked: true, //送审选择框 checked: true, //送审选择框
formExamine: {}, formExamine: {},
rules: { rules: {
approveUser: [{ required: true, message: '必填', trigger: 'blur' }] approveUser: [{ required: true, message: "必填", trigger: "blur" }]
}, },
data3:[], data3: [],
userlist:[], userlist: [],
value: `<h1>iView Admin Pro</h1>`, value: `<h1>iView Admin Pro</h1>`,
showDeptTree: false, showDeptTree: false,
modelChange:false, modelChange: false,
flag:0, flag: 0,
routing_header_Id:'', routing_header_Id: "",
changeorder_code:'', changeorder_code: "",
degreeList: {}, degreeList: {},
components: {}, components: {},
ruleValidate: { ruleValidate: {
...@@ -213,7 +239,7 @@ export default { ...@@ -213,7 +239,7 @@ export default {
// number:[{required: true,type:'number'}], // number:[{required: true,type:'number'}],
//name:[{required: true}] //name:[{required: true}]
}, },
phone: 'apple', phone: "apple",
taskTypeList: [], //任务类型 taskTypeList: [], //任务类型
handlingopinionList: [], //研制方式 handlingopinionList: [], //研制方式
versionList: [], //版本 versionList: [], //版本
...@@ -223,60 +249,61 @@ export default { ...@@ -223,60 +249,61 @@ export default {
// 初始容器高度 // 初始容器高度
initialFrameHeight: 480, initialFrameHeight: 480,
// 初始容器宽度 // 初始容器宽度
initialFrameWidth: '100%', initialFrameWidth: "100%",
// 上传文件接口, 报错属于正常，若需要验证可使用(也是盗大神的)http://35.201.165.105:8000/controller.php // 上传文件接口, 报错属于正常，若需要验证可使用(也是盗大神的)http://35.201.165.105:8000/controller.php
// 调试完毕打包上线则切换回/static/UEditor/php/controller.php即可，不用做其他处理 // 调试完毕打包上线则切换回/static/UEditor/php/controller.php即可，不用做其他处理
// serverUrl:fileUrl+'/upload_ueditor/?token=Bearer ' + window.sessionStorage.getItem('token'), // serverUrl:fileUrl+'/upload_ueditor/?token=Bearer ' + window.sessionStorage.getItem('token'),
serverUrl:"http://39.100.148.168:10080/config?token=Bearer "+window.sessionStorage.getItem('token'), serverUrl:
"http://39.100.148.168:10080/config?token=Bearer " +
window.sessionStorage.getItem("token")
//serverUrl:"http://192.168.0.101:10080/config?token=Bearer "+window.sessionStorage.getItem('token'), //serverUrl:"http://192.168.0.101:10080/config?token=Bearer "+window.sessionStorage.getItem('token'),
}, },
formValidate: { formValidate: {
id: 0, id: 0,
changeorder_code:'', changeorder_code: "",
routing_header_Id: 0, routing_header_Id: 0,
propose_user_id: 0, propose_user_id: 0,
propose_user_name: '', propose_user_name: "",
department_id: 0, department_id: 0,
department_name: '', department_name: "",
technical_name: '', technical_name: "",
technical_code: '', technical_code: "",
changed_version: '', changed_version: "",
quantity: 0, quantity: 0,
print_data: '', print_data: "",
executive_branch: '', executive_branch: "",
executive_branch_id: 0, executive_branch_id: 0,
handling_opinions_id: 0, handling_opinions_id: 0,
handling_opinions: '', handling_opinions: "",
before_change_content:'', before_change_content: "",
after_change_content: '', after_change_content: "",
change_reason:'', change_reason: "",
effective_date:'', effective_date: "",
check_person:'', check_person: "",
approval_person:'', approval_person: "",
status:0, status: 0,
note:'', note: ""
},
} }
};
}, },
mounted() { mounted() {
this.taskTypeList = [ this.taskTypeList = [
{ name: '五二九纵', value: 1 }, { name: "五二九纵", value: 1 },
{ name: '五二九横', value: 2 }, { name: "五二九横", value: 2 },
{ name: '五二九预', value: 3 } { name: "五二九预", value: 3 }
] ];
;(this.handlingopinionList = [ (this.handlingopinionList = [
{ name: '例外', value: 1 }, { name: "例外", value: 1 },
{ name: '报废', value: 2 } { name: "报废", value: 2 }
]), ]),
(this.versionList = [ (this.versionList = [
{ name: 'A', value: 1 }, { name: "A", value: 1 },
{ name: 'B', value: 2 }, { name: "B", value: 2 },
{ name: 'C', value: 2 } { name: "C", value: 2 }
]) ]);
}, },
created() { created() {
// var url = `${workflowUrl}/schema/intend?schemaId=d0cdafe3-2341-4499-a4f5-278ef0f30740` // var url = `${workflowUrl}/schema/intend?schemaId=d0cdafe3-2341-4499-a4f5-278ef0f30740`
// service // service
// .get( // .get(
// `${url}` // `${url}`
...@@ -297,7 +324,6 @@ export default { ...@@ -297,7 +324,6 @@ export default {
'<p><img src="https://file.iviewui.com/dist/2ecd3b0452aa197097d5131afacab7b8.png"></p>'; '<p><img src="https://file.iviewui.com/dist/2ecd3b0452aa197097d5131afacab7b8.png"></p>';
}, },
handleImg(e) { handleImg(e) {
let file = null; let file = null;
if ( if (
e.clipboardData && e.clipboardData &&
...@@ -308,32 +334,32 @@ export default { ...@@ -308,32 +334,32 @@ export default {
//这里就是判断是否有粘贴进来的文件且文件为图片格式 //这里就是判断是否有粘贴进来的文件且文件为图片格式
file = e.clipboardData.items[0].getAsFile(); file = e.clipboardData.items[0].getAsFile();
let reader = new FileReader(); let reader = new FileReader();
reader.readAsDataURL(file) reader.readAsDataURL(file);
setTimeout(() => { setTimeout(() => {
var img = '<img src="' + reader.result + '" alt=""/>'; var img = '<img src="' + reader.result + '" alt=""/>';
this.value += img; this.value += img;
console.log("value", this.value); console.log("value", this.value);
}, 1000); }, 1000);
new R new R();
} }
}, },
handleChange (date) { handleChange(date) {
console.log(date); console.log(date);
this.formValidate.print_data=date; this.formValidate.print_data = date;
}, },
handleChange1 (date) { handleChange1(date) {
console.log(date); console.log(date);
this.formValidate.effective_date=date; this.formValidate.effective_date = date;
}, },
selectDepart() { selectDepart() {
this.showDeptTree = true this.showDeptTree = true;
}, },
quotationBox() { quotationBox() {
this.$refs.generateQuotation.modalShow = true this.$refs.generateQuotation.modalShow = true;
}, },
previousStep() { previousStep() {
this.modalShow = false this.modalShow = false;
}, },
modalOk() { modalOk() {
// let url = `${designUrl}/routingheaderchangeorder/getpaged1` // let url = `${designUrl}/routingheaderchangeorder/getpaged1`
...@@ -346,25 +372,24 @@ export default { ...@@ -346,25 +372,24 @@ export default {
// }) // })
// this.$refs.changeSendReview.modalInfo = true; // this.$refs.changeSendReview.modalInfo = true;
var url = `${designUrl}/routingheaderchangeorder/createorupdate`; var url = `${designUrl}/routingheaderchangeorder/createorupdate`;
if(this.flag==0) if (this.flag == 0) {
{
let paramsdata = { let paramsdata = {
"id": "", id: "",
"changeorder_code": this.changeorder_code, changeorder_code: this.changeorder_code,
"routing_header_Id":this.routing_header_Id, routing_header_Id: this.routing_header_Id,
"propose_user_name": this.formValidate.propose_user_name, propose_user_name: this.formValidate.propose_user_name,
"department_name":this.formValidate.department_name, department_name: this.formValidate.department_name,
"technical_name":this.formValidate.technical_name, technical_name: this.formValidate.technical_name,
"technical_code":this.formValidate.technical_code, technical_code: this.formValidate.technical_code,
"changed_version":this.formValidate.changed_version, changed_version: this.formValidate.changed_version,
"quantity":this.formValidate.quantity, quantity: this.formValidate.quantity,
"print_data":this.formValidate.print_data, print_data: this.formValidate.print_data,
"executive_branch":this.formValidate.executive_branch, executive_branch: this.formValidate.executive_branch,
"handling_opinions":this.formValidate.handling_opinions, handling_opinions: this.formValidate.handling_opinions,
"before_change_content":this.formValidate.before_change_content, before_change_content: this.formValidate.before_change_content,
"after_change_content":this.formValidate.after_change_content, after_change_content: this.formValidate.after_change_content,
"change_reason":this.formValidate.change_reason, change_reason: this.formValidate.change_reason,
"effective_date":this.formValidate.effective_date, effective_date: this.formValidate.effective_date
// "class_id": 0, // "class_id": 0,
// "propose_user_id": 0, // "propose_user_id": 0,
// "department_id": 0, // "department_id": 0,
...@@ -372,44 +397,50 @@ export default { ...@@ -372,44 +397,50 @@ export default {
// "handling_opinions_id": 0, // "handling_opinions_id": 0,
}; };
console.log(paramsdata); console.log(paramsdata);
service.post(`${url}`, {routingHeaderChangeorder: paramsdata}).then(res=>{ service
if(res.success) { .post(`${url}`, { routingHeaderChangeorder: paramsdata })
this.$Message.success('新增成功') .then(res => {
if (res.success) {
this.$Message.success("新增成功");
this.modelChange = false; this.modelChange = false;
if(this.checked == true){ if (this.checked == true) {
let url = `${designUrl}/routingheaderchangeorder/getpaged1` let url = `${designUrl}/routingheaderchangeorder/getpaged1`;
service service
.get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 }) .get(`${url}`, {
.then((res) => { changeorder_code: this.changeorder_code,
console.log(res) pageindex: 1,
this.$refs.changeSendReview.info.changeInfo = res.result.items[0]; pageSize: 10
this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
}) })
.then(res => {
console.log(res);
this.$refs.changeSendReview.info.changeInfo =
res.result.items[0];
this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
});
this.$refs.changeSendReview.modalInfo = true; this.$refs.changeSendReview.modalInfo = true;
} }
} }
}); });
} } else {
else{
let paramsdata = { let paramsdata = {
"id": this.formValidate.id, id: this.formValidate.id,
"changeorder_code": this.changeorder_code, changeorder_code: this.changeorder_code,
"routing_header_Id":this.routing_header_Id, routing_header_Id: this.routing_header_Id,
"propose_user_name": this.formValidate.propose_user_name, propose_user_name: this.formValidate.propose_user_name,
"department_name":this.formValidate.department_name, department_name: this.formValidate.department_name,
"technical_name":this.formValidate.technical_name, technical_name: this.formValidate.technical_name,
"technical_code":this.formValidate.technical_code, technical_code: this.formValidate.technical_code,
"changed_version":this.formValidate.changed_version, changed_version: this.formValidate.changed_version,
"quantity":this.formValidate.quantity, quantity: this.formValidate.quantity,
"print_data":this.formValidate.print_data, print_data: this.formValidate.print_data,
"executive_branch":this.formValidate.executive_branch, executive_branch: this.formValidate.executive_branch,
"handling_opinions":this.formValidate.handling_opinions, handling_opinions: this.formValidate.handling_opinions,
"before_change_content":this.formValidate.before_change_content, before_change_content: this.formValidate.before_change_content,
"after_change_content":this.formValidate.after_change_content, after_change_content: this.formValidate.after_change_content,
"change_reason":this.formValidate.change_reason, change_reason: this.formValidate.change_reason,
"effective_date":this.formValidate.effective_date, effective_date: this.formValidate.effective_date,
"status":this.formValidate.status, status: this.formValidate.status,
"note":this.formValidate.note, note: this.formValidate.note
// "class_id": 0, // "class_id": 0,
// "propose_user_id": 0, // "propose_user_id": 0,
// "department_id": 0, // "department_id": 0,
...@@ -417,20 +448,27 @@ export default { ...@@ -417,20 +448,27 @@ export default {
// "handling_opinions_id": 0, // "handling_opinions_id": 0,
}; };
console.log(paramsdata); console.log(paramsdata);
service.post(`${url}`, {routingHeaderChangeorder: paramsdata}).then(res=>{ service
if(res.success) { .post(`${url}`, { routingHeaderChangeorder: paramsdata })
this.$Message.success('编辑成功') .then(res => {
if (res.success) {
this.$Message.success("编辑成功");
this.modelChange = false; this.modelChange = false;
this.$emit('getMessage'); this.$emit("getMessage");
if(this.checked == true){ if (this.checked == true) {
let url = `${designUrl}/routingheaderchangeorder/getpaged1` let url = `${designUrl}/routingheaderchangeorder/getpaged1`;
service service
.get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 }) .get(`${url}`, {
.then((res) => { changeorder_code: this.changeorder_code,
console.log(res) pageindex: 1,
this.$refs.changeSendReview.info.changeInfo = res.result.items[0]; pageSize: 10
this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
}) })
.then(res => {
console.log(res);
this.$refs.changeSendReview.info.changeInfo =
res.result.items[0];
this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
});
this.$refs.changeSendReview.modalInfo = true; this.$refs.changeSendReview.modalInfo = true;
} }
// let url = `${designUrl}/routingheaderchangeorder/getpaged1` // let url = `${designUrl}/routingheaderchangeorder/getpaged1`
...@@ -463,7 +501,6 @@ export default { ...@@ -463,7 +501,6 @@ export default {
} }
}, },
upSave() { upSave() {
// Api.start(this.formExamine.approveUser).then((r) => { // Api.start(this.formExamine.approveUser).then((r) => {
// // this.results = r.result // // this.results = r.result
// }) // })
...@@ -494,8 +531,8 @@ export default { ...@@ -494,8 +531,8 @@ export default {
// }) // })
}, },
saveCancelModel() { saveCancelModel() {
this.modelChange = false this.modelChange = false;
}, }
} }
} };
</script> </script>
pages/technology/details/edit.vue
View file @ fb575232
...@@ -157,6 +157,27 @@ export default { ...@@ -157,6 +157,27 @@ export default {
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
handleImg(e) {
console.warn(e);
// let file = null
// if (
// e.clipboardData &&
// e.clipboardData.items[0] &&
// e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type.indexOf('image') > -1
// ) {
// //这里就是判断是否有粘贴进来的文件且文件为图片格式
// file = e.clipboardData.items[0].getAsFile()
// let reader = new FileReader()
// reader.readAsDataURL(file)
// setTimeout(() => {
// var img = '<img src="' + reader.result + '" alt=""/>'
// this.bugForm.content += img
// }, 1000)
// // new R
// }
},
l(key) { l(key) {
key = "routing_detail" + "." + key; key = "routing_detail" + "." + key;
return this.$t(key); return this.$t(key);
......
pages/technology/details/routinghcorder/add.vue
View file @ fb575232
<template> <template>
<div>
<Form ref="form" :model="entity" :rules="rules" :label-width="110"> <Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row> <Row>
<Col :span="12"> <Col span="8">
<FormItem :label="l('routingHeaderId')" prop="routingHeaderId"> <FormItem :label="l('changeorderCode')" prop="changeorderCode">
<InputNumber v-model="entity.routingHeaderId"></InputNumber> <Input v-model="entity.changeorderCode" readonly></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('classId')" prop="classId">
<InputNumber v-model="entity.classId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('proposeUserId')" prop="proposeUserId">
<InputNumber v-model="entity.proposeUserId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('proposeUserName')" prop="proposeUserName"> <FormItem :label="l('printData')" prop="printData">
<Input v-model="entity.proposeUserName"></Input> <DatePicker type="date" v-model="entity.printData" style="width:100%" format="yyyy/MM/dd"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('departmentId')" prop="departmentId"> <FormItem :label="l('departmentName')" prop="departmentId">
<InputNumber v-model="entity.departmentId"></InputNumber> <departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('departmentName')" prop="departmentName"> <FormItem :label="l('proposeUserName')" prop="proposeUserId">
<Input v-model="entity.departmentName"></Input> <UserSelect v-model="entity.proposeUserId"></UserSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('technicalName')" prop="technicalName"> <FormItem :label="l('technicalName')" prop="technicalName">
<Input v-model="entity.technicalName"></Input> <Input v-model="entity.technicalName"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('technicalCode')" prop="technicalCode"> <FormItem :label="l('technicalCode')" prop="technicalCode">
<Input v-model="entity.technicalCode"></Input> <Input v-model="entity.technicalCode"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('changedVersion')" prop="changedVersion"> <FormItem :label="l('changedVersion')" prop="changedVersion">
<Input v-model="entity.changedVersion"></Input> <dictionary
code="Process.Routing.version"
v-model="entity.changedVersion"
style="width:100%"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('quantity')" prop="quantity"> <FormItem :label="l('quantity')" prop="quantity">
<InputNumber v-model="entity.quantity"></InputNumber> <InputNumber v-model="entity.quantity" style="width:100%"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('printData')" prop="printData">
<Input v-model="entity.printData"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<FormItem :label="l('executiveBranch')" prop="executiveBranch"> <Col span="8">
<Input v-model="entity.executiveBranch"></Input> <FormItem :label="l('executiveBranch')" prop="executiveBranchId">
<departmentSelect v-model="entity.executiveBranchId"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<FormItem :label="l('executiveBranchId')" prop="executiveBranchId"> <Col span="8">
<InputNumber v-model="entity.executiveBranchId"></InputNumber> <FormItem :label="l('handlingOpinions')" prop="handlingOpinionsId">
<Dictionary
code="Process.Routing.opinion"
v-model="entity.handlingOpinionsId"
type="radio"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('handlingOpinionsId')" prop="handlingOpinionsId"> <FormItem :label="l('changeReason')" prop="changeReason">
<InputNumber v-model="entity.handlingOpinionsId"></InputNumber> <Input v-model="entity.changeReason"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('handlingOpinions')" prop="handlingOpinions"> <FormItem :label="l('effectiveDate')" prop="effectiveDate">
<Input v-model="entity.handlingOpinions"></Input> <DatePicker type="date" v-model="entity.effectiveDate" style="width:100%" format="yyyy/MM/dd"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="24">
<FormItem :label="l('beforeChangeContent')" prop="beforeChangeContent"> <FormItem :label="l('beforeChangeContent')" prop="beforeChangeContent">
<Input v-model="entity.beforeChangeContent"></Input> <i-quill v-model="entity.beforeChangeContent" :height="200" border v-paste="handleImg" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="24">
<FormItem :label="l('afterChangeContent')" prop="afterChangeContent"> <FormItem :label="l('afterChangeContent')" prop="afterChangeContent">
<Input v-model="entity.afterChangeContent"></Input> <i-quill v-model="entity.afterChangeContent" :height="200" border v-paste="handleImg" />
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('changeorderCode')" prop="changeorderCode">
<Input v-model="entity.changeorderCode"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('changeReason')" prop="changeReason">
<Input v-model="entity.changeReason" type="textarea" :rows="5"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<FormItem :label="l('effectiveDate')" prop="effectiveDate"> <!--
<Input v-model="entity.effectiveDate"></Input> <Col span="12">
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('checkPerson')" prop="checkPerson"> <FormItem :label="l('checkPerson')" prop="checkPerson">
<InputNumber v-model="entity.checkPerson"></InputNumber> <InputNumber v-model="entity.checkPerson"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="12">
<FormItem :label="l('approvalPerson')" prop="approvalPerson"> <FormItem :label="l('approvalPerson')" prop="approvalPerson">
<InputNumber v-model="entity.approvalPerson"></InputNumber> <InputNumber v-model="entity.approvalPerson"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="12">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="status">
<InputNumber v-model="entity.status"></InputNumber> <InputNumber v-model="entity.status"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col span="24">
<FormItem :label="l('note')" prop="note"> <FormItem label>
<Input v-model="entity.note" type="textarea" :rows="5"></Input> <Process ref="userProcess" schemaIdVal="d0cdafe3-2341-4499-a4f5-278ef0f30740" />
</FormItem> </FormItem>
</Col> </Col>
-->
</Row> </Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Row>
<Button @click="handleClose" class="ml20">取消</Button> <Col span="24" style="text-align:right">
<FormItem label>
<Button @click="handleClose" class="ml20">取消</Button>&nbsp;&nbsp;
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>&nbsp;&nbsp;
<Checkbox v-show="submitShow" v-model="checked" class="ml10" label="送审">送审</Checkbox>
</FormItem> </FormItem>
</Col>
</Row>
</Form> </Form>
<changeSendReview ref="changeSendReview"></changeSendReview>
</div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import iQuill from "@/components/quill";
import changeSendReview from "./changeSendReview.vue";
export default { export default {
name: "Add", name: "Add",
components: { iQuill, changeSendReview },
data() { data() {
return { return {
disabled: false, disabled: false,
submitShow: true, //送审按钮显隐
checked: true, //送审选择框
entity: { entity: {
routingHeaderId: null, routingHeaderId: null,
classId: null, classId: null,
...@@ -144,7 +141,7 @@ export default { ...@@ -144,7 +141,7 @@ export default {
departmentName: "", departmentName: "",
technicalName: "", technicalName: "",
technicalCode: "", technicalCode: "",
changedVersion: "", changedVersion: null,
quantity: null, quantity: null,
printData: "", printData: "",
executiveBranch: "", executiveBranch: "",
...@@ -171,11 +168,24 @@ export default { ...@@ -171,11 +168,24 @@ export default {
eid: Number eid: Number
}, },
mounted() { mounted() {
if (this.eid > 0) { // if (this.eid > 0) {
this.load(this.eid); // this.load(this.eid);
} // }
this.loadCode();
}, },
methods: { methods: {
loadCode() {//生成更改单编号
let parma = {
code: "JSWJGGD"
};
Api.GetCodeByType(parma)
.then(res => {
this.entity.changeorderCode = res.result;
})
.cathc(err => {
this.$Message.error("数据连接错误");
});
},
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
...@@ -186,6 +196,20 @@ export default { ...@@ -186,6 +196,20 @@ export default {
if (r.success) { if (r.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
if (this.checked) {
let params = {
changeorder_code: this.entity.changeorderCode,
pageindex: 1,
pageSize: 10
};
Api.getpaged1(params).then(res => {
this.$refs.changeSendReview.info.changeInfo =
res.result.items[0];
this.$refs.changeSendReview.changeorder_code = this.entity.changeorderCode;
});
this.$refs.changeSendReview.modalInfo = true;
}
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
} }
...@@ -207,6 +231,32 @@ export default { ...@@ -207,6 +231,32 @@ export default {
this.entity.id = 0; this.entity.id = 0;
}); });
}, },
handleImg(e) {
console.warn(e);
// let file = null
// if (
// e.clipboardData &&
// e.clipboardData.items[0] &&
// e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type.indexOf('image') > -1
// ) {
// //这里就是判断是否有粘贴进来的文件且文件为图片格式
// file = e.clipboardData.items[0].getAsFile()
// let reader = new FileReader()
// reader.readAsDataURL(file)
// setTimeout(() => {
// var img = '<img src="' + reader.result + '" alt=""/>'
// this.bugForm.content += img
// }, 1000)
// // new R
// }
},
departChange(v,items)
{
this.entity.departmentId=v
this.entity.departmentName=items.name
},
l(key) { l(key) {
key = "routing_header_changeorder" + "." + key; key = "routing_header_changeorder" + "." + key;
return this.$t(key); return this.$t(key);
......
pages/technology/details/routinghcorder/api.js
View file @ fb575232
...@@ -4,6 +4,12 @@ export default { ...@@ -4,6 +4,12 @@ export default {
paged(params) { paged(params) {
return Api.post(`${technologyUrl}routingheaderchangeorder/paged`, params); return Api.post(`${technologyUrl}routingheaderchangeorder/paged`, params);
}, },
getpaged1(params) {//获取审批流程
return Api.get(`${designUrl}/routingheaderchangeorder/getpaged1`, params);
},
GetCodeByType(params) {//获取工艺更改单号
return Api.get(`${designUrl}/routingheader/GetCodeByType`, params);
},
get(params) { get(params) {
return Api.get(`${technologyUrl}routingheaderchangeorder/get`, params); return Api.get(`${technologyUrl}routingheaderchangeorder/get`, params);
}, },
......
pages/technology/details/routinghcorder/changeInfos.vue 0 → 100644
View file @ fb575232
<template>
<div class="detail">
<Row>
<Filed span="12" :name="'工艺更改单'">{{info.changeInfo.changeorder_code}}</Filed>
<Filed span="12" :name="'提出人'">{{info.changeInfo.propose_user_name}}</Filed>
<Filed span="12" :name="'申请部门'">{{info.changeInfo.department_name}}</Filed>
<Filed span="12" :name="'技术文件名称'">{{info.changeInfo.technical_name}}</Filed>
<Filed span="12" :name="'技术文件编号'">{{info.changeInfo.technical_code}}</Filed>
<Filed span="12" :name="'执行部门'">{{info.changeInfo.executive_branch}}</Filed>
<Filed span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed>
<Filed span="12" :name="'发行日期'">{{info.changeInfo.print_data}}</Filed>
<Filed span="12" :name="'更改原因'">{{info.changeInfo.change_reason}}</Filed>
<Filed span="12" :name="'有效日期'">{{info.changeInfo.effective_date}}</Filed>
<Filed span="12" :name="'更改后版本号'">
<state
code="Process.Routing.version"
:value="info.changeInfo.changed_version+''"
type="text"
></state>
</Filed>
<Filed span="12" :name="'在制品意见'">
<state
code="Process.Routing.opinion"
:value="info.changeInfo.handling_opinions+''"
type="text"
></state>
</Filed>
</Row>
</div>
</template>
<script>
export default {
name: "changeInfos",
props: {
info:Object,
default:{},
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
data() {
return {};
},
methods: {
l(key) {
key = "orderInfo" + "." + key;
return this.$t(key);
}
}
};
</script>
<style lang="less">
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
margin: 0 0 -1px 0;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
pages/technology/details/routinghcorder/changeSendReview.vue 0 → 100644
View file @ fb575232
<template>
<Modal
v-model="modalInfo"
title="工艺更改单送审"
width="800"
:mask-closable="false"
:scrollable="true"
fullscreen
>
<div style="width:80%;margin:0 auto">
<changeInfos v-if="info.status" :info="info"></changeInfos>
<Process ref="userProcess" schemaIdVal="d0cdafe3-2341-4499-a4f5-278ef0f30740" />
</div>
<div slot="footer">
<Button @click="modalInfo = false">取消</Button>
<Button type="primary" @click="upSave">确定送审</Button>
</div>
<Modal
v-model="modalchangeInfo"
title="送审提示"
width="800"
:mask-closable="false"
:scrollable="true"
>
<h2 class="center">确定送审该工艺更改单吗？</h2>
<div slot="footer">
<Button @click="modalchangeInfo = false">取消</Button>
<Button type="primary" @click="upSave1">确定</Button>
</div>
</Modal>
</Modal>
</template>
<script>
import changeInfos from "./changeInfos.vue";
import Process from "@/components/orderOperator/process";
import Api from "./api";
export default {
name: "changeSendReview",
components: {
changeInfos,
Process
},
data() {
return {
modalchangeInfo: false,
modalInfo: false,
data3: [],
userlist: [],
changeorder_code: "",
loading: false,
info: {
status: true,
changeInfo: []
},
dataListRetrunNew: {
schemaId: "d0cdafe3-2341-4499-a4f5-278ef0f30740", //schemaId
idList: [], //id List
codeList: [], //编号List
operatorIdList: [] //操作员id
},
operatorIdList: [] //操作员id
};
},
created() {},
mounted() {},
methods: {
upSave() {
this.modalchangeInfo = true;
},
upSave1() {
let parmas = {
changeorder_code: this.changeorder_code,
pageindex: 1,
pageSize: 10
};
Api.getpaged1(parmas).then(res => {
this.data3 = res.result.items;
let operatorIdList = this.returnDataList();
let itemCode = this.changeorder_code;
this.dataListRetrunNew.idList = [];
this.dataListRetrunNew.codeList = [];
this.dataListRetrunNew.idList.push(this.data3[0].id);
this.dataListRetrunNew.codeList.push(itemCode);
this.dataListRetrunNew.operatorIdList = operatorIdList;
this.$http.order.batchstart(this.dataListRetrunNew).then(response => {
if (response.success) {
this.$Message.info("工艺更改单送审成功!");
} else {
this.$Message.error("送审失败!");
}
this.modalInfo = false;
this.modalchangeInfo = false;
});
});
},
returnDataList() {
let ues = this.$refs.userProcess;
this.operatorIdList = ues.immutData;
return this.operatorIdList;
}
}
};
</script>
pages/technology/details/routinghcorder/edit.vue
View file @ fb575232
...@@ -180,6 +180,27 @@ export default { ...@@ -180,6 +180,27 @@ export default {
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
handleImg(e) {
console.warn(e);
// let file = null
// if (
// e.clipboardData &&
// e.clipboardData.items[0] &&
// e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type.indexOf('image') > -1
// ) {
// //这里就是判断是否有粘贴进来的文件且文件为图片格式
// file = e.clipboardData.items[0].getAsFile()
// let reader = new FileReader()
// reader.readAsDataURL(file)
// setTimeout(() => {
// var img = '<img src="' + reader.result + '" alt=""/>'
// this.bugForm.content += img
// }, 1000)
// // new R
// }
},
l(key) { l(key) {
key = "routing_header_changeorder" + "." + key; key = "routing_header_changeorder" + "." + key;
return this.$t(key); return this.$t(key);
......
pages/technology/details/routinghcorder/index.vue
View file @ fb575232
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide> <Modal v-model="modal" :title="title" width="1200" footer-hide scrollable>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
...@@ -100,13 +100,13 @@ export default { ...@@ -100,13 +100,13 @@ export default {
{ {
key: "quantity", key: "quantity",
title: this.l("quantity"), title: this.l("quantity"),
align: "left", align: "right",
high: true high: true
}, },
{ {
key: "status", key: "status",
title: this.l("status"), title: this.l("status"),
align: "left", align: "center",
high: true, high: true,
code: "unProduct.repairstatus" code: "unProduct.repairstatus"
}, },
......
pages/technology/details/routinghcorder/search.vue
View file @ fb575232
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</Col> </Col>
<Col :span="12" v-if="condition.printData.show"> <Col :span="12" v-if="condition.printData.show">
<FormItem :label="l('printData')" prop="printData"> <FormItem :label="l('printData')" prop="printData">
<DatePicker type="daterange" v-model="condition.printData.value"></DatePicker> <DatePicker type="daterange" v-model="condition.printData.value" style="width:100%"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
...@@ -60,7 +60,11 @@ ...@@ -60,7 +60,11 @@
</Col> </Col>
<Col :span="12" v-if="condition.changedVersion.show"> <Col :span="12" v-if="condition.changedVersion.show">
<FormItem :label="l('changedVersion')" prop="changedVersion"> <FormItem :label="l('changedVersion')" prop="changedVersion">
<Input v-model="condition.changedVersion.value"></Input> <dictionary
code="Process.Routing.version"
v-model="condition.changedVersion.value"
style="width:100%"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.quantity.show"> <Col :span="12" v-if="condition.quantity.show">
...@@ -117,7 +121,7 @@ ...@@ -117,7 +121,7 @@
</Col> </Col>
<Col :span="12" v-if="condition.creationTime.show"> <Col :span="12" v-if="condition.creationTime.show">
<FormItem :label="$t('creationTime')" prop="creationTime"> <FormItem :label="$t('creationTime')" prop="creationTime">
<DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.creationTime.value" style="width:100%"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.lastModifierUserId.show"> <Col :span="12" v-if="condition.lastModifierUserId.show">
...@@ -127,7 +131,7 @@ ...@@ -127,7 +131,7 @@
</Col> </Col>
<Col :span="12" v-if="condition.lastModificationTime.show"> <Col :span="12" v-if="condition.lastModificationTime.show">
<FormItem :label="$t('lastModificationTime')" prop="lastModificationTime"> <FormItem :label="$t('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.lastModificationTime.value" style="width:100%"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
......
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