Skip to content

F
founder_vue
Commit 7ef84cdc by 张超军
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 5040af80 85d81808
Showing with 108 additions and 62 deletions
src/views/AllPersonnelBase/dclb.vue
......@@ -25,62 +25,82 @@
class="head"
v-if="showType == 1"
>
<div class='search taskNumber'>
<div class='item'> 任务号：</div>
<el-input
placeholder="请输入任务号"
v-model.trim="taskNumber"
maxlength="14"
show-word-limit
clearable
>
</el-input>
</div>
<div class='search barcode'>
<div class='item'> 人员编号：</div>
<el-input
placeholder="请输入人员编号"
v-model.trim="barcode"
maxlength="23"
show-word-limit
clearable
>
</el-input>
<div class='left'>
<div class='search taskNumber'>
<div class='item'> 任务号：</div>
<el-input
placeholder="请输入任务号"
v-model.trim="taskNumber"
maxlength="14"
show-word-limit
@keyup.enter.native="search"
clearable
>
</el-input>
</div>
<div class='search barcode'>
<div class='item'> 人员编号：</div>
<el-input
placeholder="请输入人员编号"
v-model.trim="barcode"
@keyup.enter.native="search"
maxlength="23"
show-word-limit
clearable
>
</el-input>
</div>
</div>
<div class="right">
<el-button @click="clear">清空</el-button>
<el-button @click="search">筛选</el-button>
<el-button
type="text"
@click="clear"
>清空</el-button>
<el-button
class='sx'
@click="search"
>筛选</el-button>
</div>
</div>
<div
class='head'
v-if="showType==2"
>
<div class='search taskNumber'>
<div class='item'> 任务号：</div>
<el-input
placeholder="请输入任务号"
v-model.trim="taskNumber"
maxlength="14"
show-word-limit
clearable
>
</el-input>
</div>
<div class='search barcode'>
<div class='item'> 案事件编号：</div>
<el-input
placeholder="请输入人员编号"
v-model.trim="barcode"
maxlength="23"
show-word-limit
clearable
>
</el-input>
<div class="left">
<div class='search taskNumber'>
<div class='item'> 任务号：</div>
<el-input
placeholder="请输入任务号"
v-model.trim="taskNumber"
maxlength="14"
show-word-limit
@keyup.enter.native="search"
clearable
>
</el-input>
</div>
<div class='search barcode'>
<div class='item'> 案事件编号：</div>
<el-input
placeholder="请输入人员编号"
v-model.trim="barcode"
maxlength="23"
@keyup.enter.native="search"
show-word-limit
clearable
>
</el-input>
</div>
</div>
<div class="right">
<el-button @click="clear">清空</el-button>
<el-button @click="search">筛选</el-button>
<el-button
type="text"
@click="clear"
>清空</el-button>
<el-button
class='sx'
@click="search"
>筛选</el-button>
</div>
</div>
<el-divider></el-divider>
......@@ -978,6 +998,7 @@ export default {
margin-top: 10px;
height: 55px;
display: flex;
justify-content: space-between;
align-items: center;
/deep/.el-radio:nth-child(2) {
margin-left: 24px;
......@@ -990,6 +1011,10 @@ export default {
/deep/.el-input__icon {
line-height: 32px;
}
.left {
display: flex;
}
.search {
display: flex;
align-items: center;
......@@ -1027,7 +1052,7 @@ export default {
}
}
.right {
/deep/.el-button {
/deep/.sx {
width: 72px;
height: 32px;
background: #055fe7;
......@@ -1047,7 +1072,7 @@ export default {
margin-top: 24px;
}
.right {
/deep/.el-button {
/deep/.sx {
width: 72px;
height: 32px;
background: #055fe7;
......
src/views/AllPersonnelBase/modules/ajxxk.vue
......@@ -122,16 +122,15 @@
<div class='zwDivHead'>
<!-- <div class="blueDiv"></div>滚动<div class="Num"><span>8</span>/10</div> -->
</div>
<div
class='zwDivBodyNoImg'
v-if='caseLoading'
v-if="caseLoading"
>
正在加载
</div>
<div
class='zwDivBody'
v-if="CaseImgNum&&caseLoading==false"
v-else-if="CaseImgNum&&caseLoading==false"
>
<div
v-for="(item, index) in CaseImg"
......@@ -150,7 +149,7 @@
</div>
<div
class='zwDivBodyNoImg'
v-if='CaseImgNum==0&&caseLoading==false'
v-else-if='CaseImgNum==0&&caseLoading==false'
>
该案件无图像信息
</div>
......@@ -210,6 +209,10 @@ export default {
this.getfileinfo()
this.getCaseBybarcode()
},
CaseImgNum (val) {
// 去掉加载状态
this.caseLoading = false;
}
},
methods: {
......@@ -223,8 +226,10 @@ export default {
)
.then((response) => {
if (response.data.code == 0) {
this.CaseImgNum = response.data.ret.length;
if (this.CaseImgNum > 0) {
debugger
self.CaseImgNum = response.data.ret.length;
if (self.CaseImgNum > 0) {
for (let i = 0; i <= response.data.ret.length; i++) {
let arr = {
code: null,
......@@ -232,14 +237,13 @@ export default {
}
arr.code = response.data.ret[i].seq
arr.img = response.data.ret[i].image
this.CaseImg.push(arr)
self.CaseImg.push(arr)
}
console.log(this.CaseImg, 'CaseImg')
// self.$forceUpdate()
console.log(self.CaseImg, 'CaseImg')
}
// 去掉加载状态
// 去掉加载状态
self.caseLoading = false;
} else if (response.data.code == 4) {
// 去掉加载状态
self.caseLoading = false;
......
src/views/AllPersonnelBase/modules/dcftpx.vue
......@@ -280,6 +280,7 @@
<el-radio :label="1">分开文件</el-radio>
<el-radio :label="2">同一文件</el-radio>
</el-radio-group>
<el-checkbox v-model="tm">脱密</el-checkbox>
</el-form-item>
<!-- <el-form-item label="保存路径：">
<el-input placeholder="请选择保存路径"></el-input>
......@@ -409,6 +410,7 @@ export default {
sjlx: null, // 数据类型
wjgs: 1,//文件格式
dcms: 1, //导出模式
tm: false, // 脱密
tmbz: null,// 条码补值
};
},
......
src/views/AllPersonnelBase/modules/gz.vue
......@@ -212,6 +212,7 @@ export default {
if (response.data.code === 0) {
this.$message.success("关注成功");
this.comments = ''
this.$store.commit('layout/delcachePageName', 'gzlb');
this.dialogVisible = false;
} else {
this.$message.error("关注失败");
......
src/views/drFPTX/RAList.vue
......@@ -28,6 +28,7 @@
v-model.trim="barcode"
maxlength="23"
show-word-limit
@keyup.enter.native="search"
clearable
>
</el-input>
......@@ -37,6 +38,7 @@
<el-select
v-model="logicDatabase"
placeholder="请选择逻辑分库"
@keyup.enter.native="search"
>
<el-option
v-for="item in logicDatabaseoptions"
......@@ -52,6 +54,7 @@
<el-input
placeholder="请输入任务号"
v-model.trim="taskNumber"
@keyup.enter.native="search"
maxlength="14"
show-word-limit
clearable
......@@ -63,6 +66,7 @@
<el-select
v-model="status"
placeholder="请选择入库状态"
@keyup.enter.native="search"
>
<el-option
v-for="item in statusoptions"
......@@ -76,6 +80,7 @@
<div class="search sjxz">
<div class="item">时间选择：</div>
<el-date-picker
@keyup.enter.native="search"
v-model="startEndDate"
type="daterange"
start-placeholder="开始日期"
......@@ -94,6 +99,7 @@
<div class='search barcode'>
<div class='item'> 条码号：</div>
<el-input
@keyup.enter.native="search"
placeholder="请输入条码号"
v-model.trim="barcode"
maxlength="23"
......@@ -105,6 +111,7 @@
<div class="search ljfk">
<div class="item">查询类型：</div>
<el-select
@keyup.enter.native="search"
v-model="queryType"
placeholder="请选择查询类型"
>
......@@ -120,6 +127,7 @@
<div class="search ljfk">
<div class="item">逻辑分库：</div>
<el-select
@keyup.enter.native="search"
v-model="logicDatabase"
placeholder="请选择逻辑分库"
>
......@@ -180,8 +188,14 @@
</el-radio-group>
</div>
<div class="right">
<el-button @click="clear">清空</el-button>
<el-button @click="search">筛选</el-button>
<el-button
type="text"
@click="clear"
>清空</el-button>
<el-button
class="sx"
@click="search"
>筛选</el-button>
</div>
</div>
<el-divider></el-divider>
......@@ -1327,7 +1341,7 @@ export default {
margin-top: 24px;
}
.right {
/deep/.el-button {
/deep/.sx {
width: 72px;
height: 32px;
background: #055fe7;
......
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