Skip to content

P
patzn-cloud-web-back-soil
Commit 2a1328cf by wangweidong
Options

计量证书修改

parent 7e352150
Showing with 44 additions and 36 deletions
pages/meter-entrust/MeterSampleManage.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data> @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -43,11 +43,15 @@ ...@@ -43,11 +43,15 @@
{{scope.row[item.key]===1?'是':'否'}} {{scope.row[item.key]===1?'是':'否'}}
</div> </div>
<div v-else-if="item.key==='type'"> <div v-else-if="item.key==='type'">
<Select v-model="scope.row.type"> <span v-if="scope.row[item.key]===0">
<Option v-for="(item,index) in options" :key="item.name" :value="index"> 检定
{{ item.name }} </span>
</Option> <span v-if="scope.row[item.key]===1">
</Select> 校准
</span>
<span v-if="scope.row[item.key]===2">
外观检查
</span>
</div> </div>
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
...@@ -90,11 +94,11 @@ export default { ...@@ -90,11 +94,11 @@ export default {
id: 'meter-entrust-meter-sample-manage-edit-operation', id: 'meter-entrust-meter-sample-manage-edit-operation',
name: '编辑' name: '编辑'
}, },
{ // {
type: 'ios-flask-outline', // type: 'ios-flask-outline',
id: 'meter-entrust-meter-sample-manage-test-item-manage', // id: 'meter-entrust-meter-sample-manage-test-item-manage',
name: '管理检测项目' // name: '管理检测项目'
}, // },
{ {
type: 'trash-a', type: 'trash-a',
id: 'meter-entrust-meter-sample-manage-remove-operation', id: 'meter-entrust-meter-sample-manage-remove-operation',
...@@ -121,12 +125,12 @@ export default { ...@@ -121,12 +125,12 @@ export default {
type: 'success', type: 'success',
id: 'entrust-meter-sample-manage-subpackage-cancel', id: 'entrust-meter-sample-manage-subpackage-cancel',
name: '取消分包' name: '取消分包'
},
{
type: 'success',
id: 'entrust-meter-sample-manage-import-test-item',
name: '导入检测项目'
} }
//, {
// type: 'success',
// id: 'entrust-meter-sample-manage-import-test-item',
// name: '导入检测项目'
// }
], ],
options: [ options: [
{ {
...@@ -146,11 +150,10 @@ export default { ...@@ -146,11 +150,10 @@ export default {
selectData: [], selectData: [],
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '样品编号', key: 'code', width: 120 }, { title: '样品编号', key: 'code', width: 140 },
{ title: '样品名称', key: 'name', width: 140 }, { title: '样品名称', key: 'name', width: 140 },
{ title: '型号规格', key: 'spec', width: 140 }, { title: '型号规格', key: 'spec', width: 140 },
{ title: '出厂编号', key: 'factoryNumber', width: 140 }, { title: '出厂编号', key: 'factoryNumber', width: 140 },
{ title: '所检项目', key: 'itemNames', width: 140 },
{ title: '是否分包', key: 'jobOut', width: 110 }, { title: '是否分包', key: 'jobOut', width: 110 },
{ title: '检测类型', key: 'type', width: 140 }, { title: '检测类型', key: 'type', width: 140 },
{ title: '数量', key: 'quantity', width: 140 } { title: '数量', key: 'quantity', width: 140 }
......
pages/meter-review/MeterSampleManage.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data> @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -43,11 +43,15 @@ ...@@ -43,11 +43,15 @@
{{scope.row[item.key]===1?'是':'否'}} {{scope.row[item.key]===1?'是':'否'}}
</div> </div>
<div v-else-if="item.key==='type'"> <div v-else-if="item.key==='type'">
<Select v-model="scope.row.type"> <span v-if="scope.row[item.key]===0">
<Option v-for="(item,index) in options" :key="item.name" :value="index"> 检定
{{ item.name }} </span>
</Option> <span v-if="scope.row[item.key]===1">
</Select> 校准
</span>
<span v-if="scope.row[item.key]===2">
外观检查
</span>
</div> </div>
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
...@@ -92,11 +96,11 @@ export default { ...@@ -92,11 +96,11 @@ export default {
id: 'meter-review-meter-sample-manage-edit-o', id: 'meter-review-meter-sample-manage-edit-o',
name: '编辑' name: '编辑'
}, },
{ // {
type: 'ios-flask-outline', // type: 'ios-flask-outline',
id: 'meter-review-meter-sample-manage-test-itm-manage-o', // id: 'meter-review-meter-sample-manage-test-itm-manage-o',
name: '管理检测项目' // name: '管理检测项目'
}, // },
{ {
type: 'trash-a', type: 'trash-a',
id: 'meter-review-meter-sample-manage-remove-o', id: 'meter-review-meter-sample-manage-remove-o',
...@@ -113,12 +117,13 @@ export default { ...@@ -113,12 +117,13 @@ export default {
type: 'success', type: 'success',
id: 'review-meter-sample-manage-subpackage-cancel', id: 'review-meter-sample-manage-subpackage-cancel',
name: '取消分包' name: '取消分包'
},
{
type: 'success',
id: 'review-meter-sample-manage-import-test-item',
name: '导入检测项目'
} }
// ,
// {
// type: 'success',
// id: 'review-meter-sample-manage-import-test-item',
// name: '导入检测项目'
// }
], ],
options: [ options: [
{ {
...@@ -138,11 +143,11 @@ export default { ...@@ -138,11 +143,11 @@ export default {
selectData: [], selectData: [],
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '样品编号', key: 'code', width: 120 }, { title: '样品编号', key: 'code', width: 140 },
{ title: '样品名称', key: 'name', width: 140 }, { title: '样品名称', key: 'name', width: 140 },
{ title: '型号规格', key: 'spec', width: 140 }, { title: '型号规格', key: 'spec', width: 140 },
{ title: '出厂编号', key: 'factoryNumber', width: 140 }, { title: '出厂编号', key: 'factoryNumber', width: 140 },
{ title: '检测项目', key: 'itemNames', width: 140 }, // { title: '检测项目', key: 'itemNames', width: 140 },
{ title: '是否分包', key: 'jobOut', width: 110 }, { title: '是否分包', key: 'jobOut', width: 110 },
{ title: '检测类型', key: 'type', width: 140 }, { title: '检测类型', key: 'type', width: 140 },
{ title: '数量', key: 'quantity', width: 140 } { title: '数量', key: 'quantity', width: 140 }
......
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