Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
yangwl
zhaoxiaolin 12 months ago
parent 5f9e638697 9f75f980ac
commit a875961898
6 changed files with 178 additions and 152 deletions
Show Stats Download Patch File Download Diff File

148
src/views/mes/reportWork/index.vue
Unescape Escape View File

@ -48,7 +48,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -79,7 +79,7 @@
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:reportWork:remove']" v-hasPermi="['mes:reportWork:remove']"
>删除</el-button> >删除</el-button>
</el-col> --> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -95,7 +95,7 @@
<el-table v-loading="loading" :data="reportWorkList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="reportWorkList" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" /> <el-table-column type="selection" align="center" />
<el-table-column label="报工单编号" align="center" prop="reportCode" width="100"> <el-table-column label="报工单编号" align="center" prop="reportCode" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -140,7 +140,7 @@
<el-table-column label="线体名称" align="center" prop="machineName" /> <el-table-column label="线体名称" align="center" prop="machineName" />
<el-table-column label="班组编码" align="center" prop="teamCode" /> <el-table-column label="班组编码" align="center" prop="teamCode" />
<el-table-column label="班次编码" align="center" prop="shiftCode" /> <el-table-column label="班次编码" align="center" prop="shiftCode" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -157,7 +157,7 @@
v-hasPermi="['mes:reportWork:remove']" v-hasPermi="['mes:reportWork:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<pagination <pagination
@ -170,7 +170,7 @@
<!-- 添加或修改报工报表对话框 --> <!-- 添加或修改报工报表对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="报工单编号" prop="reportCode"> <el-form-item label="报工单编号" prop="reportCode">
@ -179,105 +179,135 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="报工类型" prop="reportType"> <el-form-item label="报工类型" prop="reportType">
<el-select v-model="form.reportType" placeholder="请选择报工类型" @change="$forceUpdate()" clearable> <el-select v-model="form.reportType" placeholder="请选择报工类型" style="width:180px">
<el-option v-for="item in reportTypeOptions" :key="item.reportType" :label="item.label" :value="item.reportType"></el-option> <el-option
v-for="dict in dict.type.report_work_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="生产工单编码" prop="workorderCode"> <el-form-item label="报工人员" prop="userName">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单编码" /> <el-input v-model="form.userName" placeholder="请输入报工人员" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品编码" prop="productCode"> <el-form-item label="报工途径" prop="feedbackChannel">
<el-input v-model="form.productCode" placeholder="请输入产品编码" /> <el-select v-model="form.feedbackChannel" placeholder="请选择报工途径" style="width:180px">
<el-option
v-for="dict in dict.type.report_work_channel"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品名称" prop="productName"> <el-form-item label="生产工单编码" prop="workorderCode">
<el-input v-model="form.productName" placeholder="请输入产品名称" /> <el-input v-model="form.workorderCode" placeholder="请输入生产工单编码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="规格型号" prop="spec"> <el-form-item label="产品编码" prop="productCode">
<el-input v-model="form.spec" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.productCode" placeholder="请输入产品编码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单位" prop="unit"> <el-form-item label="产品名称" prop="productName">
<el-input v-model="form.unit" placeholder="请输入单位" /> <el-input v-model="form.productName" placeholder="请输入产品名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="排产数量" prop="quantity"> <el-form-item label="规格型号" prop="spec">
<el-input v-model="form.quantity" placeholder="请输入排产数量" /> <el-input v-model="form.spec" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="本次报工数量" prop="quantityFeedback"> <el-form-item label="单位" prop="unit">
<el-input v-model="form.quantityFeedback" placeholder="请输入本次报工数量" /> <el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="合格数量" prop="quantityQualified"> <el-form-item label="线体编码" prop="machineCode">
<el-input v-model="form.quantityQualified" placeholder="请输入合格数量" /> <el-input v-model="form.machineCode" placeholder="请输入线体编码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="不合格数量" prop="quantityUnqualified"> <el-form-item label="线体名称" prop="machineName">
<el-input v-model="form.quantityUnqualified" placeholder="请输入不合格数量" /> <el-input v-model="form.machineName" placeholder="请输入线体名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="报工人员" prop="userName"> <el-form-item label="报工时间" prop="feedbackTime">
<el-input v-model="form.userName" placeholder="请输入报工人员" /> <el-date-picker clearable
v-model="form.feedbackTime"
type="date"
value-format="yyyy-MM-dd"
style="width: 180px"
placeholder="请选择报工时间">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="人员名称" prop="nickName"> <el-form-item label="排产数量" prop="quantity">
<el-input v-model="form.nickName" placeholder="请输入人员名称" /> <el-input-number
:min="0"
:step="1"
v-model="form.quantity"
style="width: 180px"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="报工途径" prop="feedbackChannel"> <el-form-item label="本次报工数量" prop="quantityFeedback">
<el-select v-model="form.feedbackChannel" placeholder="请选择报工类型" @change="$forceUpdate()" clearable> <el-input-number
<el-option v-for="item in feedbackChannelOptions" :key="item.feedbackChannel" :label="item.label" :value="item.feedbackChannel"></el-option> :min="0"
</el-select> :step="1"
v-model="form.quantityFeedback"
style="width: 180px"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="报工时间" prop="feedbackTime"> <el-form-item label="合格数量" prop="quantityQualified">
<el-date-picker clearable <el-input-number
v-model="form.feedbackTime" :min="0"
type="date" :step="1"
value-format="yyyy-MM-dd" v-model="form.quantityQualified"
placeholder="请选择报工时间"> style="width: 180px"
</el-date-picker> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="录入人员" prop="recordUser"> <el-form-item label="不合格数量" prop="quantityUnqualified">
<el-input v-model="form.recordUser" placeholder="请输入录入人员" /> <el-input-number
:min="0"
:step="1"
v-model="form.quantityUnqualified"
style="width: 180px"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="线体编码" prop="machineCode"> <el-form-item label="人员名称" prop="nickName">
<el-input v-model="form.machineCode" placeholder="请输入线体编码" /> <el-input v-model="form.nickName" placeholder="请输入人员名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="线体名称" prop="machineName"> <el-form-item label="录入人员" prop="recordUser">
<el-input v-model="form.machineName" placeholder="请输入线体名称" /> <el-input v-model="form.recordUser" placeholder="请输入录入人员" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -294,7 +324,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark"placeholder="请输入内容" /> <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -311,7 +341,7 @@
<!-- 添加或修改生产报工物料消耗对话框 --> <!-- 添加或修改生产报工物料消耗对话框 -->
<el-dialog :title="title" :visible.sync="reportWorkConsunmOpen" width="1200px" append-to-body> <el-dialog :title="title" :visible.sync="reportWorkConsunmOpen" width="1200px" append-to-body>
<el-table v-loading="loading" :data="reportWorkConsumeList"> <el-table v-loading="loading" :data="reportWorkConsumeList">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="100" align="center" />
<el-table-column label="报工编码" align="center" prop="reportCode" /> <el-table-column label="报工编码" align="center" prop="reportCode" />
<el-table-column label="工单编码" align="center" prop="workorderCode" /> <el-table-column label="工单编码" align="center" prop="workorderCode" />
<el-table-column label="物料编号" align="center" prop="materialCode" /> <el-table-column label="物料编号" align="center" prop="materialCode" />
@ -345,26 +375,10 @@ import ReportWorkConsume from "./reportWorkConsume.vue";
export default { export default {
name: "ReportWork", name: "ReportWork",
dicts: ['report_work_type','report_work_channel'],
components: {ReportWorkConsume}, components: {ReportWorkConsume},
data() { data() {
return { return {
reportTypeOptions: [{
reportType: 'SELF自行报工',
label: 'SELF自行报工'
}, {
reportType: 'UNI统一报工',
label: 'UNI统一报工'
}],
feedbackChannelOptions: [{
feedbackChannel: 'PAD',
label: 'PAD'
}, {
feedbackChannel: 'MOBILE',
label: 'MOBILE'
}, {
feedbackChannel: 'PC',
label: 'PC'
}],
optType: undefined, optType: undefined,
// 遮罩层 // 遮罩层
loading: true, loading: true,

1
src/views/mes/reportWork/reportWorkConsume.vue
Unescape Escape View File

@ -48,7 +48,6 @@
<el-table v-loading="loading" :data="reportWorkConsumeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="reportWorkConsumeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="recordId" />
<el-table-column label="工单编码" align="center" prop="workorderCode" width="200"/> <el-table-column label="工单编码" align="center" prop="workorderCode" width="200"/>
<el-table-column label="物料编号" align="center" prop="materialCode" width="200"/> <el-table-column label="物料编号" align="center" prop="materialCode" width="200"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="200"/> <el-table-column label="物料名称" align="center" prop="materialName" width="200"/>

26
src/views/mes/rfidProcess/index.vue
Unescape Escape View File

@ -80,32 +80,40 @@
<el-table v-loading="loading" :data="rfidProcessList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="rfidProcessList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" align="center" :index="indexMethod" label="序号"/> <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
<!-- <el-table-column label="工单ID" align="center" prop="workorderId" width="180"/> --> <!-- <el-table-column label="工单ID" align="center" prop="workorderId" width="180"/> -->
<el-table-column label="工单编号" align="center" prop="workorderCode" width="200"/> <el-table-column label="工单编号" align="center" prop="workorderCode" width="200" fixed/>
<!-- <el-table-column label="工单名称" align="center" prop="workorderName"/> --> <!-- <el-table-column label="工单名称" align="center" prop="workorderName"/> -->
<!-- <el-table-column label="订单ID" align="center" prop="orderId" width="180"/> --> <!-- <el-table-column label="订单ID" align="center" prop="orderId" width="180"/> -->
<el-table-column label="订单编号" align="center" prop="orderCode" width="180"/> <el-table-column label="订单编号" align="center" prop="orderCode" width="200"/>
<el-table-column label="rfid号" align="center" prop="rfid" /> <el-table-column label="rfid号" align="center" prop="rfid" width="180"/>
<el-table-column label="工厂编码" align="center" prop="factoryCode" /> <el-table-column label="工厂编码" align="center" prop="factoryCode" />
<el-table-column label="机台编码" align="center" prop="machineCode" /> <el-table-column label="机台编码" align="center" prop="machineCode" />
<el-table-column label="当前步" align="center" prop="nowProcessId" /> <el-table-column label="当前步工序编码" align="center" prop="nowProcessCode" width="150"/>
<el-table-column label="下一步" align="center" prop="nextProcessId" /> <el-table-column label="当前步工序名称" align="center" prop="nowProcessName" width="150"/>
<el-table-column label="下一步工序编码" align="center" prop="nextProcessCode" width="150"/>
<el-table-column label="下一步工序名称" align="center" prop="nextProcessName" width="150"/>
<el-table-column label="工序步骤" align="center" prop="orderNum" /> <el-table-column label="工序步骤" align="center" prop="orderNum" />
<el-table-column label="入时间" align="center" prop="inTime" width="180"> <el-table-column label="入时间" align="center" prop="inTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
{{ parseTime(scope.row.inTime, '{h}:{m}:{s}') }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出时间" align="center" prop="outTime" width="180"> <el-table-column label="出时间" align="center" prop="outTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
{{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
{{ scope.row.status == "0" ? "待办" : "完成" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

24
src/views/plan/whiteOrder/index.vue
Unescape Escape View File

@ -220,7 +220,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleMaterielQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleMaterielQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetProductQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -323,7 +323,14 @@
<el-col :offset="1" :span="9"> <el-col :offset="1" :span="9">
<el-form-item label-width="100px" label="单位" prop="unit"> <el-form-item label-width="100px" label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位"/> <el-select v-model="form.unit" placeholder="请输入单位" style="width:220px">
<el-option
v-for="dict in dict.type.bp"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="false" label-width="100px" label="订单车数" prop="carNum"> <el-form-item v-if="false" label-width="100px" label="订单车数" prop="carNum">
@ -608,7 +615,7 @@ import {getProEquipment, selectMaterielList, subSplitOrder} from "@/api/plan/ord
export default { export default {
name: "WhiteOrder", name: "WhiteOrder",
dicts: ['product_type', 'order_status'], dicts: ['product_type', 'order_status','bp'],
components: { components: {
Treeselect Treeselect
}, },
@ -1217,6 +1224,7 @@ export default {
// 新增-物料搜索按钮 // 新增-物料搜索按钮
handleMaterielQuery() { handleMaterielQuery() {
this.materielQueryParams.pageNum = 1; this.materielQueryParams.pageNum = 1;
this.materielQueryParams.pageSize = 10;
this.getMaterielList(); this.getMaterielList();
}, },
// 拆分-车数数量校验 // 拆分-车数数量校验
@ -1263,6 +1271,8 @@ export default {
this.materielQueryParams = { this.materielQueryParams = {
productCode: undefined, productCode: undefined,
productDescZh: '白坯', productDescZh: '白坯',
pageNum: 1,
pageSize: 10,
} }
// 打开选择物料弹窗 // 打开选择物料弹窗
this.innerVisible = true; this.innerVisible = true;
@ -1280,6 +1290,7 @@ export default {
this.reset(); this.reset();
// 设置白坯 // 设置白坯
this.form.prodType = 'white' this.form.prodType = 'white'
this.form.unit = 'PC';
// 初始化设置计划生产日期 // 初始化设置计划生产日期
this.form.planProDate = moment(new Date()).format('YYYY-MM-DD') this.form.planProDate = moment(new Date()).format('YYYY-MM-DD')
// 初始化设置计划完成日期 // 初始化设置计划完成日期
@ -1345,7 +1356,7 @@ export default {
addWhiteOrder(this.form).then(response => { addWhiteOrder(this.form).then(response => {
this.$modal.msgSuccess('新增成功') this.$modal.msgSuccess('新增成功')
this.dialogVisible = false this.dialogVisible = false
this.reset() this.reset();
this.getList() this.getList()
}); });
}, },
@ -1421,6 +1432,11 @@ export default {
this.queryParams.planDateEnd = moment(this.queryParams.planDateArray[1]).format('YYYY-MM-DD') this.queryParams.planDateEnd = moment(this.queryParams.planDateArray[1]).format('YYYY-MM-DD')
this.getList(); this.getList();
}, },
// 物料选择页面重置
resetProductQuery(){
this.materielQueryParams.productCode = null;
this.getMaterielList();
},
// 首-重置按钮操作 // 首-重置按钮操作
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");

17
src/views/wms/customer/index.vue
Unescape Escape View File

@ -73,12 +73,12 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" /> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" />
<el-table-column label="客户编码" align="center" prop="clientCode" /> <el-table-column label="客户编码" align="center" prop="clientCode" width="150"/>
<el-table-column label="客户名称" align="center" prop="clientName" /> <el-table-column label="客户名称" align="center" prop="clientName" width="270"/>
<el-table-column label="客户简介" align="center" prop="clientDes" /> <!-- <el-table-column label="客户简介" align="center" prop="clientDes" /> -->
<el-table-column label="客户类型" align="center" prop="clientType" /> <!-- <el-table-column label="客户类型" align="center" prop="clientType" /> -->
<el-table-column label="客户地址" align="center" prop="address" width="200"/> <el-table-column label="客户地址" align="center" prop="address" width="300"/>
<el-table-column label="客户官网地址" align="center" prop="website" width="200"/> <!-- <el-table-column label="客户官网地址" align="center" prop="website" width="200"/>
<el-table-column label="客户邮箱地址" align="center" prop="email" width="200"/> <el-table-column label="客户邮箱地址" align="center" prop="email" width="200"/>
<el-table-column label="客户电话" align="center" prop="tel" width="150"/> <el-table-column label="客户电话" align="center" prop="tel" width="150"/>
<el-table-column label="联系人1" align="center" prop="contact1" /> <el-table-column label="联系人1" align="center" prop="contact1" />
@ -87,7 +87,9 @@
<el-table-column label="联系人2" align="center" prop="contact2" /> <el-table-column label="联系人2" align="center" prop="contact2" />
<el-table-column label="联系人2-电话" align="center" prop="contact2Tel" width="150"/> <el-table-column label="联系人2-电话" align="center" prop="contact2Tel" width="150"/>
<el-table-column label="联系人2-邮箱" align="center" prop="contact2Email" width="150"/> <el-table-column label="联系人2-邮箱" align="center" prop="contact2Email" width="150"/>
<el-table-column label="统一社会信用代码" align="center" prop="creditCode" width="200" /> <el-table-column label="统一社会信用代码" align="center" prop="creditCode" width="200" /> -->
<el-table-column label="创建人" align="center" prop="createBy" width="200"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="200"/>
<el-table-column label="是否启用" align="center" prop="enableFlag"> <el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.enableFlag == 1 ? "是" : "否" }} {{ scope.row.enableFlag == 1 ? "是" : "否" }}
@ -240,7 +242,6 @@
<script> <script>
import { listCustomer, getCustomer, delCustomer, addCustomer, updateCustomer } from "@/api/wms/customer"; import { listCustomer, getCustomer, delCustomer, addCustomer, updateCustomer } from "@/api/wms/customer";
export default { export default {
name: "Customer", name: "Customer",
data() { data() {

78
src/views/wms/supplier/index.vue
Unescape Escape View File

@ -73,10 +73,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人电话" prop="contactPhone">
<el-input <el-input
v-model="queryParams.contact" v-model="queryParams.contactPhone"
placeholder="请输入联系人" placeholder="请输入联系人电话"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -195,8 +195,8 @@
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" ></el-table-column> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" ></el-table-column>
<el-table-column label="供应商编码" align="center" prop="supplierCode" width="100" /> <el-table-column label="供应商编码" align="center" prop="supplierCode" width="100" />
<el-table-column label="供应商名字" align="center" prop="zhDesc" width="100" /> <el-table-column label="供应商名字" align="center" prop="zhDesc" width="350" />
<el-table-column label="英文描述" align="center" prop="enDesc" /> <!-- <el-table-column label="英文描述" align="center" prop="enDesc" />
<el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/> <el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/>
<el-table-column label="账号" align="center" prop="accountNumber" width="100"/> <el-table-column label="账号" align="center" prop="accountNumber" width="100"/>
<el-table-column label="证照编码" align="center" prop="licenceNumber" width="200"/> <el-table-column label="证照编码" align="center" prop="licenceNumber" width="200"/>
@ -204,19 +204,21 @@
<el-table-column label="国家" align="center" prop="userDefined1" /> <el-table-column label="国家" align="center" prop="userDefined1" />
<el-table-column label="省" align="center" prop="province" /> <el-table-column label="省" align="center" prop="province" />
<el-table-column label="市" align="center" prop="city" /> <el-table-column label="市" align="center" prop="city" />
<el-table-column label="区" align="center" prop="area" /> <el-table-column label="区" align="center" prop="area" /> -->
<el-table-column label="详细地址" align="center" prop="address" width="300"/> <el-table-column label="详细地址" align="center" prop="address" width="300"/>
<el-table-column label="邮编" align="center" prop="postcode" /> <!-- <el-table-column label="邮编" align="center" prop="postcode" /> -->
<el-table-column label="联系人" align="center" prop="contact" /> <!-- <el-table-column label="联系人" align="center" prop="contact" />-->
<el-table-column label="联系人电话" align="center" prop="contactPhone" width="120"/> <el-table-column label="联系人电话" align="center" prop="contactPhone" width="150"/>
<el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/> <el-table-column label="创建人" align="center" prop="createBy" width="150"/>
<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/> <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
<!-- <el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/> -->
<el-table-column label="是否启用" align="center" prop="activeFlag"> <el-table-column label="是否启用" align="center" prop="activeFlag">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.activeFlag == 1 ? "是" : "否" }} {{ scope.row.activeFlag == 1 ? "是" : "否" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="税号" align="center" prop="userDefined2" width="200"/> <!-- <el-table-column label="税号" align="center" prop="userDefined2" width="200"/> -->
<!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" /> <!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" />
<el-table-column label="备注" align="center" prop="remark" /> --> <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
@ -248,21 +250,15 @@
/> />
<!-- 添加或修改供应商管理对话框 --> <!-- 添加或修改供应商管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="供应商代码" prop="supplierCode"> <el-form-item label="供应商代码" prop="supplierCode">
<el-input v-model="form.supplierCode" placeholder="请输入供应商代码" /> <el-input v-model="form.supplierCode" placeholder="请输入供应商代码" style="width:320px"/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商名字" prop="zhDesc"> <el-form-item label="供应商名字" prop="zhDesc">
<el-input v-model="form.zhDesc" placeholder="请输入供应商名字" /> <el-input v-model="form.zhDesc" placeholder="请输入供应商名字" style="width:320px"/>
</el-form-item> </el-form-item>
</el-col> <!-- <el-row :gutter="10" class="mb8">
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="英文描述" prop="enDesc"> <el-form-item label="英文描述" prop="enDesc">
<el-input v-model="form.enDesc" placeholder="请输入英文描述" /> <el-input v-model="form.enDesc" placeholder="请输入英文描述" />
@ -321,20 +317,21 @@
<el-input v-model="form.postcode" placeholder="请输入邮编" /> <el-input v-model="form.postcode" placeholder="请输入邮编" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row :gutter="10" class="mb8"> <!-- <el-col :span="12"> -->
<el-col :span="12"> <!-- <el-form-item label="联系人" prop="contact">
<el-form-item label="联系人" prop="contact">
<el-input v-model="form.contact" placeholder="请输入联系人" /> <el-input v-model="form.contact" placeholder="请输入联系人" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-form-item label="是否启用" prop="activeFlag">
<el-select v-model="form.activeFlag" placeholder="请选择是否启用" @change="$forceUpdate()" clearable style="width:320px">
<el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
</el-select>
</el-form-item>
<el-form-item label="联系人电话" prop="contactPhone"> <el-form-item label="联系人电话" prop="contactPhone">
<el-input v-model="form.contactPhone" placeholder="请输入联系人电话" /> <el-input v-model="form.contactPhone" placeholder="请输入联系人电话" style="width:320px"/>
</el-form-item> </el-form-item>
</el-col> <!-- <el-row :gutter="10" class="mb8">
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系人职务" prop="contactPosition"> <el-form-item label="联系人职务" prop="contactPosition">
<el-input v-model="form.contactPosition" placeholder="请输入联系人职务" /> <el-input v-model="form.contactPosition" placeholder="请输入联系人职务" />
@ -345,16 +342,8 @@
<el-input v-model="form.contactEmail" placeholder="请输入联系人电子邮件" /> <el-input v-model="form.contactEmail" placeholder="请输入联系人电子邮件" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row :gutter="10" class="mb8"> <!-- <el-col :span="12">
<el-col :span="12">
<el-form-item label="是否启用" prop="activeFlag">
<el-select v-model="form.activeFlag" placeholder="请选择是否启用" @change="$forceUpdate()" clearable style="width:365px">
<el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经营范围" prop="businessScope"> <el-form-item label="经营范围" prop="businessScope">
<el-input v-model="form.businessScope" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.businessScope" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
@ -366,15 +355,14 @@
<el-input v-model="form.userDefined2" placeholder="请输入税号" /> <el-input v-model="form.userDefined2" placeholder="请输入税号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12"> -->
<!-- <el-form-item label="用户自定义3" prop="userDefined3"> <!-- <el-form-item label="用户自定义3" prop="userDefined3">
<el-input v-model="form.userDefined3" placeholder="请输入用户自定义3" /> <el-input v-model="form.userDefined3" placeholder="请输入用户自定义3" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> --> </el-form-item> -->
</el-col> <!-- </el-col>-->
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>

Write Preview
Loading…
Cancel
Save