Skip to content

M
mes-ui
Commit e8ca494d authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'ting-p' into product

parents faa5b1e7 d7c7ed19
Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 74 deletions
pages/materiel/classification/add.vue
View file @ e8ca494d
......@@ -29,56 +29,70 @@
</FormItem>
</Col>
<Col :span="24">
<h4>扩展属性</h4>
<Table border :columns="columns" :data="checkList" height="300">
<template slot-scope="{ row, index }" slot="title">
<div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
<Input
v-if="row.fieldType==3"
v-model="row.title"
placeholder="请输入"
@on-blur="setRow(row,index)"
/>
</template>
<template slot-scope="{ row, index }" slot="note">
<div v-if="row.fieldType==1">{{row.note}}</div>
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
</template>
<template slot-scope="{ row, index }" slot="dataType">
<state
v-if="row.fieldType==1"
code="materail.category.dataType"
:value="row.dataType"
type="text"
></state>
<Dictionary
v-else
@on-change="setRow(row,index)"
v-model="row.dataType"
code="materail.category.dataType"
type="select"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
</template>
<!-- <template slot-scope="{ row, index }" slot="result">
<Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" />
</template>-->
<template slot-scope="{ row, index }" slot="required">
<Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
</template>
<template slot-scope="{ row, index }" slot="isUnique">
<Checkbox v-model="row.isUnique" @on-change="setRow(row,index)"></Checkbox>
</template>
<template
slot-scope="{ row, index }"
slot="action"
v-if="row.fieldType==2||row.fieldType==3"
>
<a @click="remove(index,row)" style="color:#FF7A8B">删除</a>
</template>
</Table>
<Button type="dashed" long @click="addNew" class="mt10">新增属性</Button>
<h4>扩展属性</h4>
<Table border :columns="columns" :data="checkList" height="300">
<template slot-scope="{ row, index }" slot="title">
<div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
<Input
v-if="row.fieldType==3"
v-model="row.title"
placeholder="请输入"
@on-blur="setRow(row,index)"
/>
</template>
<template slot-scope="{ row, index }" slot="note">
<div v-if="row.fieldType==1">{{row.note}}</div>
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
</template>
<template slot-scope="{ row, index }" slot="dataType">
<state
v-if="row.fieldType==1"
code="materail.category.dataType"
:value="row.dataType"
type="text"
></state>
<Dictionary
v-else
@on-change="setRow(row,index)"
v-model="row.dataType"
code="materail.category.dataType"
type="select"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
</template>
<template slot-scope="{ row, index }" slot="dataType">
<!-- <state
v-if="row.fieldType==1"
code="materail.main.company"
:value="row.company"
type="text"
></state> -->
<Dictionary
@on-change="setRow(row,index)"
v-model="row.company"
code="materail.main.company"
type="select"
:value="row.company"
:key="row.company"
></Dictionary>
</template>
<template slot-scope="{ row, index }" slot="required">
<Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
</template>
<template slot-scope="{ row, index }" slot="isUnique">
<Checkbox v-model="row.isUnique" @on-change="setRow(row,index)"></Checkbox>
</template>
<template
slot-scope="{ row, index }"
slot="action"
v-if="row.fieldType==2||row.fieldType==3"
>
<a @click="remove(index,row)" style="color:#FF7A8B">删除</a>
</template>
</Table>
<Button type="dashed" long @click="addNew" class="mt10">新增属性</Button>
</Col>
<Col :span="24" class="tr mt10">
<FormItem>
......@@ -129,12 +143,12 @@ export default {
align: "center",
slot: "dataType"
},
// {
// title: "是否显示",
// key: "result",
// align: "center",
// slot: "result"
// },
{
title: "单位",
key: "company",
align: "center",
slot: "company"
},
{
title: "是否必填",
key: "required",
......@@ -181,7 +195,11 @@ export default {
}
];
Api.listTable({ conditions: conditions ,sortBy:'id',isDesc:false}).then(r => {
Api.listTable({
conditions: conditions,
sortBy: "id",
isDesc: false
}).then(r => {
if (r.result) {
var arr = r.result;
this.checkList = arr.filter(function(item) {
......
pages/materiel/classification/index.vue
View file @ e8ca494d
......@@ -122,6 +122,7 @@ export default {
methods: {
clickItem(val) {
this.nodeInfo.codeRuleId = val;
this.model8 = val;
this.loadTree(this.nodeInfo.codeRuleId);
this.cityList.forEach(e => {
if (val == e.id) {
......
pages/materiel/masterData/api.js
View file @ e8ca494d
......@@ -26,4 +26,7 @@ export default {
categoryList(params){
return Api.post(`${systemUrl}/actionlog/list`,params);
},
batchstart(params) {
return Api.post(`${workflowUrl}/instance/batchstart`, params); //送审
},
}
\ No newline at end of file
pages/materiel/masterData/details.vue
View file @ e8ca494d
......@@ -73,7 +73,7 @@ export default {
entity: {},
easySearch: {
keys: { op: "title", value: "" },
table: { op: "Equal", value: "material" },
tableTitle: { op: "Equal", value: "material" },
tId: {
op: "Equal",
value: this.$route.query.id
......
pages/materiel/masterData/masterData.vue
View file @ e8ca494d
......@@ -8,6 +8,7 @@
:initsearch="sets"
:high="false"
:height="tableHeight"
@on-selection-change="onSelect"
>
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
......@@ -24,19 +25,29 @@
</FormItem>
</Form>
</template>
<!-- <template slot="searchForm">
<Search />
</template>-->
<template slot="buttons">
<Button type="primary" @click="add">新增</Button>
</template>
<template slot="batch">
<Button type="primary" @click="modalSchedule">批量送审</Button>
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1000" footer-hide :mask-closable="false">
<Modal
v-model="modal"
:title="title"
width="1000"
footer-hide
:mask-closable="false"
:fullscreen="fullscreen"
>
<component
:is="detail"
:eid="curId"
:rowsTable="rowsTable"
:nodeInfo="nodeInfo"
@on-close="cancel"
@on-cancel="cancel"
@on-ok="ok"
ref="chlidren"
/>
......@@ -59,6 +70,9 @@ export default {
modal: false,
title: "新增",
curId: 0,
selectRows: [],
rowsTable: [],
fullscreen: false,
detail: null,
sets: v => {
v.categoryId = this.nodeInfo.categoryId;
......@@ -72,12 +86,11 @@ export default {
}
},
columns: [
// {
// key: "index",
// title: "#",
// align: "left",
// width: 60
// },
{
type: "selection",
width: 70,
align: "center"
},
{
key: "code",
title: "编码",
......@@ -177,6 +190,18 @@ export default {
};
},
methods: {
onSelect(a, b) {
//批量选择
this.selectRows = a;
},
modalSchedule() {
this.fullscreen = true;
this.rowsTable = this.selectRows;
this.title = "物料送审";
this.curId = 0;
this.detail = () => import("./submit");
this.modal = true;
},
search() {
this.$refs.grid.reload(this.easySearch);
},
......@@ -227,6 +252,14 @@ export default {
}
});
},
send(row) {
this.fullscreen = true;
this.curId = row.id;
this.title = "物料送审";
this.detail = () => import("./submit");
this.rowsTable = [];
this.modal = true;
},
ok() {
this.$refs.grid.reload(this.easySearch);
this.modal = false;
......@@ -235,8 +268,7 @@ export default {
cancel() {
this.curId = 0;
this.modal = false;
},
send(row) {}
}
},
watch: {
nodeInfo: {
......
pages/materiel/masterData/submit.vue 0 → 100644
View file @ e8ca494d
<template>
<div class="submit" :style="{ height: divHeight }">
<div class="body-procee">
<div class="new-detail" v-if="osrOneList1">
<Row>
<Filed :span="8" name="编码：">{{entity.code}}</Filed>
<Filed :span="8" name="名称：">{{entity.name}}</Filed>
<Filed :span="8" name="状态：">
<State code="materail.category.status" :value="parseInt(entity.status)" />
</Filed>
<Filed :span="8" name="版本：">{{entity.version}}</Filed>
<Filed :span="8" name="描述：">{{entity.description}}</Filed>
</Row>
</div>
<Table
:loading="loading"
border
:columns="columns"
:data="dataList"
class="tableCommon"
v-if="osrOneList2"
></Table>
<Process ref="userProcess" schemaIdVal="b6303ddc-8b5e-40a3-a51b-294657d1d913" />
<div slot="footer">
<Button @click="modalInfo">取消</Button>
<Button type="primary" @click="upSave">确定送审</Button>
</div>
<!-- 信息提示 -->
<Modal
v-model="ModalInfo"
title="信息提示"
width="600"
:mask-closable="false"
:scrollable="true"
ok-text="确定"
cancel-text="取消"
>
{{ metCodesStrTxt }}
<div slot="footer">
<Button @click="ModalInfo = false">取消</Button>
<Button type="primary" @click="modalInfoOk">确定</Button>
</div>
</Modal>
</div>
</div>
</template>
<script>
import Process from "@/components/orderOperator/process";
import Api from "./api";
export default {
name: "orderSendReview",
components: {
Process
},
props: ["eid", "rowsTable"],
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
data() {
return {
rowId: "",
entity: {},
metCodesStrTxt: "",
results: {},
loading: false,
ModalInfo: false,
divHeight: "300px",
osrOneList1: false, //一条数据显示
osrOneList2: false,
info: true,
ruleValidate: {},
orderSearchForm: {
reviewUser: "" //订单名称
},
dataList: [],
dataListRetrun: [], //确定后返回数据
dataListRetrunNew: {
schemaId: "b6303ddc-8b5e-40a3-a51b-294657d1d913", //合格证流程id：schemaId
idList: [], //合格证id List
codeList: [], //合格证编号List
operatorIdList: [] //操作员id
}, //确定后返回数据
columns: [
{
key: "code",
title: "编码",
align: "left",
render: (h, params) => {
return h(
"a",
{
props: {},
on: {
click: () => this.details(params.row.id)
}
},
params.row.code
);
}
},
{
key: "name",
title: "名称",
align: "left"
},
{
key: "status",
title: "状态",
align: "left",
render: (h, params) => {
return h("state", {
props: {
code: "materail.category.status",
type: "text",
value: params.row.status + ""
}
});
}
},
{
key: "version",
title: "版本",
align: "left"
},
{
key: "description",
title: "描述",
align: "left"
}
]
};
},
created() {
var theight = window.innerHeight - 120 + "px";
this.divHeight = theight;
if (this.eid !== 0) {
this.osrOneList1 = true;
this.osrOneList2 = false;
this.getDetails(this.eid);
} else {
this.osrOneList1 = false;
this.osrOneList2 = true;
this.dataList = this.rowsTable;
}
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.divHeight = window.screenHeight - 120 + "px";
})();
};
},
methods: {
getDetails(v) {
Api.get({ id: v }).then(r => {
if (r.result) {
this.entity = r.result;
}
});
},
returnDataList() {
let ues = this.$refs.userProcess;
this.dataListRetrunNew.operatorIdList = ues.immutData;
alert(JSON.stringify(this.dataListRetrunNew));
// //返回审批数据
return this.dataListRetrunNew;
},
upSave() {
let codeList = [];
let idList = [];
idList.push(this.rowId);
codeList.push(this.entity.code);
if (this.eid !== 0) {
idList.push(this.rowId);
codeList.push(this.entity.code);
} else {
this.rowsTable.forEach(e => {
idList.push(e.id);
codeList.push(e.code);
});
}
this.dataListRetrunNew.idList = idList;
this.dataListRetrunNew.codeList = codeList;
let metCodesStr = JSON.stringify(codeList)
.replace("[", "")
.replace("]", "")
.replace(/\"/g, "");
this.ModalInfoStaut = "orderSendReview";
this.metCodesStrTxt = "确定物料 " + metCodesStr + "？";
this.ModalInfo = true;
alert(this.dataListRetrunNew.idList);
alert(this.dataListRetrunNew.codeList);
},
modalInfoOk() {
let ues = this.$refs.userProcess;
this.dataListRetrunNew.operatorIdList = ues.immutData;
Api.batchstart(this.dataListRetrunNew).then(r => {
if (r.success) {
this.ModalInfo = false;
this.$Message.success("送审成功");
this.$emit("on-close");
this.$emit("on-ok");
}
});
},
modalInfo() {
this.$emit("on-close");
}
}
};
</script>
<style lang="less">
.submit {
.body-procee {
width: 80%;
margin: 0 auto;
}
}
</style>
pages/resourceManagement/productionResources/index.vue
View file @ e8ca494d
......@@ -28,12 +28,12 @@
</RadioGroup>
</FormItem>
</Col>
<Col span="12">
<Col span="8">
<FormItem :label="l('capabilityValue')">
<InputNumber v-model="entity.capabilityValue"></InputNumber>
</FormItem>
</Col>
<Col span="4">
<Col span="8">
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
</FormItem>
......@@ -308,8 +308,6 @@ export default {
.form-row {
width: 600px;
margin-left: 50px;
margin-top: -45px;
.ivu-form-item-label {
color: #fff !important;
}
......
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