Skip to content

P
patzn-cloud-web-back-soil
Commit 3d578eec by lichengming
Options

修改了证书管理，合同管理部分的问题

parent 39b32596
Showing with 39 additions and 20 deletions
pages/meter-certificate/check/MeterCertificateCheck.vue
......@@ -360,6 +360,8 @@ export default {
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
this.getPage.records = this.$uniqueArray(this.getPage.records, 'id')
// this.getPage = result
}
},
_formSearch() {
......
pages/meter-certificate/make/MeterCertificateMake.vue
......@@ -56,6 +56,7 @@
外观检查
</span>
</span>
<span v-else-if="item.key==='progress'">{{scope.row[item.key].display}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
......@@ -127,11 +128,11 @@ export default {
id: 'meter-certificate-make-pageoffice-make',
name: '在线编制证书'
},
{
type: 'md-create',
id: '',
name: '编辑'
},
// {
// type: 'md-create',
// id: '',
// name: '编辑'
// },
{
type: 'md-car',
id: '',
......@@ -158,6 +159,7 @@ export default {
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec', width: 100 },
{ title: '状态', key: 'progress', width: 100 },
{ title: '证书是否编制', key: 'onlineReported', width: 120 },
{ title: '证书编号', key: 'reportCode', width: 150 },
{ title: '出厂编号', key: 'factoryNumber' },
......
pages/meter-certificate/print/MeterCertificatePrintIndex.vue
......@@ -109,6 +109,9 @@ export default {
selectData: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 130 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 145 },
{ title: '证书编号', key: 'reportCode', width: 145 },
......@@ -136,9 +139,6 @@ export default {
{ title: '型号规格', key: 'spec', width: 100 },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type', width: 100 },
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 130 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '数量', key: 'quantity' },
......
pages/meter-certificate/print/MeterCertificatePrintIndexHis.vue
......@@ -105,6 +105,9 @@ export default {
selectData: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 130 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 145 },
{ title: '证书编号', key: 'reportCode', width: 145 },
......@@ -132,9 +135,6 @@ export default {
{ title: '型号规格', key: 'spec', width: 100 },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type', width: 100 },
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 130 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '数量', key: 'quantity' },
......
pages/meter-contract/contract-file/MeterContractFile.vue
......@@ -11,8 +11,8 @@
<Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable/>
<Form-item class="search-item" label="合同编号:">
<Input v-model="formObj.salesCode" @on-enter="_formSearch" name="salesCode" placeholder="请输入合同编号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -110,7 +110,8 @@ export default {
],
formObj: {
client: undefined,
entrustCode: undefined
entrustCode: undefined,
salesCode: undefined
},
selectIds: [],
getPage: {},
......@@ -118,6 +119,7 @@ export default {
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '合同编号', key: 'salesCode', width: 100 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '要求完成时间', key: 'odate', width: 120, date: true },
......
pages/meter-subcontract/cannot-sub/MeterCannotSub.vue
......@@ -11,6 +11,9 @@
<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="合同ID:">
<Input v-model="formObj.contractId" @on-enter="_formSearch" name="contractId" placeholder="请输入合同ID" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
......@@ -87,13 +90,15 @@ export default {
}
],
formObj: {
client: undefined
client: undefined,
contractId: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托时间', key: 'edate', width: 120, date: true },
{ title: '合同ID', key: 'contractId', width: 200 },
{ title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: '分包方', key: 'subClient', width: 120 },
{ title: '分包方联系人', key: 'subPerson', width: 120 },
......@@ -203,8 +208,10 @@ export default {
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSubContract.page(this.formObj)
const data = this.$serialize('formId')
Object.assign(data, this.$refs.pageTable._searchParams())
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSubContract.page(data)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......
pages/meter-subcontract/cannot-sub/MeterCannotSubHis.vue
......@@ -6,11 +6,14 @@
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<Form id="formHisId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="合同ID:">
<Input v-model="formObj.contractId" @on-enter="_formSearch" name="contractId" placeholder="请输入合同ID" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
......@@ -91,6 +94,7 @@ export default {
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托时间', key: 'edate', width: 120, date: true },
{ title: '合同ID', key: 'contractId', width: 200 },
{ title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: '分包方', key: 'subClient', width: 120 },
{ title: '分包方联系人', key: 'subPerson', width: 120 },
......@@ -207,8 +211,10 @@ export default {
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSubContract.pageSubmit(this.formObj)
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const data = this.$serialize('formHisId')
Object.assign(data, this.$refs.pageTable._searchParams())
const result = await meterSubContract.pageSubmit(data)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......
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