Skip to content

P
patzn-cloud-web-back-soil
Commit 35bb9308 by wangweidong
Options

证书编制修改

parent 978f7154
Showing with 61 additions and 26 deletions
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
......@@ -211,7 +211,7 @@ export default {
title: '提示',
content: '确定导出委托单？',
onOk: () => {
http.open('/meter/v1/entrust/export_send_entrust/?id=' + id)
http.open('/meter/v1/entrust/export_out_entrust/?id=' + id)
}
})
},
......
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
......@@ -10,8 +10,8 @@
</Radio-group>
</Form-item>
<Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
<AutoComplete :value="formObj.client" :down-data="customerData" name="client"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
></AutoComplete>
</Form-item>
<Form-item label="联系人" prop="operation.person" class="width-48">
......@@ -24,7 +24,7 @@
<Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader v-model="testedCityData" @on-result-change="_cascaderResult" name="tested">
<CityNameCascader v-model="testedCityData" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
<Form-item label="街道" prop="street" class="width-48">
......@@ -38,15 +38,15 @@
<Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
</Form-item>
<Form-item label="委托日期：" prop="edate" class="width-48">
<Date-picker v-model="formObj.edate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择委托日期"></Date-picker>
<Date-picker v-model="formObj.edate" type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
@on-change="_ctimeChange"></Date-picker>
</Form-item>
<Form-item label="委托费用：" prop="operation.fee" class="width-48">
<Input @keydown.native="channelInputLimit" v-model="formObj.operation.fee" type="number" name="operation.fee" placeholder="请输入委托费用"/>
<Input v-model="formObj.operation.fee" type="number" name="operation.fee" placeholder="请输入委托费用" @keydown.native="channelInputLimit"/>
</Form-item>
<Form-item label="要求完成日期：" prop="odate" class="width-48">
<Date-picker v-model="formObj.odate" @on-change="_odateChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成"></Date-picker>
<Date-picker v-model="formObj.odate" type="date" 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="请输入合同号"/>
......@@ -59,8 +59,8 @@
<Col span="24">
<!-- <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
<!-- class="contHide"></btn-list>-->
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="false" @on-result-change="_btnClick"
class="contHide"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="false" class="contHide"
@on-result-change="_btnClick"></btn-list>
<!-- <Button @click="_add()" type="success">添加</Button>-->
</Col>
<Col span="24">
......@@ -83,15 +83,27 @@
>
<template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur placeholder="请输入或选择样品名称"
<el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)"
></el-input>
</div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.spec" blur placeholder="请输入或选择型号规格"
<el-input v-model="scope.row.spec" blur placeholder="请输入型号规格"
></el-input>
</div>
<div v-if="item.key==='factoryNumber'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.factoryNumber" blur placeholder="请输入或选择出厂编号"
<el-input v-model="scope.row.factoryNumber" blur placeholder="请输入出厂编号"
></el-input>
</div>
<div v-if="item.key==='verification'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.verification" blur placeholder="请输入或选择检定（校准）依据"
></el-input>
</div>
<div v-if="item.key==='manufacturer'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.manufacturer" blur placeholder="请输入制造单位"
></el-input>
</div>
<div v-if="item.key==='remark'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.remark" blur placeholder="请输入备注"
></el-input>
</div>
<div v-if="item.key==='type'" @click.stop="_handleRow(scope)">
......@@ -104,11 +116,37 @@
<div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.quantity"
type="number"
placeholder="请输入数量"
@keydown.native="channelInputLimit"
/>
</div>
<div v-if="item.key==='testFee'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.testFee"
type="number"
placeholder="请输入或选择数量"
placeholder="请输入检定/校准费"
@keydown.native="channelInputLimit"
/>
</div>
<div v-if="item.key==='repairFee'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.repairFee"
type="number"
placeholder="请输入调修费"
@keydown.native="channelInputLimit"
/>
</div>
<div v-if="item.key==='elseFee'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.elseFee"
type="number"
placeholder="请输入其他费用"
@keydown.native="channelInputLimit"
/>
</div>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
......@@ -117,8 +155,8 @@
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
<EditModal ref="EditModal" is-change @on-result-change="_backData" />
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
</Modal>
</div>
</template>
......@@ -188,8 +226,9 @@ export default {
{ title: '制造单位', key: 'manufacturer' },
{ title: '检测类型', key: 'type' },
{ title: '数量', key: 'quantity' },
{ title: '单价', key: 'price' },
{ title: '总价', key: 'totalPrice' },
{ title: '检定/校准费', key: 'testFee' },
{ title: '调修费', key: 'repairFee' },
{ title: '其他费用', key: 'elseFee' },
{ title: '备注', key: 'remark' }
],
btn: [
......@@ -328,8 +367,8 @@ export default {
methods: {
_importSample() {
const data = {
importUrl: '/meter/v1/sample/import_sample_pre',
downloadUrl: '/meter/v1/excel/template/MeterSampleImport',
importUrl: '/meter/v1/sample/import_send_sample_pre',
downloadUrl: '/meter/v1/excel/template/MeterSendSampleImport',
title: '导入'
}
this.$refs.importModal._open(data, '样品导入')
......@@ -396,12 +435,9 @@ export default {
console.log(typeof this.index)
this.getPage.records[this.index].name = data.name
this.getPage.records[this.index].aptitudeId = data.id
console.log('返回的数据')
console.log(data)
console.log(this.getPage.records)
this.getPage.records[this.index].verification = data.code + data.basis
},
_selectjudgeBasis(index) {
console.log(index)
this.index = index
this.$refs.EditModal._open()
},
......@@ -469,7 +505,6 @@ export default {
switch (msg) {
case 'select':
this.formObj.stdId = data.id
this.formObj.code = data.stdNum
this.formObj.name = data.name
this.$refs.formObj.validateField('code')
break
......
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