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
wws 11 months ago
parent 946e15378c 05b288b81c
commit 4e4d2cec9c
6 changed files with 40 additions and 83 deletions
Show Stats Download Patch File Download Diff File

2
src/views/device/repairOrder/selectSparePartsLedger.vue
Unescape Escape View File

@ -247,6 +247,8 @@ export default {
}, },
/** 查询备品备件台账管理列表 */ /** 查询备品备件台账管理列表 */
getList() { getList() {
this.sparePartsLedgerList = null;
this.total = 0;
this.loading = true; this.loading = true;
listSparePartsLedger(this.queryParams).then((response) => { listSparePartsLedger(this.queryParams).then((response) => {
this.sparePartsLedgerList = response.rows; this.sparePartsLedgerList = response.rows;

8
src/views/device/sparePartsApplicationRecord/index.vue
Unescape Escape View File

@ -306,15 +306,15 @@
<el-form-item label="备品备件名称" prop="spareName"> <el-form-item label="备品备件名称" prop="spareName">
<el-input <el-input
v-model="form.spareName" v-model="form.spareName"
placeholder="请选择备品备件名称"
style="width: 280px" style="width: 280px"
disabled
/> />
</el-form-item> </el-form-item>
<el-form-item label="规格型号" prop="spareModel"> <el-form-item label="规格型号" prop="spareModel">
<el-input <el-input
v-model="form.spareModel" v-model="form.spareModel"
placeholder="请选择规格型号"
style="width: 280px" style="width: 280px"
disabled
/> />
</el-form-item> </el-form-item>
<el-form-item label="库存总数量" prop="amount"> <el-form-item label="库存总数量" prop="amount">
@ -486,9 +486,6 @@ export default {
spareName: [ spareName: [
{ required: true, message: "备品备件名称不能为空", trigger: "blur" }, { required: true, message: "备品备件名称不能为空", trigger: "blur" },
], ],
spareModel: [
{ required: true, message: "规格型号不能为空", trigger: "blur" },
],
spareQuantity: [ spareQuantity: [
{ required: true, message: "数量不能为空", trigger: "blur" }, { required: true, message: "数量不能为空", trigger: "blur" },
], ],
@ -517,6 +514,7 @@ export default {
this.form.amount = obj[0].amount; this.form.amount = obj[0].amount;
this.form.storageAmount = obj[0].storageAmount; this.form.storageAmount = obj[0].storageAmount;
this.form.availableQuantity = obj[0].amount - obj[0].storageAmount; this.form.availableQuantity = obj[0].amount - obj[0].storageAmount;
this.form.spareQuantity = obj[0].spareQuantity;
}, },
//设备选择 //设备选择
handleSelectEquipment() { handleSelectEquipment() {

14
src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue
Unescape Escape View File

@ -84,18 +84,6 @@
v-if="columns[1].visible" v-if="columns[1].visible"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column
label="部门编码"
align="center"
prop="postCode"
v-if="columns[2].visible"
></el-table-column>
<el-table-column
label="部门名称"
align="center"
prop="postName"
v-if="columns[3].visible"
></el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -149,8 +137,6 @@ export default {
columns: [ columns: [
{ key: 0, label: `人员编码`, visible: true }, { key: 0, label: `人员编码`, visible: true },
{ key: 1, label: `人员名称`, visible: true }, { key: 1, label: `人员名称`, visible: true },
{ key: 2, label: `部门编码`, visible: true },
{ key: 3, label: `部门名称`, visible: true },
], ],
}; };
}, },

21
src/views/device/sparePartsApplicationRecord/selectSparePartsLedger.vue
Unescape Escape View File

@ -55,13 +55,6 @@
> >
</el-form-item> </el-form-item>
<el-row :gutter="10" class="mb8">
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="sparePartsLedgerList" :data="sparePartsLedgerList"
@ -252,6 +245,8 @@ export default {
}, },
/** 查询备品备件台账管理列表 */ /** 查询备品备件台账管理列表 */
getList() { getList() {
this.sparePartsLedgerList = null;
this.total = 0;
this.loading = true; this.loading = true;
listSparePartsLedger(this.queryParams).then((response) => { listSparePartsLedger(this.queryParams).then((response) => {
this.sparePartsLedgerList = response.rows; this.sparePartsLedgerList = response.rows;
@ -340,22 +335,12 @@ export default {
message: "请勿选择多种备件！", message: "请勿选择多种备件！",
type: "warning", type: "warning",
}); });
// const number =
// this.$refs.multipleTable.selection.amount -
// this.$refs.multipleTable.selection.storageAmount;
// console.log("number", number);
// if (this.$refs.multipleTable.selection.spareQuantity > number) {
// this.$message({
// message: "您填入的领用数量大于库存可用数量！",
// type: "warning",
// });
// }
} else { } else {
this.$emit("onSelected", this.$refs.multipleTable.selection); this.$emit("onSelected", this.$refs.multipleTable.selection);
this.showFlag = false; this.showFlag = false;
this.getList();
} }
}, },
}, },
}; };
</script> </script>

48
src/views/mes/prepare/index.vue
Unescape Escape View File

@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单编码" prop="orderCode"> <el-form-item label="订单编码" prop="workorderCodeSap">
<el-input <el-input
v-model="queryParams.orderCode" v-model="queryParams.workorderCodeSap"
placeholder="请输入订单编码" placeholder="请输入订单编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -51,6 +51,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!--
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
@ -61,7 +62,7 @@
@keyup.enter.native="handleQuery"> @keyup.enter.native="handleQuery">
<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option> <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" >搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" >搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -129,40 +130,23 @@
<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="序号" fixed/> <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
<el-table-column label="工单编码" align="center" prop="workorderCode" width="220" fixed/> <el-table-column label="工单编码" align="center" prop="workorderCode" width="200" fixed/>
<!-- <el-table-column label="父工单" align="center" prop="parentOrder" /> --> <el-table-column label="订单编码" align="center" prop="workorderCodeSap" width="200" fixed/>
<el-table-column label="订单编码" align="center" prop="orderCode" width="220"/>
<el-table-column label="产品编号" align="center" prop="productCode" width="180"/> <el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
<!-- <el-table-column label="产品类型" align="center" prop="prodType" /> --> <el-table-column label="产品名称" align="center" prop="productName" width="180" :show-overflow-tooltip="true"/>
<el-table-column label="产品名称" align="center" prop="productName" width="180"/>
<!-- <el-table-column label="规格型号" align="center" prop="productSpc" /> -->
<el-table-column label="工单生产日期" align="center" prop="productDate" width="180"> <el-table-column label="工单生产日期" align="center" prop="productDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="班次" align="center" prop="shiftId" /> --> <!--
<el-table-column label="单据状态" align="center" prop="status"> <el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status == "L0" ? "待确认" : "已确认" }} {{ scope.row.status == "L0" ? "待确认" : "已确认" }}
</template> </template>
</el-table-column>
<el-table-column label="物料编号" align="center" prop="materialCode" width="180"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="250"/>
<el-table-column label="物料规格型号" align="center" prop="materialSpc" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="生产数量" align="center" prop="quantity" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handlePrepareDetail(scope.row)"
v-hasPermi="['mes:prepareDetail:list']"
>查看备料单</el-button>
<Detail ref="detail"> </Detail>
</template>
</el-table-column>--> </el-table-column>-->
<el-table-column label="生产数量" align="center" prop="quantity" />
<el-table-column label="单位" align="center" prop="unit" />
</el-table> </el-table>
<pagination <pagination
@ -263,19 +247,21 @@
<el-table-column <el-table-column
prop="materialCode" prop="materialCode"
label="料号" label="料号"
width="180"> width="170">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="materailName" prop="materialName"
label="物料描述" label="物料描述"
width="300"> width="320">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unit" prop="unit"
width="50"
label="单位"> label="单位">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderCode" prop="workorderCode"
width="120"
label="生产订单"> label="生产订单">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -454,7 +440,7 @@ export default {
printPrepareByCode(this.selectPrepare[0].workorderCode).then(response => { printPrepareByCode(this.selectPrepare[0].workorderCode).then(response => {
console.log(response.data) console.log(response.data)
this.printData.factory = response.data.mesPrepareDetailList[0].factoryCode this.printData.factory = response.data.mesPrepareDetailList[0].factoryCode
this.printData.productDate = response.data.mesPrepare.productDate this.printData.productDate = response.data.mesPrepareDetailList[0].productDate
this.printData.printDate = moment(new Date()).format('YYYY-MM-DD') this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
this.printData.workTable = response.data.mesPrepareDetailList this.printData.workTable = response.data.mesPrepareDetailList
this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格

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

@ -935,7 +935,7 @@ export default {
return reportSap(code); return reportSap(code);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("报工成功"); //this.$modal.msgSuccess("报工成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 报工详情按钮操作 */ /** 报工详情按钮操作 */

Write Preview
Loading…
Cancel
Save