Skip to content

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

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

parents 44632f2d b61860d7
Show whitespace changes
Inline Side-by-side
Showing with 3585 additions and 3825 deletions
assets/css/base.less
View file @ 4c9c39af
...@@ -403,10 +403,31 @@ div::-webkit-scrollbar-corner { ...@@ -403,10 +403,31 @@ div::-webkit-scrollbar-corner {
.pt15 { .pt15 {
padding-top: 15px padding-top: 15px
} }
.pr10 {
padding-right: 10px;
}
.pr20 {
padding-right: 20px;
}
.pr30 { .pr30 {
padding-right: 30px; padding-right: 30px;
} }
.pr50 {
padding-right: 50px;
}
.pr80 {
padding-right: 80px;
}
.pr100 {
padding-right: 100px;
}
.pr200 {
padding-right: 200px;
}
.pr240 {
padding-right: 240px;
}
.bnone { .bnone {
border: none; border: none;
...@@ -996,10 +1017,9 @@ textarea::-webkit-input-placeholder { ...@@ -996,10 +1017,9 @@ textarea::-webkit-input-placeholder {
display:block; display:block;
line-height:30px; line-height:30px;
padding:5px 10px; padding:5px 10px;
background:#f5f6fa; border-bottom: #ccc solid 1px;
border-bottom:solid 1px #ccc; border-right: #ccc solid 1px;
border-left:solid 1px #ccc; border-left: #ccc solid 1px;
border-right:solid 1px #ccc
} }
.cellInfoTitle { .cellInfoTitle {
padding: 0 10px; padding: 0 10px;
......
components/page/productTree.vue
View file @ 4c9c39af
<template> <template>
<div class="flex fd tree-menu"> <div class="flex fd tree-menu">
<h3> <h3>
产品结构 产品结构
<div class="fr mr10 mt10"> <div class="fr mr10 mt10">
<ButtonGroup class="fr" size="small"> <ButtonGroup class="fr" size="small">
<Button <Button :icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'" @click="toggle" title="展开/合并"></Button>
:icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'"
@click="toggle"
title="展开/合并"
></Button>
<Button icon="md-refresh" title="刷新" @click="loadTree"></Button> <Button icon="md-refresh" title="刷新" @click="loadTree"></Button>
<Button icon="md-rewind" title="收起" @click="hide"></Button> <Button icon="md-rewind" title="收起" @click="hide"></Button>
</ButtonGroup> </ButtonGroup>
...@@ -22,7 +18,7 @@ ...@@ -22,7 +18,7 @@
<Tree :data="data" :render="renderContent" ref="tree" @on-select-change="change"></Tree> <Tree :data="data" :render="renderContent" ref="tree" @on-select-change="change"></Tree>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -44,11 +40,12 @@ export default { ...@@ -44,11 +40,12 @@ export default {
.get(`${technologyUrl}productlevel/getproducttreenew`) .get(`${technologyUrl}productlevel/getproducttreenew`)
.then(r => { .then(r => {
setTree(r.result); setTree(r.result);
function setTree(data) { function setTree(data) {
data.map(u => { data.map(u => {
u.title = u.name; u.title = u.name;
u.value = u.id; u.value = u.id;
// u.expand = true; u.expand = true;
// u.selected = false; // u.selected = false;
// u.checked = false; // u.checked = false;
if (u.children) { if (u.children) {
...@@ -63,7 +60,11 @@ export default { ...@@ -63,7 +60,11 @@ export default {
toggle() { toggle() {
this.expand = !this.expand; this.expand = !this.expand;
}, },
renderContent(h, { root, node, data }) { renderContent(h, {
root,
node,
data
}) {
let type = "md-folder"; let type = "md-folder";
if (data.isProduct != 0) { if (data.isProduct != 0) {
type = "ios-image"; type = "ios-image";
...@@ -78,8 +79,7 @@ export default { ...@@ -78,8 +79,7 @@ export default {
} }
}), }),
h( h(
"span", "span", {
{
style: { style: {
color: data.isProduct == 0 ? "#000" : "rgba(38, 128, 235, 1)" color: data.isProduct == 0 ? "#000" : "rgba(38, 128, 235, 1)"
} }
...@@ -98,6 +98,7 @@ export default { ...@@ -98,6 +98,7 @@ export default {
productIds.push(b.value); productIds.push(b.value);
if (b.children) { if (b.children) {
addId(b.children); addId(b.children);
function addId(data) { function addId(data) {
data.map(u => { data.map(u => {
if (u.bomId !== 0) { if (u.bomId !== 0) {
...@@ -122,6 +123,7 @@ export default { ...@@ -122,6 +123,7 @@ export default {
let expand = this.expand; let expand = this.expand;
let result = []; let result = [];
search(this.keys, items); search(this.keys, items);
function search(keys, data) { function search(keys, data) {
data.map(u => { data.map(u => {
if (keys.length < 2) { if (keys.length < 2) {
...@@ -145,6 +147,7 @@ export default { ...@@ -145,6 +147,7 @@ export default {
<style lang="less"> <style lang="less">
@import "../../assets/css/custom.less"; @import "../../assets/css/custom.less";
.tree-menu { .tree-menu {
h3 { h3 {
height: 50px; height: 50px;
...@@ -157,16 +160,19 @@ export default { ...@@ -157,16 +160,19 @@ export default {
opacity: 1; opacity: 1;
padding-left: 10px; padding-left: 10px;
} }
.search { .search {
height: 50px; height: 50px;
padding: 5px 10px; padding: 5px 10px;
} }
.fg { .fg {
flex: none; flex: none;
// height:0; // height:0;
overflow: auto; overflow: auto;
padding-left: 10px; padding-left: 10px;
} }
.tree { .tree {
height: calc(100vh - 215px); height: calc(100vh - 215px);
overflow: auto; overflow: auto;
......
pages/handle/examine1/index.vue
View file @ 4c9c39af
...@@ -266,6 +266,7 @@ export default { ...@@ -266,6 +266,7 @@ export default {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu = 3 this.footerStatu = 3
this.$refs.userProcess.load(this.detailId)
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
} }
...@@ -282,6 +283,7 @@ export default { ...@@ -282,6 +283,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -298,6 +300,7 @@ export default { ...@@ -298,6 +300,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
......
pages/handle/examine10/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" /> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
...@@ -14,39 +14,19 @@ ...@@ -14,39 +14,19 @@
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId"> <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
<Select <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -68,8 +48,9 @@ ...@@ -68,8 +48,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -111,30 +92,29 @@ export default { ...@@ -111,30 +92,29 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -148,16 +128,14 @@ export default { ...@@ -148,16 +128,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -170,8 +148,8 @@ export default { ...@@ -170,8 +148,8 @@ export default {
this.testObj = r this.testObj = r
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -220,6 +198,7 @@ export default { ...@@ -220,6 +198,7 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
...@@ -239,6 +218,7 @@ export default { ...@@ -239,6 +218,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -257,6 +237,7 @@ export default { ...@@ -257,6 +237,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
......
pages/handle/examine11/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" /> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
...@@ -14,39 +14,19 @@ ...@@ -14,39 +14,19 @@
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId"> <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
<Select <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -68,8 +48,9 @@ ...@@ -68,8 +48,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -111,30 +92,29 @@ export default { ...@@ -111,30 +92,29 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -148,16 +128,14 @@ export default { ...@@ -148,16 +128,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -170,8 +148,8 @@ export default { ...@@ -170,8 +148,8 @@ export default {
this.testObj = r this.testObj = r
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -220,6 +198,7 @@ export default { ...@@ -220,6 +198,7 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
...@@ -239,6 +218,7 @@ export default { ...@@ -239,6 +218,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -257,6 +237,7 @@ export default { ...@@ -257,6 +237,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
......
pages/handle/examine12/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" /> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
...@@ -14,39 +14,19 @@ ...@@ -14,39 +14,19 @@
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId"> <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
<Select <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -68,8 +48,9 @@ ...@@ -68,8 +48,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -111,30 +92,29 @@ export default { ...@@ -111,30 +92,29 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -148,16 +128,14 @@ export default { ...@@ -148,16 +128,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -170,8 +148,8 @@ export default { ...@@ -170,8 +148,8 @@ export default {
this.testObj = r this.testObj = r
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -220,6 +198,7 @@ export default { ...@@ -220,6 +198,7 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
...@@ -239,6 +218,7 @@ export default { ...@@ -239,6 +218,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -257,6 +237,7 @@ export default { ...@@ -257,6 +237,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
......
pages/handle/examine13/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" /> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
...@@ -14,39 +14,19 @@ ...@@ -14,39 +14,19 @@
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId"> <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
<Select <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -68,8 +48,9 @@ ...@@ -68,8 +48,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "../api"; import Api from "../api";
import Detail from "./detail"; import Detail from "./detail";
...@@ -111,26 +92,25 @@ export default { ...@@ -111,26 +92,25 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: "请选择驳回节点", message: "请选择驳回节点",
type: "number", type: "number",
trigger: "change" trigger: "change"
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: "请输入原因", message: "请输入原因",
trigger: "blur" trigger: "blur"
} }]
]
} }
}; };
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
created() { created() {
...@@ -149,16 +129,14 @@ export default { ...@@ -149,16 +129,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true; this.modalCheckNo = true;
this.statuTitle = "驳回"; this.statuTitle = "驳回";
} else { } else {}
}
}); });
} else { } else {
this.$refs["formValidate"].validate(valid => { this.$refs["formValidate"].validate(valid => {
if (valid) { if (valid) {
this.modalCheckNo = true; this.modalCheckNo = true;
this.statuTitle = "终止"; this.statuTitle = "终止";
} else { } else {}
}
}); });
} }
}, },
...@@ -221,6 +199,7 @@ export default { ...@@ -221,6 +199,7 @@ export default {
Api.pass(param).then(r => { Api.pass(param).then(r => {
if (r.success) { if (r.success) {
this.$Message.success("审批通过成功"); this.$Message.success("审批通过成功");
this.$refs.userProcess.load(this.detailId);
this.modalCheckNo = false; this.modalCheckNo = false;
} else { } else {
this.$Message.error("审批通过失败"); this.$Message.error("审批通过失败");
...@@ -240,6 +219,7 @@ export default { ...@@ -240,6 +219,7 @@ export default {
Api.reject(param).then(r => { Api.reject(param).then(r => {
if (r.success) { if (r.success) {
this.$Message.success("驳回审批成功"); this.$Message.success("驳回审批成功");
this.$refs.userProcess.load(this.detailId);
this.modalCheckNo = false; this.modalCheckNo = false;
} else { } else {
this.$Message.error("加载失败"); this.$Message.error("加载失败");
...@@ -258,6 +238,7 @@ export default { ...@@ -258,6 +238,7 @@ export default {
Api.terminate(param).then(r => { Api.terminate(param).then(r => {
if (r.success) { if (r.success) {
this.$Message.success("终止审批成功"); this.$Message.success("终止审批成功");
this.$refs.userProcess.load(this.detailId);
this.modalCheckNo = false; this.modalCheckNo = false;
} else { } else {
this.$Message.error("加载失败"); this.$Message.error("加载失败");
......
pages/handle/examine14/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" /> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
...@@ -14,39 +14,19 @@ ...@@ -14,39 +14,19 @@
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId"> <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
<Select <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -68,8 +48,9 @@ ...@@ -68,8 +48,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "../api"; import Api from "../api";
import Detail from "./detail"; import Detail from "./detail";
...@@ -111,26 +92,25 @@ export default { ...@@ -111,26 +92,25 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: "请选择驳回节点", message: "请选择驳回节点",
type: "number", type: "number",
trigger: "change" trigger: "change"
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: "请输入原因", message: "请输入原因",
trigger: "blur" trigger: "blur"
} }]
]
} }
}; };
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
created() { created() {
...@@ -149,16 +129,14 @@ export default { ...@@ -149,16 +129,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true; this.modalCheckNo = true;
this.statuTitle = "驳回"; this.statuTitle = "驳回";
} else { } else {}
}
}); });
} else { } else {
this.$refs["formValidate"].validate(valid => { this.$refs["formValidate"].validate(valid => {
if (valid) { if (valid) {
this.modalCheckNo = true; this.modalCheckNo = true;
this.statuTitle = "终止"; this.statuTitle = "终止";
} else { } else {}
}
}); });
} }
}, },
...@@ -221,6 +199,7 @@ export default { ...@@ -221,6 +199,7 @@ export default {
Api.pass(param).then(r => { Api.pass(param).then(r => {
if (r.success) { if (r.success) {
this.$Message.success("审批通过成功"); this.$Message.success("审批通过成功");
this.$refs.userProcess.load(this.detailId);
this.modalCheckNo = false; this.modalCheckNo = false;
} else { } else {
this.$Message.error("审批通过失败"); this.$Message.error("审批通过失败");
...@@ -240,6 +219,7 @@ export default { ...@@ -240,6 +219,7 @@ export default {
Api.reject(param).then(r => { Api.reject(param).then(r => {
if (r.success) { if (r.success) {
this.$Message.success("驳回审批成功"); this.$Message.success("驳回审批成功");
this.$refs.userProcess.load(this.detailId);
this.modalCheckNo = false; this.modalCheckNo = false;
} else { } else {
this.$Message.error("加载失败"); this.$Message.error("加载失败");
...@@ -258,6 +238,7 @@ export default { ...@@ -258,6 +238,7 @@ export default {
Api.terminate(param).then(r => { Api.terminate(param).then(r => {
if (r.success) { if (r.success) {
this.$Message.success("终止审批成功"); this.$Message.success("终止审批成功");
this.$refs.userProcess.load(this.detailId);
this.modalCheckNo = false; this.modalCheckNo = false;
} else { } else {
this.$Message.error("加载失败"); this.$Message.error("加载失败");
......
pages/handle/examine2/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" /> <Process ref="userProcess" :idVal="detailId" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
<Form <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
:model="formMyCheck"
:label-width="100"
:rules="ruleValidate"
inline
ref="formValidate"
>
<Row> <Row>
<Col span="18"> <Col span="18">
<FormItem label="审批意见："> <FormItem label="审批意见：">
...@@ -20,44 +14,20 @@ ...@@ -20,44 +14,20 @@
<Radio label="终止"></Radio> <Radio label="终止"></Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
label="驳回节点：" <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
v-if="formMyCheck.radioSp === '驳回'"
prop="rejectToNodeId"
>
<Select
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -66,12 +36,7 @@ ...@@ -66,12 +36,7 @@
</Row> </Row>
</Form> </Form>
</div> </div>
<Modal <Modal v-model="modalCheckNo" title="订单审批" width="800" :scrollable="true">
v-model="modalCheckNo"
title="订单审批"
width="800"
:scrollable="true"
>
<br /> <br />
<h4> <h4>
您确定 <span class="new-red">{{ statuTitle }}</span> 此订单审批？ 您确定 <span class="new-red">{{ statuTitle }}</span> 此订单审批？
...@@ -82,8 +47,9 @@ ...@@ -82,8 +47,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -123,30 +89,29 @@ export default { ...@@ -123,30 +89,29 @@ export default {
preNodeID: null, //上一个节点 preNodeID: null, //上一个节点
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -161,16 +126,14 @@ export default { ...@@ -161,16 +126,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -182,8 +145,8 @@ export default { ...@@ -182,8 +145,8 @@ export default {
Api.getdetail(param).then((r) => { Api.getdetail(param).then((r) => {
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -230,13 +193,14 @@ export default { ...@@ -230,13 +193,14 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
} }
}) })
this.modalCheckNo = false this.modalCheckNo = false
this.footerStatu=3 this.footerStatu = 3
}, },
//审批驳回 //审批驳回
checkNo() { checkNo() {
...@@ -249,7 +213,8 @@ export default { ...@@ -249,7 +213,8 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
...@@ -267,7 +232,8 @@ export default { ...@@ -267,7 +232,8 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
......
pages/handle/examine3/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" /> <Process ref="userProcess" :idVal="detailId" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
<Form <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
:model="formMyCheck"
:label-width="100"
:rules="ruleValidate"
inline
ref="formValidate"
>
<Row> <Row>
<Col span="18"> <Col span="18">
<FormItem label="审批意见："> <FormItem label="审批意见：">
...@@ -19,44 +13,20 @@ ...@@ -19,44 +13,20 @@
<Radio label="终止"></Radio> <Radio label="终止"></Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
label="驳回节点：" <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
v-if="formMyCheck.radioSp === '驳回'"
prop="rejectToNodeId"
>
<Select
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -65,12 +35,7 @@ ...@@ -65,12 +35,7 @@
</Row> </Row>
</Form> </Form>
</div> </div>
<Modal <Modal v-model="modalCheckNo" title="订单审批" width="800" :scrollable="true">
v-model="modalCheckNo"
title="订单审批"
width="800"
:scrollable="true"
>
<br /> <br />
<h4> <h4>
您确定 <span class="new-red">{{ statuTitle }}</span> 此工艺规程审批？ 您确定 <span class="new-red">{{ statuTitle }}</span> 此工艺规程审批？
...@@ -81,8 +46,9 @@ ...@@ -81,8 +46,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -122,30 +88,29 @@ export default { ...@@ -122,30 +88,29 @@ export default {
preNodeID: null, //上一个节点 preNodeID: null, //上一个节点
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -160,16 +125,14 @@ export default { ...@@ -160,16 +125,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -181,8 +144,8 @@ export default { ...@@ -181,8 +144,8 @@ export default {
Api.getdetail(param).then((r) => { Api.getdetail(param).then((r) => {
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -230,6 +193,7 @@ export default { ...@@ -230,6 +193,7 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
...@@ -248,6 +212,7 @@ export default { ...@@ -248,6 +212,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -265,6 +230,7 @@ export default { ...@@ -265,6 +230,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
......
pages/handle/examine4/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj"/> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'"> <div class="footers" v-if="footerStatu === '2'">
<Form :model="formMyCheck" :label-width="100"> <Form :model="formMyCheck" :label-width="100">
<Row> <Row>
...@@ -12,37 +12,15 @@ ...@@ -12,37 +12,15 @@
<Radio label="驳回"></Radio> <Radio label="驳回"></Radio>
<!-- <Radio label="终止"></Radio> --> <!-- <Radio label="终止"></Radio> -->
</RadioGroup> </RadioGroup>
<Select <Select v-if="formMyCheck.radioSp === '驳回'" style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
v-if="formMyCheck.radioSp === '驳回'"
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup <RadioGroup v-if="formMyCheck.radioSp === '驳回'" type="button" size="small" @on-change="changeToNode">
v-if="formMyCheck.radioSp === '驳回'"
type="button"
size="small"
@on-change="changeToNode"
>
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
<Input <Input v-if="formMyCheck.radioSp === '驳回'" v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请填写原因" />
v-if="formMyCheck.radioSp === '驳回'"
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请填写原因"/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -52,12 +30,7 @@ ...@@ -52,12 +30,7 @@
</Form> </Form>
</div> </div>
<Modal <Modal v-model="modalCheckNo" title="材料消耗单审批" width="800" :scrollable="true">
v-model="modalCheckNo"
title="材料消耗单审批"
width="800"
:scrollable="true"
>
<br /> <br />
<h4> <h4>
您确定 <span class="new-red">{{ statuTitle }}</span> 此材料消耗单审批？ 您确定 <span class="new-red">{{ statuTitle }}</span> 此材料消耗单审批？
...@@ -68,8 +41,9 @@ ...@@ -68,8 +41,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -84,7 +58,7 @@ export default { ...@@ -84,7 +58,7 @@ export default {
}, },
data() { data() {
return { return {
currentUserId:0, currentUserId: 0,
formMyCheck: { formMyCheck: {
radioSp: '通过', radioSp: '通过',
comment: '', comment: '',
...@@ -108,15 +82,18 @@ export default { ...@@ -108,15 +82,18 @@ export default {
firstNodeID: null, //第一个节点 firstNodeID: null, //第一个节点
preNodeID: null, //上一个节点 preNodeID: null, //上一个节点
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj:{} testObj: {}
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -128,11 +105,11 @@ export default { ...@@ -128,11 +105,11 @@ export default {
if (this.formMyCheck.radioSp == '通过') { if (this.formMyCheck.radioSp == '通过') {
this.checkOk() this.checkOk()
} else if (this.formMyCheck.radioSp == '驳回') { } else if (this.formMyCheck.radioSp == '驳回') {
if(rejectToNode == null){ if (rejectToNode == null) {
this.$Message.error('请选择驳回节点') this.$Message.error('请选择驳回节点')
return return
} }
if(commasge == ''){ if (commasge == '') {
this.$Message.error('请填写驳回原因') this.$Message.error('请填写驳回原因')
return return
} }
...@@ -154,11 +131,11 @@ export default { ...@@ -154,11 +131,11 @@ export default {
Id: idVal Id: idVal
} }
Api.getdetail(param).then((r) => { Api.getdetail(param).then((r) => {
this.testObj=r this.testObj = r
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -187,7 +164,6 @@ export default { ...@@ -187,7 +164,6 @@ export default {
this.preNodeID = this.nodeList[0].value this.preNodeID = this.nodeList[0].value
} }
}, },
changeToNode(val) { changeToNode(val) {
if (val == '1') { if (val == '1') {
...@@ -207,6 +183,7 @@ export default { ...@@ -207,6 +183,7 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
...@@ -224,6 +201,7 @@ export default { ...@@ -224,6 +201,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -240,6 +218,7 @@ export default { ...@@ -240,6 +218,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -255,7 +234,7 @@ export default { ...@@ -255,7 +234,7 @@ export default {
// else if (this.formMyCheck.radioSp == '终止') { // else if (this.formMyCheck.radioSp == '终止') {
// this.checkCancel() // this.checkCancel()
// } // }
this.footerStatu=3 this.footerStatu = 3
}, },
l(key) { l(key) {
key = 'MaterialPlacode' + '.' + key key = 'MaterialPlacode' + '.' + key
......
pages/handle/examine6/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" /> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
<Form <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
:model="formMyCheck"
:label-width="100"
:rules="ruleValidate"
inline
ref="formValidate"
>
<Row> <Row>
<Col span="18"> <Col span="18">
<FormItem label="审批意见："> <FormItem label="审批意见：">
...@@ -19,44 +13,20 @@ ...@@ -19,44 +13,20 @@
<Radio label="终止"></Radio> <Radio label="终止"></Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
label="驳回节点：" <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
v-if="formMyCheck.radioSp === '驳回'"
prop="rejectToNodeId"
>
<Select
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -115,8 +85,9 @@ ...@@ -115,8 +85,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -158,30 +129,29 @@ export default { ...@@ -158,30 +129,29 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
console.log(this.detailId) console.log(this.detailId)
...@@ -198,16 +168,14 @@ export default { ...@@ -198,16 +168,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -220,8 +188,8 @@ export default { ...@@ -220,8 +188,8 @@ export default {
this.testObj = r this.testObj = r
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -263,7 +231,7 @@ export default { ...@@ -263,7 +231,7 @@ export default {
let param = { let param = {
id: this.passId, id: this.passId,
comment: '', comment: '',
nextOperationIdList: this.nextNodeUserIdList,//this.nextNodeUserIdList nextOperationIdList: this.nextNodeUserIdList, //this.nextNodeUserIdList
data: {} data: {}
} }
console.log(param) console.log(param)
...@@ -271,7 +239,8 @@ export default { ...@@ -271,7 +239,8 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
...@@ -291,7 +260,8 @@ export default { ...@@ -291,7 +260,8 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
...@@ -309,7 +279,8 @@ export default { ...@@ -309,7 +279,8 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
......
pages/handle/examine7/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show"/> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show" />
<div class="footers" v-if="footerStatu === '2'"> <div class="footers" v-if="footerStatu === '2'">
<Form :model="formMyCheck" :label-width="150"> <Form :model="formMyCheck" :label-width="150">
<Row> <Row>
...@@ -12,34 +12,16 @@ ...@@ -12,34 +12,16 @@
<Radio label="驳回"></Radio> <Radio label="驳回"></Radio>
<!-- <Radio label="终止"></Radio> --> <!-- <Radio label="终止"></Radio> -->
</RadioGroup> </RadioGroup>
<Select <Select v-if="formMyCheck.radioSp === '驳回'" style="width:200px" clearable ransfer placeholder="请选择驳回节点" class="selectBox" v-model="formMyCheck.rejectToNodeId">
v-if="formMyCheck.radioSp === '驳回'"
style="width:200px" clearable ransfer
placeholder="请选择驳回节点" class="selectBox"
v-model="formMyCheck.rejectToNodeId">
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup <RadioGroup v-if="formMyCheck.radioSp === '驳回'" type="button" size="small" @on-change="changeToNode">
v-if="formMyCheck.radioSp === '驳回'"
type="button"
size="small"
@on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
<Input <Input v-if="formMyCheck.radioSp === '驳回' ||
v-if="formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'" v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请如如驳回原因" />
formMyCheck.radioSp === '终止'"
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请如如驳回原因"/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -49,18 +31,13 @@ ...@@ -49,18 +31,13 @@
</Form> </Form>
</div> </div>
<!-- 不合格品通过form --> <!-- 不合格品通过form -->
<Modal <Modal v-model="modalCheckOk" title="不合格品审理" width="800" :mask-closable="false" :scrollable="true">
v-model="modalCheckOk"
title="不合格品审理"
width="800" :mask-closable="false"
:scrollable="true">
<div v-if="showSize==2"> <div v-if="showSize==2">
<Form :model="formMyCheck" ref="formMyCheck" :rules="ruleValidate" :label-width="150"> <Form :model="formMyCheck" ref="formMyCheck" :rules="ruleValidate" :label-width="150">
<Row> <Row>
<Col span="24"> <Col span="24">
<FormItem label="问题产生原因分析：" prop="causeAnalysis" style="width:100%"> <FormItem label="问题产生原因分析：" prop="causeAnalysis" style="width:100%">
<Input type="textarea" :autosize="{minRows: 1,maxRows: 5}" v-model="formMyCheck.causeAnalysis" <Input type="textarea" :autosize="{minRows: 1,maxRows: 5}" v-model="formMyCheck.causeAnalysis" :disabled="disabledFlag" style="width: 600px" />
:disabled="disabledFlag" style="width: 600px"/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
...@@ -79,8 +56,7 @@ ...@@ -79,8 +56,7 @@
<Row> <Row>
<Col span="24"> <Col span="24">
<FormItem label="纠正措施：" prop="measures" style="width:100%"> <FormItem label="纠正措施：" prop="measures" style="width:100%">
<Input type="textarea" :autosize="{minRows: 1,maxRows: 5}" v-model="formMyCheck.measures" <Input type="textarea" :autosize="{minRows: 1,maxRows: 5}" v-model="formMyCheck.measures" :disabled="disabledFlag" style="width: 600px" />
:disabled="disabledFlag" style="width: 600px"/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
...@@ -100,8 +76,7 @@ ...@@ -100,8 +76,7 @@
<Row> <Row>
<Col span="24"> <Col span="24">
<FormItem label="落实情况验证结果：" prop="resultText" style="width:100%"> <FormItem label="落实情况验证结果：" prop="resultText" style="width:100%">
<Input type="textarea" :autosize="{minRows:3,maxRows: 7}" v-model="formResultText.resultText" <Input type="textarea" :autosize="{minRows:3,maxRows: 7}" v-model="formResultText.resultText" :disabled="disabledFlag" style="width: 600px" />
:disabled="disabledFlag" style="width: 600px"/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -112,10 +87,7 @@ ...@@ -112,10 +87,7 @@
<Button type="primary" @click="checkOk()" v-show="footerStatue">确定</Button> <Button type="primary" @click="checkOk()" v-show="footerStatue">确定</Button>
</div> </div>
</Modal> </Modal>
<Modal <Modal v-model="ResultModal" title="测试步骤" width="800" :scrollable="true">
v-model="ResultModal"
title="测试步骤"
width="800" :scrollable="true">
<div> <div>
{{'第'+this.showSize+'布'}} {{'第'+this.showSize+'布'}}
{{'id'+this.typeId}} {{'id'+this.typeId}}
...@@ -125,11 +97,8 @@ ...@@ -125,11 +97,8 @@
<Button type="primary" @click="checkOk6">确定</Button> <Button type="primary" @click="checkOk6">确定</Button>
</div> </div>
</Modal> </Modal>
<Modal <Modal v-model="modalCheckNo" title="不合格品审批" width="800" :scrollable="true">
v-model="modalCheckNo" <br />
title="不合格品审批"
width="800" :scrollable="true">
<br/>
<h4> <h4>
您确定 <span class="new-red">{{ statuTitle }}</span> 此不合格品审批？ 您确定 <span class="new-red">{{ statuTitle }}</span> 此不合格品审批？
</h4> </h4>
...@@ -139,8 +108,9 @@ ...@@ -139,8 +108,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -155,7 +125,7 @@ export default { ...@@ -155,7 +125,7 @@ export default {
}, },
data() { data() {
return { return {
currentUserId:0, currentUserId: 0,
formMyCheck: { formMyCheck: {
radioSp: '通过', radioSp: '通过',
comment: '', comment: '',
...@@ -165,21 +135,46 @@ export default { ...@@ -165,21 +135,46 @@ export default {
triaLevel: [], //审理级别 triaLevel: [], //审理级别
rejectToNodeId: null rejectToNodeId: null
}, },
formResultText:{resultText: ''},//落实情况 formResultText: {
ResultModal: false,//落实情况 resultText: ''
footerStatue: true,//详情隐藏确定 }, //落实情况
disabledFlag: false,//是否可用 ResultModal: false, //落实情况
stepeFlag: null,//审核flag footerStatue: true, //详情隐藏确定
showSize:1,// 弹框默认展示内容 disabledFlag: false, //是否可用
stepeFlag: null, //审核flag
showSize: 1, // 弹框默认展示内容
ruleValidate: { ruleValidate: {
causeAnalysis: [{ required: true, message: '请填写原因分析', trigger: 'blur' }], causeAnalysis: [{
conclusion: [ required: true,
{ required: true, type: 'array', min: 1, message: '至少选择一个审理结论', trigger: 'change' }, message: '请填写原因分析',
trigger: 'blur'
}],
conclusion: [{
required: true,
type: 'array',
min: 1,
message: '至少选择一个审理结论',
trigger: 'change'
},
// { type: 'array', max: 2, message: '最多选两个审理结论', trigger: 'change' } // { type: 'array', max: 2, message: '最多选两个审理结论', trigger: 'change' }
], ],
measures: [{ required: true, message: '请填写纠正措施', trigger: 'blur' }], measures: [{
resultText: [{ required: true, message: '请填写落实情况', trigger: 'blur' }], required: true,
triaLevel: [{ required: true, type: 'array', min: 1, message: '至少选择一个审理级别', trigger: 'change' }], message: '请填写纠正措施',
trigger: 'blur'
}],
resultText: [{
required: true,
message: '请填写落实情况',
trigger: 'blur'
}],
triaLevel: [{
required: true,
type: 'array',
min: 1,
message: '至少选择一个审理级别',
trigger: 'change'
}],
}, },
modalCheckOk: false, modalCheckOk: false,
modalCheckNo: false, modalCheckNo: false,
...@@ -191,21 +186,24 @@ export default { ...@@ -191,21 +186,24 @@ export default {
getDetailProcess: [], //getdetail返回process信息 getDetailProcess: [], //getdetail返回process信息
getDetailRecords: [], //getdetail返回当前records信息 getDetailRecords: [], //getdetail返回当前records信息
passId: null, //通过审批/驳回/终止接口 id， passId: null, //通过审批/驳回/终止接口 id，
typeId: null,//审批节点 typeId: null, //审批节点
nodeList: [], //返回节点 nodeList: [], //返回节点
currentNodeID: null, //当前节点 currentNodeID: null, //当前节点
firstNodeID: null, //第一个节点 firstNodeID: null, //第一个节点
preNodeID: null, //上一个节点 preNodeID: null, //上一个节点
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj:{} testObj: {}
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -215,20 +213,19 @@ export default { ...@@ -215,20 +213,19 @@ export default {
let rejectToNode = this.formMyCheck.rejectToNodeId let rejectToNode = this.formMyCheck.rejectToNodeId
let commasge = this.formMyCheck.comment let commasge = this.formMyCheck.comment
if (this.formMyCheck.radioSp == '通过') { if (this.formMyCheck.radioSp == '通过') {
if( this.typeId==2){ if (this.typeId == 2) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '通过' this.statuTitle = '通过'
} } else {
else{
this.footerStatue = true this.footerStatue = true
this.modalCheckOk = true this.modalCheckOk = true
} }
} else if (this.formMyCheck.radioSp == '驳回') { } else if (this.formMyCheck.radioSp == '驳回') {
if(rejectToNode == null){ if (rejectToNode == null) {
this.$Message.error('请选择驳回节点') this.$Message.error('请选择驳回节点')
return return
} }
if(commasge == ''){ if (commasge == '') {
this.$Message.error('请填写驳回原因') this.$Message.error('请填写驳回原因')
return return
} }
...@@ -244,15 +241,15 @@ export default { ...@@ -244,15 +241,15 @@ export default {
// this.statuTitle = '终止' // this.statuTitle = '终止'
} }
}, },
show(a){ show(a) {
this.disabledFlag = true this.disabledFlag = true
let contextDate = JSON.parse(a.contextData) let contextDate = JSON.parse(a.contextData)
console.log(a) console.log(a)
if(contextDate.measures){ if (contextDate.measures) {
this.showSize = 2 this.showSize = 2
this.stepeFlag = 2//第二步 this.stepeFlag = 2 //第二步
this.formMyCheck = contextDate this.formMyCheck = contextDate
}else if(contextDate.resultText){ } else if (contextDate.resultText) {
this.showSize = 4 this.showSize = 4
this.stepeFlag = 4 this.stepeFlag = 4
this.formResultText = contextDate this.formResultText = contextDate
...@@ -274,7 +271,7 @@ export default { ...@@ -274,7 +271,7 @@ export default {
this.passId = r.result.currentRecordId this.passId = r.result.currentRecordId
this.typeId = r.result.currentIndexId this.typeId = r.result.currentIndexId
this.showSize = this.typeId + 1 this.showSize = this.typeId + 1
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -310,23 +307,23 @@ export default { ...@@ -310,23 +307,23 @@ export default {
this.formMyCheck.rejectToNodeId = this.firstNodeID this.formMyCheck.rejectToNodeId = this.firstNodeID
} }
}, },
cancelFn(){ cancelFn() {
this.modalCheckOk = false this.modalCheckOk = false
this.formMyCheck.radioSp = '通过' this.formMyCheck.radioSp = '通过'
this.disabledFlag = false this.disabledFlag = false
if(this.stepeFlag = 2){ if (this.stepeFlag = 2) {
this.showSize = 4 this.showSize = 4
} }
}, },
cancelFn02(){ cancelFn02() {
this.ResultModal = false this.ResultModal = false
}, },
checkOk6(){ checkOk6() {
this.ResultModal = false this.ResultModal = false
}, },
//审批通过 //审批通过
checkOk() { checkOk() {
if(this.typeId==1){ if (this.typeId == 1) {
this.$refs['formMyCheck'].validate((valid) => { this.$refs['formMyCheck'].validate((valid) => {
// console.log(valid) // console.log(valid)
if (valid) { if (valid) {
...@@ -345,7 +342,8 @@ export default { ...@@ -345,7 +342,8 @@ export default {
// console.log(param) // console.log(param)
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
} }
...@@ -355,9 +353,9 @@ export default { ...@@ -355,9 +353,9 @@ export default {
console.log("审核不通过") console.log("审核不通过")
} }
}) })
}else if(this.typeId==3){ } else if (this.typeId == 3) {
this.$refs['formResultText'].validate((valid) => { this.$refs['formResultText'].validate((valid) => {
if (valid){ if (valid) {
let param = { let param = {
id: this.passId, id: this.passId,
comment: '', comment: '',
...@@ -370,7 +368,8 @@ export default { ...@@ -370,7 +368,8 @@ export default {
// console.log(param) // console.log(param)
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
} }
...@@ -391,6 +390,7 @@ export default { ...@@ -391,6 +390,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -407,6 +407,7 @@ export default { ...@@ -407,6 +407,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -415,7 +416,7 @@ export default { ...@@ -415,7 +416,7 @@ export default {
}) })
}, },
// 通过 // 通过
passFn(){ passFn() {
let param = { let param = {
id: this.passId, id: this.passId,
comment: '', comment: '',
...@@ -425,7 +426,7 @@ export default { ...@@ -425,7 +426,7 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu=3 this.footerStatu = 3
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
} }
...@@ -436,13 +437,12 @@ export default { ...@@ -436,13 +437,12 @@ export default {
checkFalse() { checkFalse() {
if (this.formMyCheck.radioSp == '驳回') { if (this.formMyCheck.radioSp == '驳回') {
this.checkNo() this.checkNo()
}else if(this.formMyCheck.radioSp == '通过'){ } else if (this.formMyCheck.radioSp == '通过') {
this.passFn() this.passFn()
} } else if (this.formMyCheck.radioSp == '终止') {
else if (this.formMyCheck.radioSp == '终止') {
this.checkCancel() this.checkCancel()
} }
this.footerStatu=3 this.footerStatu = 3
}, },
l(key) { l(key) {
key = 'MaterialPlacode' + '.' + key key = 'MaterialPlacode' + '.' + key
......
pages/handle/examine8/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show"/> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
<Form <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
:model="formMyCheck"
:label-width="100"
:rules="ruleValidate"
inline
ref="formValidate"
>
<Row> <Row>
<Col span="18"> <Col span="18">
<FormItem label="审批意见："> <FormItem label="审批意见：">
...@@ -19,44 +13,20 @@ ...@@ -19,44 +13,20 @@
<Radio label="终止"></Radio> <Radio label="终止"></Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
label="驳回节点：" <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
v-if="formMyCheck.radioSp === '驳回'"
prop="rejectToNodeId"
>
<Select
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -112,11 +82,7 @@ ...@@ -112,11 +82,7 @@
</Row> </Row>
<Row> <Row>
<FormItem label="是否编写临时工艺"> <FormItem label="是否编写临时工艺">
<Select <Select v-model="formMyCheck.compilation_temporary_process" placeholder="请选择" style="width:225px;">
v-model="formMyCheck.compilation_temporary_process"
placeholder="请选择"
style="width:225px;"
>
<Option value="是">是</Option> <Option value="是">是</Option>
<Option value="否">否</Option> <Option value="否">否</Option>
</Select> </Select>
...@@ -140,8 +106,9 @@ ...@@ -140,8 +106,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -160,12 +127,12 @@ export default { ...@@ -160,12 +127,12 @@ export default {
formMyCheck: { formMyCheck: {
radioSp: '通过', radioSp: '通过',
comment: '', comment: '',
coordinate_results:'', coordinate_results: '',
handling_suggestion:'', handling_suggestion: '',
change_design_file:'', change_design_file: '',
change_process_file:'', change_process_file: '',
close_situation:'', close_situation: '',
compilation_temporary_process:'', compilation_temporary_process: '',
workHours: 0, //工时 workHours: 0, //工时
printPeriod: 0, //打印周期 printPeriod: 0, //打印周期
equipment: '', //设备 equipment: '', //设备
...@@ -173,12 +140,12 @@ export default { ...@@ -173,12 +140,12 @@ export default {
rejectToNodeId: null rejectToNodeId: null
}, },
modalCheckOk: false, modalCheckOk: false,
modalCheckOk1:false, modalCheckOk1: false,
modalCheckNo: false, modalCheckNo: false,
detailId: null, detailId: null,
statuTitle: '', statuTitle: '',
footerStatu: null, //是否显示footer footerStatu: null, //是否显示footer
footerStatue:true, footerStatue: true,
getDetailResults: [], //getdetail返回数据 getDetailResults: [], //getdetail返回数据
getDetailResultOrder: [], //getdetail返回订单detail数据 getDetailResultOrder: [], //getdetail返回订单detail数据
getDetailProcess: [], //getdetail返回process信息 getDetailProcess: [], //getdetail返回process信息
...@@ -191,30 +158,29 @@ export default { ...@@ -191,30 +158,29 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
console.log(this.footerStatu) console.log(this.footerStatu)
...@@ -224,17 +190,13 @@ export default { ...@@ -224,17 +190,13 @@ export default {
nextCheckOk() { nextCheckOk() {
console.log(this.currentNodeID) console.log(this.currentNodeID)
if (this.formMyCheck.radioSp == '通过') { if (this.formMyCheck.radioSp == '通过') {
if(this.currentNodeID==165) if (this.currentNodeID == 165) {
{ this.footerStatue = true
this.footerStatue=true
this.modalCheckOk = true this.modalCheckOk = true
} } else if (this.currentNodeID == 163) {
else if(this.currentNodeID==163) this.footerStatue = true
{
this.footerStatue=true
this.modalCheckOk1 = true this.modalCheckOk1 = true
} } else {
else{
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '通过' this.statuTitle = '通过'
} }
...@@ -243,16 +205,14 @@ export default { ...@@ -243,16 +205,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -265,8 +225,8 @@ export default { ...@@ -265,8 +225,8 @@ export default {
this.testObj = r this.testObj = r
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -311,8 +271,7 @@ export default { ...@@ -311,8 +271,7 @@ export default {
// nextOperationIdList: this.nextNodeUserIdList, // nextOperationIdList: this.nextNodeUserIdList,
// data: {} // data: {}
} }
if(this.currentNodeID==165) if (this.currentNodeID == 165) {
{
if (!this.formMyCheck.close_situation) { if (!this.formMyCheck.close_situation) {
this.$Message.error('请填写闭环情况') this.$Message.error('请填写闭环情况')
return return
...@@ -325,9 +284,7 @@ export default { ...@@ -325,9 +284,7 @@ export default {
close_situation: this.formMyCheck.close_situation close_situation: this.formMyCheck.close_situation
} }
} }
} } else if (this.currentNodeID == 163) {
else if(this.currentNodeID==163)
{
if (!this.formMyCheck.coordinate_results) { if (!this.formMyCheck.coordinate_results) {
this.$Message.error('请填写协调结果') this.$Message.error('请填写协调结果')
return return
...@@ -360,8 +317,7 @@ export default { ...@@ -360,8 +317,7 @@ export default {
compilation_temporary_process: this.formMyCheck.compilation_temporary_process compilation_temporary_process: this.formMyCheck.compilation_temporary_process
} }
} }
} } else {
else{
param = { param = {
id: this.passId, id: this.passId,
comment: '', comment: '',
...@@ -374,7 +330,8 @@ export default { ...@@ -374,7 +330,8 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
this.modalCheckNo = false this.modalCheckNo = false
this.modalCheckOk = false this.modalCheckOk = false
this.modalCheckOk1 = false this.modalCheckOk1 = false
...@@ -396,7 +353,8 @@ export default { ...@@ -396,7 +353,8 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
...@@ -414,7 +372,8 @@ export default { ...@@ -414,7 +372,8 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.footerStatu=3 this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
...@@ -436,17 +395,14 @@ export default { ...@@ -436,17 +395,14 @@ export default {
key = 'MaterialPlacode' + '.' + key key = 'MaterialPlacode' + '.' + key
return this.$t(key) return this.$t(key)
}, },
show(a){ show(a) {
console.log(a) console.log(a)
this.footerStatue = false this.footerStatue = false
let contextDate = JSON.parse(a.contextData) let contextDate = JSON.parse(a.contextData)
this.formMyCheck = contextDate this.formMyCheck = contextDate
if(a.nodeId==163) if (a.nodeId == 163) {
{
this.modalCheckOk1 = true this.modalCheckOk1 = true
} } else if (a.nodeId == 165) {
else if(a.nodeId==165)
{
this.modalCheckOk = true this.modalCheckOk = true
} }
......
pages/handle/examine9/index.vue
View file @ 4c9c39af
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" /> <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
...@@ -14,39 +14,19 @@ ...@@ -14,39 +14,19 @@
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId"> <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
<Select <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因：" v-if="
label="原因："
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -67,8 +47,9 @@ ...@@ -67,8 +47,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -110,30 +91,29 @@ export default { ...@@ -110,30 +91,29 @@ export default {
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
testObj: {}, testObj: {},
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -147,16 +127,14 @@ export default { ...@@ -147,16 +127,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -169,8 +147,8 @@ export default { ...@@ -169,8 +147,8 @@ export default {
this.testObj = r this.testObj = r
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -219,6 +197,7 @@ export default { ...@@ -219,6 +197,7 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.$refs.userProcess.load(this.detailId)
this.modalCheckNo = false this.modalCheckNo = false
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
...@@ -238,6 +217,7 @@ export default { ...@@ -238,6 +217,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
...@@ -255,6 +235,7 @@ export default { ...@@ -255,6 +235,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
......
pages/handle/process.vue
View file @ 4c9c39af
<style lang="less" scope> <style lang="less">
@import "./shen.less"; @import "./shen.less";
</style> </style>
<template> <template>
<div class="Design"> <div class="Design">
<h3>{{ processTitle }}</h3> <h3>{{ processTitle }}</h3>
<Divider /> <Divider />
<Timeline> <Timeline>
...@@ -27,29 +27,19 @@ ...@@ -27,29 +27,19 @@
<div v-if="index>cur"> <div v-if="index>cur">
<CheckboxGroup v-model="immutData"> <CheckboxGroup v-model="immutData">
<span>审批人：</span> <span>审批人：</span>
<Checkbox <Checkbox v-for="(item1, index1) in item.defaultUsers.immutable" :key="index1" :label="item1" :disabled="item.isFixed">
v-for="(item1, index1) in item.defaultUsers.immutable"
:key="index1"
:label="item1"
:disabled="item.isFixed"
>
<User :value="item1" style="margin-right:5px;" /> <User :value="item1" style="margin-right:5px;" />
</Checkbox> </Checkbox>
</CheckboxGroup> </CheckboxGroup>
</div> </div>
<div class="wait" v-else> <div class="wait" v-else>
<span>审批人：</span> <span>审批人：</span>
<User <User v-for="(item2, index2) in item.defaultUsers.immutable" :key="index2" :value="item2" class="mr5" />
v-for="(item2, index2) in item.defaultUsers.immutable"
:key="index2"
:value="item2"
class="mr5"
/>
</div> </div>
<div style="width:98%" v-if="com(item.records).length>0"> <div style="width:98%" v-if="com(item.records).length>0">
<!-- <Table :columns="columns" border size="small" width="90%" :data="com(item.records)"></Table> --> <!-- <Table :columns="columns" border size="small" width="90%" :data="com(item.records)"></Table> -->
<p class="shen_row" v-for="(item3, index3) in item.records" :key="index3" :value="item3"> <p class="shen_row" v-for="(item3, index3) in item.records" :key="index3" :value="item3">
<User class="user_span" :value="item3.operatorId"/> <User class="user_span" :value="item3.operatorId" />
<span class="plr row_time">{{item3.operationTime}}</span> <span class="plr row_time">{{item3.operationTime}}</span>
<state code="workflow.record.status" class="row_statu" :value="item3.status" type="text"></state> <state code="workflow.record.status" class="row_statu" :value="item3.status" type="text"></state>
<span class="plr remark" v-if="item3.remark">{{item3.remark}}</span> <span class="plr remark" v-if="item3.remark">{{item3.remark}}</span>
...@@ -60,14 +50,18 @@ ...@@ -60,14 +50,18 @@
</div> </div>
</TimelineItem> </TimelineItem>
</Timeline> </Timeline>
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from './api'
export default { export default {
name: 'process', name: 'process',
components: {}, components: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
data() { data() {
...@@ -78,8 +72,7 @@ export default { ...@@ -78,8 +72,7 @@ export default {
dataImmut: [], dataImmut: [],
creatRows: [], creatRows: [],
cur: 0, cur: 0,
columns: [ columns: [{
{
key: 'status', key: 'status',
title: '结果', title: '结果',
align: 'left', align: 'left',
...@@ -101,7 +94,11 @@ export default { ...@@ -101,7 +94,11 @@ export default {
easy: true, easy: true,
high: true, high: true,
render: (h, params) => { render: (h, params) => {
return h('User', { attrs: { value: params.row.operatorId } }) return h('User', {
attrs: {
value: params.row.operatorId
}
})
} }
}, },
{ {
...@@ -123,8 +120,11 @@ export default { ...@@ -123,8 +120,11 @@ export default {
render: (h, params) => { render: (h, params) => {
if (params.row.contextData.length > 2) if (params.row.contextData.length > 2)
return h( return h(
'a', 'a', {
{ on: { click: () => this.edit(params.row) } }, on: {
click: () => this.edit(params.row)
}
},
'详情' '详情'
) )
return h('span', '') return h('span', '')
...@@ -143,11 +143,16 @@ export default { ...@@ -143,11 +143,16 @@ export default {
} }
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.dataImmut = [] this.dataImmut = []
this.dataMut = [] this.dataMut = []
this.load(this.idVal)
Api.getdetail({ Id: this.idVal }).then((r) => { },
methods: {
load(v) {
Api.getdetail({
Id: v
}).then((r) => {
if (r.success) { if (r.success) {
this.dataImmut = r.result.nodes this.dataImmut = r.result.nodes
this.currentNodeId = r.result.currentNodeId this.currentNodeId = r.result.currentNodeId
...@@ -159,12 +164,12 @@ export default { ...@@ -159,12 +164,12 @@ export default {
}; };
// if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){ // if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){
// u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable) // u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable)
u.defaultUsers.immutable=u.defaultUsers.immutable||(u.defaultUsers.mutable)//审核人员bug u.defaultUsers.immutable = u.defaultUsers.immutable || (u.defaultUsers.mutable) //审核人员bug
// } // }
}) })
if (this.dataImmut.length > this.cur + 1) { if (this.dataImmut.length > this.cur + 1) {
// console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length ) // console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length )
this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable||(this.dataImmut[this.cur + 1].defaultUsers.mutable)//审核人员bug this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable || (this.dataImmut[this.cur + 1].defaultUsers.mutable) //审核人员bug
} }
} else { } else {
...@@ -172,8 +177,6 @@ export default { ...@@ -172,8 +177,6 @@ export default {
} }
}) })
}, },
methods: {
load(v) {},
type(i) { type(i) {
if (i < this.cur) { if (i < this.cur) {
return 'primary' return 'primary'
...@@ -191,7 +194,7 @@ export default { ...@@ -191,7 +194,7 @@ export default {
console.log(record) console.log(record)
}, },
com(items) { com(items) {
if(items) if (items)
return items.filter((u) => { return items.filter((u) => {
return [2, 3, 5, 6].indexOf(u.status) > -1 return [2, 3, 5, 6].indexOf(u.status) > -1
}) })
......
pages/mesPlan/index.vue
View file @ 4c9c39af
...@@ -57,8 +57,9 @@ ...@@ -57,8 +57,9 @@
<Detail :row="rowData" /> <Detail :row="rowData" />
</Modal> </Modal>
<Modal v-model="splitModal" title="订单分解" width="1200"> <Modal v-model="splitModal" title="订单分解" width="1200">
<Split :row="rowData" ref="orderSplit" /> <Split :row="rowData" ref="orderSplit" @on-amount="getAmount" />
<div slot="footer"> <div slot="footer">
<span class="pr240">剩余产品数量：{{amountNew}}</span>
<Button @click="splitModal = false">取消</Button> <Button @click="splitModal = false">取消</Button>
<Button type="primary" @click="orderSplitOk">确定分解</Button> <Button type="primary" @click="orderSplitOk">确定分解</Button>
</div> </div>
...@@ -487,7 +488,8 @@ export default { ...@@ -487,7 +488,8 @@ export default {
codeList: [], //订单编号List codeList: [], //订单编号List
operatorIdList: [] //操作员id operatorIdList: [] //操作员id
}, //确定后返回数据 }, //确定后返回数据
wfstatu: 1 //流程是否启用1 禁用 0启用 wfstatu: 1, //流程是否启用1 禁用 0启用
amountNew: 0,
}; };
}, },
created() { created() {
...@@ -575,11 +577,16 @@ export default { ...@@ -575,11 +577,16 @@ export default {
split(row) { split(row) {
if (row.quantity > 1) { if (row.quantity > 1) {
this.splitModal = true; this.splitModal = true;
this.amountNew = row.quantity
this.rowData = row; this.rowData = row;
} else { } else {
this.$Message.error("数量为1，不能进行分解"); this.$Message.error("数量为1，不能进行分解");
} }
}, },
//获取可分解剩余条数
getAmount(val) {
this.amountNew = val
},
onHide() { onHide() {
// this.$Message.info("收起左侧树") // this.$Message.info("收起左侧树")
this.showMenu = false; this.showMenu = false;
......
pages/mesPlan/split.vue
View file @ 4c9c39af
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="分解数量" style="width:100%" prop="splitQuantity"> <FormItem label="分解数量" style="width:100%" prop="splitQuantity">
<InputNumber :min="2" :max="orderForm.quantity" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber> <InputNumber :min="1" :max="orderForm.quantity" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
<Button type="primary" @click="addSplitOrder" v-noClick>确定</Button> <Button type="primary" @click="addSplitOrder" v-noClick>确定</Button>
</FormItem> </FormItem>
</Col> </Col>
...@@ -47,10 +47,6 @@ ...@@ -47,10 +47,6 @@
<DatePicker v-model="row.demandDate" type="daterange" placeholder="请选择日期" style="width:240px" :transfer="true" :options="optionsDate" @on-change="inputOrderCat(row,index)"></DatePicker> <DatePicker v-model="row.demandDate" type="daterange" placeholder="请选择日期" style="width:240px" :transfer="true" :options="optionsDate" @on-change="inputOrderCat(row,index)"></DatePicker>
</template> </template>
</Table> </Table>
<div class="cellblock">
<p>剩余产品数量：{{amount}}</p>
</div>
</div> </div>
</template> </template>
...@@ -81,14 +77,14 @@ export default { ...@@ -81,14 +77,14 @@ export default {
productName: "", //产品名称 productName: "", //产品名称
drawingNo: "", //图号 drawingNo: "", //图号
orderCat: "", //任务类型 orderCat: "", //任务类型
quantity: "", //数量 quantity: 0, //数量
remark: "" //备注 remark: "" //备注
}, },
orderForm: { orderForm: {
mesCode: "", //订单编号 mesCode: "", //订单编号
productName: "", //产品名称 productName: "", //产品名称
stage: "", //阶段 stage: "", //阶段
quantity: "", //数量 quantity: 0, //数量
planStartTime: "", //计划开始时间 planStartTime: "", //计划开始时间
planEndTime: "", //计划结束时间 planEndTime: "", //计划结束时间
splitQuantity: 2, //分解数量 splitQuantity: 2, //分解数量
...@@ -153,7 +149,7 @@ export default { ...@@ -153,7 +149,7 @@ export default {
//打开modal层时给订单list赋值 //打开modal层时给订单list赋值
//alert(JSON.stringify(data)) //alert(JSON.stringify(data))
this.dataListRetrun.id = data[0].id; this.dataListRetrun.id = data[0].id;
this.dataListRetrun.quantity = data[0].quantity; this.dataListRetrun.quantity = Number(data[0].quantity);
this.dataListRetrun.mesCode = data[0].mesCode; this.dataListRetrun.mesCode = data[0].mesCode;
this.orderInfo = []; this.orderInfo = [];
this.dataList = []; this.dataList = [];
...@@ -162,7 +158,7 @@ export default { ...@@ -162,7 +158,7 @@ export default {
mesCode: this.orderInfo.mesCode, //订单编号 mesCode: this.orderInfo.mesCode, //订单编号
productName: this.orderInfo.productName, //产品名称 productName: this.orderInfo.productName, //产品名称
stage: this.orderInfo.stage, //阶段 stage: this.orderInfo.stage, //阶段
quantity: this.orderInfo.quantity, //数量 quantity: Number(this.orderInfo.quantity), //数量
planStartTime: this.orderInfo.demandStartDate, //计划开始时间 planStartTime: this.orderInfo.demandStartDate, //计划开始时间
planEndTime: this.orderInfo.demandFinishDate, //计划结束时间 planEndTime: this.orderInfo.demandFinishDate, //计划结束时间
splitQuantity: 2, //分解数量 splitQuantity: 2, //分解数量
...@@ -190,7 +186,7 @@ export default { ...@@ -190,7 +186,7 @@ export default {
this.dataList.push({ this.dataList.push({
mesCode: i + 1 < 10 ? mesCode: i + 1 < 10 ?
mesCodeSon + "0" + (i + 1) : mesCodeSon + "" + (i + 1), mesCodeSon + "0" + (i + 1) : mesCodeSon + "" + (i + 1),
quantity: "", quantity: 0,
demandDate: [planStartTime, planEndTime], demandDate: [planStartTime, planEndTime],
demandStartDate: planStartTime, demandStartDate: planStartTime,
demandFinishDate: planEndTime demandFinishDate: planEndTime
...@@ -209,7 +205,7 @@ export default { ...@@ -209,7 +205,7 @@ export default {
let forDemandStartDate = this.getFormatDate(row.demandDate[0]); let forDemandStartDate = this.getFormatDate(row.demandDate[0]);
let forDemandFinishDate = this.getFormatDate(row.demandDate[1]); let forDemandFinishDate = this.getFormatDate(row.demandDate[1]);
this.dataListRetrun.items[index].mesCode = row.mesCode; this.dataListRetrun.items[index].mesCode = row.mesCode;
this.dataListRetrun.items[index].quantity = row.quantity; this.dataListRetrun.items[index].quantity = Number(row.quantity);
this.dataListRetrun.items[index].demandStartDate = forDemandStartDate; this.dataListRetrun.items[index].demandStartDate = forDemandStartDate;
this.dataListRetrun.items[index].demandFinishDate = forDemandFinishDate; this.dataListRetrun.items[index].demandFinishDate = forDemandFinishDate;
this.dataList[index].demandDate = [ this.dataList[index].demandDate = [
...@@ -220,10 +216,11 @@ export default { ...@@ -220,10 +216,11 @@ export default {
this.dataList.forEach(el => { this.dataList.forEach(el => {
splitAmount = Number(splitAmount) + Number(el.quantity) splitAmount = Number(splitAmount) + Number(el.quantity)
}) })
this.amount = this.orderForm.quantity - splitAmount this.amount = Number(this.orderForm.quantity) - splitAmount
this.$emit("on-amount", this.amount);
}, },
inputFocus(row, index) { inputFocus(row, index) {
this.amountMax = this.amount + row.quantity this.amountMax = this.amount + Number(row.quantity)
}, },
getFormatDate(dates) { getFormatDate(dates) {
const d = new Date(dates); const d = new Date(dates);
...@@ -259,7 +256,7 @@ export default { ...@@ -259,7 +256,7 @@ export default {
mesCode: this.orderInfo.mesCode, //订单编号 mesCode: this.orderInfo.mesCode, //订单编号
productName: "", //产品名称 productName: "", //产品名称
stage: "", //阶段 stage: "", //阶段
quantity: "", //数量 quantity: 0, //数量
planStartTime: "", //计划开始时间 planStartTime: "", //计划开始时间
planEndTime: "", //计划结束时间 planEndTime: "", //计划结束时间
splitQuantity: 2, //分解数量 splitQuantity: 2, //分解数量
...@@ -275,11 +272,11 @@ export default { ...@@ -275,11 +272,11 @@ export default {
this.orderForm.planEndTime = this.orderForm.demandFinishDate; this.orderForm.planEndTime = this.orderForm.demandFinishDate;
//this.orderForm.splitQuantity = 2; //this.orderForm.splitQuantity = 2;
this.dataListRetrun.id = this.orderForm.id; this.dataListRetrun.id = this.orderForm.id;
this.dataListRetrun.quantity = this.orderForm.quantity; this.dataListRetrun.quantity = Number(this.orderForm.quantity);
this.dataListRetrun.mesCode = this.orderForm.mesCode; this.dataListRetrun.mesCode = this.orderForm.mesCode;
this.dataList = [] this.dataList = []
this.amount = this.orderForm.quantity this.amount = Number(this.orderForm.quantity)
} }
} }
} }
......
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