Commit f76336a8 authored by 孙浩's avatar 孙浩

persistCheck

parent 76fd445f
...@@ -28,11 +28,11 @@ export function getIncomeInspectInfo(businessId) { ...@@ -28,11 +28,11 @@ export function getIncomeInspectInfo(businessId) {
}) })
} }
// 3. 新增 // 3. 保存检查一
export function addIncomeInspectInfo(data) { export function addIncomeInspectInfo(data) {
data = Qs.stringify(data) data = Qs.stringify(data)
return request({ return request({
url: '/incomeinspectinfo/add', url: '/incomeinspectinfo/persistCheck',
method: 'post', method: 'post',
data: data data: data
}) })
......
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<!-- <el-form-item label="类型(1 )" prop="jcType">--> <el-form-item label="单号" prop="jcCode">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.jcType"--> v-model="queryParams.jcCode"
<!-- placeholder="请输入类型(1 )"--> placeholder="请输入单号"
<!-- clearable--> clearable
<!-- :maxlength="1"--> :maxlength="127"
<!-- size="small"--> size="small"
<!-- style="width: 150px"--> style="width: 150px"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="单号" prop="jcCode">--> <el-form-item label="lot" prop="jcLot">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.jcCode"--> v-model="queryParams.jcLot"
<!-- placeholder="请输入单号"--> placeholder="请输入lot"
<!-- clearable--> clearable
<!-- :maxlength="127"--> :maxlength="127"
<!-- size="small"--> size="small"
<!-- style="width: 150px"--> style="width: 150px"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="lot" prop="jcLot">-->
<!-- <el-input-->
<!-- v-model="queryParams.jcLot"-->
<!-- placeholder="请输入lot"-->
<!-- clearable-->
<!-- :maxlength="127"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="厂家" prop="jcCj"> <el-form-item label="厂家" prop="jcCj">
<el-input <el-input
v-model="queryParams.jcCj" v-model="queryParams.jcCj"
...@@ -41,88 +31,46 @@ ...@@ -41,88 +31,46 @@
style="width: 150px" style="width: 150px"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="pn" prop="jcPn">--> <el-form-item label="pn" prop="jcPn">
<!-- <el-input-->
<!-- v-model="queryParams.jcPn"-->
<!-- placeholder="请输入pn"-->
<!-- clearable-->
<!-- :maxlength="255"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="lot number" prop="jcNum">-->
<!-- <el-input-->
<!-- v-model="queryParams.jcNum"-->
<!-- placeholder="请输入lot number"-->
<!-- clearable-->
<!-- :maxlength="255"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="检查结果" prop="jcResult">-->
<!-- <el-input-->
<!-- v-model="queryParams.jcResult"-->
<!-- placeholder="请输入检查结果"-->
<!-- clearable-->
<!-- :maxlength="1"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注" prop="jcNote">-->
<!-- <el-input-->
<!-- v-model="queryParams.jcNote"-->
<!-- placeholder="请输入备注"-->
<!-- clearable-->
<!-- :maxlength="500"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="审批时间">-->
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- size="small"-->
<!-- style="width: 200px"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- type="daterange"-->
<!-- range-separator="-"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="审批意见" prop="approveNote">-->
<!-- <el-input-->
<!-- v-model="queryParams.approveNote"-->
<!-- placeholder="请输入审批意见"-->
<!-- clearable-->
<!-- :maxlength="500"-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="审批状态" prop="approveStatus">
<el-input <el-input
v-model="queryParams.approveStatus" v-model="queryParams.jcPn"
placeholder="请输入审批状态" placeholder="请输入pn"
clearable clearable
:maxlength="1" :maxlength="255"
size="small"
style="width: 150px"
/>
</el-form-item>
<el-form-item label="lot number" prop="jcNum">
<el-input
v-model="queryParams.jcNum"
placeholder="请输入lot number"
clearable
:maxlength="255"
size="small" size="small"
style="width: 150px" style="width: 150px"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="状态" prop="flag">--> <el-form-item label="rank" prop="jcRank">
<!-- <el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">--> <el-input
<!-- <el-option--> v-model="queryParams.jcRank"
<!-- v-for="dict in statusOptions"--> placeholder="请输入rank"
<!-- :key="dict.dictValue"--> clearable
<!-- :label="dict.dictLabel"--> :maxlength="255"
<!-- :value="dict.dictValue"--> size="small"
<!-- />--> style="width: 150px"
<!-- </el-select>--> />
<!-- </el-form-item>--> </el-form-item>
<el-form-item label="审批状态" prop="approveStatus">
<el-select v-model="queryParams.approveStatus" placeholder="请选择">
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
:class="commonField.queryClass" :class="commonField.queryClass"
...@@ -138,12 +86,6 @@ ...@@ -138,12 +86,6 @@
</el-form-item> </el-form-item>
<div style="float: right"> <div style="float: right">
<el-form-item> <el-form-item>
<!-- <el-button-->
<!-- :class="commonField.addClass"-->
<!-- :type="commonField.typePrimary"-->
<!-- :icon="commonField.addIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="handleAdd">新增</el-button>-->
<el-button <el-button
:class="commonField.exportClass" :class="commonField.exportClass"
:type="commonField.typeSuccess" :type="commonField.typeSuccess"
...@@ -158,97 +100,65 @@ ...@@ -158,97 +100,65 @@
<div class="mb12 font-small-bold">检查表列表</div> <div class="mb12 font-small-bold">检查表列表</div>
<el-table v-loading="loading" border :data="incomeInspectInfoList" > <el-table v-loading="loading" border :data="incomeInspectInfoList" >
<el-table-column type="index" label="序号" width="55" align="center" /> <el-table-column type="index" label="序号" width="55" align="center" />
<!-- <el-table-column label="类型 (1 )" prop="jcType" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.jcType || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="单号" prop="jcCode" :show-overflow-tooltip="true"> <el-table-column label="单号" prop="jcCode" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.jcCode || '-' }} {{ scope.row.jcCode || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="lot" prop="jcLot" :show-overflow-tooltip="true">--> <el-table-column label="lot" prop="jcLot" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- {{ scope.row.jcLot || '-' }}--> {{ scope.row.jcLot || '-' }}
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column label="厂家" prop="jcCj" :show-overflow-tooltip="true"> <el-table-column label="厂家" prop="jcCj" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.jcCj || '-' }} {{ scope.row.jcCj || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="pn" prop="jcPn" :show-overflow-tooltip="true">--> <el-table-column label="pn" prop="jcPn" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.jcPn || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="lot number" prop="jcNum" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.jcNum || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="抽样" prop="jcFacadeCy" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.jcFacadeCy || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="不合格" prop="jcFacadeBl" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.jcFacadeBl || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="检查结果" prop="jcResult" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.jcResult || '-' }} {{ scope.row.jcPn || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" prop="jcNote" :show-overflow-tooltip="true"> <el-table-column label="lot number" prop="jcNum" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.jcNote || '-' }} {{ scope.row.jcNum || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批人" prop="approveUser" :show-overflow-tooltip="true"> <el-table-column label="rank" prop="jcRank" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.approveUser || '-' }} {{ scope.row.jcRank || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" prop="approveDate" :show-overflow-tooltip="true"> <el-table-column label="抽样" prop="jcFacadeCy" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.approveDate | transformDateByFormat('YYYY-MM-DD') }}</span> {{ scope.row.jcFacadeCy || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批意见" prop="approveNote" :show-overflow-tooltip="true"> <el-table-column label="不合格" prop="jcFacadeBl" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.approveNote || '-' }} {{ scope.row.jcFacadeBl || '-' }}
</template>
</el-table-column>
<el-table-column label="检查结果" prop="jcResult" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.jcResult || '-' }}
</template>
</el-table-column>
<el-table-column label="备注" prop="jcNote" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.jcNote || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批状态" prop="approveStatus" :show-overflow-tooltip="true"> <el-table-column label="审批状态" prop="approveStatus" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.approveStatus || '-' }} <span v-if="scope.row.approveStatus=='0'">草稿</span>
<span v-else-if="scope.row.approveStatus=='1'">待审核</span>
<span v-else-if="scope.row.approveStatus=='2'">已审核</span>
<span v-else-if="scope.row.approveStatus=='3'">已驳回</span>
<span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column width="120" label="状态" prop="flag">-->
<!-- <template slot-scope="scope">-->
<!-- <el-switch-->
<!-- v-model="scope.row.flag"-->
<!-- class="switchDisabledStyle"-->
<!-- inactive-value="0"-->
<!-- active-value="1"-->
<!-- @click.native="handleStatusChange(scope.row)"-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" class-name="small-padding fixed-width" width="200px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -325,19 +235,13 @@ ...@@ -325,19 +235,13 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="审批意见" prop="approveNote"> <el-form-item label="审批意见" prop="approveNote">
<el-input v-model.trim="form.approveNote" show-word-limit :maxlength="500" placeholder="请输入????" /> <el-input v-model.trim="form.approveNote" show-word-limit :maxlength="500" placeholder="请输入审批意见" />
</el-form-item> </el-form-item>
<el-form-item label="审批状态" prop="approveStatus"> <el-form-item label="审批状态" prop="approveStatus">
<el-input v-model.trim="form.approveStatus" show-word-limit :maxlength="1" placeholder="请输入0 cg 1 ??? 2 ??? 3 ???" /> <el-input v-model.trim="form.approveStatus" show-word-limit :maxlength="1" placeholder="请输入审批状态" />
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.flag">
<el-radio label="1">启用</el-radio>
<el-radio label="0">停用</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remarks"> <el-form-item label="rank" prop="jcRank">
<el-input v-model.trim="form.remarks" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" /> <el-input v-model.trim="form.jcRank" show-word-limit :maxlength="255" placeholder="请输入rank" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -372,16 +276,19 @@ export default { ...@@ -372,16 +276,19 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 状态菜单 // 状态菜单
statusOptions: [ statusOptions: [{
{ value: '0',
dictLabel: '启用', label: '草稿'
dictValue: '1' }, {
}, value: '1',
{ label: '待审核'
dictLabel: '停用', }, {
dictValue: '0' value: '2',
} label: '已审核'
], }, {
value: '3',
label: '已驳回'
}],
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
// 查询参数 // 查询参数
...@@ -402,6 +309,7 @@ export default { ...@@ -402,6 +309,7 @@ export default {
approveDate: undefined, approveDate: undefined,
approveNote: undefined, approveNote: undefined,
approveStatus: undefined, approveStatus: undefined,
jcRank: undefined,
flag: '' flag: ''
}, },
// 表单参数 // 表单参数
...@@ -455,6 +363,7 @@ export default { ...@@ -455,6 +363,7 @@ export default {
approveDate: undefined, approveDate: undefined,
approveNote: undefined, approveNote: undefined,
approveStatus: undefined, approveStatus: undefined,
jcRank: undefined,
flag: '1' flag: '1'
} }
this.resetForm('form') this.resetForm('form')
...@@ -484,6 +393,7 @@ export default { ...@@ -484,6 +393,7 @@ export default {
approveDate: undefined, approveDate: undefined,
approveNote: undefined, approveNote: undefined,
approveStatus: undefined, approveStatus: undefined,
jcRank: undefined,
flag: '' flag: ''
} }
this.handleQuery() this.handleQuery()
......
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