yemianqunaxiananniutinajia
This commit is contained in:
parent
544478dc0b
commit
750e751513
|
|
@ -2,12 +2,22 @@
|
|||
<div class="app-container">
|
||||
<el-card>
|
||||
<div>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handlecgCreate"
|
||||
>新增采购入库</el-button
|
||||
<el-button
|
||||
v-if="checkPermission(['fifo_in_pur'])"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
@click="handlecgCreate"
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
|
||||
>新增其他入库</el-button
|
||||
新增采购入库
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="checkPermission(['fifo_in_other'])"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
@click="handleCreate"
|
||||
>
|
||||
新增其他入库
|
||||
</el-button>
|
||||
<el-input
|
||||
v-model="listQuery.search"
|
||||
placeholder="仓库名称/仓库编号"
|
||||
|
|
@ -20,15 +30,17 @@
|
|||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索</el-button
|
||||
>
|
||||
搜索
|
||||
</el-button>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>重置</el-button
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card>
|
||||
|
|
@ -42,18 +54,15 @@
|
|||
height="100"
|
||||
v-el-height-adaptive-table="{ bottomOffset: 42 }"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
|
||||
<el-table-column label="记录编号">
|
||||
<template slot-scope="scope">{{ scope.row.number }}</template>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="记录编号" prop="number">
|
||||
</el-table-column>
|
||||
<el-table-column label="操作人员">
|
||||
<template slot-scope="scope" v-if="scope.row.create_by">{{
|
||||
scope.row.create_by_.name
|
||||
}}</template>
|
||||
<template slot-scope="scope" v-if="scope.row.create_by">
|
||||
{{scope.row.create_by_.name}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="出/入库时间">
|
||||
<template slot-scope="scope">{{ scope.row.inout_date }}</template>
|
||||
<el-table-column label="出/入库时间" prop="inout_date">
|
||||
</el-table-column>
|
||||
<el-table-column label="出/入库类型">
|
||||
<template slot-scope="scope">{{ types_[scope.row.type] }}</template>
|
||||
|
|
@ -64,35 +73,38 @@
|
|||
<el-tag v-else>已审核</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间">
|
||||
<template slot-scope="scope">{{ scope.row.create_time }}</template>
|
||||
<el-table-column label="创建时间" prop="create_time">
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="220px">
|
||||
<template slot-scope="scope">
|
||||
<el-link
|
||||
v-if="scope.row.type==2"
|
||||
v-if="checkPermission(['fifo_pack'])&&scope.row.type==2"
|
||||
type="primary"
|
||||
@click="handlePack(scope)"
|
||||
>装箱</el-link
|
||||
>
|
||||
装箱
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['warehouse_update'])"
|
||||
v-if="checkPermission(['fifo_pack'])"
|
||||
type="primary"
|
||||
@click="handleDetail(scope)"
|
||||
>查看</el-link
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="scope.row.is_audited == false"
|
||||
v-if="checkPermission(['fifo_hear'])&&scope.row.is_audited == false"
|
||||
type="primary"
|
||||
@click="handleAudit(scope)"
|
||||
>审核</el-link
|
||||
>
|
||||
审核
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['warehouse_delete'])"
|
||||
v-if="checkPermission(['fifo_delete'])"
|
||||
type="danger"
|
||||
@click="handleDelete(scope)"
|
||||
>删除</el-link
|
||||
>
|
||||
删除
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -116,7 +128,7 @@
|
|||
label-position="right"
|
||||
:rules="rule1"
|
||||
>
|
||||
<el-form-item label="采购订单" >
|
||||
<el-form-item label="采购订单">
|
||||
<el-select v-model="inpur.pu_order">
|
||||
<el-option
|
||||
v-for="item in puorderoptions"
|
||||
|
|
@ -129,12 +141,18 @@
|
|||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="text-align: right">
|
||||
<el-button type="danger" @click="dialogVisibles = false"
|
||||
>取消</el-button
|
||||
<el-button
|
||||
type="danger"
|
||||
@click="dialogVisibles = false"
|
||||
>
|
||||
<el-button type="primary" @click="confirminpur('Form1')"
|
||||
>确认</el-button
|
||||
取消
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="confirminpur('Form1')"
|
||||
>
|
||||
确认
|
||||
</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
|
|
@ -150,7 +168,7 @@
|
|||
label-position="right"
|
||||
:rules="rule1"
|
||||
>
|
||||
<el-form-item class="warehouse" label="供应商" >
|
||||
<el-form-item class="warehouse" label="供应商">
|
||||
<el-select v-model="inventory.vendor" size="small">
|
||||
<el-option
|
||||
v-for="item in vendoroptions"
|
||||
|
|
@ -180,7 +198,6 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="5" style="margin-right: 10px">
|
||||
<el-form-item
|
||||
class="material"
|
||||
|
|
@ -198,7 +215,6 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="5" style="margin-right: 10px">
|
||||
<el-form-item
|
||||
class="count"
|
||||
|
|
@ -234,10 +250,8 @@
|
|||
style="width:100%"
|
||||
>
|
||||
</el-date-picker>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!-- 删除按钮 -->
|
||||
<el-col :span="1">
|
||||
<el-tooltip
|
||||
|
|
@ -295,7 +309,7 @@
|
|||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import {
|
||||
import {
|
||||
getfifoList,
|
||||
createInventory,
|
||||
createInother,
|
||||
|
|
@ -303,15 +317,15 @@ import {
|
|||
deleteFifoitem,
|
||||
deleteFifo,
|
||||
audit,
|
||||
} from "@/api/inm";
|
||||
import { getPuorderList } from "@/api/pum";
|
||||
import checkPermission from "@/utils/permission";
|
||||
import { getpVendorList } from "@/api/vendor";
|
||||
import { getMaterialList } from "@/api/mtm";
|
||||
import { getUserList } from "@/api/user";
|
||||
import { genTree } from "@/utils";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
const defaulteinventory = {
|
||||
} from "@/api/inm";
|
||||
import {getPuorderList} from "@/api/pum";
|
||||
import checkPermission from "@/utils/permission";
|
||||
import {getpVendorList} from "@/api/vendor";
|
||||
import {getMaterialList} from "@/api/mtm";
|
||||
import {getUserList} from "@/api/user";
|
||||
import {genTree} from "@/utils";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
const defaulteinventory = {
|
||||
vendor: null,
|
||||
details: [
|
||||
{
|
||||
|
|
@ -321,9 +335,9 @@ const defaulteinventory = {
|
|||
batch: "", //批次
|
||||
},
|
||||
],
|
||||
};
|
||||
export default {
|
||||
components: { Pagination },
|
||||
};
|
||||
export default {
|
||||
components: {Pagination},
|
||||
data() {
|
||||
return {
|
||||
inventory: defaulteinventory,
|
||||
|
|
@ -351,7 +365,7 @@ export default {
|
|||
dialogType: "new",
|
||||
dialogVisibles: false,
|
||||
rule1: {
|
||||
name: [{ required: true, message: "请输入", trigger: "blur" }],
|
||||
name: [{required: true, message: "请输入", trigger: "blur"}],
|
||||
},
|
||||
};
|
||||
},
|
||||
|
|
@ -381,13 +395,13 @@ export default {
|
|||
handleDetail(scope) {
|
||||
this.$router.push({
|
||||
name: "fifodetail",
|
||||
params: { id: scope.row.id, pu_order: scope.row.pu_order},
|
||||
params: {id: scope.row.id, pu_order: scope.row.pu_order},
|
||||
});
|
||||
},
|
||||
|
||||
//供应商列表
|
||||
getListgys() {
|
||||
getpVendorList({ page: 0 }).then((response) => {
|
||||
getpVendorList({page: 0}).then((response) => {
|
||||
if (response.data) {
|
||||
this.vendoroptions = response.data;
|
||||
}
|
||||
|
|
@ -395,7 +409,7 @@ export default {
|
|||
},
|
||||
//采购订单
|
||||
getpuorderList() {
|
||||
getPuorderList({ page: 0 }).then((response) => {
|
||||
getPuorderList({page: 0}).then((response) => {
|
||||
if (response.data) {
|
||||
this.puorderoptions = response.data;
|
||||
}
|
||||
|
|
@ -413,7 +427,7 @@ export default {
|
|||
},
|
||||
//仓库
|
||||
getlists() {
|
||||
getWarehouseList({ page: 0 }).then((response) => {
|
||||
getWarehouseList({page: 0}).then((response) => {
|
||||
if (response.data) {
|
||||
this.warehouseData = genTree(response.data);
|
||||
}
|
||||
|
|
@ -441,7 +455,7 @@ export default {
|
|||
//物料
|
||||
getmaterialList() {
|
||||
this.listLoading = true;
|
||||
getMaterialList({ pageoff: true }).then((response) => {
|
||||
getMaterialList({pageoff: true}).then((response) => {
|
||||
if (response.data) {
|
||||
this.materialoptions = genTree(response.data);
|
||||
}
|
||||
|
|
@ -519,10 +533,9 @@ export default {
|
|||
});
|
||||
},
|
||||
//装箱
|
||||
handlePack(scope)
|
||||
{
|
||||
this.$router.push({name: "salesdetail", params: { id: scope.row.sale }, })
|
||||
handlePack(scope) {
|
||||
this.$router.push({name: "salesdetail", params: {id: scope.row.sale},})
|
||||
}
|
||||
},
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,18 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleorder"
|
||||
>选择订单
|
||||
<el-button
|
||||
v-if="checkPermission(['wp_to_order'])"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
@click="handleorder"
|
||||
>
|
||||
选择订单
|
||||
</el-button>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
v-loading="listLoading"
|
||||
:data="iproductData.results"
|
||||
ref="multipleTable"
|
||||
border
|
||||
fit
|
||||
stripe
|
||||
|
|
@ -17,12 +22,9 @@
|
|||
>
|
||||
<el-table-column type="selection" width="55"></el-table-column>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="成品编号">
|
||||
<template slot-scope="scope">{{ scope.row.number }}</template>
|
||||
<el-table-column label="成品编号" prop="number">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="成品批次">
|
||||
<template slot-scope="scope">{{ scope.row.batch }}</template>
|
||||
<el-table-column label="成品批次" prop="batch">
|
||||
</el-table-column>
|
||||
<el-table-column label="成品名称" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">{{ scope.row.material_.name }}</template>
|
||||
|
|
@ -30,13 +32,10 @@
|
|||
<el-table-column label="所在仓库">
|
||||
<template slot-scope="scope">{{scope.row.warehouse_.name}}</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="订单">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.to_order_">{{scope.row.to_order_.number}}</span>
|
||||
<el-tag
|
||||
v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
|
||||
>
|
||||
<el-tag v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true">
|
||||
需要确定订单
|
||||
</el-tag>
|
||||
<span v-else></span>
|
||||
|
|
@ -45,9 +44,7 @@
|
|||
<el-table-column label="合同">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.to_order_">{{scope.row.to_order_.contract_.name}}</span>
|
||||
<span
|
||||
v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
|
||||
>
|
||||
<span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true">
|
||||
</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
|
|
@ -55,9 +52,7 @@
|
|||
<el-table-column label="客户">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.to_order_">{{scope.row.to_order_.customer_.name}}</span>
|
||||
<span
|
||||
v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
|
||||
>
|
||||
<span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true">
|
||||
</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
|
|
@ -69,13 +64,9 @@
|
|||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="销售状态">
|
||||
<template slot-scope="scope">{{state_[scope.row.state]}}</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
|
||||
<!-- <el-table-column align="center" label="操作" width="220px">
|
||||
<template slot-scope="scope">
|
||||
<el-link
|
||||
|
|
@ -150,7 +141,8 @@
|
|||
<el-link
|
||||
v-if="checkPermission(['warehouse_update'])"
|
||||
@click="toorders(scope)"
|
||||
>确认
|
||||
>
|
||||
确认
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -167,7 +159,7 @@
|
|||
import checkPermission from "@/utils/permission";
|
||||
import {getOrderList} from "@/api/sam";
|
||||
import {mtest, toorder} from "@/api/wpm";
|
||||
import {genTree} from "@/utils";
|
||||
// import {genTree} from "@/utils";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
|
||||
export default {
|
||||
|
|
@ -225,10 +217,12 @@
|
|||
this.listLoading = false;
|
||||
});
|
||||
},
|
||||
|
||||
handleMtest(scope) {
|
||||
this.saleproduct = scope.row.id;
|
||||
this.dialogVisible = true;
|
||||
},
|
||||
|
||||
submtest() {
|
||||
mtest(this.saleproduct, this.mtestform).then((res) => {
|
||||
if (res.code >= 200) {
|
||||
|
|
@ -237,6 +231,7 @@
|
|||
}
|
||||
});
|
||||
},
|
||||
|
||||
//批量选择成品发给谋订单
|
||||
handleorder() {
|
||||
this.dialogFormVisibleorder = true;
|
||||
|
|
@ -261,6 +256,7 @@
|
|||
}
|
||||
);
|
||||
},
|
||||
|
||||
//提交批量产品选择的订单
|
||||
toorders(scope) {
|
||||
toorder({
|
||||
|
|
|
|||
|
|
@ -2,9 +2,14 @@
|
|||
<div class="app-container">
|
||||
<el-card>
|
||||
<div>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
|
||||
>新增仓库</el-button
|
||||
<el-button
|
||||
v-if="checkPermission(['warehouse_create'])"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
@click="handleCreate"
|
||||
>
|
||||
新增仓库
|
||||
</el-button>
|
||||
<el-input
|
||||
v-model="listQuery.search"
|
||||
placeholder="仓库名称/仓库编号"
|
||||
|
|
@ -17,19 +22,20 @@
|
|||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索</el-button
|
||||
>
|
||||
搜索
|
||||
</el-button>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>重置</el-button
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
</div>
|
||||
|
||||
</el-card>
|
||||
<el-card >
|
||||
<el-card>
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="warehouseList.results"
|
||||
|
|
@ -37,24 +43,17 @@
|
|||
fit
|
||||
stripe
|
||||
highlight-current-row
|
||||
|
||||
height="100"
|
||||
v-el-height-adaptive-table="{bottomOffset: 42}"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="仓库名称">
|
||||
<template slot-scope="scope">{{ scope.row.name }}</template>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="仓库名称" prop="name">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="仓库编号">
|
||||
<template slot-scope="scope">{{ scope.row.number }}</template>
|
||||
<el-table-column label="仓库编号" prop="number">
|
||||
</el-table-column>
|
||||
<el-table-column label="具体地点">
|
||||
<template slot-scope="scope">{{ scope.row.place }}</template>
|
||||
<el-table-column label="具体地点" prop="place">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="创建时间">
|
||||
<template slot-scope="scope">{{ scope.row.create_time }}</template>
|
||||
<el-table-column label="创建时间" prop="create_time">
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="220px">
|
||||
<template slot-scope="scope">
|
||||
|
|
@ -62,20 +61,23 @@
|
|||
v-if="checkPermission(['warehouse_update'])"
|
||||
type="primary"
|
||||
@click="handleMaterial(scope)"
|
||||
>查看物料</el-link
|
||||
>
|
||||
查看物料
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['warehouse_update'])"
|
||||
type="primary"
|
||||
@click="handleEdit(scope)"
|
||||
>编辑</el-link
|
||||
>
|
||||
编辑
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['warehouse_delete'])"
|
||||
type="danger"
|
||||
@click="handleDelete(scope)"
|
||||
>删除</el-link
|
||||
>
|
||||
删除
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -100,13 +102,13 @@
|
|||
:rules="rule1"
|
||||
>
|
||||
<el-form-item label="仓库名称" prop="name">
|
||||
<el-input v-model="warehouse.name" placeholder="仓库名称" />
|
||||
<el-input v-model="warehouse.name" placeholder="仓库名称"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库编号" prop="number">
|
||||
<el-input v-model="warehouse.number" placeholder="仓库编号" />
|
||||
<el-input v-model="warehouse.number" placeholder="仓库编号"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="具体地点" prop="place">
|
||||
<el-input v-model="warehouse.place" placeholder="具体地点" />
|
||||
<el-input v-model="warehouse.place" placeholder="具体地点"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="text-align: right">
|
||||
|
|
@ -117,19 +119,19 @@
|
|||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import {
|
||||
import {
|
||||
getWarehouseList,
|
||||
createWarehouse,
|
||||
updateWarehouse,
|
||||
deleteWarehouse,
|
||||
} from "@/api/inm";
|
||||
import checkPermission from "@/utils/permission";
|
||||
} from "@/api/inm";
|
||||
import checkPermission from "@/utils/permission";
|
||||
|
||||
import { genTree } from "@/utils";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
const defaultewarehouse = {};
|
||||
export default {
|
||||
components: { Pagination },
|
||||
// import {genTree} from "@/utils";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
const defaultewarehouse = {};
|
||||
export default {
|
||||
components: {Pagination},
|
||||
data() {
|
||||
return {
|
||||
warehouse: defaultewarehouse,
|
||||
|
|
@ -160,9 +162,9 @@ export default {
|
|||
dialogVisible: false,
|
||||
dialogType: "new",
|
||||
rule1: {
|
||||
name: [{ required: true, message: "请输入", trigger: "blur" }],
|
||||
number: [{ required: true, message: "请输入", trigger: "blur" }],
|
||||
place: [{ required: true, message: "请输入", trigger: "blur" }],
|
||||
name: [{required: true, message: "请输入", trigger: "blur"}],
|
||||
number: [{required: true, message: "请输入", trigger: "blur"}],
|
||||
place: [{required: true, message: "请输入", trigger: "blur"}],
|
||||
},
|
||||
};
|
||||
},
|
||||
|
|
@ -183,14 +185,17 @@ export default {
|
|||
this.listLoading = false;
|
||||
});
|
||||
},
|
||||
|
||||
//跳转到该仓库的物料表
|
||||
handleMaterial(scope) {
|
||||
this.$router.push({ name: "inventory", params: { id: scope.row.id } });
|
||||
this.$router.push({name: "inventory", params: {id: scope.row.id}});
|
||||
},
|
||||
|
||||
handleFilter() {
|
||||
this.listQuery.page = 1;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
resetFilter() {
|
||||
this.listQuery = {
|
||||
page: 1,
|
||||
|
|
@ -198,6 +203,7 @@ export default {
|
|||
};
|
||||
this.getList();
|
||||
},
|
||||
|
||||
handleCreate() {
|
||||
this.warehouse = Object.assign({}, defaultewarehouse);
|
||||
this.dialogType = "new";
|
||||
|
|
@ -215,6 +221,7 @@ export default {
|
|||
this.$refs["Form"].clearValidate();
|
||||
});
|
||||
},
|
||||
|
||||
handleDelete(scope) {
|
||||
this.$confirm("确认删除?", "警告", {
|
||||
confirmButtonText: "确认",
|
||||
|
|
@ -227,7 +234,7 @@ export default {
|
|||
this.$message.success("成功");
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err);
|
||||
this.$message.error(err);
|
||||
});
|
||||
},
|
||||
|
||||
|
|
@ -258,5 +265,5 @@ export default {
|
|||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -2,10 +2,14 @@
|
|||
<div class="app-container">
|
||||
<el-card>
|
||||
<div>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
|
||||
>新增采购订单</el-button
|
||||
<el-button
|
||||
v-if="checkPermission(['puorder_create'])"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
@click="handleCreate"
|
||||
>
|
||||
|
||||
新增采购订单
|
||||
</el-button>
|
||||
<el-input
|
||||
v-model="listQuery.search"
|
||||
placeholder="采购订单编号、供应商名称"
|
||||
|
|
@ -18,15 +22,17 @@
|
|||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索</el-button
|
||||
>
|
||||
搜索
|
||||
</el-button>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>重置</el-button
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card style="margin-top: 2px">
|
||||
|
|
@ -41,14 +47,13 @@
|
|||
height="100"
|
||||
v-el-height-adaptive-table="{ bottomOffset: 43 }"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="采购订单编号">
|
||||
<template slot-scope="scope">{{ scope.row.number }}</template>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="采购订单编号" prop="number">
|
||||
</el-table-column>
|
||||
<el-table-column label="供应商">
|
||||
<template slot-scope="scope" v-if="scope.row.vendor_">{{
|
||||
scope.row.vendor_.name
|
||||
}}</template>
|
||||
<template slot-scope="scope" v-if="scope.row.vendor_">
|
||||
{{scope.row.vendor_.name}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核情况" width="150">
|
||||
<template slot-scope="scope">
|
||||
|
|
@ -56,38 +61,38 @@
|
|||
<el-tag v-else-if="scope.row.is_audited == true">已审核</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间">
|
||||
<template slot-scope="scope">{{ scope.row.create_time }}</template>
|
||||
<el-table-column label="创建时间" prop="create_time">
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="220px">
|
||||
<template slot-scope="scope">
|
||||
<el-link
|
||||
v-if="checkPermission(['vendor_update'])"
|
||||
v-if="checkPermission(['puorder_update'])"
|
||||
type="primary"
|
||||
@click="handlePuOrderItem(scope)"
|
||||
>订单项</el-link
|
||||
>
|
||||
订单项
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="
|
||||
checkPermission(['vendor_update']) &&
|
||||
scope.row.is_audited == false
|
||||
"
|
||||
v-if="checkPermission(['puorder_hear']) &&scope.row.is_audited == false"
|
||||
type="primary"
|
||||
@click="handleAudit(scope)"
|
||||
>审核</el-link
|
||||
>
|
||||
审核
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['vendor_update'])"
|
||||
v-if="checkPermission(['puorder_update'])"
|
||||
type="primary"
|
||||
@click="handleEdit(scope)"
|
||||
>编辑</el-link
|
||||
>
|
||||
编辑
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['vendor_delete'])"
|
||||
v-if="checkPermission(['puorder_delete'])"
|
||||
type="danger"
|
||||
@click="handleDelete(scope)"
|
||||
>删除</el-link
|
||||
>
|
||||
删除
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -111,13 +116,13 @@
|
|||
:rules="rule1"
|
||||
>
|
||||
<el-form-item label="订单编号" prop="number">
|
||||
<el-input v-model="puorder.number" placeholder="订单编号" />
|
||||
<el-input v-model="puorder.number" placeholder="订单编号"/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="供应商" prop="vendor">
|
||||
<el-select
|
||||
style="width: 100%"
|
||||
v-model="puorder.vendor"
|
||||
style="width: 100%"
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option
|
||||
|
|
@ -138,9 +143,9 @@
|
|||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { getpVendorList } from "@/api/vendor";
|
||||
import { getUserList } from "@/api/user";
|
||||
import {
|
||||
import {getpVendorList} from "@/api/vendor";
|
||||
import {getUserList} from "@/api/user";
|
||||
import {
|
||||
getPuorderList,
|
||||
createPuorder,
|
||||
updatePuorder,
|
||||
|
|
@ -148,16 +153,16 @@ import {
|
|||
createPuorderAudit,
|
||||
createPuorderItem,
|
||||
deletePuorderItem,
|
||||
} from "@/api/pum";
|
||||
import checkPermission from "@/utils/permission";
|
||||
} from "@/api/pum";
|
||||
import checkPermission from "@/utils/permission";
|
||||
|
||||
import { genTree } from "@/utils";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
const defaultpuorder = {
|
||||
import {genTree} from "@/utils";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
const defaultpuorder = {
|
||||
number: "",
|
||||
};
|
||||
export default {
|
||||
components: { Pagination },
|
||||
};
|
||||
export default {
|
||||
components: {Pagination},
|
||||
data() {
|
||||
return {
|
||||
puorder: defaultpuorder,
|
||||
|
|
@ -173,9 +178,9 @@ export default {
|
|||
dialogVisible: false,
|
||||
dialogType: "new",
|
||||
rule1: {
|
||||
number: [{ required: true, message: "请输入", trigger: "blur" }],
|
||||
number: [{required: true, message: "请输入", trigger: "blur"}],
|
||||
vendor: [
|
||||
{ required: true, message: "请选择供应商", trigger: "change" },
|
||||
{required: true, message: "请选择供应商", trigger: "change"},
|
||||
],
|
||||
},
|
||||
};
|
||||
|
|
@ -200,7 +205,7 @@ export default {
|
|||
},
|
||||
//供应商列表
|
||||
getVendorList() {
|
||||
getpVendorList({ page: 0 }).then((response) => {
|
||||
getpVendorList({page: 0}).then((response) => {
|
||||
if (response.data) {
|
||||
this.vendorList = response.data;
|
||||
}
|
||||
|
|
@ -277,7 +282,7 @@ export default {
|
|||
});
|
||||
},
|
||||
handlePuOrderItem(scope) {
|
||||
this.$router.push({ name: "puorderitem", params: { id: scope.row.id } });
|
||||
this.$router.push({name: "puorderitem", params: {id: scope.row.id}});
|
||||
},
|
||||
handleAudit(scope) {
|
||||
|
||||
|
|
@ -290,5 +295,5 @@ export default {
|
|||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,12 @@
|
|||
<div class="app-container">
|
||||
<el-card>
|
||||
<div>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">
|
||||
<el-button
|
||||
v-if="checkPermission(['vendor_create'])"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
@click="handleCreate"
|
||||
>
|
||||
新增供应商
|
||||
</el-button>
|
||||
<el-input
|
||||
|
|
@ -43,27 +48,19 @@
|
|||
v-el-height-adaptive-table="{bottomOffset: 50}"
|
||||
>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="供应商名">
|
||||
<template slot-scope="scope">{{ scope.row.name }}</template>
|
||||
<el-table-column label="供应商名" prop="name">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="联系人">
|
||||
<template slot-scope="scope">{{ scope.row.contact }}</template>
|
||||
<el-table-column label="联系人" prop="contact">
|
||||
</el-table-column>
|
||||
<el-table-column label="联系电话">
|
||||
<template slot-scope="scope">{{ scope.row.contact_phone }}</template>
|
||||
<el-table-column label="联系电话" prop="contact_phone">
|
||||
</el-table-column>
|
||||
<el-table-column label="地址" min-width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">{{ scope.row.address }}</template>
|
||||
<el-table-column label="地址" prop="address" min-width="120" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column label="供应物料">
|
||||
<template slot-scope="scope">{{ scope.row.material }}</template>
|
||||
<el-table-column label="供应物料" prop="material">
|
||||
</el-table-column>
|
||||
<el-table-column label="备注">
|
||||
<template slot-scope="scope">{{ scope.row.description }}</template>
|
||||
<el-table-column label="备注" prop="description">
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" width="160">
|
||||
<template slot-scope="scope">{{ scope.row.create_time }}</template>
|
||||
<el-table-column label="创建时间" prop="create_time" width="160">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
|
|
@ -124,9 +121,9 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="备注" prop="description">
|
||||
<el-input
|
||||
v-model="vendor.description"
|
||||
type="textarea"
|
||||
:rows="4"
|
||||
v-model="vendor.description"
|
||||
placeholder="备注"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -140,10 +137,9 @@
|
|||
</template>
|
||||
<script>
|
||||
import {getpVendorList, createVendor, updateVendor, deleteVendor} from "@/api/vendor";
|
||||
import {getUserList} from "@/api/user";
|
||||
// import {getUserList} from "@/api/user";
|
||||
import checkPermission from "@/utils/permission";
|
||||
|
||||
import {genTree} from "@/utils";
|
||||
// import {genTree} from "@/utils";
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
const defaultvendor = {
|
||||
name: "",
|
||||
|
|
@ -205,13 +201,15 @@
|
|||
this.listQuery.page = 1;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
resetFilter() {
|
||||
this.listQuery = {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
}
|
||||
};
|
||||
this.getList();
|
||||
},
|
||||
|
||||
handleCreate() {
|
||||
this.vendor = Object.assign({}, defaultvendor);
|
||||
this.dialogType = "new";
|
||||
|
|
@ -229,6 +227,7 @@
|
|||
this.$refs["Form"].clearValidate();
|
||||
});
|
||||
},
|
||||
|
||||
handleDelete(scope) {
|
||||
this.$confirm("确认删除?", "警告", {
|
||||
confirmButtonText: "确认",
|
||||
|
|
@ -241,7 +240,7 @@
|
|||
this.$message.success("成功");
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err);
|
||||
this.$message.error(err);
|
||||
});
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,14 @@
|
|||
<div class="app-container">
|
||||
<el-card>
|
||||
<div>
|
||||
<el-button
|
||||
v-if="checkPermission(['workflow_create'])"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
@click="handleCreate"
|
||||
>
|
||||
新增
|
||||
</el-button>
|
||||
<el-input
|
||||
v-model="listQuery.search"
|
||||
placeholder="名称"
|
||||
|
|
@ -14,18 +22,17 @@
|
|||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索</el-button
|
||||
>
|
||||
搜索
|
||||
</el-button>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>重置</el-button
|
||||
>
|
||||
</div>
|
||||
<div style="margin-top: 2px">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
|
||||
重置
|
||||
</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card style="margin-top: 2px">
|
||||
|
|
@ -38,20 +45,17 @@
|
|||
highlight-current-row
|
||||
v-el-height-adaptive-table="{bottomOffset: 50}"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="名称">
|
||||
<template slot-scope="scope">{{ scope.row.name }}</template>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="名称" prop="name">
|
||||
</el-table-column>
|
||||
<el-table-column label="描述">
|
||||
<template slot-scope="scope">{{ scope.row.description }}</template>
|
||||
<el-table-column label="描述" prop="description">
|
||||
</el-table-column>
|
||||
<el-table-column label="工单查看权限校验">
|
||||
<template slot-scope="scope">
|
||||
{{ !!(scope.row.view_permission_check)?'是':'否' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="180" label="创建时间">
|
||||
<template slot-scope="scope">{{ scope.row.create_time }}</template>
|
||||
<el-table-column width="180" prop="create_time" label="创建时间">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
|
|
@ -62,24 +66,36 @@
|
|||
<el-link
|
||||
v-if="checkPermission(['workflow_update'])"
|
||||
@click="handlecfgt(scope)"
|
||||
>配置</el-link>
|
||||
>
|
||||
配置
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['workflow_update'])"
|
||||
@click="handleEdit(scope)"
|
||||
>编辑</el-link>
|
||||
>
|
||||
编辑
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['workflow_delete'])"
|
||||
type="danger"
|
||||
@click="handleDelete(scope)"
|
||||
>删除</el-link>
|
||||
>
|
||||
删除
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['workflow_update'])"
|
||||
type="primary"
|
||||
@click="handleTicket(scope)"
|
||||
>查看工单</el-link>
|
||||
>
|
||||
查看工单
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="checkPermission(['workflow_update'])"
|
||||
type="primary"
|
||||
@click="handleWatch(scope)"
|
||||
>查看流程图</el-link>
|
||||
>
|
||||
查看流程图
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -116,18 +132,19 @@
|
|||
:model="workflow"
|
||||
label-width="100px"
|
||||
label-position="right"
|
||||
:rules="rule1">
|
||||
:rules="rule1"
|
||||
>
|
||||
<el-form-item label="名称" prop="name">
|
||||
<el-input v-model="workflow.name" placeholder="名称" />
|
||||
<el-input v-model="workflow.name" placeholder="名称"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="流水号前缀">
|
||||
<el-input v-model="workflow.sn_prefix " placeholder="流水号前缀" />
|
||||
<el-input v-model="workflow.sn_prefix " placeholder="流水号前缀"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="描述" prop="description">
|
||||
<el-input
|
||||
v-model="workflow.description"
|
||||
type="textarea"
|
||||
:rows="4"
|
||||
v-model="workflow.description"
|
||||
placeholder="描述"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -147,10 +164,10 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标题模板" prop="title_template">
|
||||
<el-input v-model="workflow.title_template" placeholder="你有一个待办工单:{title}" />
|
||||
<el-input v-model="workflow.title_template" placeholder="你有一个待办工单:{title}"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="内容模板" prop="content_template">
|
||||
<el-input v-model="workflow.content_template" placeholder="标题:{title}, 创建时间:{create_time}" />
|
||||
<el-input v-model="workflow.content_template" placeholder="标题:{title}, 创建时间:{create_time}"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="text-align: right">
|
||||
|
|
@ -162,34 +179,43 @@
|
|||
</template>
|
||||
<script src="https://d3js.org/d3.v4.min.js"></script>
|
||||
<script>
|
||||
import { getWfTransitionList,getWorkflowList, createWorkflow,updateWorkflow,deleteWorkflow,getWfCustomfieldList,getWfStateList } from "@/api/workflow";
|
||||
import {
|
||||
getWfTransitionList,
|
||||
getWorkflowList,
|
||||
createWorkflow,
|
||||
updateWorkflow,
|
||||
deleteWorkflow,
|
||||
getWfCustomfieldList,
|
||||
getWfStateList
|
||||
} from "@/api/workflow";
|
||||
import checkPermission from "@/utils/permission";
|
||||
// import vueJsonEditor from 'vue-json-editor'
|
||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||
import dagreD3 from 'dagre-d3'
|
||||
import * as d3 from 'd3'
|
||||
const defaultworkflow = {
|
||||
|
||||
const defaultworkflow = {
|
||||
name: "",
|
||||
number: "",
|
||||
};
|
||||
export default {
|
||||
components: { Pagination },
|
||||
};
|
||||
export default {
|
||||
components: {Pagination},
|
||||
data() {
|
||||
return {
|
||||
// workflow: defaultworkflow,
|
||||
workflow:{
|
||||
name:'',
|
||||
sn_prefix:'',
|
||||
description:'',
|
||||
view_permission_check:'',
|
||||
display_form_str:'',
|
||||
title_template:'',
|
||||
content_template:'',
|
||||
workflow: {
|
||||
name: '',
|
||||
sn_prefix: '',
|
||||
description: '',
|
||||
view_permission_check: '',
|
||||
display_form_str: '',
|
||||
title_template: '',
|
||||
content_template: '',
|
||||
},
|
||||
limitedWatch:false,
|
||||
view_permission_check:false,
|
||||
hasJsonFlag:true, // json是否验证通过
|
||||
hasJsonFlag1:true, // json是否验证通过
|
||||
limitedWatch: false,
|
||||
view_permission_check: false,
|
||||
hasJsonFlag: true, // json是否验证通过
|
||||
hasJsonFlag1: true, // json是否验证通过
|
||||
workflowList: {
|
||||
count: 0,
|
||||
},
|
||||
|
|
@ -197,17 +223,17 @@ export default {
|
|||
page: 1,
|
||||
page_size: 20,
|
||||
},
|
||||
choiceOption:[],
|
||||
display_form_str:[],
|
||||
limit_expression:[],
|
||||
choiceOption: [],
|
||||
display_form_str: [],
|
||||
limit_expression: [],
|
||||
listLoading: true,
|
||||
dialogVisible: false,
|
||||
dialogType: "new",
|
||||
watchedName:'',
|
||||
watchedCreateTime:'',
|
||||
watchedName: '',
|
||||
watchedCreateTime: '',
|
||||
rule1: {
|
||||
name: [{ required: true, message: "请输入", trigger: "blur" }],
|
||||
description: [{ required: true, message: "请输入", trigger: "blur" }]
|
||||
name: [{required: true, message: "请输入", trigger: "blur"}],
|
||||
description: [{required: true, message: "请输入", trigger: "blur"}]
|
||||
},
|
||||
};
|
||||
},
|
||||
|
|
@ -227,10 +253,12 @@ export default {
|
|||
this.listLoading = false;
|
||||
});
|
||||
},
|
||||
|
||||
handleFilter() {
|
||||
this.listQuery.page = 1;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
resetFilter() {
|
||||
this.listQuery = {
|
||||
page: 1,
|
||||
|
|
@ -238,6 +266,7 @@ export default {
|
|||
}
|
||||
this.getList();
|
||||
},
|
||||
|
||||
handleCreate() {
|
||||
this.workflow = Object.assign({}, defaultworkflow);
|
||||
this.dialogType = "new";
|
||||
|
|
@ -246,6 +275,7 @@ export default {
|
|||
this.$refs["Form"].clearValidate();
|
||||
});
|
||||
},
|
||||
|
||||
handleEdit(scope) {
|
||||
this.workflow = Object.assign({}, scope.row); // copy obj
|
||||
this.dialogType = "edit";
|
||||
|
|
@ -257,13 +287,13 @@ export default {
|
|||
if (response.data) {
|
||||
this.choiceOption = response.data;
|
||||
}
|
||||
|
||||
});
|
||||
},
|
||||
handlecfgt(scope)
|
||||
{
|
||||
this.$router.push({name:"configuration",params:{workflow:scope.row.id}})
|
||||
|
||||
handlecfgt(scope) {
|
||||
this.$router.push({name: "configuration", params: {workflow: scope.row.id}})
|
||||
},
|
||||
|
||||
handleDelete(scope) {
|
||||
this.$confirm("确认删除?", "警告", {
|
||||
confirmButtonText: "确认",
|
||||
|
|
@ -279,13 +309,13 @@ export default {
|
|||
console.error(err);
|
||||
});
|
||||
},
|
||||
handleTicket(scope){
|
||||
this.$router.push({name:"workFlowTickets",params:{workflow:scope.row.id}})
|
||||
},
|
||||
async confirm(form) {
|
||||
debugger;
|
||||
console.log(this.workflow.display_form_str)
|
||||
|
||||
handleTicket(scope) {
|
||||
this.$router.push({name: "workFlowTickets", params: {workflow: scope.row.id}})
|
||||
},
|
||||
|
||||
async confirm(form) {
|
||||
// console.log(this.workflow.display_form_str)
|
||||
this.$refs[form].validate((valid) => {
|
||||
if (valid) {
|
||||
const isEdit = this.dialogType === "edit";
|
||||
|
|
@ -315,13 +345,14 @@ export default {
|
|||
}
|
||||
});
|
||||
},
|
||||
handleWatch(scope){
|
||||
|
||||
handleWatch(scope) {
|
||||
let that = this;
|
||||
let workFlow = scope.row.id;
|
||||
that.watchedName = scope.row.name;
|
||||
that.watchedCreateTime = scope.row.create_time;
|
||||
that.limitedWatch = true;
|
||||
that.$nextTick(()=>{
|
||||
that.$nextTick(() => {
|
||||
var g = new dagreD3.graphlib.Graph().setGraph({
|
||||
rankdir: 'DL',
|
||||
nodesep: 100,
|
||||
|
|
@ -345,34 +376,38 @@ export default {
|
|||
//节点样式
|
||||
style: "fill:#fff;stroke:#000",
|
||||
labelStyle: "fill:#000;",
|
||||
rx :5,//矩形节点圆角度
|
||||
ry :5
|
||||
rx: 5,//矩形节点圆角度
|
||||
ry: 5
|
||||
});
|
||||
});
|
||||
g.nodes().forEach(function (v) {
|
||||
console.log("Node " + v + ": " + JSON.stringify(g.node(v)));
|
||||
});
|
||||
//获取流转得到线 链接关系
|
||||
getWfTransitionList(workFlow).then((res)=>{
|
||||
if(res.data){
|
||||
getWfTransitionList(workFlow).then((res) => {
|
||||
if (res.data) {
|
||||
let transitionList = res.data;
|
||||
transitionList.forEach((transition0)=>{
|
||||
if (transition0.condition_expression.length>0){
|
||||
transitionList.forEach((transition0) => {
|
||||
if (transition0.condition_expression.length > 0) {
|
||||
debugger;
|
||||
g.setNode(transition0.source_state_.id+100000, {label: "条件表达式",style: "stroke: #000;fill: #afa", shape: "diamond"});
|
||||
g.setEdge(transition0.source_state_.id, transition0.source_state_.id+100000, {
|
||||
g.setNode(transition0.source_state_.id + 100000, {
|
||||
label: "条件表达式",
|
||||
style: "stroke: #000;fill: #afa",
|
||||
shape: "diamond"
|
||||
});
|
||||
g.setEdge(transition0.source_state_.id, transition0.source_state_.id + 100000, {
|
||||
// 边标签
|
||||
label: transition0.name,
|
||||
style: "fill:#ffffff;stroke:#c0c1c3;stroke-width:1.5px"
|
||||
});
|
||||
let condition_expression = transition0.condition_expression;
|
||||
condition_expression.forEach(condition_expression0=>{
|
||||
g.setEdge(transition0.source_state_.id+100000, condition_expression0.target_state, {
|
||||
condition_expression.forEach(condition_expression0 => {
|
||||
g.setEdge(transition0.source_state_.id + 100000, condition_expression0.target_state, {
|
||||
label: condition_expression0.label,
|
||||
style: "fill:#ffffff;stroke:#c0c1c3;stroke-width:1.5px"
|
||||
})
|
||||
})
|
||||
}else{
|
||||
} else {
|
||||
g.setEdge(transition0.source_state_.id, transition0.destination_state_.id, {
|
||||
// 边标签
|
||||
label: transition0.name,
|
||||
|
|
@ -381,7 +416,7 @@ export default {
|
|||
});
|
||||
}
|
||||
})
|
||||
g.nodes().length-1
|
||||
g.nodes().length - 1
|
||||
g.nodes().forEach(function (v) {
|
||||
console.log("Node " + v + ": " + JSON.stringify(g.node(v)));
|
||||
});
|
||||
|
|
@ -392,7 +427,8 @@ export default {
|
|||
let svgGroup = svg.append('g');
|
||||
// 在绘图容器上运行渲染器生成流程图.
|
||||
render(d3.select("svg g"), g);
|
||||
}else{}
|
||||
} else {
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
|
@ -400,15 +436,17 @@ export default {
|
|||
|
||||
})
|
||||
},
|
||||
closeMark(){
|
||||
|
||||
closeMark() {
|
||||
this.limitedWatch = false;
|
||||
},
|
||||
onJsonChange (value) {
|
||||
|
||||
onJsonChange(value) {
|
||||
// console.log('更改value:', value);
|
||||
// 实时保存
|
||||
this.onJsonSave(value)
|
||||
},
|
||||
onJsonSave (value) {
|
||||
onJsonSave(value) {
|
||||
// console.log('保存value:', value);
|
||||
this.limit_expression = value
|
||||
this.hasJsonFlag = true
|
||||
|
|
@ -416,20 +454,21 @@ export default {
|
|||
onError(value) {
|
||||
this.hasJsonFlag = false
|
||||
},
|
||||
onJsonChange1 (value) {
|
||||
onJsonChange1(value) {
|
||||
// 实时保存
|
||||
this.onJsonSave1(value)
|
||||
},
|
||||
onJsonSave1 (value) {
|
||||
onJsonSave1(value) {
|
||||
this.display_form_str = value
|
||||
this.hasJsonFlag1 = true
|
||||
},
|
||||
onError1(value) {
|
||||
this.hasJsonFlag1 = false
|
||||
},
|
||||
|
||||
// 检查json
|
||||
checkJson(){
|
||||
if (this.hasJsonFlag == false){
|
||||
checkJson() {
|
||||
if (this.hasJsonFlag == false) {
|
||||
// alert("限制表达式json验证失败")
|
||||
return false
|
||||
} else {
|
||||
|
|
@ -437,9 +476,10 @@ export default {
|
|||
return true
|
||||
}
|
||||
},
|
||||
|
||||
// 检查json
|
||||
checkJson2(){
|
||||
if (this.hasJsonFlag1 == false){
|
||||
checkJson2() {
|
||||
if (this.hasJsonFlag1 == false) {
|
||||
// alert("展现表单字段json验证失败")
|
||||
return false
|
||||
} else {
|
||||
|
|
@ -448,23 +488,26 @@ export default {
|
|||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
::-webkit-scrollbar {
|
||||
width: 15px;
|
||||
}
|
||||
::-webkit-scrollbar-track{
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.2);
|
||||
|
||||
::-webkit-scrollbar-track {
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .2);
|
||||
background-color: #fefefe;
|
||||
border-radius: 7px;
|
||||
}
|
||||
::-webkit-scrollbar-thumb{
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
border-radius: 7px;
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.5);
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .5);
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
.svgMark{
|
||||
|
||||
.svgMark {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: fixed;
|
||||
|
|
@ -475,9 +518,10 @@ export default {
|
|||
overflow: auto;
|
||||
margin: 0;
|
||||
z-index: 2000;
|
||||
background: rgba(0,0,0,.3);
|
||||
background: rgba(0, 0, 0, .3);
|
||||
}
|
||||
.svgWrapper{
|
||||
|
||||
.svgWrapper {
|
||||
background: #fff;
|
||||
width: 800px;
|
||||
margin: 10vh auto 0;
|
||||
|
|
@ -486,30 +530,36 @@ export default {
|
|||
max-height: 80vh;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
.svgItem{
|
||||
padding: 20px 40px 0 ;
|
||||
|
||||
.svgItem {
|
||||
padding: 20px 40px 0;
|
||||
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
|
||||
font-size: 18px;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
svg {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.node rect {
|
||||
stroke: #606266;
|
||||
fill: #fff;
|
||||
}
|
||||
|
||||
.edgePath path {
|
||||
stroke: #606266;
|
||||
fill: #333;
|
||||
stroke-width: 1.5px;
|
||||
}
|
||||
|
||||
g.conditions > rect {
|
||||
fill: #00ffd0;
|
||||
stroke: #000;
|
||||
}
|
||||
.el-icon-close{
|
||||
|
||||
.el-icon-close {
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue