Skip to content

P
patzn-cloud-web-back-soil
Commit 384254a8 by wangweidong
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 937a68dc 4dc7b767
Showing with 167 additions and 84 deletions
api/soil/soil-test.js
...@@ -57,6 +57,18 @@ export default { ...@@ -57,6 +57,18 @@ export default {
http.post('soil/v1/experiment/page_prepare_by_exp', data).then(res => res), http.post('soil/v1/experiment/page_prepare_by_exp', data).then(res => res),
pageExperimentTest: data => pageExperimentTest: data =>
http.post('soil/v1/experiment/page_exp_test', data).then(res => res), http.post('soil/v1/experiment/page_exp_test', data).then(res => res),
// pageExperimentTestBath: data =>
// http.post('soil/v1/experiment/page_exp_test_bath', data).then(res => res),
pageExperimentTestBath: data =>
https
.post(
'soil/v1/experiment/page_exp_test_bath?page=' +
data.page +
'&rows=' +
data.rows,
JSON.stringify(data.obj)
)
.then(res => res),
pageExpPrepare: data => pageExpPrepare: data =>
http.post('soil/v1/experiment/page_exp_prepare', data).then(res => res), http.post('soil/v1/experiment/page_exp_prepare', data).then(res => res),
zTree: data => zTree: data =>
......
pages/meter-entrust/entrust-register/EntrustIndex.vue
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<el-tab-pane label="历史记录" name="his"></el-tab-pane> <el-tab-pane label="历史记录" name="his"></el-tab-pane>
</el-tabs> </el-tabs>
<keep-alive> <keep-alive>
<!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent"></component> <component ref="refModal" :is="currentComponent"></component>
</keep-alive> </keep-alive>
</div> </div>
...@@ -19,7 +20,9 @@ import MeterSendEntrustHis from './EntrustRegisterHis' ...@@ -19,7 +20,9 @@ import MeterSendEntrustHis from './EntrustRegisterHis'
export default { export default {
name: 'MeterSendEntrustIndex', name: 'MeterSendEntrustIndex',
components: { components: {
// eslint-disable-next-line vue/no-unused-components
MeterSendEntrust, MeterSendEntrust,
// eslint-disable-next-line vue/no-unused-components
MeterSendEntrustHis MeterSendEntrustHis
}, },
data() { data() {
......
pages/meter-entrust/entrust-register/EntrustRegister.vue
...@@ -62,10 +62,15 @@ import SoilSampleItemManage from '../SoilSampleItemManageEdit' ...@@ -62,10 +62,15 @@ import SoilSampleItemManage from '../SoilSampleItemManageEdit'
import EntrustRegisterEdit from './EntrustRegisterEdit' import EntrustRegisterEdit from './EntrustRegisterEdit'
export default { export default {
components: { components: {
// eslint-disable-next-line vue/no-unused-components
Operation, Operation,
// eslint-disable-next-line vue/no-unused-components
EntrustRegisterEdit, EntrustRegisterEdit,
// eslint-disable-next-line vue/no-unused-components
SoilSampleManage, SoilSampleManage,
// eslint-disable-next-line vue/no-unused-components
importModal, importModal,
// eslint-disable-next-line vue/no-unused-components
SoilSampleItemManage SoilSampleItemManage
}, },
data() { data() {
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitScan.vue
...@@ -5,11 +5,29 @@ ...@@ -5,11 +5,29 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24" style="padding-bottom: 5px"> <Col span="24" style="padding-bottom: 5px">
<Form id="search-wait-scan" :label-width="90" v-show="searchOpen" inline onsubmit="return false"> <Form id="search-wait-scan" :label-width="100" v-show="searchOpen" 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 @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable></Input> <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable></Input>
</Form-item> </Form-item>
<Form-item label="是否有试验项目:" class="search-item">
<Select v-model="formObj.haveExp" clearable name="groupId" style="width:150px" placeholder="请选择是否有试验项目">
<Option v-for="(item,index) in itemData" :value="item.value" :key="index">{{item.name}}</Option>
</Select>
</Form-item>
<Form-item label="筛选试样:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.experimentNames" name="experimentNames" placeholder="请输入试验项目" clearable></Input>
</Form-item>
<Form-item label="试验科室:" class="search-item">
<el-select @change="_selGroup" v-model="formObj.groupId" placeholder="请选择" clearable style="width: 100%">
<el-option
v-for="(item,index) in groupoptions"
:key="index"
:label="item.name"
:value="item.id"
/>
</el-select>
</Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
...@@ -30,6 +48,7 @@ ...@@ -30,6 +48,7 @@
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
:getPage="getPage" :getPage="getPage"
:icon-msg="iconMsg"
select-data> select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
...@@ -57,13 +76,16 @@ ...@@ -57,13 +76,16 @@
</div> </div>
</template> </template>
<script> <script>
import { soilEntrust } from '../../../../api' import { soilAptitude, soilEntrust } from '../../../../api'
export default { export default {
components: {}, components: {},
data() { data() {
return { return {
btn: [{ type: 'primary', id: '', name: '发放' }], btn: [
{ type: 'primary', id: '', name: '发放' },
{ type: 'primary', id: '', name: '发放到高级试验' }
],
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
...@@ -74,18 +96,7 @@ export default { ...@@ -74,18 +96,7 @@ export default {
{ title: '土质描述', key: 'sampleDescribe', width: 185 }, { title: '土质描述', key: 'sampleDescribe', width: 185 },
{ title: '样品包装类型', key: 'samplePack', width: 120 } { title: '样品包装类型', key: 'samplePack', width: 120 }
], ],
iconMsg: [ iconMsg: [{ type: 'md-cloud-download', id: '', name: '导出样品交接单' }],
{ type: 'md-create', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制' },
{ type: 'md-trash', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志',
componentName: 'SampleRecord'
},
{ type: 'cloud', id: '', name: '附件', componentName: 'FileManage' }
],
type: '', type: '',
contractId: '', // 合同id contractId: '', // 合同id
selectData: [], selectData: [],
...@@ -96,9 +107,14 @@ export default { ...@@ -96,9 +107,14 @@ export default {
num: '', num: '',
detectType: '', detectType: '',
standard: '', standard: '',
samplingLinkList: [] samplingLinkList: [],
haveExp: undefined,
groupName: undefined,
groupId: undefined,
experimentNames: undefined
}, },
stdList: [], stdList: [],
groupoptions: [],
sampleLinkList: [ sampleLinkList: [
{ value: 0, name: '食品生产' }, { value: 0, name: '食品生产' },
{ value: 1, name: '食品流通' }, { value: 1, name: '食品流通' },
...@@ -108,6 +124,16 @@ export default { ...@@ -108,6 +124,16 @@ export default {
{ value: 5, name: '流通' }, { value: 5, name: '流通' },
{ value: 6, name: '餐饮' } { value: 6, name: '餐饮' }
], ],
itemData: [
{
name: '是',
value: 1
},
{
name: '否',
value: 0
}
],
searchOpen: true, searchOpen: true,
acceptSelectUserValue: '' acceptSelectUserValue: ''
} }
...@@ -150,6 +176,16 @@ export default { ...@@ -150,6 +176,16 @@ export default {
_selectSampleLink(data) { _selectSampleLink(data) {
console.log(data) console.log(data)
}, },
_selGroup(data) {
console.log(data)
this.formObj.groupId = data
},
_getGroupList: async function() {
const result = await soilAptitude.getGroupList()
if (result) {
this.groupoptions = result
}
},
// 组件返回值 // 组件返回值
_componentResult(data, msg) { _componentResult(data, msg) {
switch (this.currentComponent) { switch (this.currentComponent) {
...@@ -189,11 +225,13 @@ export default { ...@@ -189,11 +225,13 @@ export default {
this.entrustId = contractId this.entrustId = contractId
this.type = type this.type = type
this.selectIds = [] this.selectIds = []
this._getGroupList()
this.$nextTick(() => { this.$nextTick(() => {
this._page() this._page()
}) })
}, },
_page: async function() { _page: async function() {
this.selectData = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.entrustId this.formObj.entrustId = this.entrustId
const result = await soilEntrust.pageSend( const result = await soilEntrust.pageSend(
...@@ -214,6 +252,9 @@ export default { ...@@ -214,6 +252,9 @@ export default {
case '编辑': case '编辑':
this._editModal(true, data) this._editModal(true, data)
break break
case '导出样品交接单':
console.log(data)
break
case '复制': case '复制':
this._copySample(data) this._copySample(data)
break break
...@@ -236,6 +277,9 @@ export default { ...@@ -236,6 +277,9 @@ export default {
case '发放': case '发放':
this._submitSend() this._submitSend()
break break
case '发放到高级试验':
this._send()
break
case '扫码发放': case '扫码发放':
this._oneKeySend() this._oneKeySend()
break break
...@@ -337,6 +381,13 @@ export default { ...@@ -337,6 +381,13 @@ export default {
this._resultChange('发放成功') this._resultChange('发放成功')
} }
}, },
_send() {
if (this.selectData.length === 0) {
this.$Message.warning('请至少选择一条数据')
} else {
console.log(this.selectData)
}
},
_resultChange(msg) { _resultChange(msg) {
this._page() this._page()
this.$Message.success(msg) this.$Message.success(msg)
......
pages/soil-test-manage/test-input/item-tabs/ItemLeftList.vue
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
</Col> </Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :is-radio="true" :page-columns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-name="tableName"
:table-height="tableHeight" :table-height="tableHeight"
:get-page="getPage" :icon-msg="iconMsg" :hide-checkbox="true" @on-result-change="_tableResultChange" select-data> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
tableName: 'food-task-assign-item-left', tableName: 'food-task-assign-item-left',
// 用户自己选中的列 // 用户自己选中的列
userColumns: [], userColumns: [],
selectDataName: [],
optionList: [ optionList: [
{ key: 'name', name: '检测项目', placeholder: '请输入检测项目' }, { key: 'name', name: '检测项目', placeholder: '请输入检测项目' },
{ key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' } { key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' }
...@@ -126,10 +127,14 @@ export default { ...@@ -126,10 +127,14 @@ export default {
this._page() this._page()
break break
case 'selectData': case 'selectData':
this.$emit('on-result-change', data) this.selectDataName = []
for (let i = 0; i < data.length; i++) {
this.selectDataName.push(data[i].name)
}
console.log('selectDataName', this.selectDataName)
this.$emit('on-result-change', this.selectDataName)
break break
case 'singleSelect': case 'singleSelect':
console.log('data-----------------', data)
this.$emit('on-result-change', data) this.$emit('on-result-change', data)
break break
case 'iconClick': case 'iconClick':
......
pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue
...@@ -96,7 +96,11 @@ export default { ...@@ -96,7 +96,11 @@ export default {
entrustId: '', entrustId: '',
name: '', name: '',
testMethod: '', testMethod: '',
testBasis: '' testBasis: '',
obj: {
entrustId: '',
nameList: []
}
}, },
entrustId: '', entrustId: '',
envPro: false, envPro: false,
...@@ -161,7 +165,7 @@ export default { ...@@ -161,7 +165,7 @@ export default {
{ title: '大类', key: 'mainType', width: 140 }, { title: '大类', key: 'mainType', width: 140 },
{ title: '小类', key: 'smallType', width: 140 } { title: '小类', key: 'smallType', width: 140 }
], ],
leftSelectData: {}, leftSelectData: [],
selectIds: [], // 检测项目id selectIds: [], // 检测项目id
selectData: [], // 检测项目data selectData: [], // 检测项目data
selectSampleIds: [], // 样品ids selectSampleIds: [], // 样品ids
...@@ -537,11 +541,13 @@ export default { ...@@ -537,11 +541,13 @@ export default {
return obj return obj
}, },
_page: async function() { _page: async function() {
this.formObj.obj.nameList = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.entrustId this.formObj.obj.entrustId = this.entrustId
this.formObj.name = this.leftSelectData.name this.formObj.obj.nameList = this.leftSelectData
this.formObj.testMethod = this.leftSelectData.testMethod // this.formObj.entrustId = this.entrustId
const result = await soilTest.pageExperimentTest( // this.formObj.nameList = this.leftSelectData.join(',')
const result = await soilTest.pageExperimentTestBath(
this.$serializeForm(this.formObj) this.$serializeForm(this.formObj)
) )
if (result) { if (result) {
......
pages/workbench/sample-progress/SampleProgress.vue
<template> <template>
<div> <div>
<Card style="width:100%;">
<div class="layout-content-padding"> <div class="layout-content-padding">
<div class="layout-content-main"> <div class="layout-content-main">
<Row style="margin-top: 10px;"> <Row style="margin-top: 10px;">
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
</Row> </Row>
</div> </div>
</div> </div>
</Card>
</div> </div>
</template> </template>
......
pages/workbench/workbench.vue
...@@ -13,62 +13,61 @@ ...@@ -13,62 +13,61 @@
<template> <template>
<div class="layout-content-padding"> <div class="layout-content-padding">
<div class="layout-content-main"> <div class="layout-content-main">
<Row :gutter="10"> <!-- <Row :gutter="10">-->
<Col span="12"> <!-- <Col span="12">-->
<messagePanel></messagePanel> <!-- <messagePanel></messagePanel>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<myTask></myTask> <!-- <myTask></myTask>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<taskCalendar></taskCalendar> <!-- <taskCalendar></taskCalendar>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<UnfinishedContract></UnfinishedContract> <!-- <UnfinishedContract></UnfinishedContract>-->
</Col> <!-- </Col>-->
<Col span="24"> <!-- <Col span="24">-->
<SampleProgress style="margin-bottom: 20px;"></SampleProgress> <!-- <SampleProgress style="margin-bottom: 20px;"></SampleProgress>-->
</Col> <!-- </Col>-->
<Col span="24" style="margin-bottom: 10px;"> <!-- <Col span="24" style="margin-bottom: 10px;">-->
<SampleProgressDetail></SampleProgressDetail> <!-- <SampleProgressDetail></SampleProgressDetail>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<UnfinishedItem></UnfinishedItem> <!-- <UnfinishedItem></UnfinishedItem>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<YearContractNum></YearContractNum> <!-- <YearContractNum></YearContractNum>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<DetectTypeNum></DetectTypeNum> <!-- <DetectTypeNum></DetectTypeNum>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<ContractEndNum></ContractEndNum> <!-- <ContractEndNum></ContractEndNum>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<YearTestItem></YearTestItem> <!-- <YearTestItem></YearTestItem>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<YearOverItem></YearOverItem> <!-- <YearOverItem></YearOverItem>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<GroupItem></GroupItem> <!-- <GroupItem></GroupItem>-->
</Col> <!-- </Col>-->
<Col span="12"> <!-- <Col span="12">-->
<CustomerContract></CustomerContract> <!-- <CustomerContract></CustomerContract>-->
</Col> <!-- </Col>-->
<!-- <div :style="{height}" v-if="moduleList.length" class="config_home">--> <div :style="{height}" v-if="moduleList.length" class="config_home">
<!-- <Row :gutter="10">--> <Row :gutter="10">
<!-- <Col--> <Col
<!-- :sm="{span:item.alias === 'FoodToDoAndOverdue'?24:12}"--> :sm="{span:item.alias === 'SampleProgress'||item.alias === 'SampleProgressDetail' ?24:12}"
<!-- v-for="(item,index) in moduleList"--> v-for="(item,index) in moduleList"
<!-- :key="index"--> :key="index"
<!-- style="margin-bottom: 10px">--> style="margin-bottom: 10px">
<!-- &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;--> <!-- eslint-disable-next-line vue/require-component-is -->
<!-- <component :is="item.alias" @on-result-change="_result" keep-alive></component>--> <component :is="item.alias" @on-result-change="_result" keep-alive></component>
<!-- </Col>--> </Col>
<!-- </Row>--> </Row>
<!-- </div>--> </div>
</Row>
</div> </div>
</div> </div>
</template> </template>
...@@ -132,7 +131,6 @@ export default { ...@@ -132,7 +131,6 @@ export default {
}, },
data() { data() {
return { return {
height: document.documentElement.clientHeight - 115 + 'px',
moduleList: [] moduleList: []
} }
}, },
...@@ -159,6 +157,7 @@ export default { ...@@ -159,6 +157,7 @@ export default {
// }) // })
const result = await sysOrg.getModulesList() const result = await sysOrg.getModulesList()
if (result) { if (result) {
this.moduleList = result
console.log('菜单', result) console.log('菜单', result)
} }
} }
......
router/soil-routes.js
...@@ -108,7 +108,7 @@ export default [ ...@@ -108,7 +108,7 @@ export default [
{ {
path: 'receive', path: 'receive',
component: SampleReceiveIndex, component: SampleReceiveIndex,
meta: { title: '收样室收样' } meta: { title: '样品分波' }
}, },
{ {
path: 'prepare', path: 'prepare',
......
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