Skip to content

P
patzn-cloud-web-back-soil
Commit 53721587 by lichengming
Options

Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

parents e0551c9b 6ccb4b71
Showing with 50 additions and 67 deletions
pages/meter-contract/contract-review/MeterContractReview.vue
......@@ -71,7 +71,7 @@ export default {
{
type: 'success',
id: '',
name: '添加'
name: '评审'
}
],
iconMsg: [
......@@ -135,7 +135,7 @@ export default {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '添加':
case '评审':
this._editModal(false)
break
case '提交':
......
pages/meter-out/personal-task/MeterOutPersonalTask.vue
......@@ -37,7 +37,21 @@
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope">
<span>{{scope.row[item.key]}}</span>
<span v-if="item.key==='type'">
<span v-if="scope.row[item.key]===0">
检定
</span>
<span v-else-if="scope.row[item.key]===1">
校准
</span>
<span v-else-if="scope.row[item.key]===2">
外观检查
</span>
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
......@@ -49,8 +63,8 @@
<operationModal ref="operationModal"></operationModal>
<SelEquip ref="SelEquip" @on-result-change="_equipSelectBack"></SelEquip>
<CarManage ref="carEdit"></CarManage>
<InstruMentEdit ref="InstruEdit"></InstruMentEdit>
<MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
<InstruMentEdit ref="InstruEdit" @on-result-change="_page"></InstruMentEdit>
<MeterPersonItemTaskManage ref="personModal" @on-result-change="_page"></MeterPersonItemTaskManage>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
</div>
</template>
......@@ -97,7 +111,7 @@ export default {
{
type: 'md-create',
id: '',
name: '编辑'
name: '检测结果'
},
{
type: 'md-car',
......@@ -126,9 +140,9 @@ export default {
pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec' },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' },
{ title: '型号规格', key: 'spec', width: 120 },
{ title: '出厂编号', key: 'factoryNumber', width: 120 },
{ title: '检测类型', key: 'type', width: 100 },
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
......@@ -218,8 +232,7 @@ export default {
case '车辆管理':
this.$refs.carEdit._open()
break
case '编辑':
// this._editModal(true, data.id)
case '检测结果':
this._personModal(data)
break
case '资质项目':
......@@ -238,7 +251,6 @@ export default {
})
},
_personModal(data) {
console.log(data)
this.$refs.personModal._open(data.id)
},
_equipSelectBack(data) {
......
pages/meter-out/personal-task/MeterPersonItemTaskManage.vue
......@@ -86,11 +86,7 @@ export default {
// {id: '', name: '复制历史样品检测项目', componentName: 'CopyHisItem'},
// {id: '', name: '删除'},
// ],
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
],
iconMsg: [{ type: 'md-checkmark', id: '', name: '完成' }],
btn: [
{
// meter-review-entrust-pass-btn
......
pages/meter-out/task-distribute/MeterOutTaskAlloca.vue
......@@ -43,11 +43,15 @@
{{scope.row[item.key]===1?'是':'否'}}
</div>
<div v-else-if="item.key==='type'">
<Select v-model="scope.row.type">
<Option v-for="(item,index) in options" :key="item.name" :value="index">
{{ item.name }}
</Option>
</Select>
<span v-if="scope.row[item.key]===0">
检定
</span>
<span v-else-if="scope.row[item.key]===1">
校准
</span>
<span v-else-if="scope.row[item.key]===2">
外观检查
</span>
</div>
<div v-else>{{scope.row[item.key]}}</div>
</template>
......@@ -66,26 +70,14 @@ import assignPerson from '../../../components/user-info-single/assignPerson'
export default {
components: {
assignPerson
// FoodSampleGovernDetail,
// CopyModal,
// FoodSampleGovernLYEdits
},
data() {
return {
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: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
// { type: 'compose', id: '', name: '编辑' },
// { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
// { type: 'trash-a', id: '', name: '删除' }
],
btn: [
{
......
pages/meter-out/task-distribute/MeterOutTaskDistribute.vue
......@@ -6,24 +6,24 @@
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:">
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
<Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
<Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
<Button type="primary" @click="_formSearch">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
class="contHide"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></btn-list>
</Col>
<!--表格-->
<Col span="24">
......@@ -47,18 +47,15 @@
</div>
<FileManage ref="FileManage"></FileManage>
<MeterOutTaskAlloca ref="taskAllocaModal"></MeterOutTaskAlloca>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterOutTaskOperation ref="operationModal"></MeterOutTaskOperation>
</div>
</template>
<script>
import { meterEntrust } from '../../../api'
import MeterSubcontractorEdit from './MeterGoOutTestEdit'
import MeterOutTaskAlloca from './MeterOutTaskAlloca'
import MeterOutTaskOperation from './MeterOutTaskOperation'
export default {
components: {
MeterSubcontractorEdit,
MeterOutTaskAlloca,
MeterOutTaskOperation
},
......@@ -67,24 +64,13 @@ export default {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: 'meter-go-out-entrust-add-btn',
name: '添加'
},
{
type: 'success',
id: 'meter-go-out-entrust-submit-btn',
name: '提交'
}
],
btn: [],
iconMsg: [
{
type: 'md-create',
id: '',
name: '编辑'
},
// {
// type: 'md-create',
// id: '',
// name: '编辑'
// },
{
type: 'ios-contact',
id: '',
......
pages/meter-out/task-distribute/MeterOutTaskDistributeHis.vue
......@@ -45,15 +45,12 @@
</Row>
</div>
</div>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
</div>
</template>
<script>
import { meterEntrust } from '../../../api'
import MeterSubcontractorEdit from './MeterGoOutTestEdit'
export default {
components: { MeterSubcontractorEdit },
components: {},
data() {
return {
currentComponent: '',
......
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