Skip to content

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

Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

parents b9679521 d6f0e7e2
Showing with 2054 additions and 217 deletions
api/meter/meter-manage-item.js
......@@ -12,6 +12,8 @@ export default {
// 删除
deleteById: data =>
http.delete('meter/v1/aptitude/?ids=' + data).then(res => res),
deleteItemById: data =>
http.delete('meter/v1/aptitude_item/?ids=' + data).then(res => res),
// 保存
save: data =>
https
......
api/meter/meter-sample.js
......@@ -49,6 +49,20 @@ export default {
pageSampleInput: data =>
http.post('meter/v1/sample/page_sample_input', data).then(res => res),
pageSampleInStock: data =>
http.post('meter/v1/sample/page_sample_in_stock', data).then(res => res),
pageSampleInStockHis: data =>
http
.post('meter/v1/sample/page_sample_in_stock_his', data)
.then(res => res),
pageSampleOutStock: data =>
http.post('meter/v1/sample/page_sample_out_stock', data).then(res => res),
pageSampleOutStockHis: data =>
http
.post('meter/v1/sample/page_sample_out_stock_his', data)
.then(res => res),
pageCertificateMake: data =>
http.post('meter/v1/sample/page_certificate_make', data).then(res => res),
pageCertificateCheck: data =>
......@@ -67,6 +81,9 @@ export default {
https
.post('meter/v1/sample/add_send_entrust', JSON.stringify(data))
.then(res => res),
addSample: data => http.post('meter/v1/sample/', data).then(res => res),
chaseAddSample: data =>
http.post('meter/v1/sample/chase_add_sample', data).then(res => res),
saveSampleEnv: data =>
http
.put('meter/v1/sample/save_sample_env/' + data.ids, data.obj)
......@@ -87,7 +104,10 @@ export default {
http
.post('meter/v1/sample/submit_report_to_issue?ids=' + data)
.then(res => res),
submitReportToEnd: data =>
http
.post('meter/v1/sample/submit_report_to_end?ids=' + data)
.then(res => res),
submitFlow: data =>
https
.post('meter/v1/sample/sample_flow', JSON.stringify(data))
......@@ -108,6 +128,16 @@ export default {
.post('meter/v1/sample/subpackage_out_stock?ids=' + data.ids, data.obj)
.then(res => res),
sampleInStock: data =>
http
.put('meter/v1/sample/sample_in_stock/' + data.ids, data.obj)
.then(res => res),
sampleOutStock: data =>
http
.put('meter/v1/sample/sample_out_stock/' + data.ids, data.obj)
.then(res => res),
subpackageInStock: data =>
http
.post('meter/v1/sample/subpackage_in_stock?ids=' + data.ids, data.obj)
......@@ -116,6 +146,18 @@ export default {
submitReceive: data =>
http.post('meter/v1/sample/submit_receive?ids=' + data).then(res => res),
taskTransfer: data =>
http
.post(
'meter/v1/sample/task_transfer?ids=' +
data.ids +
'&user=' +
data.user +
'&userId=' +
data.userId
)
.then(res => res),
reportCheckBack: data =>
http
.post(
......
ecosystem.config.js
......@@ -6,7 +6,7 @@
module.exports = {
apps: [
{
name: 'pt-llgt',
name: 'pt-metr',
script: './node_modules/nuxt-start/bin/nuxt-start.js',
instances: 2,
max_memory_restart: '512M',
......
nuxt.config.js
......@@ -9,7 +9,7 @@ if (process.env.NODE_ENV) {
module.exports = {
mode: 'universal',
server: {
port: 8028,
port: 8130,
host: '0.0.0.0'
},
/*
......
pages/contract-tab/ContractRightList.vue
......@@ -46,10 +46,7 @@
sortable
>
<template v-slot="{ row }">
<div v-if="item.key === 'name'" :style="{color:colorComputed(row.planEndDate)}">
{{row.name}}
</div>
<div v-else-if="item.date">{{row[item.key]?$dateformat(row[item.key],'yyyy-mm-dd'):''}}</div>
<div v-if="item.date">{{row[item.key]?$dateformat(row[item.key],'yyyy-mm-dd'):''}}</div>
<div v-else-if="item.key==='progress'">{{row[item.key].display}}</div>
<div v-else>{{row[item.key]}}</div>
</template>
......@@ -159,15 +156,6 @@ export default {
computed: {
tableHeight: function() {
return this.$tableHeight('tabSearch')
},
colorComputed() {
return function(val) {
return val - new Date().getTime() > this.detectionDate * 86400000
? '#606266'
: val - new Date().getTime() <= 0
? '#eb6877'
: '#f90'
}
}
},
mounted() {
......
pages/meter-aptitude/manage/MeterAptitudeManageEdit.vue
......@@ -137,8 +137,8 @@ export default {
],
btn: [{ type: 'success', id: '', name: '添加' }],
iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
{ type: 'md-create', id: '', name: '编辑' },
{ type: 'md-trash', id: '', name: '删除' }
],
currentRow: {},
currentIndex: 0,
......@@ -259,12 +259,12 @@ export default {
this.$refs.formObj.resetFields()
if (this.$string(formObj).isEmpty()) {
this.id = ''
this.modalTitle = '添加判定依据'
this.modalTitle = '添加检定依据'
} else {
this.formObj = formObj
this.id = formObj.id
console.log(this.formObj)
this.modalTitle = '编辑判定依据'
this.modalTitle = '编辑检定依据'
}
this.showModal = true
},
......
pages/meter-aptitude/manage/SampleItemList.vue
......@@ -13,17 +13,17 @@
<Col span="24" />
<Form v-model="formObj" :label-width="90" inline onsubmit="return false">
<Form-item class="search-item" label="检测项目:" style="margin-left: -25px">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
<Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
<input v-model="formObj.catalogueId" type="hidden">
</Form-item>
<Form-item class="search-item" label="检测依据:">
<Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入检测依据" clearable />
<Input v-model="formObj.code" placeholder="请输入检测依据" clearable @on-enter="_formSearch" />
</Form-item>
<Form-item class="search-item" label="检测依据名称:">
<Input v-model="formObj.standardName" @on-enter="_formSearch" placeholder="请输入检测依据名称" clearable />
<Input v-model="formObj.standardName" placeholder="请输入检测依据名称" clearable @on-enter="_formSearch" />
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">
<Button type="primary" @click="_formSearch">
搜索
</Button>
</Form-item>
......@@ -31,16 +31,16 @@
</Col>
<!--正常界面-->
<Col span="24" />
<Button @click="_importItem" type="primary" style="margin-bottom: 5px">导入检测项目</Button>
<Button type="primary" style="margin-bottom: 5px" @click="_importItem">导入检测项目</Button>
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETable
ref="pageTable"
:form-id="formId"
:tableHeight="500"
:getPage="getPage"
:iconMsg="iconMsg"
:table-height="500"
:get-page="getPage"
:icon-msg="iconMsg"
@on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
......@@ -60,23 +60,24 @@
</PTVXETable>
</Col>
<div slot="footer">
<ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter>
<ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
</div>
</Row>
</Modal>
<!--导入项目 左右关联的modal 单个导入项目-->
<!-- <SampleItemSelect ref="relItemModal" @on-result-change="_formSearch" />-->
<DownloadTemplateImport ref="importModal" @on-result-change="_page" />
</div>
</template>
<script>
// import { drugCatalogueItem } from '../../api'
// import SampleItemSelect from './SampleItemSelect'
import DownloadTemplateImport from '../../../components/import/DownloadTemplateImport'
import ModalFooter from '../../../components/base/modalFooter'
import { meterManageItem } from '../../../api'
export default {
components: {
ModalFooter
ModalFooter,
DownloadTemplateImport
// SampleItemSelect
},
data() {
......@@ -91,7 +92,7 @@ export default {
showModal: false,
searchOpen: false,
btn: [{ type: 'primary', id: '', name: '导入检测项目' }],
iconMsg: [{ type: 'pt-a-trash', id: '', name: '删除' }],
iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '保存', type: 'primary' }
......@@ -162,8 +163,16 @@ export default {
break
}
},
_importItem() {
this.$refs.relItemModal._open(this.catalogueId)
const data = {
importUrl:
'/meter/v1/aptitude_item/import_aptitude_item?aptitudeId=' +
this.formObj.aptitudeId,
downloadUrl: '/meter/v1/excel/template/MeterAptitudeItemImport',
title: '导入'
}
this.$refs.importModal._open(data, '授权资质项目导入')
},
// 操作列操作
_iconClick(res, data) {
......@@ -183,7 +192,13 @@ export default {
}
})
},
_deleteOk: async function(id) {
const result = await meterManageItem.deleteItemById(id)
if (result) {
await this._page()
this.$Message.success('删除成功')
}
},
_handleOrderValueEdit(id, value) {
this._edit({ id: id, obj: { orderBy: value } })
},
......
pages/meter-aptitude/standard/MeterAptitudeStandard.vue
......@@ -8,10 +8,10 @@
<Col span="24" style="margin-top:10px">
<Form :d="formId" :label-width="90" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="判定依据:" style="margin-left: -20px">
<Form-item class="search-item" label="检定依据:" style="margin-left: -20px">
<Input @on-enter="_formSearch" v-model="formObj.code" name="judgeBasis" placeholder="请输入判定依据" clearable/>
</Form-item>
<Form-item class="search-item" label="判定依据名称:">
<Form-item class="search-item" label="检定依据名称:">
<Input @on-enter="_formSearch" v-model="formObj.name" name="judgeBasisName" placeholder="请输入判定依据名称" clearable/>
</Form-item>
<Form-item class="search-btn">
......@@ -44,7 +44,7 @@
sortable
>
<template slot-scope="scope">
<span v-if="item.dateTime">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</span>
<span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
......@@ -69,21 +69,18 @@ export default {
return {
formId: 'meterAptitudeFormId',
pageColumns: [
{ title: '检测依据', key: 'code', width: 160 },
{ title: '检测依据名称', key: 'name' },
// {title: '限制范围或说明', key: 'limitDescription'},
{ title: '登记时间', key: 'ctime', dateTime: true, width: 140 },
{ title: '检定依据', key: 'code', width: 160 },
{ title: '检定依据名称', key: 'name' },
{ title: '登记时间', key: 'ctime', date: true, width: 140 },
{ title: '备注', key: 'remark' }
],
btn: [
{ type: 'success', id: '', name: '添加' },
{ type: 'error', id: '', name: '删除' },
{ type: '', id: '', name: '导入' },
{ type: '', id: '', name: '导出' }
{ type: 'error', id: '', name: '删除' }
],
iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
{ type: 'md-create', id: '', name: '编辑' },
{ type: 'md-trash', id: '', name: '删除' }
],
formObj: {
name: undefined,
......
pages/meter-aptitude/standard/MeterAptitudeStandardEdit.vue
......@@ -4,15 +4,15 @@
<p slot="header">{{modalTitle}}</p>
<div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
<Form-item label="判定依据" prop="code">
<Form-item label="检定依据" prop="code">
<!-- <autoComplete :value="formObj.judgeBasis" :downData="judgeBasisData" @on-result-change="_judgeBasisChange" name="judgeBasis"-->
<!-- show-key="stdNum" placeholder="请输入或选择判定依据" focus-->
<!-- ></autoComplete>-->
<Input v-model="formObj.code" @on-result-change="_judgeBasisChange" name="code" placeholder="请输入或选择判定依据" />
<Input v-model="formObj.code" @on-result-change="_judgeBasisChange" name="code" placeholder="请输入或选择检定依据" />
</Form-item>
<Form-item label="判定依据名称" prop="basis">
<Input v-model="formObj.name" name="name" placeholder="请输入判定依据名称" />
<Form-item label="检定依据名称" prop="basis">
<Input v-model="formObj.name" name="name" placeholder="请输入检定依据名称" />
</Form-item>
<Form-item label="备注" prop="remark">
<Input :rows="3" v-model="formObj.remark" placeholder="请输入备注" type="textarea" name="remark"/>
......@@ -98,11 +98,11 @@ export default {
this.$refs.formObj.resetFields()
if (this.$string(formObj).isEmpty()) {
this.id = ''
this.modalTitle = '添加判定依据'
this.modalTitle = '添加检定依据'
} else {
this.formObj = formObj
this.id = formObj.id
this.modalTitle = '编辑判定依据'
this.modalTitle = '编辑检定依据'
}
this.showModal = true
},
......
pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue
......@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
......@@ -674,6 +674,17 @@ export default {
result[0].city,
result[0].area
]
if (result[0].province) {
this.formObj.province = result[0].province
}
if (result[0].city) {
this.formObj.city = result[0].city
}
if (result[0].area) {
this.formObj.county = result[0].area
}
}
},
_getAptitudeList: async function() {
......
pages/meter-certificate/issue/MeterCertificateIssue.vue
......@@ -6,29 +6,29 @@
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<Form v-show="searchOpen" id="formId" :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/>
<Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
<Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
<Button type="primary" @click="_formSearch">搜索</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>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></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" select-data>
:get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -75,7 +75,12 @@ export default {
{
type: 'success',
id: '',
name: '生成'
name: '提交'
},
{
type: 'error',
id: '',
name: '退回'
}
],
iconMsg: [
......@@ -139,6 +144,9 @@ export default {
case '提交':
this._submitToReview()
break
case '退回':
this._goBack()
break
case 'search':
this.searchOpen = !this.searchOpen
break
......@@ -146,25 +154,31 @@ export default {
})
},
_submitToReview() {
this._submitByContractIds('委托评审')
this._submitByContractIds()
},
_submitByContractIds(cont) {
_submitByContractIds() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
content: '确定要把这 ' + ids.length + ' 条记录批准通过吗？',
onOk: () => {
const result = meterSample.submit(ids)
if (result) {
console.log(result)
}
this._submitIssue(ids)
}
})
}
},
_submitIssue: async function(data) {
const result = await meterSample.submitReportToEnd(data)
if (result) {
this.$Message.success('提交成功！')
await this._page()
}
},
_create() {
const selectData = JSON.parse(JSON.stringify(this.selectData))
console.log(selectData)
......
pages/meter-contract/contract-file/MeterContractFileEdit.vue
......@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
......
pages/meter-contract/contract-register/MeterContractRegisterEdit.vue
......@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
......
pages/meter-contract/contract-review/MeterContractReviewEdit.vue
......@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
......
pages/meter-entrust/MeterItemManage.vue
......@@ -23,7 +23,7 @@
@on-result-change="_btnClick"></btn-list>
</Col>
<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"
select-data @on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
......@@ -74,11 +74,7 @@ export default {
data() {
return {
currentComponent: '',
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
],
iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
btn: [],
options: [
{
......@@ -229,12 +225,18 @@ export default {
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this.$store.dispatch('FoodSample/deleteByIds', ids).then(() => {
this._resultChange('删除成功!')
})
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await meterItem.deleteById(ids)
if (result) {
await this._page()
this.$Message.success('删除成功！')
this.$emit('on-result-change')
}
},
_deleteById(id) {
// 删除一条记录
this._deleteByIds([id])
......
pages/meter-entrust/MeterSampleEdit.vue
......@@ -47,7 +47,7 @@
* 添加编辑环境检测项目包
*/
import ModalFooter from '../../components/base/modalFooter'
import { meterAptitude } from '../../api'
import { meterAptitude, meterSample } from '../../api'
import EditModal from './go-out-test/EditModal'
export default {
......@@ -72,6 +72,7 @@ export default {
modalTitle: '',
formObj: {
verification: '',
aptitudeId: '',
name: '',
spec: '',
factoryNumber: '',
......@@ -110,12 +111,12 @@ export default {
},
_backData(data) {
this.formObj.name = data.name
this.formObj.aptitudeId = data.id
this.formObj.verification = data.code + data.basis
console.log('返回的数据')
console.log(data)
},
_save: async function(data) {
const result = await meterAptitude.save(data)
console.log(data)
const result = await meterSample.addSample(data)
console.log(result)
if (result) {
this._resultChange('添加成功!')
......@@ -149,25 +150,11 @@ export default {
if (this.$string(this.id).isEmpty()) {
// 添加
const saveData = this.formObj
console.log(saveData)
// this._save(saveData)
this._save(saveData)
} else {
// 编辑
this._edit({ id: this.formObj.id, obj: data })
}
// if (this.$string(this.id).isEmpty()) {
// // 添加
// this.$store.dispatch('FoodJudgeBasis/add', data).then(() => {
// this._resultChange('添加成功!')
// })
// } else {
// // 编辑
// this.$store
// .dispatch('FoodJudgeBasis/edit', { id: this.id, obj: data })
// .then(() => {
// this._resultChange('编辑成功!')
// })
// }
} else {
this.$refs.footerModal._hideLoading()
this.$Message.error('表单验证失败!')
......
pages/meter-entrust/MeterSampleHisEdit.vue
......@@ -47,7 +47,7 @@
* 添加编辑环境检测项目包
*/
import ModalFooter from '../../components/base/modalFooter'
import { meterAptitude } from '../../api'
import { meterAptitude, meterSample } from '../../api'
import EditModal from './go-out-test/EditModal'
export default {
......@@ -72,6 +72,7 @@ export default {
modalTitle: '',
formObj: {
verification: '',
aptitudeId: '',
name: '',
spec: '',
factoryNumber: '',
......@@ -110,12 +111,13 @@ export default {
},
_backData(data) {
this.formObj.name = data.name
this.formObj.aptitudeId = data.id
this.formObj.verification = data.code + data.basis
console.log('返回的数据')
console.log(data)
},
_save: async function(data) {
const result = await meterAptitude.save(data)
const result = await meterSample.chaseAddSample(data)
console.log(result)
if (result) {
this._resultChange('添加成功!')
......@@ -150,7 +152,7 @@ export default {
// 添加
const saveData = this.formObj
console.log('要追加的数据', saveData)
// this._save(saveData)
this._save(saveData)
} else {
// 编辑
this._edit({ id: this.formObj.id, obj: data })
......
pages/meter-entrust/MeterSampleManage.vue
......@@ -60,16 +60,20 @@
<importModal ref="importModal" @on-result-change="_page"></importModal>
<MeterSampleManageEdit ref="sampleEditModal" @on-result-change="_page"></MeterSampleManageEdit>
<MeterSampleEdit ref="meterSampleEditModal" @on-result-change="_page"></MeterSampleEdit>
<DownloadTemplateImport ref="downloadTemplateImportModal" @on-result-change="_page" />
</div>
</template>
<script>
import { meterSample } from '../../api'
import DownloadTemplateImport from '../../components/import/DownloadTemplateImport'
import importModal from '../contract-tab/ContractTab'
import MeterSampleManageEdit from './MeterItemManage'
import MeterSampleEdit from './MeterSampleEdit'
export default {
components: {
MeterSampleManageEdit,
DownloadTemplateImport,
MeterSampleEdit,
importModal
// FoodSampleGovernDetail,
......@@ -352,11 +356,12 @@ export default {
// 导入样品
_importSample() {
const data = {
importUrl: '/meter/v1/sample/import_' + this.formObj.entrustId,
importUrl:
'/meter/v1/sample/import_sample?entrustId=' + this.formObj.entrustId,
downloadUrl: '/meter/v1/excel/template/MeterSampleImport',
title: '导入'
}
this.$refs.refModal._open(data)
this.$refs.downloadTemplateImportModal._open(data, '样品导入')
},
// 导入检测项目
_importItem() {
......
pages/meter-entrust/MeterSampleManageRead.vue
......@@ -138,6 +138,7 @@ export default {
{ title: '样品编号', key: 'code', width: 120 },
{ title: '样品名称', key: 'name', width: 140 },
{ title: '型号规格', key: 'spec', width: 140 },
{ title: '检测项目', key: 'itemNames', width: 140 },
{ title: '出厂编号', key: 'factoryNumber', width: 140 },
{ title: '是否分包', key: 'jobOut', width: 110 },
{ title: '检测类型', key: 'type', width: 140 },
......
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
......@@ -38,10 +38,16 @@
<Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
</Form-item>
<Form-item label="委托日期：" prop="edate" class="width-48">
<!-- <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>-->
<Date-picker type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
<Date-picker type="date" v-model="formObj.edate" split-panels style="width:100%;" placeholder="请选择委托日期"
@on-change="_ctimeChange"></Date-picker>
</Form-item>
<Form-item label="要求完成日期：" prop="odate" class="width-48">
<Date-picker type="date" v-model="formObj.odate" split-panels style="width:100%;" placeholder="请选择要求完成"
@on-change="_odateChange"></Date-picker>
</Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-48">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/>
</Form-item>
......@@ -191,6 +197,7 @@ export default {
subArea: '',
personCondition: '',
edate: '',
odate: '',
contractCode: '',
operation: {
person: '',
......@@ -287,6 +294,11 @@ export default {
console.log('时间', data)
this.formObj.edate = data
},
_odateChange(data) {
console.log('odate时间', data)
this.formObj.odate = data
},
_backData(data) {
console.log(typeof this.index)
this.getPage.records[this.index].name = data.name
......@@ -524,6 +536,7 @@ export default {
this.id = formObj.id
this.formObj = formObj
this._showAddress(formObj)
this._showTime(formObj)
this.getPage.records = formObj.sampleList
console.log(this.formObj)
},
......@@ -571,12 +584,17 @@ export default {
}
},
_showTime(formObj) {
// 回显资质类型
// if (formObj.aptitude !== undefined || '') {
// this.formObj.aptitude = formObj.aptitude.split(',')
// } else {
// this.formObj.aptitude = []
// }
if (this.formObj.odate === undefined) {
this.formObj.odate = ''
} else {
this.formObj.odate = new Date(formObj.odate)
}
if (this.formObj.edate === undefined) {
this.formObj.edate = ''
} else {
this.formObj.edate = new Date(formObj.edate)
}
},
_showAddress(formObj) {
this.testedCityData = []
......
pages/meter-out/personal-task/MeterGoOutTestEdit.vue
......@@ -27,7 +27,7 @@
</Form-item>
<Form-item label="省、市、区" prop="name" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
<Form-item label="街道" prop="street" class="width-48">
......
pages/meter-out/task-distribute/MeterOutTaskAlloca.vue
......@@ -62,28 +62,36 @@
</div>
</Modal>
<assignPerson ref="userModal" is-change @on-result-change="_userData"></assignPerson>
<MeterItemManage ref="itemManageModal" @on-result-change="_page"></MeterItemManage>
<importModal ref="importModal" @on-result-change="_importBack"></importModal>
</div>
</template>
<script>
import { meterSample } from '../../../api'
import assignPerson from '../../../components/user-info-single/assignPerson'
import MeterItemManage from '../MeterItemManage'
import importModal from '../../contract-tab/ContractTab'
export default {
components: {
assignPerson
assignPerson,
MeterItemManage,
importModal
},
data() {
return {
currentComponent: '',
iconMsg: [
// { type: 'compose', id: '', name: '编辑' },
// { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
// { type: 'trash-a', id: '', name: '删除' }
],
iconMsg: [{ type: 'ios-beaker', id: '', name: '检测项目' }],
btn: [
{
type: 'success',
id: '',
name: '分配任务'
},
{
type: 'success',
id: '',
name: '导入检测项目'
}
],
searchOpen: false,
......@@ -107,6 +115,7 @@ export default {
pageColumns: [
{ title: '样品编号', key: 'code', width: 120 },
{ title: '样品名称', key: 'name', width: 140 },
{ title: '检测项目', key: 'itemNames', width: 140 },
{ title: '型号规格', key: 'spec', width: 140 },
{ title: '出厂编号', key: 'factoryNumber', width: 140 },
{ title: '是否分包', key: 'jobOut', width: 110 },
......@@ -139,12 +148,12 @@ export default {
case '分配任务':
this._changePeople()
break
case '导入检测项目':
this._importTestItem()
break
case '添加':
this._editModal(false)
break
case '导入检测项目':
this._importItem()
break
case '导入检测项目包':
this._importItemPackage()
break
......@@ -185,6 +194,16 @@ export default {
this.$refs.userModal._open('salesman')
}
},
_importTestItem() {
if (this.selectIds.length === 0) {
this.$Message.warning('请选择至少一项数据!')
return false
} else {
this.$refs.importModal._open(this.selectIds)
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
......@@ -204,7 +223,7 @@ export default {
this._deleteById(data.id)
break
case '检测项目':
this._itemDetail(data.id)
this._itemManage(data.id)
break
}
})
......@@ -236,9 +255,12 @@ export default {
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
_importBack() {
this.selectIds = []
this._page()
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await meterSample.pageOutDistribute(this.formObj)
if (result) {
this.getPage = result
......@@ -404,8 +426,8 @@ export default {
this.$refs.refModal._open(this.selectIds)
}
},
_itemDetail(id) {
this.$refs.foodItem._open(id)
_itemManage(id) {
this.$refs.itemManageModal._open(id)
},
_operationRecord(id) {
// 操作日志
......
pages/meter-out/task-distribute/MeterOutTaskDistribute.vue
......@@ -45,9 +45,9 @@
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<MeterOutTaskAlloca ref="taskAllocaModal"></MeterOutTaskAlloca>
<MeterOutTaskOperation ref="operationModal"></MeterOutTaskOperation>
<FileManage ref="FileManage" @on-result-change="_page"></FileManage>
<MeterOutTaskAlloca ref="taskAllocaModal" @on-result-change="_page"></MeterOutTaskAlloca>
<MeterOutTaskOperation ref="operationModal" @on-result-change="_page"></MeterOutTaskOperation>
</div>
</template>
<script>
......
pages/meter-review/contract-tab/ContractRightList.vue
......@@ -46,10 +46,7 @@
sortable
>
<template v-slot="{ row }">
<div v-if="item.key === 'name'" :style="{color:colorComputed(row.planEndDate)}">
{{row.name}}
</div>
<div v-else-if="item.date">{{row[item.key]?$dateformat(row[item.key],'yyyy-mm-dd'):''}}</div>
<div v-if="item.date">{{row[item.key]?$dateformat(row[item.key],'yyyy-mm-dd'):''}}</div>
<div v-else-if="item.key==='progress'">{{row[item.key].display}}</div>
<div v-else>{{row[item.key]}}</div>
</template>
......@@ -166,15 +163,6 @@ export default {
computed: {
tableHeight: function() {
return this.$tableHeight('tabSearch')
},
colorComputed() {
return function(val) {
return val - new Date().getTime() > this.detectionDate * 86400000
? '#606266'
: val - new Date().getTime() <= 0
? '#eb6877'
: '#f90'
}
}
},
mounted() {
......
pages/meter-send/sample-flow/MeterSampleFlow.vue
......@@ -6,29 +6,29 @@
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<Form v-show="searchOpen" id="formId" :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/>
<Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
<Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
<Button type="primary" @click="_formSearch">搜索</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>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></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" select-data>
:get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -56,9 +56,9 @@
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
<personModal ref="personModal"></personModal>
<FileManage ref="FileManage" @on-result-change="_page"></FileManage>
<MeterPersonItemTaskManage ref="personModal" @on-result-change="_page"></MeterPersonItemTaskManage>
<personModal ref="personModal" @on-result-change="_taskTransferBack"></personModal>
<ListModal ref="ListModal" @on-result-change="_page"></ListModal>
</div>
</template>
......@@ -138,7 +138,7 @@ export default {
this.$nextTick(function() {
switch (msg) {
case '任务转发':
this.$refs.personModal._open('salesman')
this._taskGive()
break
case '流转':
this._sampleReceive()
......@@ -161,6 +161,15 @@ export default {
}
})
},
_taskGive() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据!')
} else {
this.$refs.personModal._open('salesman')
}
},
_sampleReceive() {
const ids = this.selectIds
const selectData = this.selectData
......@@ -206,12 +215,6 @@ export default {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '仪器领用':
this.$refs.InstruEdit._open()
break
case '车辆管理':
this.$refs.carEdit._open()
break
case '编辑':
// this._editModal(true, data.id)
this._personModal(data)
......@@ -283,13 +286,30 @@ export default {
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await meterSample.pageSampleFlow(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
}
},
_taskTransferBack(data, treeName) {
console.log('AAAA', data)
this._taskTransfer(data)
},
_taskTransfer: async function(data) {
const result = await meterSample.taskTransfer({
ids: this.selectIds,
userId: data.id,
user: data.realname
})
if (result) {
await this._page()
this.$Message.success('转发成功！')
}
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
......
pages/meter-send/sample-input/MeterGoOutTestEdit.vue
......@@ -27,7 +27,7 @@
</Form-item>
<Form-item label="省、市、区" prop="name" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
<Form-item label="街道" prop="street" class="width-48">
......
pages/meter-send/task-distribute/MeterTaskAlloca.vue
......@@ -61,14 +61,22 @@
</div>
</Modal>
<assignPerson ref="userModal" is-change @on-result-change="_userData"></assignPerson>
<MeterItemManage ref="itemManageModal" @on-result-change="_page"></MeterItemManage>
<importModal ref="importModal" @on-result-change="_importBack"></importModal>
</div>
</template>
<script>
import { meterSample } from '../../../api'
import assignPerson from '../../../components/user-info-single/assignPerson'
import MeterItemManage from '../MeterItemManage'
import importModal from '../../contract-tab/ContractTab'
export default {
components: {
assignPerson
assignPerson,
MeterItemManage,
importModal
// FoodSampleGovernDetail,
// CopyModal,
// FoodSampleGovernLYEdits
......@@ -85,11 +93,7 @@ export default {
// {id: '', name: '复制历史样品检测项目', componentName: 'CopyHisItem'},
// {id: '', name: '删除'},
// ],
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
],
iconMsg: [{ type: 'ios-beaker', id: '', name: '检测项目管理' }],
footerList: [
{ id: '', name: '关闭', type: '' },
{ id: '', name: '确定', type: 'primary' }
......@@ -99,6 +103,11 @@ export default {
type: 'success',
id: '',
name: '分配任务'
},
{
type: 'success',
id: '',
name: '导入检测项目'
}
],
searchOpen: false,
......@@ -122,6 +131,7 @@ export default {
pageColumns: [
{ title: '样品编号', key: 'code', width: 120 },
{ title: '样品名称', key: 'name', width: 140 },
{ title: '检测项目', key: 'itemNames', width: 140 },
{ title: '型号规格', key: 'spec', width: 140 },
{ title: '出厂编号', key: 'factoryNumber', width: 140 },
{ title: '是否分包', key: 'jobOut', width: 110 },
......@@ -161,6 +171,10 @@ export default {
this.formObj.ctimeBegin = data[0]
this.formObj.ctimeEnd = data[1]
},
_importBack() {
this.selectIds = []
this._page()
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
......@@ -232,12 +246,15 @@ export default {
case '删除':
this._deleteById(data.id)
break
case '检测项目':
this._itemDetail(data.id)
case '检测项目管理':
this._itemManage(data.id)
break
}
})
},
_itemManage(id) {
this.$refs.itemManageModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'selectData':
......@@ -414,9 +431,10 @@ export default {
// 导入检测项目
_importItem() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选中一条样品数据！')
this.$Message.warning('请选择至少一项数据!')
return false
} else {
this.$refs.refModal._open(this.selectIds, this.selectData[0])
this.$refs.importModal._open(this.selectIds)
}
},
_importItemPackage() {
......
pages/meter-send/task-distribute/MeterTaskDistribute.vue
......@@ -8,11 +8,11 @@
<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 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.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
<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>
......@@ -99,13 +99,14 @@ export default {
}
],
formObj: {
name: undefined,
aptitude: undefined
client: undefined,
entrustCode: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托单位', key: 'client', width: 180 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
......
pages/meter-send/task-distribute/MeterTestEdit.vue
......@@ -27,7 +27,7 @@
</Form-item>
<Form-item label="省、市、区" prop="name" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
<Form-item label="街道" prop="street" class="width-48">
......
pages/meter-subcontract/subpackage-input/MeterSubpackageInput.vue
......@@ -8,11 +8,8 @@
<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 class="search-item" label="委托单位:">
<Input v-model="formObj.client" @on-enter="_formSearch" name="name" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -94,8 +91,7 @@ export default {
}
],
formObj: {
name: undefined,
aptitude: undefined
client: undefined
},
selectIds: [],
getPage: {},
......
pages/meter-subcontract/subpackage-input/MeterSubpackageInputHis.vue
......@@ -6,29 +6,26 @@
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<Form v-show="searchOpen" id="formId" :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 class="search-item" label="委托单位:">
<Input v-model="formObj.client" name="name" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
<Button type="primary" @click="_formSearch">搜索</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>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></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>
:get-page="getPage" :icon-msg="iconMsg" hide-checkbox @on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -45,47 +42,56 @@
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<subSampleManage ref="subSampleManage"></subSampleManage>
<operationModal ref="operationModal"></operationModal>
</div>
</template>
<script>
import { meterEntrust, meterSubcontractor } from '../../../api'
import operationModal from '../../../components/operation/Operation'
import subSampleManage from './MeterSubSampleManage'
export default {
components: {},
components: { subSampleManage, operationModal },
data() {
return {
currentComponent: '',
formId: 'meterSubpackageTaskHisFormId',
formId: 'meterSubpackageTaskFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: 'meter-subcontractor-add-btn',
name: '添加'
}
// {
// // meter-review-entrust-pass-btn
// type: 'success',
// id: '',
// name: '通过'
// },
// // meter-review-entrust-back-btn
// {
// type: 'success',
// id: '',
// name: '驳回'
// }
],
iconMsg: [
{
type: 'ios-clock',
type: 'md-paper',
id: '',
name: '编辑'
},
{
type: 'ios-clock',
type: 'ios-beaker',
id: '',
name: '资质项目'
name: '分包样品管理'
},
{ type: 'ios-clock', id: '', name: '附件' },
{ type: 'ios-clock', id: '', name: '删除' },
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'ios-clock',
type: 'md-book',
id: '',
name: '操作日志'
}
],
formObj: {
name: undefined,
aptitude: undefined
client: undefined
},
selectIds: [],
getPage: {},
......@@ -134,6 +140,9 @@ export default {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '分包样品管理':
this.subSampleManage(data)
break
case '编辑':
this._editModal(true, data.id)
break
......@@ -152,8 +161,12 @@ export default {
}
})
},
subSampleManage(data) {
// 管理样品
this.$refs.subSampleManage._open(data.id)
},
_record(id) {
this.$refs.refModal._open(id)
this.$refs.operationModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
......@@ -171,7 +184,7 @@ export default {
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await meterEntrust.pageSendEntrust(this.formObj)
const result = await meterEntrust.pageSubpackageInputEntrust(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......@@ -208,7 +221,7 @@ export default {
_upload(id) {
// 上传文件
this.$refs.refModal._open(id, 'subcontractorId')
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterSubcontractor.getById(id)
......
pages/meter-warehouse/warehouse-in/MeterMeterWarehouseInHis.vue 0 → 100644
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="样品名称:">
<Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></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.key==='type'">
<span v-if="scope.row[item.key]===0">
检定
</span>
<span v-else-if="scope.row[item.key]===1">
校准
</span>
<span v-else-if="scope.row[item.key]===2">
外观检查
</span>
</span>
<div v-else-if="item.dateTime">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</div>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<WarehousePersonSelect ref="warehousePersonSelectModal" @on-result-change="_page"></WarehousePersonSelect>
</div>
</template>
<script>
import { meterDevice, meterSample } from '../../../api'
import WarehousePersonSelect from './WarehousePersonSelect'
export default {
components: { WarehousePersonSelect },
data() {
return {
currentComponent: '',
formId: 'meterWarehouseInFormId',
searchOpen: false,
btn: [
// {
// type: 'success',
// id: '',
// name: '入库'
// }
],
iconMsg: [{ type: 'md-cloud', id: '', name: '附件' }],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '入库人', key: 'sampleInner', width: 120 },
{
title: '入库时间',
key: 'sampleInnerTime',
width: 130,
dateTime: true
},
{ title: '型号规格', key: 'spec' },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' },
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '数量', key: 'quantity' },
{ title: '备注', key: 'remark' }
]
}
},
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._receiveApparatus()
break
case '车辆管理':
this._carManage()
break
case '添加':
this._editModal(false)
break
case '入库':
this._submitToReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_carManage() {
this.$refs.carEdit._open()
},
_receiveApparatus() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.SelEquip._open('sample-input')
}
},
_submitToReview() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.warehousePersonSelectModal._open(ids)
}
},
_submitByContractIds(cont) {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => {
const result = meterSample.submit(ids)
if (result) {
console.log(result)
}
}
})
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '仪器领用':
this.$refs.InstruEdit._open()
break
case '车辆管理':
this.$refs.carEdit._open()
break
case '编辑':
// this._editModal(true, data.id)
this._personModal(data)
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
}
})
},
_personModal(data) {
console.log(data)
this.$refs.personModal._open(data.id)
},
_equipSelectBack(data) {
console.log('_equipSelectBack', data)
const equipData = []
for (let i = 0; i < data.length; i++) {
const object = data[i]
const obj = {}
obj.name = object.name
obj.certificateNo = object.ceNum
obj.measuringRange = object.range
obj.uncertaintyAccuray = object.uncertainty
obj.validUntil = object.effectDate
equipData.push(obj)
}
this._addEquipUse({ sampleIds: this.selectIds, devicesList: equipData })
},
_addEquipUse: async function(data) {
const result = await meterDevice.addEquipUse(data)
if (result) {
await this._page()
}
},
_record(id) {
this.$refs.refModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'selectIds':
this.selectIds = data
break
case 'changeSize':
this._page()
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSample.pageSampleInStockHis(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._getById(id)
} else {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterSample.getById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterSample.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-warehouse/warehouse-in/MeterMeterWarehouseInIndex.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">
<MeterGoOutEntrust ref="waitTabs"></MeterGoOutEntrust>
</el-tab-pane>
<el-tab-pane label="历史记录" name="his">
<MeterGoOutEntrustHis ref="hisTabs"></MeterGoOutEntrustHis>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
import MeterGoOutEntrust from './MeterWarehouseIn'
import MeterGoOutEntrustHis from './MeterMeterWarehouseInHis'
export default {
name: 'MeterGoOutEntrustIndex',
components: {
MeterGoOutEntrust,
MeterGoOutEntrustHis
},
data() {
return {
activeName: 'wait'
}
},
mounted() {
this.activeName = 'wait'
this._page()
},
methods: {
_changeTabs(tab, event) {
if (tab.name === 'wait') {
this._page()
} else {
this.$refs.hisTabs._page()
}
},
_page() {
this.$refs.waitTabs._page()
}
}
}
</script>
<style scoped>
</style>
pages/meter-warehouse/warehouse-in/MeterWarehouseIn.vue 0 → 100644
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="样品名称:">
<Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></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.key==='type'">
<span v-if="scope.row[item.key]===0">
检定
</span>
<span v-else-if="scope.row[item.key]===1">
校准
</span>
<span v-else-if="scope.row[item.key]===2">
外观检查
</span>
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<WarehousePersonSelect ref="warehousePersonSelectModal" @on-result-change="_page"></WarehousePersonSelect>
</div>
</template>
<script>
import { meterDevice, meterSample } from '../../../api'
import WarehousePersonSelect from './WarehousePersonSelect'
export default {
components: { WarehousePersonSelect },
data() {
return {
currentComponent: '',
formId: 'meterWarehouseInFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: '',
name: '入库'
}
],
iconMsg: [{ type: 'md-cloud', id: '', name: '附件' }],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec' },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' },
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '数量', key: 'quantity' },
{ title: '备注', key: 'remark' }
]
}
},
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._receiveApparatus()
break
case '车辆管理':
this._carManage()
break
case '添加':
this._editModal(false)
break
case '入库':
this._submitToReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_carManage() {
this.$refs.carEdit._open()
},
_receiveApparatus() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.SelEquip._open('sample-input')
}
},
_submitToReview() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.warehousePersonSelectModal._open(ids)
}
},
_submitByContractIds(cont) {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => {
const result = meterSample.submit(ids)
if (result) {
console.log(result)
}
}
})
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '仪器领用':
this.$refs.InstruEdit._open()
break
case '车辆管理':
this.$refs.carEdit._open()
break
case '编辑':
// this._editModal(true, data.id)
this._personModal(data)
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
}
})
},
_personModal(data) {
console.log(data)
this.$refs.personModal._open(data.id)
},
_equipSelectBack(data) {
console.log('_equipSelectBack', data)
const equipData = []
for (let i = 0; i < data.length; i++) {
const object = data[i]
const obj = {}
obj.name = object.name
obj.certificateNo = object.ceNum
obj.measuringRange = object.range
obj.uncertaintyAccuray = object.uncertainty
obj.validUntil = object.effectDate
equipData.push(obj)
}
this._addEquipUse({ sampleIds: this.selectIds, devicesList: equipData })
},
_addEquipUse: async function(data) {
const result = await meterDevice.addEquipUse(data)
if (result) {
await this._page()
}
},
_record(id) {
this.$refs.refModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'selectIds':
this.selectIds = data
break
case 'changeSize':
this._page()
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSample.pageSampleInStock(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._getById(id)
} else {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterSample.getById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterSample.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-warehouse/warehouse-in/WarehousePersonSelect.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="inner">
<Input v-model="formObj.inner" @click.native="_selectStaff" readonly name="inner"></Input>
</Form-item>
<Form-item label="入库时间：" prop="inTime">
<div class="block">
<el-date-picker
v-model="formObj.inTime"
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>
<!--选择实验室-->
<UserInfo ref="userModal" @on-result-change="_userData" is-change></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'
/**
* 添加编辑分包信息
*/
const defVal = {
inner: undefined,
innerId: undefined,
inTime: undefined,
remark: undefined
}
export default {
components: {
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: {
_labResult(data) {
console.log(data)
},
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.inTime = defaultDate
// this.$set(this.searchFormField, 'date', defaultDate)
},
_userData(data, msg, contractTempData) {
if (msg === 'salesman') {
// 选择业务员
this.formObj.inner = 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.sampleInStock(data)
if (result) {
this.$Message.success('样品入库成功！')
this.$emit('on-result-change')
this.showModal = false
this._hideLoading()
}
},
_cancel() {
this.showModal = false
},
_open(ids, selectData) {
this.formObj = {
inner: undefined,
innerId: undefined,
inTime: 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.inner = user.realname
this.formObj.innerId = 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-warehouse/warehouse-out/MeterMeterWarehouseOutHis.vue 0 → 100644
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="样品名称:">
<Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></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.key==='type'">
<span v-if="scope.row[item.key]===0">
检定
</span>
<span v-else-if="scope.row[item.key]===1">
校准
</span>
<span v-else-if="scope.row[item.key]===2">
外观检查
</span>
</span>
<div v-else-if="item.dateTime">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</div>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<WarehousePersonSelect ref="warehousePersonSelectModal" @on-result-change="_page"></WarehousePersonSelect>
</div>
</template>
<script>
import { meterDevice, meterSample } from '../../../api'
import WarehousePersonSelect from './WarehousePersonSelect'
export default {
components: { WarehousePersonSelect },
data() {
return {
currentComponent: '',
formId: 'meterWarehouseInFormId',
searchOpen: false,
btn: [
// {
// type: 'success',
// id: '',
// name: '入库'
// }
],
iconMsg: [{ type: 'md-cloud', id: '', name: '附件' }],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '入库人', key: 'sampleInner', width: 130 },
{
title: '入库时间',
key: 'sampleInnerTime',
width: 120,
dateTime: true
},
{ title: '出库人', key: 'sampleOuter', width: 130 },
{
title: '出库时间',
key: 'sampleOutTime',
width: 120,
dateTime: true
},
{ title: '型号规格', key: 'spec' },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' },
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '数量', key: 'quantity' },
{ title: '备注', key: 'remark' }
]
}
},
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._receiveApparatus()
break
case '车辆管理':
this._carManage()
break
case '添加':
this._editModal(false)
break
case '入库':
this._submitToReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_carManage() {
this.$refs.carEdit._open()
},
_receiveApparatus() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.SelEquip._open('sample-input')
}
},
_submitToReview() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.warehousePersonSelectModal._open(ids)
}
},
_submitByContractIds(cont) {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => {
const result = meterSample.submit(ids)
if (result) {
console.log(result)
}
}
})
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '仪器领用':
this.$refs.InstruEdit._open()
break
case '车辆管理':
this.$refs.carEdit._open()
break
case '编辑':
// this._editModal(true, data.id)
this._personModal(data)
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
}
})
},
_personModal(data) {
console.log(data)
this.$refs.personModal._open(data.id)
},
_equipSelectBack(data) {
console.log('_equipSelectBack', data)
const equipData = []
for (let i = 0; i < data.length; i++) {
const object = data[i]
const obj = {}
obj.name = object.name
obj.certificateNo = object.ceNum
obj.measuringRange = object.range
obj.uncertaintyAccuray = object.uncertainty
obj.validUntil = object.effectDate
equipData.push(obj)
}
this._addEquipUse({ sampleIds: this.selectIds, devicesList: equipData })
},
_addEquipUse: async function(data) {
const result = await meterDevice.addEquipUse(data)
if (result) {
await this._page()
}
},
_record(id) {
this.$refs.refModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'selectIds':
this.selectIds = data
break
case 'changeSize':
this._page()
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSample.pageSampleOutStockHis(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._getById(id)
} else {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterSample.getById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterSample.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-warehouse/warehouse-out/MeterMeterWarehouseOutIndex.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">
<MeterGoOutEntrust ref="waitTabs"></MeterGoOutEntrust>
</el-tab-pane>
<el-tab-pane label="历史记录" name="his">
<MeterGoOutEntrustHis ref="hisTabs"></MeterGoOutEntrustHis>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
import MeterGoOutEntrust from './MeterWarehouseOut'
import MeterGoOutEntrustHis from './MeterMeterWarehouseOutHis'
export default {
name: 'MeterGoOutEntrustIndex',
components: {
MeterGoOutEntrust,
MeterGoOutEntrustHis
},
data() {
return {
activeName: 'wait'
}
},
mounted() {
this.activeName = 'wait'
this._page()
},
methods: {
_changeTabs(tab, event) {
if (tab.name === 'wait') {
this._page()
} else {
this.$refs.hisTabs._page()
}
},
_page() {
this.$refs.waitTabs._page()
}
}
}
</script>
<style scoped>
</style>
pages/meter-warehouse/warehouse-out/MeterWarehouseOut.vue 0 → 100644
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="样品名称:">
<Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></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.key==='type'">
<span v-if="scope.row[item.key]===0">
检定
</span>
<span v-else-if="scope.row[item.key]===1">
校准
</span>
<span v-else-if="scope.row[item.key]===2">
外观检查
</span>
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<WarehousePersonSelect ref="warehousePersonSelectModal" @on-result-change="_page"></WarehousePersonSelect>
</div>
</template>
<script>
import { meterDevice, meterSample } from '../../../api'
import WarehousePersonSelect from './WarehousePersonSelect'
export default {
components: { WarehousePersonSelect },
data() {
return {
currentComponent: '',
formId: 'meterWarehouseInFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: '',
name: '出库'
}
],
iconMsg: [{ type: 'md-cloud', id: '', name: '附件' }],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec' },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' },
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '数量', key: 'quantity' },
{ title: '备注', key: 'remark' }
]
}
},
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._receiveApparatus()
break
case '车辆管理':
this._carManage()
break
case '添加':
this._editModal(false)
break
case '出库':
this._submitToReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_carManage() {
this.$refs.carEdit._open()
},
_receiveApparatus() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.SelEquip._open('sample-input')
}
},
_submitToReview() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.warehousePersonSelectModal._open(ids)
}
},
_submitByContractIds(cont) {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => {
const result = meterSample.submit(ids)
if (result) {
console.log(result)
}
}
})
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '仪器领用':
this.$refs.InstruEdit._open()
break
case '车辆管理':
this.$refs.carEdit._open()
break
case '编辑':
// this._editModal(true, data.id)
this._personModal(data)
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
}
})
},
_personModal(data) {
console.log(data)
this.$refs.personModal._open(data.id)
},
_equipSelectBack(data) {
console.log('_equipSelectBack', data)
const equipData = []
for (let i = 0; i < data.length; i++) {
const object = data[i]
const obj = {}
obj.name = object.name
obj.certificateNo = object.ceNum
obj.measuringRange = object.range
obj.uncertaintyAccuray = object.uncertainty
obj.validUntil = object.effectDate
equipData.push(obj)
}
this._addEquipUse({ sampleIds: this.selectIds, devicesList: equipData })
},
_addEquipUse: async function(data) {
const result = await meterDevice.addEquipUse(data)
if (result) {
await this._page()
}
},
_record(id) {
this.$refs.refModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'selectIds':
this.selectIds = data
break
case 'changeSize':
this._page()
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSample.pageSampleOutStock(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._getById(id)
} else {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterSample.getById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterSample.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-warehouse/warehouse-out/WarehousePersonSelect.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">
<Input v-model="formObj.outer" @click.native="_selectStaff" readonly name="outer"></Input>
</Form-item>
<Form-item label="出库时间：" prop="outTime">
<div class="block">
<el-date-picker
v-model="formObj.outTime"
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>
<!--选择实验室-->
<UserInfo ref="userModal" @on-result-change="_userData" is-change></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'
/**
* 添加编辑分包信息
*/
const defVal = {
outer: undefined,
outerId: undefined,
outTime: undefined,
remark: undefined
}
export default {
components: {
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: {
_labResult(data) {
console.log(data)
},
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.outTime = defaultDate
// this.$set(this.searchFormField, 'date', defaultDate)
},
_userData(data, msg, contractTempData) {
if (msg === 'salesman') {
// 选择业务员
this.formObj.outer = 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.sampleOutStock(data)
if (result) {
this.$Message.success('样品出库成功！')
this.$emit('on-result-change')
this.showModal = false
this._hideLoading()
}
},
_cancel() {
this.showModal = false
},
_open(ids, selectData) {
this.formObj = {
outer: undefined,
outerId: undefined,
outTime: 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>
router/meter-routes.js
......@@ -34,6 +34,8 @@ import MeterContractReviewIndex from '../pages/meter-contract/contract-review/Me
import MeterContractFileIndex from '../pages/meter-contract/contract-file/MeterContractFileIndex'
import MeterSampleProgress from '../pages/meter-progress/progress-sample/MeterSampleProgress'
import MeterClientOnlineEntrustIndex from '../pages/meter-entrust/client-online/MeterClientOnlineEntrustIndex'
import MeterMeterWarehouseInIndex from '../pages/meter-warehouse/warehouse-in/MeterMeterWarehouseInIndex'
import MeterMeterWarehouseOutIndex from '../pages/meter-warehouse/warehouse-out/MeterMeterWarehouseOutIndex'
import Blank from '~/pages/blank'
export default [
{
......@@ -220,7 +222,23 @@ export default [
{
path: 'sample_progress',
component: MeterSampleProgress,
meta: { title: '' }
meta: { title: '样品进度查询' }
}
]
},
{
path: 'warehouse',
component: Blank,
children: [
{
path: 'sample_in_store',
component: MeterMeterWarehouseInIndex,
meta: { title: '样品入库管理' }
},
{
path: 'sample_out_store',
component: MeterMeterWarehouseOutIndex,
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