Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wws 10 months ago
parent 114aecd86d 602238af10
commit 701ce46545
4 changed files with 193 additions and 31 deletions
Show Stats Download Patch File Download Diff File

9
src/api/wms/put.js
Unescape Escape View File

@ -25,7 +25,14 @@ export function addPut(data) {
data: data
});
}
//过账
export function SAPPut(data) {
return request({
url: '/wms/put/WmsProductPutByWorkOrderConfirmSAPPosting',
method: 'post',
data: data
});
}
// 修改成品生产入库
export function updatePut(data) {
return request({

143
src/views/quality/produceReport/index.vue
Unescape Escape View File

@ -249,7 +249,125 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 打印首检对话框 -->
<el-dialog :title="title" :visible.sync="firstReportOpen" width="1200px" append-to-body>
<el-row>
<el-col :span="20">
<el-button
class="print-btn"
size="mini"
type="primary"
icon="el-icon-edit"
@click="handlePrint(form)"
>打印</el-button>
</el-col>
</el-row>
<!-- 打印整个firstReportPrint区域 -->
<div id="firstReportPrint">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :offset="8" :span="8">
<h1 style="align-content: center;">中山榄菊日化实业有限公司</h1>
</el-col>
</el-row>
<el-row>
<el-col :offset="8" :span="8">
<h3 style="align-content: center;">（黑蚊香）首检确认表</h3>
</el-col>
</el-row>
<el-row>
<el-col :offset="16" :span="8">
<el-form-item label="检验标准" prop="incomeBatchNo">
<el-input v-model="form.incomeBatchNo" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="产品名称" prop="materialName">
<el-input v-model="form.materialName" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品编码" prop="materialCode">
<el-input v-model="form.materialCode" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="首检日期" prop="checkTime">
<el-input v-model="form.checkTime" disabled>
{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
</el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="首检原因" >
<el-input disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="100"/>
<el-table-column label="检验项目" align="center" prop="ruleName" />
<el-table-column label="内容" align="center" prop="checkStandard" width="200"/>
<el-table-column label="实际检验结果" align="center" prop="propertyCode" width="200">
<template slot-scope="scope">
<dict-tag
:options="dict.type.qc_rule_prop"
:value="scope.row.propertyCode"
/>
</template>
</el-table-column>
<el-table-column label="判定" align="center" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col :span="20">
<el-form-item label="备注：" label-width="160px">
<el-input type="textarea" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="综合结论：" label-width="160px">
<el-input type="textarea" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="车间组长/机管员签名" label-width="160px">
<el-input disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="质量管理部品管员签名" prop="checkManName" label-width="160px">
<el-input disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleDone">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
@ -299,6 +417,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
firstReportOpen: false,
// 查询参数
queryParams: {
checkTimeArray: [],
@ -451,10 +570,20 @@ export default {
this.queryParams.recordId = recordId;
getProduce(recordId).then(response => {
this.form = response.data;
this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
this.open = true;
this.title = "查看过程检验报告";
if(this.form.checkType =='checkTypeSC') {
//首检报告
this.form.printable = 'firstReportPrint'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
this.firstReportOpen = true;
this.title = "首检检验报告";
}else {
//巡检报告
this.form.printable = 'printForm'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
this.open = true;
this.title = "巡检检验报告";
}
});
this.getCheckedProjectList();
},
@ -518,6 +647,10 @@ export default {
properties: params.properties || null
})
},
handleDone() {
this.firstReportOpen = false;
this.reset();
},
}
};
</script>

8
src/views/quality/qcProjectType/index.vue
Unescape Escape View File

@ -80,6 +80,8 @@
</router-link>
</template>
</el-table-column>
<el-table-column label="检验标准编码" align="center" prop="standardNo" />
<el-table-column label="版本" align="center" prop="version" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -117,6 +119,12 @@
<el-form-item label="检测项方案名称" prop="projectTypeName">
<el-input v-model="form.projectTypeName" placeholder="请输入检测项方案名称" />
</el-form-item>
<el-form-item label="检测标准编号" prop="standardNo">
<el-input v-model="form.standardNo" placeholder="请输入检测标准编号" />
</el-form-item>
<el-form-item label="版本" prop="version">
<el-input v-model="form.version" placeholder="请输入版本" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>

64
src/views/wms/put/index.vue
Unescape Escape View File

@ -232,10 +232,10 @@
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
:disabled="multiple"
@click="handleUpdate"
v-hasPermi="['wms:put:edit']"
>修改</el-button>
>过账</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -261,29 +261,41 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="putList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="putList" @selection-change="handleSelectionChange" style="width: 100%">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="报工单号" align="center" prop="workOrder" />
<el-table-column label="ID" align="center" prop="id" v-if="false"/>
<el-table-column label="报工单号" align="center" prop="workOrder" width="200px"/>
<!-- <el-table-column label="工厂编码" align="center" prop="factoryCode" />-->
<el-table-column label="生产工单号" align="center" prop="productOrder" />
<el-table-column label="生产工单号" align="center" prop="productOrder" width="200px"/>
<el-table-column label="仓库编码" align="center" prop="whCode" />
<el-table-column label="库区编码" align="center" prop="waCode" />
<el-table-column label="库位编码" align="center" prop="wlCode" />
<!-- <el-table-column label="产品名称" align="center" prop="productName" />-->
<el-table-column label="库区编码" align="center" prop="waCode" v-if="false"/>
<el-table-column label="库位编码" align="center" prop="wlCode" v-if="false"/>
<el-table-column label="产品名称" align="center" prop="productName" width="200px"/>
<el-table-column label="产品编码" align="center" prop="productCode" />
<el-table-column label="产品分类" align="center" prop="productSort" />
<el-table-column label="产品分类" align="center" prop="productSort" v-if="false"/>
<!-- <el-table-column label="规格型号" align="center" prop="specification" />-->
<!-- <el-table-column label="单位" align="center" prop="unitOfMeasure" />-->
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="计划入库数量" align="center" prop="planQuantity" />
<el-table-column label="入库数量" align="center" prop="putQuantity" />
<el-table-column label="入库状态" align="center" prop="status" />
<el-table-column label="过账SAP状态" align="center" prop="sapStatus" />
<el-table-column label="过账SAP凭证" align="center" prop="sapProof" />
<el-table-column label="过账SAP返回信息" align="center" prop="sapMessage" />
<el-table-column label="入库时间" align="center" prop="putDate" width="180">
<!-- <el-table-column label="入库状态" align="center" prop="status" />-->
<el-table-column label="入库状态" align="center" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status === '0'">未进行</span>
<span v-else-if="scope.row.status === '1'">完成</span>
</template>
</el-table-column>
<el-table-column label="过账SAP状态" align="center" prop="sapStatus" width="200px">
<template slot-scope="scope">
<span v-if="scope.row.sapStatus === '0'">未过账</span>
<span v-else-if="scope.row.sapStatus === '2'">过账失败</span>
<span v-else-if="scope.row.sapStatus === '1'">过账成功</span>
</template>
</el-table-column>
<el-table-column label="过账SAP凭证" align="center" prop="sapProof" width="200px"/>
<el-table-column label="过账SAP返回信息" align="center" prop="sapMessage" width="200px" />
<el-table-column label="入库时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.putDate, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="预留字段1" align="center" prop="attr1" />-->
@ -420,7 +432,7 @@
</template>
<script>
import { listPut, getPut, delPut, addPut, updatePut } from "@/api/wms/put";
import { listPut, getPut, delPut, addPut, updatePut ,SAPPut} from "@/api/wms/put";
export default {
name: "Put",
@ -568,13 +580,15 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getPut(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改成品生产入库";
});
const ids = row.id || this.ids;
let postData = this.ids.map(id => ({ id: id }));
console.log(postData)
this.$modal.confirm('是否进行过账').then(function() {
return SAPPut(JSON.stringify(postData));
}).then(() => {
this.getList();
this.$modal.msgSuccess("过账完成");
}).catch(() => {});
},
/** 提交按钮 */
submitForm() {

Write Preview
Loading…
Cancel
Save