Skip to content

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

修改了出库管理

parent aad5d506
Showing with 1166 additions and 1 deletions
api/soil/soil-sample.js
...@@ -250,5 +250,9 @@ export default { ...@@ -250,5 +250,9 @@ export default {
pageWaitStorage: data => pageWaitStorage: data =>
http.post('soil/v1/alone_sample/page_wait_storage', data).then(res => res), http.post('soil/v1/alone_sample/page_wait_storage', data).then(res => res),
inStorageSubmit: data => inStorageSubmit: data =>
http.post('soil/v1/alone_sample/in_storage_submit', data).then(res => res) http.post('soil/v1/alone_sample/in_storage_submit', data).then(res => res),
pageWaitDelivery: data =>
http.post('soil/v1/alone_sample/page_wait_delivery', data).then(res => res),
outStorageSubmit: data =>
http.post('soil/v1/alone_sample/out_storage_submit', data).then(res => res)
} }
pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustIndex.vue 0 → 100644
<template>
<div>
<div class="layout-content-padding">
<div class="layout-content-main">
<el-tabs v-model="activeName" @tab-click="_changeTabs">
<el-tab-pane label="待完成" name="wait"></el-tab-pane>
<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>
</div>
</div>
</template>
<script>
import MeterSendEntrust from './EntrustRegister'
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() {
return {
activeName: 'wait',
currentComponent: ''
}
},
mounted() {
this.activeName = 'wait'
this.currentComponent = 'MeterSendEntrust'
this.$nextTick(() => {
this.$refs.refModal._page()
})
},
methods: {
_changeTabs(tab, event) {
if (tab.name === 'wait') {
this.currentComponent = 'MeterSendEntrust'
this.$nextTick(() => {
this.$refs.refModal._page()
})
} else {
this.currentComponent = 'MeterSendEntrustHis'
this.$nextTick(() => {
this.$refs.refModal._page()
})
}
}
}
}
</script>
<style scoped>
</style>
pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterHis.vue 0 → 100644
<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.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" 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">
<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 v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-else-if="item.status">{{scope.row[item.key].display}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<keep-alive>
<!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent"></component>
</keep-alive>
</div>
</template>
<script>
import { soilAptitude, soilEntrust } from '../../../api'
import MeterEntrustRecord from '../../../components/operation/Operation'
export default {
// eslint-disable-next-line vue/no-unused-components
components: { MeterEntrustRecord },
data() {
return {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: true,
btn: [
// {
// type: 'success',
// id: '',
// name: '添加'
// }
],
iconMsg: [
{
type: 'ios-list',
id: '',
name: '试样列表'
},
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
],
formObj: {
client: undefined,
entrustCode: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托商', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '委托日期', key: 'entrustDate', width: 120, date: true },
{ title: '钻孔位置', key: 'boreholeLocation', width: 120 },
{ title: '水深（米）', key: 'waterDepth', width: 120 },
{ title: '钻孔名称', key: 'boreholeName', width: 120 },
{ title: '进度', key: 'progress', width: 120, status: true },
{ title: '平均容重', key: 'projectNo', width: 120 },
{ title: '报告编号', key: 'reportCode', width: 120 },
{ title: '制表日期', key: 'tabulateDate', width: 120, date: true },
{ title: '制表人', key: 'tabulater', width: 120 },
{ title: '批准日期', key: 'approveDate', width: 120, date: true },
{ title: '批准人', key: 'approver', width: 120 },
{ title: '检验类别', key: 'testType', width: 120 }
]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this._page()
},
methods: {
_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
case '查看样品':
this._sampleManage(data.id)
break
case '试样列表':
this._sampleManage(data.id)
break
}
})
},
_sampleManage(data) {
// 管理样品
this.currentComponent = 'SoilSampleManage'
this.$nextTick(() => {
this.$refs.refModal._open(data)
})
// this.$refs.sampleManageModal._open(data)
},
_record(id) {
this.currentComponent = 'MeterEntrustRecord'
this.$nextTick(() => {
this.$refs.refModal._open(id)
})
// this.$refs.entrustRecordModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
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 soilEntrust.pageRegHis(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 soilAptitude.getById(id)
if (result) {
this.$refs.editSubcontractorModal._open(result)
}
},
_delete: async function(ids) {
const result = await soilAptitude.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/soil-alone-sample-manage/soil-alone-sample-outstock/Outstock.vue 0 → 100644
<template>
<div>
<Modal v-model="showEditModal" v-drag :mask-closable="false" :width="500" class="zIndex-1200">
<p slot="header">{{modalTitle}}</p>
<div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
<Form-item label="库房号" prop="storehouse" style="width: 100%">
<Input v-model="formObj.storehouse" name="storehouse" placeholder="请输入库房号"/>
</Form-item>
<Form-item label="架位号" prop="shelfCode" style="width: 100%">
<Input v-model="formObj.shelfCode" name="shelfCode" placeholder="请输入架位号"/>
</Form-item>
<Form-item label="出库人" prop="outStocker" style="width: 100%">
<Input v-model="formObj.outStocker" @click.native="_selectStaff" name="outStocker" readonly/>
</Form-item>
<Form-item prop="outStockerId" style="width: 100%;display: none">
<Input v-model="formObj.outStockerId" @click.native="_selectStaff" name="outStockerId" readonly/>
</Form-item>
<Form-item label="出库接收方" prop="outStockReceiver" style="width: 100%">
<Input v-model="formObj.outStockReceiver" @click.native="_selectoutStockReceiver" name="outStockReceiver" readonly/>
</Form-item>
<Form-item prop="outStockReceiverId" style="width: 100%;display: none">
<Input v-model="formObj.outStockReceiverId" @click.native="_selectoutStockReceiver" name="outStockReceiverId" readonly/>
</Form-item>
<Form-item label="出库时间：" prop="outStock">
<Date-picker v-model="formObj.outStock" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择出库时间" name="outStock"></Date-picker>
</Form-item>
<!-- <Form-item label="留存有效期：" prop="keepLimitTime">-->
<!-- <Date-picker v-model="formObj.keepLimitTime" @on-change="_keepLimitTimeChange" type="date" split-panels style="width:100%;"-->
<!-- placeholder="请选择入库时间" name="keepLimitTime"></Date-picker>-->
<!-- </Form-item>-->
</Form>
</div>
<div slot="footer">
<ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter>
</div>
</Modal>
<UserInfo ref="userModal" @on-result-change="_userData" is-change></UserInfo>
</div>
</template>
<script>
/**
* 添加编辑
*/
import ModalFooter from '../../../components/base/modalFooter'
import { soilSample } from '../../../api'
import Global from '../../../api/config'
import UserInfo from '../../../components/user-info-single/assignPerson'
export default {
components: {
ModalFooter,
UserInfo
},
data() {
return {
formId: '',
id: '',
userType: '',
lengthLimitList: [
{ key: 'stdNum', title: '标准号' },
{ key: 'enName', title: '英文名称' },
{ key: 'belongUnit', title: '归口单位' },
{ key: 'publishUnit', title: '发布单位' }
],
modalTitle: '出库',
formObj: {
name: '',
warehouse: '',
type: '',
remark: '',
inStocker: '',
inStockerId: '',
outStockReceiver: '',
outStockReceiverId: ''
},
options: [
{
name: '国家标准'
},
{
name: '地方标准'
},
{
name: '行业标准'
},
{
name: '企业标准'
}
],
typeData: [
{
name: '待检',
value: 0
},
{
name: '备样',
value: 1
},
{
name: '备用',
value: 2
}
],
ruleValidate: {
warehouse: [
{ required: true, message: '库房号不能为空', trigger: 'blur' }
]
},
showEditModal: false,
classifyList: [
{ value: 0, name: '判定依据' },
{ value: 1, name: '检测依据' },
{ value: 2, name: '其他' }
],
typeList: [
{ value: 0, name: '国家标准' },
{ value: 1, name: '地方标准' },
{ value: 2, name: '行业标准' },
{ value: 3, name: '企业标准' }
],
statusList: [
{ value: 0, name: '现行' },
{ value: 1, name: '即将实施' },
{ value: 2, name: '部分被代替' },
{ value: 3, name: '被代替' },
{ value: 4, name: '作废' }
],
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '确定', type: 'primary' }
]
}
},
methods: {
_getUser() {
const user = Global.getUserInfo()
this.formObj.outStocker = user.realname
this.formObj.outStockerId = user.id
this.formObj.outStockReceiver = user.realname
this.formObj.outStockReceiverId = user.id
console.log(user)
},
_selectStaff() {
this.userType = ''
this.$refs.userModal._open()
},
_selectoutStockReceiver() {
this.userType = 'outStockReceiver'
this.$refs.userModal._open()
},
_userData(data, msg, contractTempData) {
if (this.userType === 'outStockReceiver') {
this.formObj.outStockReceiver = data.realname
this.formObj.outStockReceiverId = data.id
} else {
this.formObj.outStocker = data.realname
this.formObj.outStockerId = data.id
}
console.log(data, msg)
},
_ctimeChange(data) {
this.formObj.outStock = data
},
_keepLimitTimeChange(data) {
this.formObj.keepLimitTime = data
},
/** *modal-footer */
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '确定':
this._ok()
break
}
},
_hideLoading() {
this.$refs.footerModal._hideLoading()
},
_resultChange(msg) {
this.showEditModal = false
this.$Message.success(msg)
this.$emit('on-result-change')
this._hideLoading()
},
_ok() {
this.$refs.formObj.validate(valid => {
if (valid) {
const data = this.$serialize('edit-form')
console.log(data)
data.ids = this.id
data.entrustCode = '1564980847'
this._outstockSubmit(data)
} else {
this.$Message.error('表单验证失败!')
this._hideLoading()
}
})
},
_outstockSubmit: async function(data) {
const result = await soilSample.outStorageSubmit(data)
if (result) {
this._resultChange('成功出库')
}
},
_save: async function(data) {
const result = await soilSample.aloneWarehouseLocationAdd(data)
if (result) {
this._resultChange('添加成功!')
}
},
_edit: async function(data) {
const result = await soilSample.aloneWarehouseLocationEdit(data)
if (result) {
this._resultChange('编辑成功!')
}
},
_cancel() {
this._hideLoading()
this.showEditModal = false
},
_open(ids) {
this.formId = this.$randomCode()
this._hideLoading()
this.$refs.formObj.resetFields()
this.id = ids.join(',')
this._getUser()
this.showEditModal = true
},
_registerAdd() {
this.formId = this.$randomCode()
this._hideLoading()
this.$refs.formObj.resetFields()
this.modalTitle = '添加'
this.formObj.id = ''
this.formObj.type = 3
this.showEditModal = true
}
}
}
</script>
pages/soil-alone-sample-manage/soil-alone-sample-outstock/RegisterDetail.vue 0 → 100644
<template>
<div>
<Modal v-model="showDetailModal" v-drag :width="700" title="人员信息" class="modal-footer-none">
<div :style="{height}" style="overflow-y: auto">
<table class="tableClass">
<tbody>
<tr>
<th colspan="6" class="tableClass_back">人员信息</th>
</tr>
<tr>
<th>姓名</th>
<td>{{obj.realname}}</td>
<th>联系方式</th>
<td>{{obj.mobile}}</td>
</tr>
</tbody>
</table>
</div>
</Modal>
</div>
</template>
<script>
/**
* 政府委托信息表详情
*/
export default {
data() {
return {
obj: {
firsted: 0,
client: '',
boreholeLocation: '',
boreholeName: '',
waterDepth: '',
tabulater: '',
testType: ''
},
showDetailModal: false,
dispose: '',
height: '',
showMoney: false
}
},
methods: {
_open(obj, flag) {
console.log('obj', obj)
this.showDetailModal = true
this.obj = obj.records[0]
if (flag === 'showMoney') {
this.showMoney = true
} else {
this.showMoney = false
}
this.height = '350px'
}
}
}
</script>
pages/soil-alone-sample-manage/soil-alone-sample-outstock/SampleItemEdit.vue 0 → 100644
<!--检测项目编辑列表（添加、导入检测项目）-->
<template>
<div>
<Modal
v-model="showModal"
:mask-closable="false"
:width="690"
@on-cancel="_cancel"
title="检测项目管理"
>
<Row>
<!--正常界面-->
<Col span="24">
<PTVXETable ref="pageTable" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<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 v-if="item.key==='judged'">
{{ scope.row[item.key]===1?'是':'否' }}
</span>
<div v-else-if="item.key==='compareSymbol'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.compareSymbol"
placeholder="请输入比较符"
/>
</div>
<div v-else-if="item.key==='limitValue'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.limitValue"
placeholder="请输入限值"
/>
</div>
<div v-else-if="item.key==='unit'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.unit"
placeholder="请输入单位"
/>
</div>
<div v-else-if="item.key==='code'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.code"
style="width: 130px;"
blur
placeholder="请选择检测依据"
/>
<i @click.stop="_selectjudgeBasis(scope.$index)" style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search"></i>
</div>
<span v-else>
{{ scope.row[item.key] }}
</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
</div>
</Modal>
</div>
</template>
<script>
import { soilEntrust } from '../../../api'
export default {
components: {},
data() {
return {
formObj: {
catalogueId: '',
name: '',
code: '',
standardCode: '',
standardName: ''
},
showModal: false,
searchOpen: false,
btn: [],
index: '',
iconMsg: [
{
type: 'md-trash',
id: '',
name: '删除'
}
],
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '保存', type: 'primary' }
],
pageColumns: [
{ title: '试验名称', key: 'name', width: 140 },
{ title: '大类', key: 'mainType', width: 140 },
{ title: '小类', key: 'smallType', width: 140 },
{ title: '方法', key: 'testMethod', width: 180 }
],
catalogueId: '',
itemList: {
records: []
},
getPage: {
records: []
},
selectData: [],
originalList: []
}
},
methods: {
_open(expList) {
this.formObj = this.$resetFields(this.formObj)
this.showModal = true
this.getPage.records = expList
this.selectData = []
console.log(expList)
this.$refs.pageTable._clearSelection()
// this.formObj.sampleId = id
// this.$refs.pageTable._hideLoading()
// if (catalogueId) {
// this._page()
// }
},
_handleRow(scope) {
console.log(scope)
},
_selectjudgeBasis(index) {
console.log(index)
this.index = index
this.$refs.EditModal._open()
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '保存':
this._saveCatalogueItem()
break
}
},
_page: async function() {
// this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilEntrust.pageItem(
this.$serializeForm(this.formObj)
)
if (result) {
console.log(result)
this.getPage = result
this.$refs.pageTable._hideLoading()
}
},
_btnClick(msg) {
switch (msg) {
case '导入检测项目':
this.$refs.relItemModal._open(this.catalogueId)
break
}
},
// 操作列操作
_iconClick(res, data) {
switch (res) {
case '删除':
this._deleteById(data.id, data.index)
break
}
},
// 删除
_deleteById(id, index) {
this.$Modal.confirm({
title: '提示',
content: '确定删除该数据？',
onOk: () => {
this._deleteOk(id, index)
}
})
},
_deleteOk: async function(id, index) {
if (id) {
const result = await soilEntrust.experimentDeleteById(id)
if (result) {
this.$Message.success('删除成功')
this.getPage.records.splice(index, 1)
}
} else {
this.$Message.success('成功删除')
this.getPage.records.splice(index, 1)
}
},
// table结果 返回整行
_tableResultChange(msg, data) {
switch (msg) {
case 'selectData':
this.selectData = data
break
case 'iconClick':
this._iconClick(data.name, data.rowData)
break
case 'changeSize':
this._page()
}
},
_ok() {
const expNames = []
for (let i = 0; i < this.getPage.records.length; i++) {
expNames.push(this.getPage.records[i].name)
}
const data = expNames
this._saveCatalogueItem(data)
},
_saveCatalogueItem(data) {
this.showModal = false
this.$emit('on-result-change', this.getPage.records)
this._hideLoading()
console.log(this.getPage.records)
},
_cancel() {
this.selectData = []
this.showModal = false
this.$emit('on-result-change', this.getPage.records)
},
_visibleChange() {
const data = this.itemList.records
this._saveCatalogueItem(data)
this.selectData = []
this.showModal = false
},
_hideLoading() {
this.$refs.footerModal._hideLoading()
}
}
}
</script>
pages/soil-alone-sample-manage/soil-alone-sample-outstock/SampleItemRemove.vue 0 → 100644
<!--检测项目编辑列表（添加、导入检测项目）-->
<template>
<div>
<Modal
v-model="showModal"
:mask-closable="false"
:width="690"
@on-cancel="_cancel"
title="检测项目管理"
>
<Row>
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :loading="true"
:get-page="itemList" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-page="true" select-data>
<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 v-if="item.key==='judged'">
{{ scope.row[item.key]===1?'是':'否' }}
</span>
<div v-else-if="item.key==='compareSymbol'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.compareSymbol"
placeholder="请输入比较符"
/>
</div>
<div v-else-if="item.key==='limitValue'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.limitValue"
placeholder="请输入限值"
/>
</div>
<div v-else-if="item.key==='unit'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.unit"
placeholder="请输入单位"
/>
</div>
<div v-else-if="item.key==='code'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.code"
style="width: 130px;"
blur
placeholder="请选择检测依据"
/>
<i @click.stop="_selectjudgeBasis(scope.$index)" style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search"></i>
</div>
<span v-else>
{{ scope.row[item.key] }}
</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
</div>
</Modal>
</div>
</template>
<script>
import { soilAptitude } from '../../../api'
export default {
components: {},
data() {
return {
formObj: {
catalogueId: '',
name: '',
code: '',
standardCode: '',
standardName: ''
},
showModal: false,
searchOpen: false,
btn: [],
index: '',
iconMsg: [
{
type: 'md-trash',
id: '',
name: '删除'
}
],
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '保存', type: 'primary' }
],
pageColumns: [
{ title: '试验名称', key: 'name', width: 140 },
{ title: '大类', key: 'mainType', width: 140 },
{ title: '小类', key: 'smallType', width: 140 },
{ title: '方法', key: 'testMethod', width: 180 }
],
catalogueId: '',
itemList: {
records: []
},
selectData: [],
originalList: []
}
},
methods: {
_open(itemList) {
this.itemList.records = []
this.formObj = this.$resetFields(this.formObj)
this.showModal = true
this.itemList.records = itemList
this.$refs.pageTable._hideLoading()
this.$refs.pageTable._clearSelection()
// if (catalogueId) {
// this._page()
// }
},
_handleRow(scope) {
console.log(scope)
},
_selectjudgeBasis(index) {
console.log(index)
this.index = index
this.$refs.EditModal._open()
},
_formSearch() {
console.log(this.formObj.name)
const searchItem = []
for (let i = 0; i < this.itemList.records.length; i++) {
if (this.itemList.records[i].name === this.formObj.name) {
console.log(this.itemList.records[i])
searchItem.push(this.itemList.records[i])
}
}
this.itemList.records = searchItem
},
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '保存':
this._ok()
break
}
},
_page: async function() {
// this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilAptitude.page(this.$serializeForm(this.formObj))
if (result) {
console.log(result)
this.getPage = result
this.$refs.pageTable._hideLoading()
}
},
_btnClick(msg) {
switch (msg) {
case '导入检测项目':
this.$refs.relItemModal._open(this.catalogueId)
break
}
},
// 操作列操作
_iconClick(res, data) {
switch (res) {
case '删除':
this.itemList.records.splice(data.index, 1)
break
}
},
// 删除
_deleteById(id) {
this.$Modal.confirm({
title: '提示',
content: '确定删除该数据？',
onOk: () => {
this._deleteOk(id)
}
})
},
_deleteOk(id) {
// const result = await drugCatalogueItem.deleteById(id)
this.itemList.splice(id, 1)
this.getPage.records = this.itemList
this.$Message.success('已删除')
},
// table结果 返回整行
_tableResultChange(msg, data) {
switch (msg) {
case 'selectData':
this.selectData = data
break
case 'iconClick':
this._iconClick(data.name, data.rowData)
break
}
},
_ok() {
const data = this.itemList.records
this._saveCatalogueItem(data)
},
_saveCatalogueItem(data) {
this.showModal = false
this.$emit('on-result-change', data)
this._hideLoading()
},
_cancel() {
const data = this.itemList.records
this._saveCatalogueItem(data)
this.selectData = []
this.showModal = false
},
_visibleChange() {
const data = this.itemList.records
this._saveCatalogueItem(data)
this.selectData = []
this.showModal = false
},
_hideLoading() {
this.$refs.footerModal._hideLoading()
}
}
}
</script>
pages/soil-alone-sample-manage/soil-alone-sample-outstock/ViewDetail.vue 0 → 100644
<template>
<div>
<Modal v-model="showDetailModal" v-drag :width="700" title="人员信息" class="modal-footer-none">
<div :style="{height}" style="overflow-y: auto">
<table class="tableClass">
<tbody>
<tr>
<th colspan="6" class="tableClass_back">人员信息</th>
</tr>
<tr>
<th>接收人</th>
<td>{{obj.receiver}}</td>
<th>接收日期</th>
<td>{{$dateformat(obj.receiveTime,'yyyy-mm-dd')}}</td>
</tr>
<tr>
<th>项目名称</th>
<td>{{obj.projectName}}</td>
<th>项目负责人</th>
<td>{{obj.projectLeader}}</td>
</tr>
<tr>
<th>钻孔名称</th>
<td>{{obj.boreholeName}}</td>
<th>箱数</th>
<td>{{obj.casesNum}}</td>
</tr>
<tr>
<th>登记人</th>
<td>{{obj.registrant}}</td>
<th>登记日期</th>
<td>{{$dateformat(obj.registTime,'yyyy-mm-dd')}}</td>
</tr>
</tbody>
</table>
</div>
</Modal>
</div>
</template>
<script>
/**
* 政府委托信息表详情
*/
export default {
data() {
return {
obj: {
firsted: 0,
client: '',
boreholeLocation: '',
boreholeName: '',
waterDepth: '',
tabulater: '',
testType: ''
},
showDetailModal: false,
dispose: '',
height: '',
showMoney: false
}
},
methods: {
_open(obj, flag) {
this.showDetailModal = true
this.obj = obj
console.log('obj', obj)
if (flag === 'showMoney') {
this.showMoney = true
} else {
this.showMoney = false
}
this.height = '350px'
}
}
}
</script>
router/soil-routes.js
...@@ -8,6 +8,7 @@ import ExperimentItemManage from '../pages/meter-aptitude/item-manage/Experiment ...@@ -8,6 +8,7 @@ import ExperimentItemManage from '../pages/meter-aptitude/item-manage/Experiment
import EntrustIndex from '../pages/meter-entrust/entrust-register/EntrustIndex' import EntrustIndex from '../pages/meter-entrust/entrust-register/EntrustIndex'
import ReceiveSampleIndex from '../pages/soil-alone-sample/EntrustIndex' import ReceiveSampleIndex from '../pages/soil-alone-sample/EntrustIndex'
import InstockIndex from '../pages/soil-alone-sample-instock/EntrustIndex' import InstockIndex from '../pages/soil-alone-sample-instock/EntrustIndex'
import OutstockIndex from '../pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustIndex'
import StorehousePlace from '../pages/soil-alone-sample-manage/storehouse-place-manage/AddressManage' import StorehousePlace from '../pages/soil-alone-sample-manage/storehouse-place-manage/AddressManage'
import ReviewEntrust from '../pages/meter-entrust/entrust-review/ReviewEntrust' import ReviewEntrust from '../pages/meter-entrust/entrust-review/ReviewEntrust'
import SampleReceiveIndex from '../pages/soil-sample-manage/sample-receive/SampleReceiveIndex' import SampleReceiveIndex from '../pages/soil-sample-manage/sample-receive/SampleReceiveIndex'
...@@ -63,6 +64,11 @@ export default [ ...@@ -63,6 +64,11 @@ export default [
meta: { title: '入库管理' } meta: { title: '入库管理' }
}, },
{ {
path: 'outstock',
component: OutstockIndex,
meta: { title: '出库管理' }
},
{
path: 'storehouse_place', path: 'storehouse_place',
component: StorehousePlace, component: StorehousePlace,
meta: { title: '库房位置管理' } meta: { title: '库房位置管理' }
......
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