Skip to content

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

工艺规程、工艺更改单审批相关

parent 71eabcfa
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 134 deletions
pages/technology/add.vue
View file @ 4973afc9
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('version')" prop="versionid"> <FormItem :label="l('version')" prop="versionid">
<Dictionary code="Process.Routing.version" v-model="entity.versionid"></Dictionary> <Dictionary code="Process.Routing.version" v-model="entity.versionid"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
...@@ -196,7 +196,15 @@ export default { ...@@ -196,7 +196,15 @@ export default {
}, },
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" }],
routingType: [
{
required: true,
message: "请选择工艺类型",
trigger: "change",
type: "number"
}
]
}, },
parms: { parms: {
app: "technology", app: "technology",
......
pages/technology/details/routinghcorder/edit.vue
View file @ 4973afc9
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="110"> <Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row> <Row>
<Col span="8"> <Col span="8">
<FormItem :label="l('changeorderCode')" prop="changeorderCode"> <FormItem :label="l('changeorderCode')" prop="changeorderCode">
<Input v-model="entity.changeorderCode" readonly></Input> <Input v-model="entity.changeorderCode" readonly></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('printData')" prop="printData"> <FormItem :label="l('printData')" prop="printData">
<DatePicker type="date" v-model="entity.printData" style="width:100%" format="yyyy/MM/dd"></DatePicker> <DatePicker type="date" v-model="entity.printData" style="width:100%" format="yyyy/MM/dd"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('departmentName')" prop="departmentId"> <FormItem :label="l('departmentName')" prop="departmentId">
<departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect> <departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('proposeUserName')" prop="proposeUserId"> <FormItem :label="l('proposeUserName')" prop="proposeUserId">
<UserSelect v-model="entity.proposeUserId"></UserSelect> <UserSelect v-model="entity.proposeUserId"></UserSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <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="8"> <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="8"> <Col span="8">
<FormItem :label="l('changedVersion')" prop="changedVersion"> <FormItem :label="l('changedVersion')" prop="changedVersion">
<dictionary <dictionary
code="Process.Routing.version" code="Process.Routing.version"
v-model="entity.changedVersion" v-model="entity.changedVersion"
style="width:100%" style="width:100%"
></dictionary> ></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('quantity')" prop="quantity"> <FormItem :label="l('quantity')" prop="quantity">
<InputNumber v-model="entity.quantity" style="width:100%"></InputNumber> <InputNumber v-model="entity.quantity" style="width:100%"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('executiveBranch')" prop="executiveBranchId"> <FormItem :label="l('executiveBranch')" prop="executiveBranchId">
<departmentSelect v-model="entity.executiveBranchId"></departmentSelect> <departmentSelect v-model="entity.executiveBranchId"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('handlingOpinions')" prop="handlingOpinionsId"> <FormItem :label="l('handlingOpinions')" prop="handlingOpinionsId">
<Dictionary <Dictionary
code="Process.Routing.opinion" code="Process.Routing.opinion"
v-model="entity.handlingOpinionsId" v-model="entity.handlingOpinionsId"
type="radio" type="radio"
></Dictionary> ></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('changeReason')" prop="changeReason"> <FormItem :label="l('changeReason')" prop="changeReason">
<Input v-model="entity.changeReason"></Input> <Input v-model="entity.changeReason"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('effectiveDate')" prop="effectiveDate"> <FormItem :label="l('effectiveDate')" prop="effectiveDate">
<DatePicker type="date" v-model="entity.effectiveDate" style="width:100%" format="yyyy/MM/dd"></DatePicker> <DatePicker
</FormItem> type="date"
</Col> v-model="entity.effectiveDate"
<Col span="24"> style="width:100%"
<FormItem :label="l('beforeChangeContent')" prop="beforeChangeContent"> format="yyyy/MM/dd"
<i-quill v-model="entity.beforeChangeContent" :height="200" border v-paste="handleImg" /> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
<FormItem :label="l('afterChangeContent')" prop="afterChangeContent"> <FormItem :label="l('beforeChangeContent')" prop="beforeChangeContent">
<i-quill v-model="entity.afterChangeContent" :height="200" border v-paste="handleImg1" /> <i-quill v-model="entity.beforeChangeContent" :height="200" border v-paste="handleImg" />
</FormItem> </FormItem>
</Col> </Col>
<Col span="24">
<FormItem :label="l('afterChangeContent')" prop="afterChangeContent">
<i-quill v-model="entity.afterChangeContent" :height="200" border v-paste="handleImg1" />
</FormItem>
</Col>
<!-- <!--
<Col span="12"> <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>
...@@ -103,19 +108,19 @@ ...@@ -103,19 +108,19 @@
<Process ref="userProcess" schemaIdVal="d0cdafe3-2341-4499-a4f5-278ef0f30740" /> <Process ref="userProcess" schemaIdVal="d0cdafe3-2341-4499-a4f5-278ef0f30740" />
</FormItem> </FormItem>
</Col> </Col>
--> -->
</Row> </Row>
<Row> <Row>
<Col span="24" style="text-align:right"> <Col span="24" style="text-align:right">
<FormItem label> <FormItem label>
<Button @click="handleClose" class="ml20">取消</Button>&nbsp;&nbsp; <Button @click="handleClose" class="ml20">取消</Button>&nbsp;&nbsp;
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>&nbsp;&nbsp; <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>&nbsp;&nbsp;
<Checkbox v-show="submitShow" v-model="checked" class="ml10" label="送审">送审</Checkbox> <Checkbox v-show="submitShow" v-model="checked" class="ml10" label="送审">送审</Checkbox>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
</Form> </Form>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
...@@ -123,7 +128,7 @@ import iQuill from "@/components/quill"; ...@@ -123,7 +128,7 @@ import iQuill from "@/components/quill";
import changeSendReview from "./changeSendReview.vue"; import changeSendReview from "./changeSendReview.vue";
export default { export default {
name: "Edit", name: "Edit",
components: { iQuill, changeSendReview }, components: { iQuill, changeSendReview },
data() { data() {
return { return {
disabled: false, disabled: false,
...@@ -151,6 +156,7 @@ export default { ...@@ -151,6 +156,7 @@ export default {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
this.entity.status = 1;//修改后（未通过审核或新建的）的状态都为待送审
Api.update(this.entity) Api.update(this.entity)
.then(r => { .then(r => {
this.disabled = false; this.disabled = false;
...@@ -174,45 +180,45 @@ export default { ...@@ -174,45 +180,45 @@ export default {
}, },
handleImg(e) { handleImg(e) {
console.warn(e); console.warn(e);
let file = null let file = null;
if ( if (
e.clipboardData && e.clipboardData &&
e.clipboardData.items[0] && e.clipboardData.items[0] &&
e.clipboardData.items[0].type && e.clipboardData.items[0].type &&
e.clipboardData.items[0].type.indexOf('image') > -1 e.clipboardData.items[0].type.indexOf("image") > -1
) { ) {
//这里就是判断是否有粘贴进来的文件且文件为图片格式 //这里就是判断是否有粘贴进来的文件且文件为图片格式
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.entity.beforeChangeContent += img this.entity.beforeChangeContent += img;
}, 1000) }, 1000);
// new R // new R
} }
}, },
handleImg1(e) { handleImg1(e) {
console.warn(e); console.warn(e);
let file = null let file = null;
if ( if (
e.clipboardData && e.clipboardData &&
e.clipboardData.items[0] && e.clipboardData.items[0] &&
e.clipboardData.items[0].type && e.clipboardData.items[0].type &&
e.clipboardData.items[0].type.indexOf('image') > -1 e.clipboardData.items[0].type.indexOf("image") > -1
) { ) {
//这里就是判断是否有粘贴进来的文件且文件为图片格式 //这里就是判断是否有粘贴进来的文件且文件为图片格式
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.entity.afterChangeContent += img this.entity.afterChangeContent += img;
}, 1000) }, 1000);
// new R // new R
} }
}, },
l(key) { l(key) {
key = "routing_header_changeorder" + "." + key; key = "routing_header_changeorder" + "." + key;
......
pages/technology/details/routinghcorder/index.vue
View file @ 4973afc9
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row.id) }
}, },
params.row.status == 1 ? "编辑" : "" params.row.status == 1||params.row.status == 4 ? "编辑" : ""
), ),
h( h(
"op", "op",
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
attrs: { oprate: "delete" }, attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
params.row.status == 1 ? "删除" : "" params.row.status == 1||params.row.status == 4 ? "删除" : ""
), ),
h( h(
"op", "op",
......
pages/technology/index.vue
View file @ 4973afc9
...@@ -275,7 +275,7 @@ export default { ...@@ -275,7 +275,7 @@ export default {
{ {
title: "操作", title: "操作",
key: "action", key: "action",
width: 320, width: 260,
align: "left", align: "left",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", { class: "action" }, [
......
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