Skip to content

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

整体优化

parent 066b5862
Showing with 97 additions and 59 deletions
api/meter/meter-entrust.js
...@@ -95,6 +95,11 @@ export default { ...@@ -95,6 +95,11 @@ export default {
https https
.post('meter/v1/entrust/submit_to_review?ids=' + data) .post('meter/v1/entrust/submit_to_review?ids=' + data)
.then(res => res), .then(res => res),
submitToEntrustRegister: data =>
https
.post('meter/v1/entrust/submit_to_entrust_register?ids=' + data)
.then(res => res),
passReview: data => passReview: data =>
http.post('meter/v1/entrust/pass_review?ids=' + data).then(res => res), http.post('meter/v1/entrust/pass_review?ids=' + data).then(res => res),
......
pages/meter-entrust/MeterSampleManageRead.vue
...@@ -86,6 +86,11 @@ export default { ...@@ -86,6 +86,11 @@ export default {
searchOpen: false, searchOpen: false,
iconMsg: [{ type: 'ios-flask-outline', id: '', name: '管理检测项目' }], iconMsg: [{ type: 'ios-flask-outline', id: '', name: '管理检测项目' }],
btn: [ btn: [
{
type: 'success',
id: '',
name: '追加样品'
}
// { // {
// type: 'success', // type: 'success',
// id: '', // id: '',
......
pages/meter-entrust/client-online/MeterClientOnlineEntrust.vue
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :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> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/> <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button type="primary" @click="_formSearch">搜索</Button>
...@@ -40,6 +40,17 @@ ...@@ -40,6 +40,17 @@
<span v-if="item.status"> <span v-if="item.status">
{{scope.row[item.key].display}} {{scope.row[item.key].display}}
</span> </span>
<span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else-if="item.key==='type'">
<span v-if="scope.row[item.key]===0">
送检
</span>
<span v-if="scope.row[item.key]===1">
出检
</span>
</span>
<span v-else>{{scope.row[item.key]}}</span> <span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
...@@ -70,11 +81,6 @@ export default { ...@@ -70,11 +81,6 @@ export default {
{ {
type: 'success', type: 'success',
id: '', id: '',
name: '添加'
},
{
type: 'success',
id: '',
name: '提交' name: '提交'
} }
], ],
...@@ -98,8 +104,8 @@ export default { ...@@ -98,8 +104,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
...@@ -108,12 +114,13 @@ export default { ...@@ -108,12 +114,13 @@ export default {
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '下单号', key: 'orderNum', width: 130 }, { title: '下单号', key: 'orderNum', width: 130 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '进度', key: 'progress', width: 200, status: true }, { title: '进度', key: 'progress', width: 120, status: true },
{ title: '委托类型', key: 'type', width: 120 },
{ title: '传真', key: 'fax', width: 120 }, { title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' }, { title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 }, { title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 }, { title: '委托日期', key: 'edate', width: 120, data: true },
{ title: '费用合计', key: 'fee', width: 120 }, { title: '费用合计', key: 'fee', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 }, { title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
...@@ -150,7 +157,7 @@ export default { ...@@ -150,7 +157,7 @@ export default {
}) })
}, },
_submitToReview() { _submitToReview() {
this._submitByContractIds('委托评审') this._submitByContractIds('委托登记')
}, },
_submitByContractIds(cont) { _submitByContractIds(cont) {
const ids = this.selectIds const ids = this.selectIds
...@@ -161,15 +168,18 @@ export default { ...@@ -161,15 +168,18 @@ export default {
title: '提示', title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？', content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => { onOk: () => {
const result = meterEntrust.submit(ids) this._submitToRegister(ids)
if (result) {
this.$Message.warning('提交成功！')
this._page()
}
} }
}) })
} }
}, },
_submitToRegister: async function(ids) {
const result = await meterEntrust.submitToEntrustRegister(ids)
if (result) {
this.$Message.warning('提交成功！')
await this._page()
}
},
_sampleManage(data) { _sampleManage(data) {
// 管理样品 // 管理样品
this.$refs.meterSampleManageModal._open(data) this.$refs.meterSampleManageModal._open(data)
......
pages/meter-entrust/client-online/MeterClientOnlineEntrustHis.vue
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/> <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/> <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
...@@ -87,8 +87,8 @@ export default { ...@@ -87,8 +87,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
......
pages/meter-entrust/client-online/MeterGoOutTestEdit.vue
...@@ -15,36 +15,34 @@ ...@@ -15,36 +15,34 @@
></AutoComplete> ></AutoComplete>
</Form-item> </Form-item>
<Form-item label="联系人" prop="operation.person" class="width-48"> <Form-item label="联系人" prop="operation.person" class="width-48">
<Input v-model="formObj.operation.person" name="operation.person" placeholder="请输入委托单位"/> <Input v-model="formObj.operation.person" name="operation.person" placeholder="请输入联系人"/>
</Form-item> </Form-item>
<Form-item label="联系电话" prop="operation.tel" class="width-48"> <Form-item label="联系电话" prop="operation.tel" class="width-48">
<Input v-model="formObj.operation.tel" name="operation.tel" placeholder="请输入委托单位"/> <Input v-model="formObj.operation.tel" name="operation.tel" placeholder="请输入联系电话"/>
</Form-item> </Form-item>
<Form-item label="传真" prop="operation.fax" class="width-48"> <Form-item label="传真" prop="operation.fax" class="width-48">
<Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入委托单位"/> <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入传真"/>
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48"> <Form-item label="省、市、区" prop="testedCityData" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader v-model="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader v-model="testedCityData" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
<Form-item label="街道" prop="street" class="width-48"> <Form-item label="街道" prop="street" class="width-48">
<Input v-model="formObj.street" name="street" placeholder="请输入委托单位"/> <Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item> </Form-item>
<Form-item label="邮编" prop="operation.postcode" class="width-48"> <Form-item label="邮编" prop="operation.postcode" class="width-48">
<Input v-model="formObj.operation.postcode" name="operation.postcode" placeholder="请输入委托单位"/> <Input v-model="formObj.operation.postcode" name="operation.postcode" placeholder="请输入邮编"/>
</Form-item> </Form-item>
<Form-item label="E-mail" prop="operation.email" class="width-48"> <Form-item label="E-mail" prop="operation.email" class="width-48">
<Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/> <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
</Form-item> </Form-item>
<Form-item label="委托日期：" prop="edate" class="width-48"> <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" split-panels style="width:100%;" placeholder="请选择委托日期"
@on-change="_ctimeChange"></Date-picker> @on-change="_ctimeChange"></Date-picker>
</Form-item> </Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-48"> <Form-item label="合同号：" prop="contractCode" class="width-48">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入联系人"/> <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/>
</Form-item> </Form-item>
<Form-item label="备注：" prop="remark" style="width: 99.8%"> <Form-item label="备注：" prop="remark" style="width: 99.8%">
<Input v-model="formObj.remark" :rows="3" name="remark" type="textarea" <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
......
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :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> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/> <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button type="primary" @click="_formSearch">搜索</Button>
...@@ -99,8 +99,8 @@ export default { ...@@ -99,8 +99,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
......
pages/meter-entrust/go-out-test/MeterGoOutEntrustHis.vue
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/> <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/> <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
return { return {
currentComponent: '', currentComponent: '',
formId: 'meterSubcontractorFormId', formId: 'meterSubcontractorFormId',
searchOpen: false, searchOpen: true,
btn: [ btn: [
{ {
type: 'success', type: 'success',
...@@ -87,8 +87,8 @@ export default { ...@@ -87,8 +87,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
......
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
...@@ -15,28 +15,27 @@ ...@@ -15,28 +15,27 @@
></AutoComplete> ></AutoComplete>
</Form-item> </Form-item>
<Form-item label="联系人" prop="operation.person" class="width-48"> <Form-item label="联系人" prop="operation.person" class="width-48">
<Input v-model="formObj.operation.person" name="operation.person" placeholder="请输入委托单位"/> <Input v-model="formObj.operation.person" name="operation.person" placeholder="请输入联系人"/>
</Form-item> </Form-item>
<Form-item label="联系电话" prop="operation.tel" class="width-48"> <Form-item label="联系电话" prop="operation.tel" class="width-48">
<Input v-model="formObj.operation.tel" name="operation.tel" placeholder="请输入委托单位"/> <Input v-model="formObj.operation.tel" name="operation.tel" placeholder="请输入联系电话"/>
</Form-item> </Form-item>
<Form-item label="传真" prop="operation.fax" class="width-48"> <Form-item label="传真" prop="operation.fax" class="width-48">
<Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入委托单位"/> <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入传真"/>
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48"> <Form-item label="省、市、区" prop="testedCityData" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader v-model="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader v-model="testedCityData" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
<Form-item label="街道" prop="street" class="width-48"> <Form-item label="街道" prop="street" class="width-48">
<Input v-model="formObj.street" name="street" placeholder="请输入委托单位"/> <Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item> </Form-item>
<Form-item label="邮编" prop="operation.postcode" class="width-48"> <Form-item label="邮编" prop="operation.postcode" class="width-48">
<Input v-model="formObj.operation.postcode" name="operation.postcode" placeholder="请输入委托单位"/> <Input v-model="formObj.operation.postcode" name="operation.postcode" placeholder="请输入邮编"/>
</Form-item> </Form-item>
<Form-item label="E-mail" prop="operation.email" class="width-48"> <Form-item label="E-mail" prop="operation.email" class="width-48">
<Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/> <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
</Form-item> </Form-item>
<Form-item label="委托日期：" prop="edate" class="width-48"> <Form-item label="委托日期：" prop="edate" class="width-48">
<!-- <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>--> <!-- <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>-->
...@@ -44,7 +43,7 @@ ...@@ -44,7 +43,7 @@
@on-change="_ctimeChange"></Date-picker> @on-change="_ctimeChange"></Date-picker>
</Form-item> </Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-48"> <Form-item label="合同号：" prop="contractCode" class="width-48">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入联系人"/> <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/>
</Form-item> </Form-item>
<Form-item label="备注：" prop="remark" style="width: 99.8%"> <Form-item label="备注：" prop="remark" style="width: 99.8%">
<Input v-model="formObj.remark" :rows="3" name="remark" type="textarea" <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
......
pages/meter-entrust/send-test/MeterSendEntrust.vue
...@@ -93,7 +93,8 @@ export default { ...@@ -93,7 +93,8 @@ export default {
} }
], ],
formObj: { formObj: {
client: undefined client: undefined,
entrustCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
......
pages/meter-entrust/send-test/MeterSendEntrustHis.vue
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
<Form-item class="search-item" label="委托单位:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.client" name="name" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/> <Input v-model="formObj.client" name="name" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button type="primary" @click="_formSearch">搜索</Button>
</Form-item> </Form-item>
...@@ -61,7 +64,7 @@ export default { ...@@ -61,7 +64,7 @@ export default {
return { return {
currentComponent: '', currentComponent: '',
formId: 'meterSubcontractorFormId', formId: 'meterSubcontractorFormId',
searchOpen: false, searchOpen: true,
btn: [ btn: [
// { // {
// type: 'success', // type: 'success',
...@@ -82,7 +85,8 @@ export default { ...@@ -82,7 +85,8 @@ export default {
} }
], ],
formObj: { formObj: {
client: undefined client: undefined,
entrustCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
......
pages/meter-entrust/send-test/MeterSendEntrustIndex.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<div class="layout-content-padding"> <div class="layout-content-padding">
<div class="layout-content-main"> <div class="layout-content-main">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName" @tab-click="_changeTabs">
<el-tab-pane label="待完成" name="wait"> <el-tab-pane label="待完成" name="wait">
<MeterSendEntrust ref="waitTabs"></MeterSendEntrust> <MeterSendEntrust ref="waitTabs"></MeterSendEntrust>
</el-tab-pane> </el-tab-pane>
...@@ -27,6 +27,22 @@ export default { ...@@ -27,6 +27,22 @@ export default {
return { return {
activeName: 'wait' 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> </script>
......
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