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