Skip to content

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

分包数据录入优化

parent 1a6cbfe1
Showing with 1035 additions and 80 deletions
api/meter/meter-entrust.js
...@@ -24,6 +24,11 @@ export default { ...@@ -24,6 +24,11 @@ export default {
http http
.post('meter/v1/entrust/page_subpackage_entrust', data) .post('meter/v1/entrust/page_subpackage_entrust', data)
.then(res => res), .then(res => res),
pageSubpackageInputEntrust: data =>
http
.post('meter/v1/entrust/page_subpackage_input_entrust', data)
.then(res => res),
// 操作日志 // 操作日志
pageOutTaskOperation: data => pageOutTaskOperation: data =>
http.post('meter/v1/entrust_record/page', data).then(res => res), http.post('meter/v1/entrust_record/page', data).then(res => res),
......
api/meter/meter-sample.js
...@@ -24,6 +24,10 @@ export default { ...@@ -24,6 +24,10 @@ export default {
http.post('meter/v1/item/page', data).then(res => res), http.post('meter/v1/item/page', data).then(res => res),
pageSubpackageSample: data => pageSubpackageSample: data =>
http.post('meter/v1/sample/page_subpackage_sample', data).then(res => res), http.post('meter/v1/sample/page_subpackage_sample', data).then(res => res),
pageSubpackageSampleInput: data =>
http
.post('meter/v1/sample/page_subpackage_sample_input', data)
.then(res => res),
pageOutDistribute: data => pageOutDistribute: data =>
http.post('meter/v1/sample/page_distribute', data).then(res => res), http.post('meter/v1/sample/page_distribute', data).then(res => res),
pageOutPersonalTask: data => pageOutPersonalTask: data =>
...@@ -62,6 +66,10 @@ export default { ...@@ -62,6 +66,10 @@ export default {
.post('meter/v1/sample/subpackage_info_reg?ids=' + data.ids, data.reg) .post('meter/v1/sample/subpackage_info_reg?ids=' + data.ids, data.reg)
.then(res => res), .then(res => res),
subpackageOutStock: data =>
http
.post('meter/v1/sample/subpackage_out_stock?ids=' + data.ids, data.obj)
.then(res => res),
reportCheckBack: data => reportCheckBack: data =>
http http
.post( .post(
......
pages/meter-subcontract/subpackage-input/EditLabSelect.vue 0 → 100644
<template>
<!--仓库-->
<Modal v-model="showModal" width="1000" class="modal-footer-none">
<p slot="header">实验室列表</p>
<Row>
<Col span="24">
<Form :id="formId" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item label="实验室名称:">
<Input @on-enter="_formSearch" v-model="subcontractorName" name="subcontractorName" placeholder="请输入实验室名称"
style="width: 200px;"
clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<Col span="24">
<PTVXETable ref="pageTable" :tableHeight="400"
@on-result-change="_tableResultChange" :getPage="getPage" hide-checkbox>
<vxe-table-column
:field="item.key"
:title="item.title"
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined"
v-for="item in pageColumns"
:key="item.key" sortable>
<template slot-scope="scope">
<div v-if="item.datetime">{{$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM')}}</div>
<div v-else>{{scope.row[item.key]}}</div>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</Modal>
</template>
<script>
/**
* 选择实验室
*/
import { meterSubcontractor } from '../../../api'
export default {
data() {
return {
showModal: false,
formId: '',
selectNames: '',
selectIds: '',
getPage: {},
pageColumns: [
{ title: '实验室名称', key: 'name', width: 160 },
{ title: '资质', key: 'aptitude', width: 160 },
{ title: '检测项目', key: 'itemName' },
{ title: '报价', key: 'price', width: 160 }
],
voList: [],
subcontractorName: ''
}
},
methods: {
_open(voList, formId) {
this.formId = formId
this.voList = voList
this.showModal = true
this.subcontractorName = ''
this.$nextTick(() => {
this._page()
})
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
_page: async function() {
const data = {}
if (this.voList && this.voList.length) {
data.voList = this.voList
}
// this.$refs.pageTable._page(
// this.formId,
// 'FoodSubcontracter/getLabByAptitude',
// data
// )
const result = await meterSubcontractor.page(data)
console.log('实验室名称', result)
if (result) {
this.getPage = result
// console.log(result.records)
// this.labList = result.records
// console.log(this.labList)
}
},
_tableResultChange(msg, data) {
switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodSubcontracter.page
break
case 'dbSelect':
this.$emit('on-result-change', data)
this.showModal = false
break
case 'changeSize':
this._page()
break
}
}
}
}
</script>
pages/meter-subcontract/subpackage-input/MeterSubSampleEdit.vue 0 → 100644
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" width="700">
<p slot="header">分包信息</p>
<div>
<Form id="batch-edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90">
<Form-item label="分包价格：" prop="outFee">
<InputNumber v-model.number="formObj.outFee" :min="0" :step="1"
name="outFee" style="width:100%" placeholder="">
</InputNumber>
</Form-item>
<Form-item label="分包实验室：" prop="subcontractor">
<div style="display: flex">
<AutoCompletes :value="formObj.subcontractor" :down-data="labList" name="subcontractorName"
show-key="name"
placeholder="请输入或选择分包实验室" style="width: 94%" @on-result-change="_labChange"></AutoCompletes>
<Icon type="ios-arrow-forward" size="24" color="#00a0e9" style="margin-top: 5px;margin-left: 5px" @click="_labSel"/>
</div>
<input v-model="formObj.subcontractorId" type="hidden" name="subcontractorId"/>
</Form-item>
<Form-item label="分包原因" prop="outReason">
<Input v-model="formObj.outReason" :rows="3" type="textarea"
name="outReason"
placeholder="请输入分包原因"/>
</Form-item>
</Form>
</div>
<div slot="footer">
<ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
</div>
</Modal>
<!--选择实验室-->
<EditLabSelect ref="labModal" @on-result-change="_labResult"></EditLabSelect>
</div>
</template>
<script>
import ModalFooter from '../../../components/base/modalFooter'
import AutoCompletes from '../../../components/base/AutoCompletes'
import { meterSample, meterSubcontractor } from '../../../api'
import EditLabSelect from './EditLabSelect'
/**
* 添加编辑分包信息
*/
const defVal = {
subcontractor: undefined,
subcontractorId: undefined,
outReason: undefined,
outFee: undefined
}
export default {
components: {
EditLabSelect,
ModalFooter,
AutoCompletes
},
data() {
return {
ids: [],
selectData: [],
formObj: defVal,
ruleValidate: {
// price: [{required: true, message: '分包价不能为空', trigger: 'blur', type: 'number'}],
},
showModal: false,
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '保存', type: 'primary' }
],
labList: []
}
},
methods: {
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '保存':
this._ok()
break
}
},
_hideLoading() {
this.$refs.footerModal._hideLoading()
},
_ok() {
console.log('_ok----', this.formObj)
console.log('_ok----', this.ids)
this._subpackageInfoReg({ ids: this.ids, reg: this.formObj })
this._hideLoading()
},
_subpackageInfoReg: async function(data) {
const result = await meterSample.subpackageInfoReg(data)
if (result) {
this.$Message.success('登记成功！')
this._hideLoading()
this.$emit('on-result-change')
this.showModal = false
}
},
_cancel() {
this.showModal = false
},
_open(ids, selectData) {
this.formObj = {
subcontractor: undefined,
subcontractorId: undefined,
outReason: undefined,
outFee: undefined
}
this._getLab()
this._hideLoading()
this.$refs.formObj.resetFields()
this.formObj.subcontractorId = ''
this.showModal = true
this.ids = ids
this.selectData = selectData
},
_labChange(msg, data) {
switch (msg) {
case 'select':
this.formObj.subcontractor = data.name
this.formObj.subcontractorId = data.id
break
case 'query':
this.formObj.subcontractor = data.name
this._getLab(data.name)
break
}
},
_getLab: async function(name) {
const data = {}
if (name) {
data.name = name
}
// this.$store.dispatch('FoodSubcontracter/getLab', data).then(() => {
// this.labList = this.$store.state.FoodSubcontracter.list
// })
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
// console.log('this.formObj', this.formObj)
const result = await meterSubcontractor.page(data)
console.log('实验室名称', result)
if (result) {
console.log(result.records)
this.labList = result.records
console.log(this.labList)
}
},
_labSel() {
const voList = []
for (let i = 0; i < this.selectData.length; i++) {
voList.push({
itemName: this.selectData[i].itemName,
testBasis: this.selectData[i].testBasis
})
}
this.$refs.labModal._open(voList, 'batch-lab-form')
},
_labResult(result) {
this.formObj.subcontractorId = result.id
this.formObj.subcontractor = result.name
}
}
}
</script>
pages/meter-subcontract/subpackage-input/MeterSubpackageInput.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.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>
<subSampleManage ref="subSampleManage"></subSampleManage>
</div>
</template>
<script>
import { meterEntrust, meterSubcontractor } from '../../../api'
import subSampleManage from './MeterSubSampleManage'
export default {
components: { subSampleManage },
data() {
return {
currentComponent: '',
formId: 'meterSubpackageTaskFormId',
searchOpen: false,
btn: [
// {
// // meter-review-entrust-pass-btn
// type: 'success',
// id: '',
// name: '通过'
// },
// // meter-review-entrust-back-btn
// {
// type: 'success',
// id: '',
// name: '驳回'
// }
],
iconMsg: [
{
type: 'md-paper',
id: '',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
name: '分包样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-trash', id: '', name: '删除' },
{
type: 'md-book',
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.subSampleManage(data)
break
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
}
})
},
subSampleManage(data) {
// 管理样品
this.$refs.subSampleManage._open(data.id)
},
_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.pageSubpackageInputEntrust(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-subcontract/subpackage-input/MeterSubpackageInputHis.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.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>
</div>
</template>
<script>
import { meterEntrust, meterSubcontractor } from '../../../api'
export default {
components: {},
data() {
return {
currentComponent: '',
formId: 'meterSubpackageTaskHisFormId',
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-subcontract/subpackage-input/MeterSubpackageInputIndex.vue 0 → 100644
<template>
<div>
<div class="layout-content-padding">
<div class="layout-content-main">
<el-tabs v-model="activeName">
<el-tab-pane label="分包数据录入任务" name="wait">
<MeterSubpackageTask ref="waitTabs"></MeterSubpackageTask>
</el-tab-pane>
<el-tab-pane label="历史任务" name="his">
<MeterSubpackageTaskHis ref="hisTabs"></MeterSubpackageTaskHis>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
import MeterSubpackageTask from './MeterSubpackageInput'
import MeterSubpackageTaskHis from './MeterSubpackageInputHis'
export default {
name: 'MeterSubpackageTaskIndex',
components: {
MeterSubpackageTask,
MeterSubpackageTaskHis
},
data() {
return {
activeName: 'wait'
}
}
}
</script>
<style scoped>
</style>
pages/meter-subcontract/subpackage-input/SubOutWarehouse.vue 0 → 100644
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" width="700">
<p slot="header">分包出库</p>
<div>
<Form id="batch-edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90">
<Form-item label="出库人：" prop="outer">
<!-- <InputNumber v-model.number="formObj.outFee" :min="0" :step="1"-->
<!-- name="outFee" style="width:100%" placeholder="">-->
<!-- </InputNumber>-->
<Input v-model="formObj.outer" readonly name="outer" @click.native="_selectStaff"></Input>
</Form-item>
<Form-item label="出库时间：" prop="outStockTime">
<div class="block">
<el-date-picker
v-model="formObj.outStockTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</div>
</Form-item>
<Form-item label="备注" prop="remark">
<Input v-model="formObj.remark" :rows="3" type="textarea"
name="remark"
placeholder="请输入备注"/>
</Form-item>
</Form>
</div>
<div slot="footer">
<ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
</div>
</Modal>
<!--选择实验室-->
<EditLabSelect ref="labModal" @on-result-change="_labResult"></EditLabSelect>
<UserInfo ref="userModal" is-change @on-result-change="_userData"></UserInfo>
</div>
</template>
<script>
import Global from '../../../api/config'
import ModalFooter from '../../../components/base/modalFooter'
import UserInfo from '../../../components/user-info-single/assignPerson'
import { meterSample } from '../../../api'
import EditLabSelect from './EditLabSelect'
/**
* 添加编辑分包信息
*/
const defVal = {
outer: undefined,
outerId: undefined,
outStockTime: undefined,
remark: undefined
}
export default {
components: {
EditLabSelect,
ModalFooter,
UserInfo
// AutoCompletes
},
data() {
return {
ids: [],
selectData: [],
formObj: defVal,
ruleValidate: {
// price: [{required: true, message: '分包价不能为空', trigger: 'blur', type: 'number'}],
},
showModal: false,
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '保存', type: 'primary' }
],
labList: []
}
},
methods: {
getNowTime() {
const now = new Date()
const year = now.getFullYear() // 得到年份
let month = now.getMonth() // 得到月份
let date = now.getDate() // 得到日期
let hour = now.getHours()
let min = now.getMinutes()
let second = now.getSeconds()
month = month + 1
month = month.toString().padStart(2, '0')
date = date.toString().padStart(2, '0')
hour = hour.toString().padStart(2, '0')
min = min.toString().padStart(2, '0')
second = second.toString().padStart(2, '0')
const defaultDate = `${year}-${month}-${date} ${hour}:${min}:${second}`
// this.$set(this.searchFormField, 'date', defaultDate)
console.log(now)
console.log('当前时间', defaultDate)
console.log('时间', now)
// this.formObj.outTime = now
this.formObj.outStockTime = defaultDate
// this.$set(this.searchFormField, 'date', defaultDate)
},
_userData(data, msg, contractTempData) {
if (msg === 'salesman') {
// 选择业务员
this.formObj.outPerson = data.realname
// this.formObj.detail.salesmanId = data.userId
// this.formObj.detail.salesmanPhone = data.mobile
}
},
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '保存':
this._ok()
break
}
},
_selectStaff() {
this.$refs.userModal._open('salesman')
},
_hideLoading() {
this.$refs.footerModal._hideLoading()
},
_ok() {
this._subpackageOutStock({ ids: this.ids, obj: this.formObj })
},
_subpackageOutStock: async function(data) {
const result = await meterSample.subpackageOutStock(data)
if (result) {
this.$Message.success('出库成功！')
this.$emit('on-result-change')
this._hideLoading()
}
},
_cancel() {
this.showModal = false
},
_open(ids, selectData) {
this.formObj = {
outer: undefined,
outerId: undefined,
outStockTime: undefined,
remark: undefined
}
this._userInfo()
this.getNowTime()
this._hideLoading()
this.$refs.formObj.resetFields()
this.showModal = true
this.ids = ids
this.selectData = selectData
},
_labChange(msg, data) {
switch (msg) {
case 'query':
this.formObj.subcontractor = data.name
this._getLab(data.name)
break
}
},
_userInfo() {
const user = Global.getUserInfo('userInfo')
this.formObj.outer = user.realname
this.formObj.outerId = user.id
},
_labSel() {
const voList = []
for (let i = 0; i < this.selectData.length; i++) {
voList.push({
itemName: this.selectData[i].itemName,
testBasis: this.selectData[i].testBasis
})
}
this.$refs.labModal._open(voList, 'batch-lab-form')
}
}
}
</script>
pages/meter-subcontract/subpackage-task/MeterSubSampleManage.vue
...@@ -10,24 +10,24 @@ ...@@ -10,24 +10,24 @@
<Form id="formId" :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.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/> <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
</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"> <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">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data> :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -200,9 +200,16 @@ export default { ...@@ -200,9 +200,16 @@ export default {
}) })
}, },
_outWarehouse() { _outWarehouse() {
if (this.selectIds.length === 0) { if (this.selectData.length === 0) {
this.$Message.warning('请选择一条或多条数据！') this.$Message.warning('请选择一条或多条数据！')
} else { } else {
for (let i = 0; i < this.selectData.length; i++) {
const obj = this.selectData[i]
if (obj.subcontractor === undefined) {
this.$Message.warning('请先填写分包信息在进行此操作！')
return false
}
}
this.$refs.OutWarehouseModal._open(this.selectIds, this.selectData) this.$refs.OutWarehouseModal._open(this.selectIds, this.selectData)
} }
}, },
......
pages/meter-subcontract/subpackage-task/SubOutWarehouse.vue
...@@ -4,29 +4,23 @@ ...@@ -4,29 +4,23 @@
<p slot="header">分包出库</p> <p slot="header">分包出库</p>
<div> <div>
<Form id="batch-edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90"> <Form id="batch-edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90">
<Form-item label="出库人：" prop="outPerson"> <Form-item label="出库人：" prop="outer">
<!-- <InputNumber v-model.number="formObj.outFee" :min="0" :step="1"--> <!-- <InputNumber v-model.number="formObj.outFee" :min="0" :step="1"-->
<!-- name="outFee" style="width:100%" placeholder="">--> <!-- name="outFee" style="width:100%" placeholder="">-->
<!-- </InputNumber>--> <!-- </InputNumber>-->
<Input v-model="formObj.outPerson" @click.native="_selectStaff" readonly name="outPerson"></Input> <Input v-model="formObj.outer" readonly name="outer" @click.native="_selectStaff"></Input>
</Form-item> </Form-item>
<Form-item label="出库时间：" prop="outTime"> <Form-item label="出库时间：" prop="outStockTime">
<div class="block"> <div class="block">
<el-date-picker <el-date-picker
v-model="formObj.outTime" v-model="formObj.outStockTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</div> </div>
<!-- <div style="display: flex">-->
<!-- <AutoCompletes :value="formObj.subcontractor" :down-data="labList" @on-result-change="_labChange"-->
<!-- name="subcontractorName"-->
<!-- show-key="name" placeholder="请输入或选择分包实验室" style="width: 94%"></AutoCompletes>-->
<!-- <Icon @click="_labSel" type="ios-arrow-forward" size="24" color="#00a0e9" style="margin-top: 5px;margin-left: 5px"/>-->
<!-- </div>-->
<input v-model="formObj.subcontractorId" type="hidden" name="subcontractorId"/>
</Form-item> </Form-item>
<Form-item label="备注" prop="remark"> <Form-item label="备注" prop="remark">
<Input v-model="formObj.remark" :rows="3" type="textarea" <Input v-model="formObj.remark" :rows="3" type="textarea"
...@@ -41,26 +35,22 @@ ...@@ -41,26 +35,22 @@
</Modal> </Modal>
<!--选择实验室--> <!--选择实验室-->
<EditLabSelect ref="labModal" @on-result-change="_labResult"></EditLabSelect> <EditLabSelect ref="labModal" @on-result-change="_labResult"></EditLabSelect>
<UserInfo ref="userModal" @on-result-change="_userData" is-change></UserInfo> <UserInfo ref="userModal" is-change @on-result-change="_userData"></UserInfo>
</div> </div>
</template> </template>
<script> <script>
import global from '../../../api/sys/sys-user' import Global from '../../../api/config'
import ModalFooter from '../../../components/base/modalFooter' import ModalFooter from '../../../components/base/modalFooter'
// import AutoCompletes from '../../../components/base/AutoCompletes'
import { meterSample, meterSubcontractor } from '../../../api'
import UserInfo from '../../../components/user-info-single/assignPerson' import UserInfo from '../../../components/user-info-single/assignPerson'
import { meterSample } from '../../../api'
import EditLabSelect from './EditLabSelect' import EditLabSelect from './EditLabSelect'
/** /**
* 添加编辑分包信息 * 添加编辑分包信息
*/ */
const defVal = { const defVal = {
subcontractor: undefined, outer: undefined,
subcontractorId: undefined, outerId: undefined,
outReason: undefined, outStockTime: undefined,
outFee: undefined,
outPerson: undefined,
outTime: undefined,
remark: undefined remark: undefined
} }
export default { export default {
...@@ -107,7 +97,7 @@ export default { ...@@ -107,7 +97,7 @@ export default {
console.log('当前时间', defaultDate) console.log('当前时间', defaultDate)
console.log('时间', now) console.log('时间', now)
// this.formObj.outTime = now // this.formObj.outTime = now
this.formObj.outTime = defaultDate this.formObj.outStockTime = defaultDate
// this.$set(this.searchFormField, 'date', defaultDate) // this.$set(this.searchFormField, 'date', defaultDate)
}, },
_userData(data, msg, contractTempData) { _userData(data, msg, contractTempData) {
...@@ -135,82 +125,49 @@ export default { ...@@ -135,82 +125,49 @@ export default {
this.$refs.footerModal._hideLoading() this.$refs.footerModal._hideLoading()
}, },
_ok() { _ok() {
console.log('_ok----', this.formObj) this._subpackageOutStock({ ids: this.ids, obj: this.formObj })
console.log('_ok----', this.ids)
console.log(this.formObj.outTime)
// this._subpackageInfoReg({ ids: this.ids, reg: this.formObj })
this._hideLoading()
}, },
_subpackageOutStock: async function(data) {
_subpackageInfoReg: async function(data) { const result = await meterSample.subpackageOutStock(data)
const result = await meterSample.subpackageInfoReg(data)
if (result) { if (result) {
this.$Message.success('登记成功！') this.$Message.success('出库成功！')
this._hideLoading()
this.$emit('on-result-change') this.$emit('on-result-change')
this.showModal = false this._hideLoading()
} }
}, },
_cancel() { _cancel() {
this.showModal = false this.showModal = false
}, },
_open(ids, selectData) { _open(ids, selectData) {
this.formObj = { this.formObj = {
subcontractor: undefined, outer: undefined,
subcontractorId: undefined, outerId: undefined,
outReason: undefined, outStockTime: undefined,
outFee: undefined,
outPerson: undefined,
outTime: undefined,
remark: undefined remark: undefined
} }
this._userInfo() this._userInfo()
this._getLab()
this.getNowTime() this.getNowTime()
this._hideLoading() this._hideLoading()
this.$refs.formObj.resetFields() this.$refs.formObj.resetFields()
this.formObj.subcontractorId = ''
this.showModal = true this.showModal = true
this.ids = ids this.ids = ids
this.selectData = selectData this.selectData = selectData
}, },
_labChange(msg, data) { _labChange(msg, data) {
switch (msg) { switch (msg) {
case 'select':
this.formObj.subcontractor = data.name
this.formObj.subcontractorId = data.id
break
case 'query': case 'query':
this.formObj.subcontractor = data.name this.formObj.subcontractor = data.name
this._getLab(data.name) this._getLab(data.name)
break break
} }
}, },
_userInfo: async function() { _userInfo() {
const result = await global.getUserInfo() const user = Global.getUserInfo('userInfo')
console.log('人员信息', result) this.formObj.outer = user.realname
if (result) { this.formObj.outerId = user.id
this.formObj.outPerson = result.realname
}
},
_getLab: async function(name) {
const data = {}
if (name) {
data.name = name
}
// this.$store.dispatch('FoodSubcontracter/getLab', data).then(() => {
// this.labList = this.$store.state.FoodSubcontracter.list
// })
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
// console.log('this.formObj', this.formObj)
const result = await meterSubcontractor.page(data)
console.log('实验室名称', result)
if (result) {
console.log(result.records)
this.labList = result.records
console.log(this.labList)
}
}, },
_labSel() { _labSel() {
const voList = [] const voList = []
for (let i = 0; i < this.selectData.length; i++) { for (let i = 0; i < this.selectData.length; i++) {
...@@ -220,10 +177,6 @@ export default { ...@@ -220,10 +177,6 @@ export default {
}) })
} }
this.$refs.labModal._open(voList, 'batch-lab-form') this.$refs.labModal._open(voList, 'batch-lab-form')
},
_labResult(result) {
this.formObj.subcontractorId = result.id
this.formObj.subcontractor = result.name
} }
} }
} }
......
router/meter-routes.js
...@@ -14,6 +14,7 @@ import MeterSendEntrustIndex from '../pages/meter-entrust/send-test/MeterSendEnt ...@@ -14,6 +14,7 @@ import MeterSendEntrustIndex from '../pages/meter-entrust/send-test/MeterSendEnt
import MeterGoOutEntrustIndex from '../pages/meter-entrust/go-out-test/MeterGoOutEntrustIndex' import MeterGoOutEntrustIndex from '../pages/meter-entrust/go-out-test/MeterGoOutEntrustIndex'
import MeterReviewEntrust from '../pages/meter-review/MeterReviewEntrust' import MeterReviewEntrust from '../pages/meter-review/MeterReviewEntrust'
import MeterSubpackageTaskIndex from '../pages/meter-subcontract/subpackage-task/MeterSubpackageTaskIndex' import MeterSubpackageTaskIndex from '../pages/meter-subcontract/subpackage-task/MeterSubpackageTaskIndex'
import MeterSubpackageInputIndex from '../pages/meter-subcontract/subpackage-input/MeterSubpackageInputIndex'
import MeterOutTaskDistributeIndex from '../pages/meter-out/task-distribute/MeterOutTaskDistributeIndex' import MeterOutTaskDistributeIndex from '../pages/meter-out/task-distribute/MeterOutTaskDistributeIndex'
import MeterOutPersonalTaskIndex from '../pages/meter-out/personal-task/MeterOutPersonalTaskIndex' import MeterOutPersonalTaskIndex from '../pages/meter-out/personal-task/MeterOutPersonalTaskIndex'
import MeterCertificateMakeIndex from '../pages/meter-certificate/make/MeterCertificateMakeIndex' import MeterCertificateMakeIndex from '../pages/meter-certificate/make/MeterCertificateMakeIndex'
...@@ -55,6 +56,11 @@ export default [ ...@@ -55,6 +56,11 @@ export default [
path: 'task_manage', path: 'task_manage',
component: MeterSubpackageTaskIndex, component: MeterSubpackageTaskIndex,
meta: { title: '分包任务' } meta: { title: '分包任务' }
},
{
path: 'task_input',
component: MeterSubpackageInputIndex,
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