elink-star
/
epdc-admin-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

人员信息改版

origin/sync_user
Jackwang 4 years ago
parent
8f63dd38c7
commit
9c411f72e4
3 changed files with 132 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 131
      src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
  2. 8
      src/views/modules/epidemic/epidemicreportuserinfo.vue
  3. 116
      src/views/modules/epidemic/epidemicreportuserinfoDetail.vue

131
src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
View File

@ -77,19 +77,19 @@
<el-input v-model="dataForm.car" placeholder="有无车辆"></el-input> <el-input v-model="dataForm.car" placeholder="有无车辆"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="现居住地" prop="outLiveAddressName" label-width="135px"> <!-- <el-form-item label="现居住地" prop="outLiveAddressName" label-width="135px">-->
<el-cascader ref="zwjzdname" <!-- <el-cascader ref="zwjzdname"-->
v-model="dataForm.outLiveAddressCodes" <!-- v-model="dataForm.outLiveAddressCodes"-->
:options="options" <!-- :options="options"-->
@change="outLiveAddressChangeHandle" <!-- @change="outLiveAddressChangeHandle"-->
:props="{ checkStrictly: false, multiple: true, emitPath: true }"></el-cascader> <!-- :props="{ checkStrictly: false, multiple: true, emitPath: true }"></el-cascader>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="拟返回平阴时间" prop="goBarkTime" label-width="135px"> <!-- <el-form-item label="拟返回平阴时间" prop="goBarkTime" label-width="135px">-->
<el-date-picker v-model="dataForm.goBarkTime" type="date" placeholder="返回平阴时间" label-width="135px" value-format="yyyy-MM-dd" <!-- <el-date-picker v-model="dataForm.goBarkTime" type="date" placeholder="返回平阴时间" label-width="135px" value-format="yyyy-MM-dd"-->
format="yyyy-MM-dd" style="width:200px"> <!-- format="yyyy-MM-dd" style="width:200px">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
</div> </div>
@ -141,13 +141,11 @@
<el-input v-model="dataForm.carNo" placeholder="车牌号"></el-input> <el-input v-model="dataForm.carNo" placeholder="车牌号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="现居住地详细地址" prop="outLiveAddressDetail" label-width="135px">
<el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地详细地址" maxlength="200" clearable></el-input>
</el-form-item>
<el-form-item label="居住地关联人" prop="relationPeople" label-width="135px">
<el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input> <!-- <el-form-item label="居住地关联人" prop="relationPeople" label-width="135px">-->
</el-form-item> <!-- <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input>-->
<!-- </el-form-item>-->
@ -213,15 +211,15 @@
<el-input v-model="dataForm.nativePlace" placeholder="籍贯"></el-input> <el-input v-model="dataForm.nativePlace" placeholder="籍贯"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="疫情风险等级" prop="riskGrade" label-width="135px"> <!-- <el-form-item label="疫情风险等级" prop="riskGrade" label-width="135px">-->
<el-select v-model="dataForm.riskGrade" placeholder="现居住地疫情风险等级"> <!-- <el-select v-model="dataForm.riskGrade" placeholder="现居住地疫情风险等级">-->
<el-option v-for="item in riskGradeeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option> <!-- <el-option v-for="item in riskGradeeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="关联人联系电话" prop="relationPeopleMobile" label-width="135px"> <!-- <el-form-item label="关联人联系电话" prop="relationPeopleMobile" label-width="135px">-->
<el-input v-model="dataForm.relationPeopleMobile" placeholder="关联人联系电话" clearable maxlength="11" @keyup.native="btKeyUpRelationPeopleMobile"></el-input> <!-- <el-input v-model="dataForm.relationPeopleMobile" placeholder="关联人联系电话" clearable maxlength="11" @keyup.native="btKeyUpRelationPeopleMobile"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</div> </div>
<div class="column"> <div class="column">
@ -265,44 +263,48 @@
<el-input v-model="dataForm.hushaiStatus" placeholder="人户状况"></el-input> <el-input v-model="dataForm.hushaiStatus" placeholder="人户状况"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="往返情况" prop="returnState" label-width="135px"> <el-form-item label="现居住地详细地址" prop="outLiveAddressDetail" label-width="135px">
<el-select v-model="dataForm.returnState" placeholder="往返情况"> <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地详细地址" maxlength="200" clearable></el-input>
<el-option v-for="item in returnStateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
<div v-if="showFlagIn">
<el-form-item label="拟离开平阴时间"
prop="leaveTime"
label-width="135px">
<el-date-picker v-model="dataForm.leaveTime"
type="date"
placeholder="选择拟离开平阴时间"
label-width="150px"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
style="width:200px">
</el-date-picker>
</el-form-item>
<el-form-item label="拟去往目的地"
prop="destinationAddressName"
label-width="135px">
<el-cascader ref="qwmddname"
v-model="dataForm.destinationAddressCodes"
:options="options"
@change="destinationChangeHandle"
:props="{ checkStrictly: false, multiple: true, emitPath: true }">
</el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="拟去往目的地详细地址"
prop="destinationAddressDetail" <!-- <el-form-item label="往返情况" prop="returnState" label-width="135px">-->
label-width="135px"> <!-- <el-select v-model="dataForm.returnState" placeholder="往返情况">-->
<el-input v-model="dataForm.destinationAddressDetail" <!-- <el-option v-for="item in returnStateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option>-->
placeholder="去往目的地详细地址" <!-- </el-select>-->
maxlength="200" <!-- </el-form-item>-->
clearable></el-input>
</el-form-item> <!-- <div v-if="showFlagIn">-->
</div> <!-- <el-form-item label="拟离开平阴时间"-->
<!-- prop="leaveTime"-->
<!-- label-width="135px">-->
<!-- <el-date-picker v-model="dataForm.leaveTime"-->
<!-- type="date"-->
<!-- placeholder="选择拟离开平阴时间"-->
<!-- label-width="150px"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- format="yyyy-MM-dd"-->
<!-- style="width:200px">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="拟去往目的地"-->
<!-- prop="destinationAddressName"-->
<!-- label-width="135px">-->
<!-- <el-cascader ref="qwmddname"-->
<!-- v-model="dataForm.destinationAddressCodes"-->
<!-- :options="options"-->
<!-- @change="destinationChangeHandle"-->
<!-- :props="{ checkStrictly: false, multiple: true, emitPath: true }">-->
<!-- </el-cascader>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="拟去往目的地详细地址"-->
<!-- prop="destinationAddressDetail"-->
<!-- label-width="135px">-->
<!-- <el-input v-model="dataForm.destinationAddressDetail"-->
<!-- placeholder="去往目的地详细地址"-->
<!-- maxlength="200"-->
<!-- clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
</div> </div>
</div> </div>
<!--<el-form-item label="县内居住地详细地址" prop="liveAddressDetail" label-width="135px">--> <!--<el-form-item label="县内居住地详细地址" prop="liveAddressDetail" label-width="135px">-->
@ -386,7 +388,8 @@ export default {
houseProperty: '', houseProperty: '',
familySecurity: '', familySecurity: '',
livingSituation: '', livingSituation: '',
deptId:'' deptId:'',
houseAddress: ''
}, },
returnStateArr: [ returnStateArr: [
{ dictValue: '1', dictName: '在本地' }, { dictValue: '1', dictName: '在本地' },

8
src/views/modules/epidemic/epidemicreportuserinfo.vue
View File

@ -166,6 +166,10 @@
<el-button type="primary" <el-button type="primary"
@click="beforeGetDataListSearch()">{{ $t('query') }}</el-button> @click="beforeGetDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="primary"
@click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" <el-button type="primary"
@click="exports()">{{ $t('export') }}</el-button> @click="exports()">{{ $t('export') }}</el-button>
@ -372,10 +376,10 @@
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" <add-or-update v-if="addOrUpdateVisible"
ref="addOrUpdate" ref="addOrUpdate"
@refreshDataList="beforeGetDataList()"></add-or-update> @refreshDataList="getDataList()"></add-or-update>
<infoDetail v-if="detailVisible" <infoDetail v-if="detailVisible"
ref="infoDetail" ref="infoDetail"
@refreshDataList="beforeGetDataList()"></infoDetail> @refreshDataList="getDataList()"></infoDetail>
<el-dialog title="导出选择" <el-dialog title="导出选择"
:visible.sync="dialogVisibleExcel" :visible.sync="dialogVisibleExcel"
width="30%"> width="30%">

116
src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
View File

@ -73,22 +73,22 @@
<!-- <el-input v-model="dataForm.car" placeholder="有无车辆"></el-input> --> <!-- <el-input v-model="dataForm.car" placeholder="有无车辆"></el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="现居住地" prop="outLiveAddressName" label-width="130px"> <!-- <el-form-item label="现居住地" prop="outLiveAddressName" label-width="130px">-->
<div class="column-content">{{dataForm.outLiveAddressName}}</div> <!-- <div class="column-content">{{dataForm.outLiveAddressName}}</div>-->
<!-- <el-cascader ref="zwjzdname" <!-- <el-cascader ref="zwjzdname"
v-model="dataForm.outLiveAddressCodes" v-model="dataForm.outLiveAddressCodes"
:options="options" :options="options"
@change="outLiveAddressChangeHandle" @change="outLiveAddressChangeHandle"
:props="{ checkStrictly: false, multiple: true, emitPath: true }"> :props="{ checkStrictly: false, multiple: true, emitPath: true }">
</el-cascader> --> </el-cascader> -->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="拟返回平阴时间" prop="goBarkTime" label-width="130px"> <!-- <el-form-item label="拟返回平阴时间" prop="goBarkTime" label-width="130px">-->
<div class="column-content">{{dataForm.goBarkTime}}</div> <!-- <div class="column-content">{{dataForm.goBarkTime}}</div>-->
<!-- <el-date-picker v-model="dataForm.goBarkTime" type="date" placeholder="返回平阴时间" label-width="130px" value-format="yyyy-MM-dd" <!-- <el-date-picker v-model="dataForm.goBarkTime" type="date" placeholder="返回平阴时间" label-width="130px" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" style="width:200px"> format="yyyy-MM-dd" style="width:200px">
</el-date-picker> --> </el-date-picker> -->
</el-form-item> <!-- </el-form-item>-->
</div> </div>
@ -146,15 +146,12 @@
<!-- <el-input v-model="dataForm.carNo" placeholder="车牌号"></el-input> --> <!-- <el-input v-model="dataForm.carNo" placeholder="车牌号"></el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="现居住地详细地址" prop="outLiveAddressDetail" label-width="130px">
<div class="column-content">{{dataForm.outLiveAddressDetail}}</div>
<!-- <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地详细地址" maxlength="200" clearable></el-input> -->
</el-form-item>
<el-form-item label="居住地关联人" prop="relationPeople" label-width="130px">
<div class="column-content">{{dataForm.relationPeople}}</div> <!-- <el-form-item label="居住地关联人" prop="relationPeople" label-width="130px">-->
<!-- <div class="column-content">{{dataForm.relationPeople}}</div>-->
<!-- <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input> --> <!-- <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input> -->
</el-form-item> <!-- </el-form-item>-->
@ -226,17 +223,17 @@
<!-- <el-input v-model="dataForm.nativePlace" placeholder="籍贯"></el-input> --> <!-- <el-input v-model="dataForm.nativePlace" placeholder="籍贯"></el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="疫情风险等级" prop="riskGrade" label-width="130px"> <!-- <el-form-item label="疫情风险等级" prop="riskGrade" label-width="130px">-->
<div class="column-content">{{getOptionsLabel(dataForm.riskGrade, riskGradeeArr)}}</div> <!-- <div class="column-content">{{getOptionsLabel(dataForm.riskGrade, riskGradeeArr)}}</div>-->
<!-- <el-select v-model="dataForm.riskGrade" placeholder="现居住地疫情风险等级"> <!-- <el-select v-model="dataForm.riskGrade" placeholder="现居住地疫情风险等级">
<el-option v-for="item in riskGradeeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option> <el-option v-for="item in riskGradeeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option>
</el-select> --> </el-select> -->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="关联人联系电话" prop="relationPeopleMobile" label-width="130px"> <!-- <el-form-item label="关联人联系电话" prop="relationPeopleMobile" label-width="130px">-->
<div class="column-content">{{dataForm.relationPeopleMobile}}</div> <!-- <div class="column-content">{{dataForm.relationPeopleMobile}}</div>-->
<!-- <el-input v-model="dataForm.relationPeopleMobile" placeholder="关联人联系电话" clearable maxlength="11" @keyup.native="btKeyUpRelationPeopleMobile"></el-input> --> <!-- <el-input v-model="dataForm.relationPeopleMobile" placeholder="关联人联系电话" clearable maxlength="11" @keyup.native="btKeyUpRelationPeopleMobile"></el-input> -->
</el-form-item> <!-- </el-form-item>-->
</div> </div>
<div class="column"> <div class="column">
@ -294,12 +291,17 @@
<!-- <el-input v-model="dataForm.hushaiStatus" placeholder="人户状况"></el-input> --> <!-- <el-input v-model="dataForm.hushaiStatus" placeholder="人户状况"></el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="往返情况" prop="returnState" label-width="130px"> <el-form-item label="现居住地详细地址" prop="outLiveAddressDetail" label-width="130px">
<div class="column-content">{{getOptionsLabel(dataForm.returnState, returnStateArr)}}</div> <div class="column-content">{{dataForm.outLiveAddressDetail}}</div>
<!-- <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地详细地址" maxlength="200" clearable></el-input> -->
</el-form-item>
<!-- <el-form-item label="往返情况" prop="returnState" label-width="130px">-->
<!-- <div class="column-content">{{getOptionsLabel(dataForm.returnState, returnStateArr)}}</div>-->
<!-- <el-select v-model="dataForm.returnState" placeholder="往返情况"> <!-- <el-select v-model="dataForm.returnState" placeholder="往返情况">
<el-option v-for="item in returnStateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option> <el-option v-for="item in returnStateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option>
</el-select> --> </el-select> -->
</el-form-item> <!-- </el-form-item>-->
</div> </div>
</div> </div>
@ -307,41 +309,41 @@
<!--<el-input v-model="dataForm.liveAddressDetail" placeholder="县内居住地详细地址" maxlength="200" clearable></el-input>--> <!--<el-input v-model="dataForm.liveAddressDetail" placeholder="县内居住地详细地址" maxlength="200" clearable></el-input>-->
<!--</el-form-item>--> <!--</el-form-item>-->
<div v-if="showFlagIn"> <!-- <div v-if="showFlagIn">-->
<el-form-item label="拟离开平阴时间" <!-- <el-form-item label="拟离开平阴时间"-->
prop="leaveTime" <!-- prop="leaveTime"-->
label-width="130px"> <!-- label-width="130px">-->
<div class="column-content">{{dataForm.leaveTime}}</div> <!-- <div class="column-content">{{dataForm.leaveTime}}</div>-->
<!-- <el-date-picker v-model="dataForm.leaveTime" <!-- &lt;!&ndash; <el-date-picker v-model="dataForm.leaveTime"-->
type="date" <!-- type="date"-->
placeholder="选择拟离开平阴时间" <!-- placeholder="选择拟离开平阴时间"-->
label-width="150px" <!-- label-width="150px"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
format="yyyy-MM-dd" <!-- format="yyyy-MM-dd"-->
style="width:200px"> <!-- style="width:200px">-->
</el-date-picker> --> <!-- </el-date-picker> &ndash;&gt;-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="拟去往目的地" <!-- <el-form-item label="拟去往目的地"-->
prop="destinationAddressName" <!-- prop="destinationAddressName"-->
label-width="130px"> <!-- label-width="130px">-->
<div class="column-content">{{dataForm.destinationAddressCodes}}</div> <!-- <div class="column-content">{{dataForm.destinationAddressCodes}}</div>-->
<!-- <el-cascader ref="qwmddname" <!-- &lt;!&ndash; <el-cascader ref="qwmddname"-->
v-model="dataForm.destinationAddressCodes" <!-- v-model="dataForm.destinationAddressCodes"-->
:options="options" <!-- :options="options"-->
@change="destinationChangeHandle" <!-- @change="destinationChangeHandle"-->
:props="{ checkStrictly: false, multiple: true, emitPath: true }"> <!-- :props="{ checkStrictly: false, multiple: true, emitPath: true }">-->
</el-cascader> --> <!-- </el-cascader> &ndash;&gt;-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="拟去往目的地详细地址" <!-- <el-form-item label="拟去往目的地详细地址"-->
prop="destinationAddressDetail" <!-- prop="destinationAddressDetail"-->
label-width="130px"> <!-- label-width="130px">-->
<div class="column-content">{{dataForm.destinationAddressDetail}}</div> <!-- <div class="column-content">{{dataForm.destinationAddressDetail}}</div>-->
<!-- <el-input v-model="dataForm.destinationAddressDetail" <!-- &lt;!&ndash; <el-input v-model="dataForm.destinationAddressDetail"-->
placeholder="去往目的地详细地址" <!-- placeholder="去往目的地详细地址"-->
maxlength="200" <!-- maxlength="200"-->
clearable></el-input> --> <!-- clearable></el-input> &ndash;&gt;-->
</el-form-item> <!-- </el-form-item>-->
</div> <!-- </div>-->
<div v-if="showFlagOut"> <div v-if="showFlagOut">
</div> </div>
</el-form> </el-form>

Write Preview
Loading…
Cancel
Save