Skip to content

P
patzn-cloud-web-back-soil
Commit 41ada202 by wangweidong
Options

合同评审

parent 5a888ebe
Showing with 25 additions and 59 deletions
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
...@@ -64,12 +64,12 @@ export default { ...@@ -64,12 +64,12 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: 'meter-go-out-entrust-add-btn', id: '',
name: '添加' name: '添加'
}, },
{ {
type: 'success', type: 'success',
id: 'meter-go-out-entrust-submit-btn', id: '',
name: '提交' name: '提交'
} }
], ],
......
pages/meter-review/MeterSampleManageEdit.vue → pages/meter-review/MeterReviewItemManage.vue
<template> <template>
<div> <div>
<Modal v-model="showModal" width="1200" class="modal-footer-none"> <Modal v-model="showModal" width="1100" class="modal-footer-none">
<p slot="header">{{modalTitle}}</p> <p slot="header">{{modalTitle}}</p>
<div> <div>
<!--内容--> <!--内容-->
...@@ -9,25 +9,22 @@ ...@@ -9,25 +9,22 @@
<Col span="24"> <Col span="24">
<Form id="formId" :label-width="80" inline onsubmit="return false"> <Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item label="样品名称:" class="search-item"> <Form-item label="检定项目:" class="search-item">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/> <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn" style="margin-left: -10px"> <Form-item class="search-btn" style="margin-left: -10px">
<Button @click="_formSearch" type="primary">搜索</Button> <Button type="primary" @click="_formSearch">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
class="contHide"></btn-list> @on-result-change="_btnClick"></btn-list>
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data> select-data @on-result-change="_tableResultChange">
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -45,14 +42,14 @@ ...@@ -45,14 +42,14 @@
<span v-else-if="item.key==='singleJudge'"> <span v-else-if="item.key==='singleJudge'">
{{ scope.row[item.key]===undefined?'':scope.row[item.key].display }} {{ scope.row[item.key]===undefined?'':scope.row[item.key].display }}
</span> </span>
<div v-else-if="item.key==='testValue'"> <!-- <div v-else-if="item.key==='testValue'">-->
<el-input <!-- <el-input-->
v-model="scope.row.testValue" <!-- v-model="scope.row.testValue"-->
@blur="_handleTestValueEdit(scope.row.id,scope.row.testValue)" <!-- size="medium"-->
size="medium" <!-- placeholder="请输入检测结果"-->
placeholder="请输入检测结果" <!-- @blur="_handleTestValueEdit(scope.row.id,scope.row.testValue)"-->
/> <!-- />-->
</div> <!-- </div>-->
<div v-else-if="item.key==='progress'"> <div v-else-if="item.key==='progress'">
{{scope.row.progress.display}} {{scope.row.progress.display}}
</div> </div>
...@@ -77,39 +74,12 @@ export default { ...@@ -77,39 +74,12 @@ export default {
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
// btn: [
// {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'},
// {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'},
// {id: '', name: '导入样品', componentName: 'FoodImportSample'},
// {id: '', name: '导入检测项目', componentName: 'RelItem'},
// {id: '', name: '导入检测项目包', componentName: 'RelItemPackage'},
// {id: '', name: '复制历史样品检测项目', componentName: 'CopyHisItem'},
// {id: '', name: '删除'},
// ],
iconMsg: [ iconMsg: [
{ type: 'compose', id: '', name: '编辑' }, { type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' }, { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' } { type: 'trash-a', id: '', name: '删除' }
], ],
btn: [ btn: [],
// {
// // meter-review-entrust-pass-btn
// type: 'success',
// id: '',
// name: '完成'
// },
// // meter-review-entrust-back-btn
// {
// type: 'success',
// id: '',
// name: '填写检测值'
// },
// {
// type: 'success',
// id: '',
// name: '判定'
// }
],
options: [ options: [
{ {
name: '检定' name: '检定'
...@@ -124,12 +94,11 @@ export default { ...@@ -124,12 +94,11 @@ export default {
formId: 'meterReviewSampleManageFormId', formId: 'meterReviewSampleManageFormId',
showModal: false, showModal: false,
searchOpen: false, searchOpen: false,
modalTitle: '管理样品', modalTitle: '检测项目管理',
selectIds: [], selectIds: [],
selectData: [], selectData: [],
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
// { title: '样品编号', key: 'code', detail: true, width: 120 },
{ title: '检定项目', key: 'name', width: 180 }, { title: '检定项目', key: 'name', width: 180 },
{ title: '比较符', key: 'compare', width: 100 }, { title: '比较符', key: 'compare', width: 100 },
{ title: '限量值', key: 'limitValue', width: 140 }, { title: '限量值', key: 'limitValue', width: 140 },
...@@ -261,7 +230,7 @@ export default { ...@@ -261,7 +230,7 @@ export default {
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj) console.log('this.formObj', this.formObj)
const result = await meterItem.pageTest(this.formObj) const result = await meterItem.page(this.formObj)
console.log('result', result) console.log('result', result)
if (result) { if (result) {
this.getPage = result this.getPage = result
......
pages/meter-review/MeterSampleManage.vue
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
</Row> </Row>
</div> </div>
</Modal> </Modal>
<importModal ref="importModal"></importModal> <importModal ref="importModal" @on-result-change="_page"></importModal>
<MeterSampleManageEdit ref="sampleEditModal"></MeterSampleManageEdit> <MeterSampleManageEdit ref="sampleEditModal" @on-result-change="_page"></MeterSampleManageEdit>
</div> </div>
</template> </template>
<script> <script>
import { meterSample } from '../../api' import { meterSample } from '../../api'
import MeterSampleManageEdit from './MeterSampleManageEdit' import MeterSampleManageEdit from './MeterReviewItemManage'
import importModal from './contract-tab/ContractTab' import importModal from './contract-tab/ContractTab'
export default { export default {
components: { components: {
...@@ -88,18 +88,15 @@ export default { ...@@ -88,18 +88,15 @@ export default {
// ], // ],
iconMsg: [ iconMsg: [
{ type: 'compose', id: '', name: '编辑' }, { type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '管理检测样品' }, { type: 'ios-flask-outline', id: '', name: '管理检测项目' },
// { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' } { type: 'trash-a', id: '', name: '删除' }
], ],
btn: [ btn: [
{ {
// meter-review-entrust-pass-btn
type: 'success', type: 'success',
id: '', id: '',
name: '分包' name: '分包'
}, },
// meter-review-entrust-back-btn
{ {
type: 'success', type: 'success',
id: '', id: '',
...@@ -195,7 +192,7 @@ export default { ...@@ -195,7 +192,7 @@ export default {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (res) { switch (res) {
case '管理检测样品': case '管理检测项目':
this._sampleEditModal(data) this._sampleEditModal(data)
break break
case '编辑': case '编辑':
......
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