Skip to content

P
patzn-cloud-web-back-soil
Commit a66bc016 by wangweidong
Options

委托评审优化

parent ab4ea64f
Showing with 53 additions and 93 deletions
api/index.js
...@@ -27,5 +27,6 @@ export { default as meterSubcontractor } from './meter/meter-subcontractor' ...@@ -27,5 +27,6 @@ export { default as meterSubcontractor } from './meter/meter-subcontractor'
export { default as meterAptitude } from './meter/meter-aptitude' export { default as meterAptitude } from './meter/meter-aptitude'
export { default as meterManage } from './meter/meter-manage' export { default as meterManage } from './meter/meter-manage'
export { default as meterEntrust } from './meter/meter-entrust' export { default as meterEntrust } from './meter/meter-entrust'
export { default as meterSample } from './meter/meter-sample'
export { default as meterManageItem } from './meter/meter-manage-item' export { default as meterManageItem } from './meter/meter-manage-item'
export { default as lmsBaseDict } from './lims/lms-base-dict' export { default as lmsBaseDict } from './lims/lms-base-dict'
api/meter/meter-entrust.js
...@@ -50,8 +50,5 @@ export default { ...@@ -50,8 +50,5 @@ export default {
// 城市 // 城市
getCity: data => http.post('/base/v1/city/list_' + data).then(res => res), getCity: data => http.post('/base/v1/city/list_' + data).then(res => res),
// 地区 // 地区
getArea: data => http.post('/base/v1/area/list_' + data).then(res => res), getArea: data => http.post('/base/v1/area/list_' + data).then(res => res)
//
getInfo: data =>
http.post('meter/v1/sample/page?entrustId=' + data).then(res => res)
} }
api/meter/meter-sample.js 0 → 100644
/**
* 工作台
*/
import http from '../http'
import { https } from '../https'
export default {
// page
page: data => http.post('meter/v1/sample/page', data).then(res => res),
getById: data => http.get('meter/v1/sample/' + data).then(res => res),
deleteById: data =>
http.delete('meter/v1/sample/?ids=' + data).then(res => res),
// 保存
save: data =>
https
.post('meter/v1/sample/add_send_entrust', JSON.stringify(data))
.then(res => res)
}
pages/meter-review/MeterReviewEntrust.vue
...@@ -45,15 +45,14 @@ ...@@ -45,15 +45,14 @@
</Row> </Row>
</div> </div>
</div> </div>
<!-- <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult" keep-alive></component>--> <MeterSampleManage ref="meterSampleManageModal" @on-result-change="_componentResult"></MeterSampleManage>
<FoodSampleGovern ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></FoodSampleGovern>
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust, meterSubcontractor } from '../../api' import { meterEntrust, meterSubcontractor } from '../../api'
import FoodSampleGovern from './FoodSampleGovern' import MeterSampleManage from './MeterSampleManage'
export default { export default {
components: { FoodSampleGovern }, components: { MeterSampleManage },
data() { data() {
return { return {
currentComponent: 'FoodSampleGovern', currentComponent: 'FoodSampleGovern',
...@@ -143,8 +142,7 @@ export default { ...@@ -143,8 +142,7 @@ export default {
} }
}) })
}, },
_iconClick(res, data, componentName) { _iconClick(res, data) {
this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (res) { switch (res) {
case '样品管理': case '样品管理':
...@@ -170,20 +168,7 @@ export default { ...@@ -170,20 +168,7 @@ export default {
}, },
_manageSample(data) { _manageSample(data) {
// 管理样品 // 管理样品
console.log(data) this.$refs.meterSampleManageModal._open(data.id)
if (data.type === 0) {
// 企业
alert(123456)
// this.currentComponent = 'FoodSampleCompany'
} else {
// 政府
this.currentComponent = 'FoodSampleGovern'
}
this.$nextTick(() => {
console.log('要传的数字')
console.log(data.id)
this.$refs.refModal._open(data.id)
})
}, },
_componentResult(data, msg) { _componentResult(data, msg) {
switch (this.currentComponent) { switch (this.currentComponent) {
...@@ -210,7 +195,7 @@ export default { ...@@ -210,7 +195,7 @@ export default {
this.getPage = this.$store.state.FoodSubcontracter.page this.getPage = this.$store.state.FoodSubcontracter.page
break break
case 'iconClick': case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName) this._iconClick(data.name, data.rowData)
break break
case 'changeSize': case 'changeSize':
this._page() this._page()
......
pages/meter-review/FoodSampleGovern.vue → pages/meter-review/MeterSampleManage.vue
...@@ -7,46 +7,36 @@ ...@@ -7,46 +7,36 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24"> <Col span="24">
<Form id="search-sample-govern" :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>
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.num" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/> <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item label="抽样单编号:" class="search-item">
<Input v-model="formObj.samplingNum" @on-enter="_formSearch" placeholder="请输入抽样单编号" clearable/>
</Form-item>
<Form-item label="制单日期:" style="width: 24%">
<Date-picker :editable="false" @on-change="_dateChange" v-model="dateList"
type="daterange" placeholder="制单日期" format="yyyy-MM-dd"
style="width:100%" placement="bottom-end"></Date-picker>
</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">-->
<!-- <BtnList :msg="btn" @on-result-change="_btnClick" class="contHide"></BtnList>-->
<!-- </Col>-->
<!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :tableHeight="tableHeight" @on-result-change="_tableResultChange" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:getPage="getPage" :iconMsg="iconMsg" select-data> :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
<vxe-table-column <vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key" :field="item.key"
:title="item.title" :title="item.title"
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" :fixed="item.fixed?item.fixed:undefined" sortable>
v-for="item in pageColumns"
:key="item.key" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.detail"><a @click.stop="_detailModal(scope.row.id)">{{scope.row[item.key]}}</a></div> <div v-if="item.detail"><a @click.stop="_detailModal(scope.row.id)">{{scope.row[item.key]}}</a></div>
<div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}} <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</div> </div>
<div v-else-if="item.key==='jobOut'">
{{scope.row[item.key]===1?'是':'否'}}
</div>
<div v-else-if="item.key==='type'"> <div v-else-if="item.key==='type'">
<Select v-model="scope.row.type"> <Select v-model="scope.row.type">
<Option v-for="(item,index) in options" :key="item.name" :value="index"> <Option v-for="(item,index) in options" :key="item.name" :value="index">
...@@ -62,22 +52,10 @@ ...@@ -62,22 +52,10 @@
</Row> </Row>
</div> </div>
</Modal> </Modal>
<!-- <component ref="refModal" :is="currentComponent" @on-result-change="_modalResult"-->
<!-- :sampleList="selectData"></component>-->
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust } from '../../api' import { meterSample } from '../../api'
// import FoodImportSample from '../../../../../components/import/DownloadTemplateImport'
// import RelItem from '../food-item/rel-item/ImportItemIndex'
// import RelItemPackage from '../food-item/rel-package/RelItemPackage'
// import CopyModal from '../food-sample-company/CopyModal'
// import CopyHisItem from '../food-item/copy-his-item/CopyHisItem'
// import FoodSampleGovernLYEdit from './FoodSampleGovernLYEdit'
// import FoodSampleGovernDetail from './FoodSampleGovernDetail'
// import FoodSampleGovernBatchAdd from './FoodSampleGovernBatchAdd'
// import FoodSampleGovernEdit from './FoodSampleGovernEdit'
export default { export default {
components: { components: {
// FoodSampleGovernDetail, // FoodSampleGovernDetail,
...@@ -112,28 +90,27 @@ export default { ...@@ -112,28 +90,27 @@ export default {
name: '外观检查' name: '外观检查'
} }
], ],
contractId: '', // 合同id formId: 'meterReviewSampleManageFormId',
showModal: false, showModal: false,
modalTitle: '管理样品', modalTitle: '管理样品',
selectIds: [], selectIds: [],
selectData: [], selectData: [],
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '样品编号', key: 'code', detail: true, width: 180 }, { title: '样品编号', key: 'code', detail: true, width: 120 },
{ title: '样品名称', key: 'name', width: 140 }, { title: '样品名称', key: 'name', width: 140 },
{ title: '型号规格', key: 'spec', width: 140 }, { title: '型号规格', key: 'spec', width: 140 },
{ title: '出厂编号', key: 'factoryNumber', width: 140 }, { title: '出厂编号', key: 'factoryNumber', width: 140 },
{ title: '是否分包', key: 'jobOut', width: 110 },
{ title: '检测类型', key: 'type', width: 140 }, { title: '检测类型', key: 'type', width: 140 },
{ title: '数量', key: 'quantity', width: 140 } { title: '数量', key: 'quantity', width: 140 }
], ],
dateList: [], dateList: [],
formObj: { formObj: {
contractId: '', entrustId: undefined,
name: '', name: undefined,
num: '', code: undefined,
samplingNum: '', type: undefined
ctimeBegin: '',
ctimeEnd: ''
} }
} }
}, },
...@@ -167,12 +144,6 @@ export default { ...@@ -167,12 +144,6 @@ export default {
case '添加': case '添加':
this._editModal(false) this._editModal(false)
break break
case '批量添加':
this.$refs.refModal._open(this.contractId)
break
case '导入样品':
this._importSample()
break
case '导入检测项目': case '导入检测项目':
this._importItem() this._importItem()
break break
...@@ -214,10 +185,6 @@ export default { ...@@ -214,10 +185,6 @@ export default {
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
case 'page':
this.selectIds = []
this.getPage = this.$store.state.FoodSample.governPage
break
case 'selectData': case 'selectData':
const selectIds = [] const selectIds = []
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
...@@ -235,30 +202,21 @@ export default { ...@@ -235,30 +202,21 @@ export default {
} }
}, },
_open(id) { _open(id) {
this.formObj = this.$resetFields(this.formObj) this.formObj.entrustId = id
console.log(this.formObj)
this.dateList = []
this.showModal = true this.showModal = true
this.contractId = id // 合同id this._page()
this._page(this.contractId)
}, },
_formSearch() { _formSearch() {
this.$refs.pageTable._pageChange(1) this.$refs.pageTable._pageChange(1)
}, },
_page: async function(id) { _page: async function(id) {
this.formObj.contractId = this.contractId Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log(this.formObj.contractId) console.log('this.formObj', this.formObj)
const result = await meterEntrust.getInfo(id) const result = await meterSample.page(this.formObj)
if (result) { if (result) {
console.log('请求到的')
console.log(result)
this.getPage = result this.getPage = result
this.$refs.pageTable._hideLoading()
} }
// this.$refs.pageTable._page(
// 'search-sample-govern',
// 'FoodSample/governPage',
// this.$serializeFormSearch(this.formObj)
// )
}, },
_deleteByIds(ids, content) { _deleteByIds(ids, content) {
this.$Modal.confirm({ this.$Modal.confirm({
......
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