Skip to content

M
mes-ui
Commit bfc8afc1 authored by 何远江's avatar 何远江
Browse files
Options

页面样式调整

parent 130d00b5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 729 additions and 496 deletions
src/views/mes/dv/brandquotation/brandquotationApply.vue
View file @ bfc8afc1
......@@ -136,7 +136,11 @@
row-key="brandQuotationId"
default-expand-all
>
<el-table-column label="品牌报价单编码" width="180" prop="brandQuotationCode">
<el-table-column
label="品牌报价单编码"
width="140"
prop="brandQuotationCode"
>
<template slot-scope="scope">
<el-button
size="mini"
......@@ -149,12 +153,17 @@
</el-table-column>
<el-table-column
label="品牌报价名称"
width="180"
align="center"
prop="brandQuotationName"
:show-overflow-tooltip="true"
/>
<el-table-column label="金额" width="180" align="center" prop="amount" :formatter="r => this.formatMoney(r.amount)"/>
<el-table-column
label="金额"
width="120"
align="center"
prop="amount"
:formatter="(r) => this.formatMoney(r.amount)"
/>
<el-table-column
label="品牌名称"
width="120"
......@@ -169,12 +178,13 @@
prop="itemName"
:show-overflow-tooltip="true"
/>
<el-table-column label="工艺路线名称" align="center" prop="routeName">
<el-table-column show-overflow-tooltip label="工艺路线名称" align="center" prop="routeName">
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" />
<el-table-column
label="操作"
width="200px"
fixed="right"
align="center"
class-name="small-padding fixed-width"
>
......@@ -241,7 +251,13 @@ import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
//导入品牌报价js
import { listBrandQuotation, getBrandQuotation, delBrandQuotation, addBrandQuotation, updateBrandQuotation } from "@/api/mes/dv/brandquotation";
import {
listBrandQuotation,
getBrandQuotation,
delBrandQuotation,
addBrandQuotation,
updateBrandQuotation,
} from "@/api/mes/dv/brandquotation";
export default {
name: "PrototypeRequest",
......@@ -412,7 +428,9 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
this.$modal
.confirm('是否确认删除编号为"' + row.brandQuotationId + '"的品牌报价单？')
.confirm(
'是否确认删除编号为"' + row.brandQuotationId + '"的品牌报价单？'
)
.then(function () {
return delBrandQuotation(row.brandQuotationId);
})
......@@ -464,6 +482,5 @@ export default {
return;
},
},
};
</script>
src/views/mes/dv/brandquotation/brandquotationInfo.vue
View file @ bfc8afc1
<template>
<div class="form-page" v-loading="loading">
<div v-loading="loading">
<PageTitle>
{{ pageTitle }}
<!-- 申请按钮显示 -->
......@@ -24,9 +24,8 @@
label-width="100px"
>
<el-row>
<el-col :md="6" :sm="12" :xs="12">
<el-form-item prop="brandQuotationCode">
<template slot="label"> 编码 </template>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="编码" prop="brandQuotationCode">
<el-input
disabled
v-model="form.brandQuotationCode"
......@@ -35,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="名称" prop="brandQuotationName">
<el-input
v-model="form.brandQuotationName"
......@@ -43,53 +42,17 @@
></el-input>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="总金额" prop="amount">
<el-input-money
v-model="form.amount"
v-bind:disabled="form.brandQuotationId==0"
placeholder="新增时不可输入，请修改时操作"/>
v-bind:disabled="form.brandQuotationId == 0"
placeholder="新增时不可输入，请修改时操作"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item label="品牌" prop="brandCode">
<el-input v-model="form.brandName" readonly="readonly">
<el-button
slot="append"
icon="el-icon-search"
@click="handleBrandSelect"
placeholder="请选择品牌"
></el-button>
</el-input>
</el-form-item>
<BrandSelect
ref="brSelect"
@onSelected="onBrandSelected"
></BrandSelect>
</el-col> -->
<!-- <el-col :span="6">
<el-form-item label="品牌名称" prop="brandName">
<el-input v-model="form.brandName" readonly="readonly" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="品牌编码" prop="brandCode">
<el-input v-model="form.brandCode" readonly="readonly">
<el-button
slot="append"
icon="el-icon-search"
@click="handleBrandSelect"
:disabled="form.brandContactId"
></el-button>
</el-input>
</el-form-item>
<BrandSelect
ref="brSelect"
@onSelected="onBrandSelected"
></BrandSelect>
</el-col> -->
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="产品" prop="itemId">
<el-input
v-model="form.itemName"
......@@ -106,13 +69,17 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="品牌名称" prop="brandName">
<el-input v-model="form.brandName" placeholder="请先将所选产品绑定品牌" disabled/>
<el-input
v-model="form.brandName"
placeholder="请先将所选产品绑定品牌"
disabled
/>
</el-form-item>
</el-col>
<el-col :md="6" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工艺路线" prop="routeId">
<el-input
v-model="form.routeName"
......@@ -133,7 +100,7 @@
</el-col>
</el-row>
<el-row>
<el-col :md="24" :sm="12" :xs="12">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
......@@ -174,10 +141,22 @@ import {
// 导入品牌选择框
import BrandSelect from "@/components/brandSelect/single.vue";
//导入品牌报价js
import { listBrandQuotation, getBrandQuotation, delBrandQuotation, addBrandQuotation, updateBrandQuotation } from "@/api/mes/dv/brandquotation";
import {
listBrandQuotation,
getBrandQuotation,
delBrandQuotation,
addBrandQuotation,
updateBrandQuotation,
} from "@/api/mes/dv/brandquotation";
export default {
components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect, BrandSelect },
components: {
ProogingBom,
ProogingProcess,
ItemSelect,
RoutesProcessSelect,
BrandSelect,
},
dicts: [],
provide() {
return {
......@@ -205,9 +184,13 @@ export default {
// 表单校验
rules: {
brandId: [
{ required: true, message: "品牌不能为空,请先查验所选产品是否已绑定品牌", trigger: "blur" }
{
required: true,
message: "品牌不能为空,请先查验所选产品是否已绑定品牌",
trigger: "blur",
},
],
}
},
};
},
computed: {
......@@ -322,8 +305,11 @@ export default {
this.loading = false;
this.$modal.msgSuccess("提交成功！");
this.$nextTick(() => {
// 关闭页签
tabPlugins.closeOpenPage();
this.$router.replace({ path: "/mes/dv/brandquotation/query" });
});
})
.catch(() => {
this.loading = false;
......
src/views/mes/dv/brandquotation/components/ProogingProcess.vue
View file @ bfc8afc1
......@@ -15,12 +15,12 @@
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
width="300"
fixed="right"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetProd(row, $index)"
>
......@@ -42,7 +42,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
......
src/views/mes/order/purchase/index.vue
View file @ bfc8afc1
This diff is collapsed.
src/views/mes/pro/productiorequest/components/ProogingProcess.vue
View file @ bfc8afc1
......@@ -15,12 +15,12 @@
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
width="300"
fixed="right"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetProd(row, $index)"
>
......@@ -28,7 +28,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetQrindex(row, $index)"
>
......@@ -36,7 +35,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetTool(row, $index)"
>
......@@ -44,7 +42,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
......
src/views/mes/pro/productiorequest/requestApply.vue
View file @ bfc8afc1
......@@ -120,7 +120,11 @@
row-key="productionRequestId"
default-expand-all
>
<el-table-column label="量产申请单编码" prop="productionRequestCode">
<el-table-column
label="申请单编码"
width="120"
prop="productionRequestCode"
>
<template slot-scope="scope">
<el-button
size="mini"
......@@ -168,25 +172,43 @@
label="是否要鞋图"
align="center"
prop="isNeedShoeImg"
width="100"
:formatter="yesNoFmt"
/>
<el-table-column
label="是否附样品"
align="center"
width="100"
prop="isNeedPrototype"
:formatter="yesNoFmt"
/>
<el-table-column label="唯一码产品" align="center" prop="isUniqueCode"
:formatter="yesNoFmt"/>
<el-table-column label="不考虑型体配色" align="center" prop="isConsiderColor"
:formatter="yesNoFmt"/>
<el-table-column label="是否禁用" align="center" prop="isDisabled"
:formatter="yesNoFmt"/>
<el-table-column
label="唯一码产品"
align="center"
width="100"
prop="isUniqueCode"
:formatter="yesNoFmt"
/>
<el-table-column
label="不考虑型体配色"
align="center"
width="130"
prop="isConsiderColor"
:formatter="yesNoFmt"
/>
<el-table-column
label="是否禁用"
align="center"
width="80"
prop="isDisabled"
:formatter="yesNoFmt"
/>
/>
<el-table-column
label="申请单状态"
align="center"
width="100"
prop="prototypeRequestStatus"
>
<template slot-scope="scope">
......@@ -200,6 +222,7 @@
label="操作"
width="200px"
align="center"
fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
......@@ -221,14 +244,6 @@
v-hasPermi="['mes:pro:productionRequest:update']"
>通过</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:productionRequest:remove']"
>删除</el-button
>
<el-button
size="mini"
type="text"
......@@ -238,6 +253,14 @@
v-hasPermi="['mes:pro:productionRequest:edit']"
>生成制作单</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:productionRequest:remove']"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
......@@ -252,21 +275,21 @@
</template>
<script>
import {
import {
listProductionRequest,
getProductionRequest,
delProductionRequest,
addProductionRequest,
updateProductionRequest,
dofinish,
} from "@/api/mes/pro/productionRequest";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
} from "@/api/mes/pro/productionRequest";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
export default {
name: "ProductionRequest",
dicts: [
"sys_yes_no",
......@@ -411,7 +434,8 @@
this.reset();
const productionRequestId = row.productionRequestId || this.ids;
this.$router.push(
"/mes/pro/productiorequest/info?productionRequestId=" + productionRequestId
"/mes/pro/productiorequest/info?productionRequestId=" +
productionRequestId
);
// getproductionRequest(productionRequestId).then((response) => {
// this.form = response.data;
......@@ -425,7 +449,8 @@
this.reset();
const productionRequestId = row.productionRequestId || this.ids;
this.$router.push(
"/mes/pro/productiorequest/edit?productionRequestId=" + productionRequestId
"/mes/pro/productiorequest/edit?productionRequestId=" +
productionRequestId
);
// getProductionRequest(productionRequestId).then((response) => {
// // this.form = response.data;
......@@ -438,7 +463,9 @@
/** 删除按钮操作 */
handleDelete(row) {
this.$modal
.confirm('是否确认删除编号为"' + row.productionRequestId + '"的量产单？')
.confirm(
'是否确认删除编号为"' + row.productionRequestId + '"的量产单？'
)
.then(function () {
return delProductionRequest(row.productionRequestId);
})
......@@ -468,7 +495,7 @@
// 审批
handleFinish(row) {
row.productionRequestStatus = 1
row.productionRequestStatus = 1;
this.$modal
.confirm("确认通过样品申请单？一旦完成，此工单将无法继续修改")
.then(function () {
......@@ -480,11 +507,11 @@
})
.catch(() => {});
},
yesNoFmt(row, column, cellValue){
if(cellValue==1){
return '是';
}else{
return '否';
yesNoFmt(row, column, cellValue) {
if (cellValue == 1) {
return "是";
} else {
return "否";
}
},
// 生成制作单
......@@ -492,10 +519,11 @@
// 跳转到制作单界面
const prototypeRequestId = row.productionRequestId || this.ids;
this.$router.push(
"/mes/pro/productionMake/apply?productionRequestId=" + prototypeRequestId
"/mes/pro/productionMake/apply?productionRequestId=" +
prototypeRequestId
);
return;
},
},
};
};
</script>
src/views/mes/pro/prototypeMake/components/ProogingProcess.vue
View file @ bfc8afc1
......@@ -15,12 +15,12 @@
v-if="mode != 'info'"
label="操作"
align="center"
width="150"
width="300"
fixed="right"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetProd(row, $index)"
>
......@@ -28,7 +28,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetQrindex(row, $index)"
>
......@@ -36,7 +35,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="openSetTool(row, $index)"
>
......@@ -44,7 +42,6 @@
</el-button>
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
......@@ -59,7 +56,6 @@
ref="ProcessProdRef"
@updateItem="updateItem"
/>
/>
<ProcessQcindex
:process="currentRow"
ref="ProcessQcindexRef"
......
src/views/mes/pro/workorder/indexApply.vue
View file @ bfc8afc1
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="工单编码" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
......@@ -172,7 +179,8 @@
size="mini"
@click="handleImport"
v-hasPermi="['mes:pro:workorder:edit']"
>导入工单</el-button>
>导入工单</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
......@@ -180,7 +188,6 @@
></right-toolbar>
</el-row>
<!-- 用户导入对话框 -->
<el-dialog title="导入工单" :visible.sync="upload.open" width="400px">
<el-upload
......@@ -199,7 +206,13 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
<el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
......@@ -254,9 +267,10 @@
</el-table-column>
<el-table-column
label="工艺名称"
width="140"
width="160"
align="center"
prop="routeName"
show-overflow-tooltip
/>
<el-table-column
label="订单编号"
......@@ -338,7 +352,8 @@
v-if="scope.row.status == 'PREPARE'"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:workorder:edit']"
>修改</el-button>
>修改</el-button
>
<el-button
size="mini"
type="text"
......@@ -346,7 +361,8 @@
v-if="scope.row.status == 'PREPARE'"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:workorder:remove']"
>删除</el-button>
>删除</el-button
>
<!-- <el-button
size="mini"
type="text"
......@@ -679,7 +695,7 @@ import VendorSelect from "@/components/vendorSelect/single.vue";
import { genCode } from "@/api/system/autocode/rule";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { getToken } from '@/utils/auth'
import { getToken } from "@/utils/auth";
export default {
name: "Workorder",
......@@ -728,7 +744,7 @@ export default {
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData"
url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData",
},
// 查询参数
queryParams: {
......@@ -754,9 +770,9 @@ export default {
requestDate: null,
parentId: null,
ancestors: null,
status: 'PREPARE',
status: "PREPARE",
},
// 表单状态
// 表单状态
options: [
{ value: "PREPARE", label: "待确认" },
{ value: "CONFIRMED", label: "已确认" },
......@@ -819,8 +835,11 @@ export default {
});
},
importTemplate() {
this.download('mes/pro/workorder/importTemplate', {
}, `work_order_template_${new Date().getTime()}.xlsx`)
this.download(
"mes/pro/workorder/importTemplate",
{},
`work_order_template_${new Date().getTime()}.xlsx`
);
},
/** 导入按钮操作 */
handleImport() {
......@@ -835,7 +854,13 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
this.getList();
},
// 提交上传文件
......@@ -1123,12 +1148,18 @@ export default {
},
/** 完成任务单操作 */
confirmWorkorder(row) {
this.$modal.confirm('是否将工单编号"' + row.workorderCode + '"的草稿数据项改为已确认？').then(function() {
this.$modal
.confirm(
'是否将工单编号"' + row.workorderCode + '"的草稿数据项改为已确认？'
)
.then(function () {
return confirmedWorkorder(row.workorderId);
}).then(() => {
})
.then(() => {
this.getList();
this.$modal.msgSuccess("已确认成功");
}).catch(() => {});
})
.catch(() => {});
},
//自动生成编码
handleAutoGenChange(autoGenFlag) {
......
src/views/mes/qt/factoryQuote/index.vue
View file @ bfc8afc1
......@@ -85,27 +85,27 @@
<el-table v-loading="loading" :data="factoryQuoteList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"/>
<el-table-column label="客户编号" prop="clientCode"/>
<el-table-column label="客户名称" prop="clientName"/>
<el-table-column label="产品编号" prop="itemCode"/>
<el-table-column label="产品名称" prop="itemName"/>
<el-table-column label="价格" prop="price"/>
<el-table-column label="有效期起" prop="validFrom" width="180">
<el-table-column label="客户编号" width="120" prop="clientCode"/>
<el-table-column label="客户名称" width="180" prop="clientName"/>
<el-table-column label="产品编号" width="160" prop="itemCode"/>
<el-table-column label="产品名称" min-width="200" show-overflow-tooltip prop="itemName"/>
<el-table-column label="价格" width="100" prop="price"/>
<el-table-column label="有效期起" prop="validFrom" width="140">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.validFrom, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="有效期至" prop="validTo" width="180">
<el-table-column label="有效期至" prop="validTo" width="140">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.validTo, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" prop="state">
<el-table-column label="状态" prop="state" width="100">
<template slot-scope="{row}">
{{ row.state === '0' ? '草稿' : row.state === '1' ? '审批中' : row.state === '2' ? '发布中' : '已发布'}}
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width">
<el-table-column width="120" fixed="right" label="操作" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
v-if="scope.row.state === '0' || scope.row.state === '2'"
......
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