Skip to content

P
patzn-cloud-web-back-soil
Commit 9c713d4a by wangweidong
Options

整体优化

parent 778ffcaa
Showing with 640 additions and 278 deletions
components/base/CityNameCascader.vue
...@@ -64,24 +64,13 @@ export default { ...@@ -64,24 +64,13 @@ export default {
// }) // })
}, },
loadData: async function(item, callback) { loadData: async function(item, callback) {
console.log('请求1市')
console.log('item')
console.log(item)
const val = item.__value const val = item.__value
console.log('val')
console.log(val)
item.loading = true item.loading = true
// if (val.indexOf(',') === -1) {
if (val.length <= 1) { if (val.length <= 1) {
// 不存在逗号 // 不存在逗号
console.log('请求市')
console.log(item.valueName)
const result = await meterEntrust.getCity(item.valueName) const result = await meterEntrust.getCity(item.valueName)
console.log(result)
if (result === undefined) { if (result === undefined) {
alert('123')
} }
// this.$store.dispatch('SysCity/getCity', item.valueName).then(() => {
const cityData = [] const cityData = []
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
cityData.push({ cityData.push({
...@@ -95,11 +84,7 @@ export default { ...@@ -95,11 +84,7 @@ export default {
item.children = cityData item.children = cityData
item.loading = false item.loading = false
callback() callback()
// })
} else { } else {
// this.$store.dispatch('SysArea/getArea', item.valueName).then(() => {
// const result = this.$store.state.SysArea.list
console.log('请求区')
const result = await meterEntrust.getArea(item.valueName) const result = await meterEntrust.getArea(item.valueName)
const areaData = [] const areaData = []
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
...@@ -112,7 +97,6 @@ export default { ...@@ -112,7 +97,6 @@ export default {
item.children = areaData item.children = areaData
item.loading = false item.loading = false
callback() callback()
// })
} }
}, },
// 省、市、区都可选 // 省、市、区都可选
......
pages/contract-tab/ContractLeftList.vue 0 → 100644
<template>
<div>
<Row>
<!--查询-->
<Col span="24">
<Form id="data-input-contract-left" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item-select">
<SelectInput ref="selInput1" :optionList="optionList" @on-result-change="_selInputResult1"
keyword="code" placeholder="请输入委托编号"></SelectInput>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<!--//操作-->
<Col span="24">
<btn-list :msg="btn" @on-result-change="_btnClick" class="contHide">
<!--切换待认领任务-->
<template slot="processTask" v-if="$showBtn('food-data-input-contract-task')">
<div class="fr process-task" style="margin-right: 10px">
<el-checkbox v-model="personal" @change="_page" :true-label="1"
:false-label="0" size="medium">个人任务
</el-checkbox>
</div>
</template>
</btn-list>
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns"
:table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange"
:getPage="getPage"
:rows="100" is-task>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:min-width="item.width"
:fixed="item.fixed?item.fixed:undefined"
sortable
>
<template slot-scope="scope">
<a v-if="item.detail" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a>
<span
v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
<VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
@on-result-change="_page" :table-name="tableName"></VXESettingCol>
</PTVXETable>
</Col>
</Row>
</div>
</template>
<script>
import { meterManage } from '../../api'
import SelectInput from './SelectInput'
export default {
components: {
SelectInput
},
data() {
return {
currentComponent: '',
tableName: 'food-data-input-contract-left',
// 用户自己选中的列
userColumns: [],
personal: 1,
btn: [],
optionList: [
{ key: 'code', name: '委托编号', placeholder: '请输入委托编号' },
{ key: 'cname', name: '委托单位', placeholder: '请输入委托单位' },
{ key: 'name', name: '委托名称', placeholder: '请输入委托名称' },
{
key: 'reportDueDate',
name: '应出报告日期',
placeholder: '请选择应出报告日期',
date: true
}
],
getPage: {},
pageColumns: [
{ title: '委托名称', key: 'name', width: 160 },
{ title: '委托编号', key: 'code', width: 180, detail: true },
{ title: '委托单位', key: 'cname', width: 200 },
{ title: '服务类型', key: 'serviceType', width: 120 },
{ title: '应出报告日期', key: 'reportDueDate', width: 140, date: true }
]
}
},
computed: {
tableHeight: function() {
return this.$tableHeight('tabSearch')
}
},
methods: {
_dicSearch() {
this.$store
.dispatch('LmsBaseDict/getItem', '个人任务是否勾选')
.then(() => {
const resultData = this.$store.state.LmsBaseDict.item
if (resultData.length > 0) {
this.personal = resultData[0].name === '是' ? 1 : 0
} else {
this.personal = 1
}
this._page()
})
},
_btnClick() {},
_selInputResult1(msg, data) {
switch (msg) {
case 'search':
this._formSearch()
break
}
},
_open() {
// this._dicSearch()
this._page()
},
_searchParams() {
const obj = {}
const obj1 = this.$refs.selInput1._getFormObj()
Object.assign(obj, obj1)
if (this.personal) {
obj.personal = this.personal
}
return obj
},
_page: async function() {
console.log(9522123)
// this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
// console.log('this.formObj', this.formObj)
const result = await meterManage.page(this.formObj)
if (result) {
console.log(55555)
console.log(result)
this.getPage = result
console.log(123456789)
console.log(this.getPage)
this.$refs.pageTable._hideLoading()
}
},
// _page() {
// // this.$refs.pageTable._page(
// // 'data-input-contract-left',
// // 'FoodContract/dataInputContractLeft',
// // this._searchParams()
// // )
// },
_tableResultChange(msg, data) {
switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodContract.page
break
case 'selectIds':
this.$emit('on-result-change', data, this.personal)
break
case 'changeSize':
this._page()
this._clear()
break
case 'table-col':
// 用户选中的表格列
this.userColumns = data
break
}
},
_clear() {
this.selectIds = []
this.$emit('on-result-change', [])
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
this._clear()
}
// 委托详情
// _detailModal(data) {
// this.$store.dispatch('FoodContract/getById', data.id).then(() => {
// if (data.type === 1) {
// this.currentComponent = 'FoodContractGovernDetail'
// } else {
// this.currentComponent = 'FoodContractCompanyDetail'
// }
// this.$nextTick(function() {
// this.$refs.refModal._open(this.$store.state.FoodContract.model)
// })
// })
// }
}
}
</script>
pages/contract-tab/ContractTab.vue 0 → 100644
<template>
<div>
<Modal v-model="showModal" width="1200">
<TwoColumnPage>
<template slot="left">
<ContractLeftList ref="leftModal" @on-result-change="_leftResult"></ContractLeftList>
</template>
<template slot="right">
<ContractRightList ref="rightModal" @on-result-change="_rightResult"></ContractRightList>
</template>
</TwoColumnPage>
</Modal>
</div>
</template>
<script>
import TwoColumnPage from '../../components/base/TwoColumnPage'
import ContractLeftList from './ContractLeftList'
import ContractRightList from './ContractRightList'
export default {
components: {
TwoColumnPage,
ContractLeftList,
ContractRightList
},
data() {
return {
showModal: false
}
},
methods: {
_open() {
// this.formObj.entrustId = id
this.showModal = true
this.$refs.leftModal._open()
// this._page()
},
_leftResult(data, personal) {
this.$refs.rightModal._open(data, personal)
// console.log(data, personal)
},
_rightResult() {
this.$refs.leftModal._page()
}
// _open() {
// this.$refs.leftModal._open()
// }
}
}
</script>
pages/contract-tab/SelectInput.vue 0 → 100644
<template>
<div>
<!--有时间组件-->
<div v-if="date === true && multiple === false" class="search-item-select-date">
<Select slot="prepend" v-model="key" @on-change="_selKeyChange" style="width:90px">
<span v-for="item in optionList" v-bind:key="item.key">
<Option :value="item.key" :key="item.key" v-if="compareKey!==item.key">
{{item.name}}
</Option>
</span>
</Select>
<template v-if="dateToMin">
<Date-picker :placeholder="msg" :editable="false"
@on-change="_dateChange"
type="datetimerange" format="yyyy-MM-dd HH:mm" style="width:185px;"
placement="bottom-start">
</Date-picker>
</template>
<template v-else>
<Date-picker :placeholder="msg" :editable="false" @on-change="_dateChange"
type="daterange" format="yyyy-MM-dd" style="width:185px;"
placement="bottom-start">
</Date-picker>
</template>
</div>
<!--结果判定单选组件-->
<div v-else-if="date === false && multiple === true" class="search-item-select-date">
<Select slot="prepend" v-model="key" @on-change="_selKeyChange" style="width:90px">
<span v-for="item in optionList" v-bind:key="item.key">
<Option :value="item.key" :key="item.key" v-if="compareKey!==item.key">
{{item.name}}
</Option>
</span>
</Select>
<el-select v-model="qualifiedValue" :placeholder="msg" size="small" clearable>
<el-option :label="item.name" :value="item.value" v-for="item in judgeList"
:key="item.value"></el-option>
</el-select>
</div>
<!--正常-->
<Input v-model="inputValue" :placeholder="msg" @on-enter="_formSearch" v-else-if="date === false && multiple === false"
style="width: 275px">
<Select slot="prepend" v-model="key" @on-change="_selKeyChange" style="width:90px">
<!--:key 渲染时key很有用，不写可能渲染错-->
<div v-for="item in optionList" v-bind:key="item.key">
<Option :value="item.key" :key="item.key" v-if="compareKey!==item.key">
{{item.name}}
</Option>
</div>
</Select>
</Input>
</div>
</template>
<script>
export default {
props: {
placeholder: null,
keyword: null,
optionList: null,
compareKeyword: null,
isDate: null,
judgeList: null
},
data() {
return {
formObj: {},
inputValue: '',
msg: this.placeholder, // 必须重新赋值 ，因前面不是变量
key: this.keyword, // 必须重新赋值 ，因前面不是变量
compareKey: this.compareKeyword, // 必须重新赋值 ，因前面不是变量
date: this.isDate !== undefined,
multiple: false,
qualifiedValue: '',
// 日期精确到分，动态设置日期格式不行
dateToMin: false
}
},
methods: {
_formSearch() {
if (this.inputValue) {
this.formObj[this.key] = this.inputValue
// this.$emit('on-result-change', 'search', this.formObj)
this.$emit('on-result-change', 'search')
} else {
this.formObj[this.key] = ''
// this.$emit('on-result-change', 'search', this.$serializeFormSearch(this.formObj))
this.$emit('on-result-change', 'search')
}
},
_setCompareKeyword(data) {
this.compareKey = data
},
_getFormObj() {
if (this.inputValue) {
this.formObj[this.key] = this.inputValue
} else {
this.formObj[this.key] = ''
}
return this.$serializeFormSearch(this.formObj)
},
_qualifiedValue() {
const obj = {}
if (this.qualifiedValue) {
obj.qualifiedValue = this.qualifiedValue
} else {
obj.qualifiedValue = ''
}
return this.$serializeFormSearch(obj)
},
_selKeyChange(data) {
this.$emit('on-result-change', 'keyword', this.key)
this.formObj = {}
this.inputValue = ''
const obj = this.optionList.find(item => item.key === data)
if (obj.date) {
if (obj.dateToMin !== undefined) {
this.dateToMin = true
} else {
this.dateToMin = false
}
this.date = true
this.multiple = false
this.qualifiedValue = ''
} else if (obj.multiple) {
this.multiple = true
this.date = false
} else {
this.multiple = false
this.date = false
this.qualifiedValue = ''
}
this.key = obj.key
this.msg = obj.placeholder
},
_dateChange(date) {
if (date[0]) {
this.formObj[this.key + 'Begin'] = date[0]
this.formObj[this.key + 'End'] = date[1]
} else {
this.formObj = {}
}
},
_selJudge() {}
}
}
</script>
pages/meter-aptitude/manage/MeterAptitudeManage.vue
...@@ -91,9 +91,9 @@ export default { ...@@ -91,9 +91,9 @@ export default {
{ type: '', id: '', name: '导出' } { type: '', id: '', name: '导出' }
], ],
iconMsg: [ iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' }, { type: 'md-create', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }, { type: 'md-trash', id: '', name: '删除' },
{ type: 'ios-clock', id: '', name: '管理检测项目' } { type: 'md-apps', id: '', name: '管理检测项目' }
], ],
formObj: { formObj: {
basis: undefined, basis: undefined,
......
pages/meter-contract/contract-technology/MeterTechnologyReviewEdit.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/> <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48"> <Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
......
pages/meter-entrust/MeterSampleEdit.vue 0 → 100644
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" width="600">
<p slot="header">{{modalTitle}}</p>
<div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
<Form-item label="样品名称" prop="name">
<Input v-model="formObj.name" name="name" placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange" />
</Form-item>
<Form-item label="检定依据" prop="verification">
<Input v-model="formObj.verification" name="verification" placeholder="请选择检定依据" />
</Form-item>
<Form-item label="型号规格" prop="spec">
<Input v-model="formObj.spec" name="spec" placeholder="请输入型号规格" />
</Form-item>
<Form-item label="出厂编号" prop="factoryNumber">
<Input v-model="formObj.factoryNumber" name="factoryNumber" placeholder="请输入出厂编号" />
</Form-item>
<Form-item label="数量" prop="quantity">
<Input v-model="formObj.quantity" name="quantity" placeholder="请选择数量" />
</Form-item>
<Form-item label="检测类型" prop="type">
<Input v-model="formObj.type" name="quantity" placeholder="请选择检测类型" />
</Form-item>
<Form-item label="备注" prop="remark">
<Input v-model="formObj.remark" :rows="3" placeholder="请输入备注" type="textarea" name="remark"/>
</Form-item>
</Form>
</div>
<div slot="footer">
<ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
</div>
</Modal>
</div>
</template>
<script>
/**
* 添加编辑环境检测项目包
*/
import ModalFooter from '../../components/base/modalFooter'
import { meterAptitude } from '../../api'
export default {
components: {
ModalFooter
// autoComplete
},
data() {
// const validateJudgeBasis = (rule, value, callback) => {
// if (this.formObj.code === '') {
// callback(new Error('判定依据不能为空！'))
// } else if (this.formObj.stdId === '') {
// this.formObj.code = ''
// callback(new Error('请选择已维护过的判定依据！'))
// } else {
// callback()
// }
// }
return {
id: '',
modalTitle: '',
formObj: {
verification: '',
name: '',
spec: '',
factoryNumber: '',
type: '',
remark: '',
quantity: 1,
entrustId: ''
},
showModal: false,
aptitudeData: [],
ruleValidate: {
name: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }]
},
footerList: [
{ name: '取消', type: '' },
{ name: '保存', type: 'primary' }
],
typeData: [],
judgeBasisData: []
}
},
methods: {
_save: async function(data) {
const result = await meterAptitude.save(data)
console.log(result)
if (result) {
this._resultChange('添加成功!')
}
},
_edit: async function(data) {
const result = await meterAptitude.edit(data)
if (result) {
this._resultChange('编辑成功!')
}
},
_open(entrustId) {
this.formObj.entrustId = entrustId
this._getJudgeBasisList()
this.$refs.formObj.resetFields()
this.id = ''
this.modalTitle = '添加样品'
this.showModal = true
},
_typeChange(msg, data) {
switch (msg) {
case 'select':
this.formObj.testType = data.name
break
}
},
_ok() {
this.$refs.formObj.validate(valid => {
if (valid) {
const data = this.$serialize('edit-form')
if (this.$string(this.id).isEmpty()) {
// 添加
this._save(data)
} else {
// 编辑
this._edit({ id: this.formObj.id, obj: data })
}
// if (this.$string(this.id).isEmpty()) {
// // 添加
// this.$store.dispatch('FoodJudgeBasis/add', data).then(() => {
// this._resultChange('添加成功!')
// })
// } else {
// // 编辑
// this.$store
// .dispatch('FoodJudgeBasis/edit', { id: this.id, obj: data })
// .then(() => {
// this._resultChange('编辑成功!')
// })
// }
} else {
this.$refs.footerModal._hideLoading()
this.$Message.error('表单验证失败!')
}
})
},
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '保存':
this._ok()
break
}
},
_cancel() {
this.showModal = false
},
_resultChange(msg) {
this.showModal = false
this.$refs.footerModal._hideLoading()
this.$Message.success(msg)
this.$emit('on-result-change')
this.$refs.footerModal._hideLoading()
},
// 关联
_getJudgeBasisList(data) {
const obj = { classify: 0 }
if (data) {
obj.stdNum = data
}
// this.$store.dispatch('StandardInfo/list', obj).then(() => {
// this.judgeBasisData = this.$store.state.StandardInfo.list
// })
},
_judgeBasisChange(msg, data) {
switch (msg) {
case 'select':
this.formObj.stdId = data.id
this.formObj.code = data.stdNum
this.formObj.name = data.name
this.$refs.formObj.validateField('code')
break
case 'query':
this.formObj.stdId = ''
this.formObj.code = data.stdNum
this.formObj.name = ''
this._getJudgeBasisList(data.stdNum)
break
case 'focus':
this._getJudgeBasisList()
break
case 'blur':
if (this.formObj.stdId === '') {
this.formObj.code = ''
this._getJudgeBasisList()
}
this.$refs.formObj.validateField('code')
}
}
}
}
</script>
pages/meter-entrust/send-test/MeterSendEntrust.vue
...@@ -6,24 +6,24 @@ ...@@ -6,24 +6,24 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24" style="margin-top: 10px"> <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> <label class="label-sign"></label>
<Form-item class="search-item" 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>
<Form-item class="search-item" label="资质:"> <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>
<Form-item class="search-btn"> <Form-item class="search-btn">
<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">
...@@ -47,15 +47,18 @@ ...@@ -47,15 +47,18 @@
</div> </div>
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage"></FileManage>
<MeterSendOperation ref="operationModal"></MeterSendOperation> <MeterSendOperation ref="operationModal"></MeterSendOperation>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust, meterSubcontractor } from '../../../api' import { meterEntrust } from '../../../api'
import MeterSampleManage from '../MeterSampleManage'
import MeterSubcontractorEdit from './MeterSendTestEdit' import MeterSubcontractorEdit from './MeterSendTestEdit'
import MeterSendOperation from './MeterSendOperation' import MeterSendOperation from './MeterSendOperation'
export default { export default {
components: { MeterSubcontractorEdit, MeterSendOperation }, components: { MeterSubcontractorEdit, MeterSendOperation, MeterSampleManage },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -83,7 +86,7 @@ export default { ...@@ -83,7 +86,7 @@ export default {
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: '',
name: '资质项目' name: '管理样品'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' }, { type: 'md-remove-circle', id: '', name: '删除' },
...@@ -155,8 +158,8 @@ export default { ...@@ -155,8 +158,8 @@ export default {
case '编辑': case '编辑':
this._editModal(true, data.id) this._editModal(true, data.id)
break break
case '资质项目': case '管理样品':
this._itemModal(data.id) this._sampleManage(data.id)
break break
case '附件': case '附件':
this._upload(data.id) this._upload(data.id)
...@@ -170,6 +173,11 @@ export default { ...@@ -170,6 +173,11 @@ export default {
} }
}) })
}, },
_sampleManage(data) {
// 管理样品
this.$refs.meterSampleManageModal._open(data)
},
_submitToReview() { _submitToReview() {
this._submitByContractIds('委托评审') this._submitByContractIds('委托评审')
}, },
...@@ -239,11 +247,10 @@ export default { ...@@ -239,11 +247,10 @@ export default {
_editModal(edit, id) { _editModal(edit, id) {
if (edit) { if (edit) {
// 编辑 // 编辑
// this.$refs.editSubcontractorModal._open(id)
this._getById(id) this._getById(id)
} else { } else {
// 添加 // 添加
this.$refs.editSubcontractorModal._open() this.$refs.editModal._open()
} }
}, },
// 追加项目 // 追加项目
...@@ -258,11 +265,11 @@ export default { ...@@ -258,11 +265,11 @@ export default {
_getById: async function(id) { _getById: async function(id) {
const result = await meterEntrust.getVOById(id) const result = await meterEntrust.getVOById(id)
if (result) { if (result) {
this.$refs.editSubcontractorModal._openEdit(result) this.$refs.editModal._openEdit(result)
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterEntrust.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功！') this.$Message.success('删除成功！')
......
pages/meter-entrust/send-test/MeterSendEntrustFinish.vue deleted 100644 → 0
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :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/>
</Form-item>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</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>
</Col>
<!--表格-->
<Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope">
<span>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
</div>
</template>
<script>
import { meterEntrust, meterSubcontractor } from '../../../api'
import MeterSubcontractorEdit from './MeterSendTestEdit'
export default {
components: { MeterSubcontractorEdit },
data() {
return {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: 'meter-subcontractor-add-btn',
name: '添加'
}
],
iconMsg: [
{
type: 'ios-clock',
id: '',
name: '编辑'
},
{
type: 'ios-clock',
id: '',
name: '资质项目'
},
{ type: 'ios-clock', id: '', name: '附件' },
{ type: 'ios-clock', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' }
]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this._page()
},
methods: {
_modalResult() {
if (this.currentComponent === 'FoodSubcontracterEdit') {
this._page()
}
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '添加':
this._editModal(false)
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '编辑':
this._editModal(true, data.id)
break
case '资质项目':
this._itemModal(data.id)
break
case '附件':
this._upload(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
case '操作日志':
this._record(data.id)
break
}
})
},
_record(id) {
this.$refs.refModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodSubcontracter.page
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'changeSize':
this._page()
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await meterEntrust.pageSendEntrust(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
}
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
// 删除
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
// 编辑&添加
_editModal(edit, id) {
if (edit) {
// 编辑
// this.$refs.editSubcontractorModal._open(id)
this._getById(id)
} else {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.refModal._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterSubcontractor.getById(id)
if (result) {
this.$refs.editSubcontractorModal._open(result)
}
},
_delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-entrust/send-test/MeterSendEntrustIndex.vue
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
<el-tab-pane label="待完成" name="wait"> <el-tab-pane label="待完成" name="wait">
<MeterSendEntrust ref="waitTabs"></MeterSendEntrust> <MeterSendEntrust ref="waitTabs"></MeterSendEntrust>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已完成" name="finish">
<MeterSendEntrustFinish ref="finishTabs"></MeterSendEntrustFinish>
</el-tab-pane>
<el-tab-pane label="历史记录" name="his"> <el-tab-pane label="历史记录" name="his">
<MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis> <MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis>
</el-tab-pane> </el-tab-pane>
...@@ -19,13 +16,11 @@ ...@@ -19,13 +16,11 @@
</template> </template>
<script> <script>
import MeterSendEntrust from './MeterSendEntrust' import MeterSendEntrust from './MeterSendEntrust'
import MeterSendEntrustFinish from './MeterSendEntrustFinish'
import MeterSendEntrustHis from './MeterSendEntrustHis' import MeterSendEntrustHis from './MeterSendEntrustHis'
export default { export default {
name: 'MeterSendEntrustIndex', name: 'MeterSendEntrustIndex',
components: { components: {
MeterSendEntrust, MeterSendEntrust,
MeterSendEntrustFinish,
MeterSendEntrustHis MeterSendEntrustHis
}, },
data() { data() {
......
pages/meter-review/MeterReviewEntrust.vue
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
</div> </div>
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage"></FileManage>
<Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason> <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_componentResult"></MeterSampleManage> <MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
<MeterEntrustDetail ref="meterSampleEdit" @on-result-change="_componentResult"></MeterEntrustDetail> <MeterEntrustDetail ref="meterSampleEdit" @on-result-change="_page"></MeterEntrustDetail>
<Operation ref="operation"></Operation> <Operation ref="operation"></Operation>
</div> </div>
</template> </template>
......
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