Commit 44624425 authored by 李苏's avatar 李苏 💬

shhj调整

parent 5d4e553d
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
data() { data() {
return { return {
editColItemList: [ editColItemList: [
{ {
label: '编码', label: '编码',
prop: 'code', prop: 'code',
......
<template> <template>
<BasePage :power="{ <BasePage
@tpDbClick='tpDbClick'
:power="{
add: false, add: false,
copy: false, copy: false,
delButton: false, delButton: false,
...@@ -22,7 +24,7 @@ ...@@ -22,7 +24,7 @@
</template> </template>
<script> <script>
// import Edit from './edit.vue' import Edit from './edit.vue'
export default { export default {
data() { data() {
return { return {
...@@ -206,13 +208,16 @@ ...@@ -206,13 +208,16 @@
}, },
methods: { methods: {
tpDbClick(){
console.log('tpDbClick')
}
/* 示例*/ /* 示例*/
// demo(basePage){ // demo(basePage){
// } // }
}, },
components: { components: {
// Edit Edit
} }
} }
......
...@@ -49,30 +49,35 @@ ...@@ -49,30 +49,35 @@
prop: 'wpbm', prop: 'wpbm',
span: 12, span: 12,
type: 'input', type: 'input',
required:true,
}, },
{ {
label: '物品名称', label: '物品名称',
prop: 'wpmc', prop: 'wpmc',
span: 12, span: 12,
type: 'input', type: 'input',
required:true,
}, },
{ {
label: '物品特征', label: '物品特征',
prop: 'wptz', prop: 'wptz',
span: 24, span: 24,
type: 'input', type: 'input',
required:true,
}, },
{ {
label: '物品持有人', label: '物品持有人',
prop: 'wpcyr', prop: 'wpcyr',
span: 12, span: 12,
type: 'input', type: 'input',
required:true,
}, },
{ {
label: '物品数量', label: '物品数量',
prop: 'count', prop: 'count',
span: 12, span: 12,
type: 'inputNumber', type: 'inputNumber',
required:true,
}, },
] ]
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -162,6 +162,12 @@ ...@@ -162,6 +162,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -169,6 +169,12 @@ ...@@ -169,6 +169,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -166,6 +166,12 @@ ...@@ -166,6 +166,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -165,6 +165,12 @@ ...@@ -165,6 +165,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -159,6 +159,12 @@ ...@@ -159,6 +159,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -154,6 +154,12 @@ ...@@ -154,6 +154,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -170,6 +170,12 @@ ...@@ -170,6 +170,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -159,6 +159,12 @@ ...@@ -159,6 +159,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -154,6 +154,12 @@ ...@@ -154,6 +154,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -246,6 +246,12 @@ ...@@ -246,6 +246,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
</div> </div>
</div> </div>
<el-row class="editMain_right" :gutter="20" :app="this"> <el-row class="editMain_right" :gutter="20" :app="this">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false " <EditColItem :required="item.required||false" :readonly="item.readonly?true:false"
v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label" v-for="(item,index) in editColItemListS " :value="item.value" :span="item.span" :label="item.label"
:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" /> :prop='item.prop' :key="item.label" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
</el-row> </el-row>
</div> </div>
...@@ -73,6 +73,222 @@ ...@@ -73,6 +73,222 @@
}) })
} }
}, },
computed:{
editColItemListS(){
this.$set(this.form,'ckid','')
if(this.form.dsfkbc==1){
this.$nextTick(()=>{
this.form.ckid=''
})
return [
{
label: '入库单号',
prop: 'rkdh',
span: 24,
type: 'input',
},
{
label: '入库日期',
prop: 'rkrq',
span: 24,
type: 'date',
value:new Date().getTime(),
required: true,
},
{
"label": "部门",
"prop": "bm",
"span": 24,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "hjbm/query",
"match": {
"value": "bmid",
"label": "bmmc"
}
}
},
{
label: '扣押方式',
prop: 'rklx',
span: 24,
"type": "RelSelect",
"typeConfig": {
"match": {
"value": "value",
"label": "name"
},
optionsData: [
{
name: '行政扣押',
value: 0
},
{
name: '刑事扣押',
value: 1
}
]
},
required: true,
},
{
label: '保存至第三方库',
prop: 'dsfkbc',
span: 24,
type: 'Rcheckbox',
typeConfig: {
true: '1',
false: '0'
}
},
{
label: '第三方仓库',
prop: 'ckid',
span: 24,
"type": "RelSelect",
"typeConfig": {
"src": "jcsj/u_ckwh/query",
"match": {
"value": "id",
"label": "ckmc"
},
params: {
cklx: "SF"
}
},
required: true,
},
{
label: '第三方名称',
prop: 'dsfmc',
span: 24,
type: 'input',
required: true,
},
{
label: '第三方地点',
prop: 'dsfkdd',
span: 24,
type: 'input',
required: true,
},
{
label: '扣押时间至',
prop: 'rkjzrq',
span: 24,
type: 'date',
required: true,
},
{
label: '经手人',
prop: 'jsr',
span: 24,
type: 'input',
required: true,
}
]
}else{
return [
{
label: '入库单号',
prop: 'rkdh',
span: 24,
type: 'input',
},
{
label: '入库日期',
prop: 'rkrq',
span: 24,
type: 'date',
value:new Date().getTime(),
required: true,
},
{
"label": "部门",
"prop": "bm",
"span": 24,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "hjbm/query",
"match": {
"value": "bmid",
"label": "bmmc"
}
}
},
{
label: '扣押方式',
prop: 'rklx',
span: 24,
"type": "RelSelect",
"typeConfig": {
"match": {
"value": "value",
"label": "name"
},
optionsData: [
{
name: '行政扣押',
value: 0
},
{
name: '刑事扣押',
value: 1
}
]
},
required: true,
},
{
label: '保存至第三方库',
prop: 'dsfkbc',
span: 24,
type: 'Rcheckbox',
typeConfig: {
true: '1',
false: '0'
}
},
{
label: '仓库',
prop: 'ckid',
span: 24,
"type": "RelSelect",
"typeConfig": {
"src": "jcsj/u_ckwh/query",
"match": {
"value": "id",
"label": "ckmc"
},
params: {
cklx: "KY"
}
},
required: true,
},
{
label: '扣押时间至',
prop: 'rkjzrq',
span: 24,
type: 'date',
required: true,
},
{
label: '经手人',
prop: 'jsr',
span: 24,
type: 'input',
required: true,
}
]
}
}
},
data() { data() {
return { return {
xlh:'', xlh:'',
...@@ -166,12 +382,14 @@ ...@@ -166,12 +382,14 @@
prop: 'dsfmc', prop: 'dsfmc',
span: 24, span: 24,
type: 'input', type: 'input',
required: true,
}, },
{ {
label: '第三方地点', label: '第三方地点',
prop: 'dsfkdd', prop: 'dsfkdd',
span: 24, span: 24,
type: 'input', type: 'input',
required: true,
}, },
{ {
...@@ -186,6 +404,7 @@ ...@@ -186,6 +404,7 @@
prop: 'jsr', prop: 'jsr',
span: 24, span: 24,
type: 'input', type: 'input',
required: true,
} }
], ],
...@@ -207,6 +426,12 @@ ...@@ -207,6 +426,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -246,6 +246,12 @@ ...@@ -246,6 +246,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -207,6 +207,12 @@ ...@@ -207,6 +207,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -155,6 +155,12 @@ ...@@ -155,6 +155,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -155,6 +155,12 @@ ...@@ -155,6 +155,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
} }
} }
}, },
{ {
label: '仓库', label: '仓库',
prop: 'ckid', prop: 'ckid',
...@@ -196,6 +196,12 @@ ...@@ -196,6 +196,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -155,6 +155,12 @@ ...@@ -155,6 +155,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="editMain_left"> <div class="editMain_left">
<!-- 扫码--> <!-- 扫码-->
<div class="editMain_left1"> <div class="editMain_left1">
<el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select"> <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
<el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button> <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
</el-input> </el-input>
</div> </div>
...@@ -155,6 +155,12 @@ ...@@ -155,6 +155,12 @@
width: 120, width: 120,
align: "center" align: "center"
}, },
{
title: "序列号",
field: "xlh",
width: 100,
align: "center"
},
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
......
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