From a6b40a1b80b586f7dbd874f3939f5e06fcc752d2 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 04 一月 2023 19:24:14 +0800
Subject: [PATCH] '页面尺寸自适应初期调整'
---
src/views/padSunmaryProcedure/Home.vue | 8
/dev/null | 0
src/views/padSunmaryProcedure/word_mange/mangeJD.vue | 29 +
package.json | 30 +-
src/router/axios.js | 2
dist1-4F.7z | 0
src/router/pad/index.js | 14
src/views/padSunmaryProcedure/padFrom.vue | 326 ++++++++++++---------
src/views/padSunmaryProcedure/padWord.vue | 103 ++++--
src/views/padSunmaryProcedure/word_mange/mangeBL.vue | 107 +++---
src/views/padSunmaryProcedure/index.vue | 258 +++++++++++-----
11 files changed, 531 insertions(+), 346 deletions(-)
diff --git a/dist-11.4.rar b/dist-11.4.rar
deleted file mode 100644
index 61d3996..0000000
--- a/dist-11.4.rar
+++ /dev/null
Binary files differ
diff --git a/dist1-4F.7z b/dist1-4F.7z
new file mode 100644
index 0000000..c9cd54c
--- /dev/null
+++ b/dist1-4F.7z
Binary files differ
diff --git a/package.json b/package.json
index 5e6e73a..7d795f4 100644
--- a/package.json
+++ b/package.json
@@ -3,12 +3,22 @@
"version": "3.11.0",
"private": true,
"scripts": {
- "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
- "dev": "vue-cli-service serve",
+ "analyze": "vue-cli-service build --report",
"build": "vue-cli-service build",
"build:docker": "vue-cli-service build --dest='./docker/dist/'",
+ "dev": "vue-cli-service serve",
"lint": "vue-cli-service lint",
- "analyze": "vue-cli-service build --report"
+ "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org "
+ },
+ "lint-staged": {
+ "*.js": [
+ "vue-cli-service lint",
+ "git add"
+ ],
+ "*.vue": [
+ "vue-cli-service lint",
+ "git add"
+ ]
},
"dependencies": {
"@chenfengyuan/vue-qrcode": "^1.0.1",
@@ -57,22 +67,12 @@
"devDependencies": {
"@vue/cli-plugin-babel": "^3.12.0",
"@vue/cli-service": "^3.12.0",
+ "benz-amr-recorder": "^1.0.14",
"chai": "^4.1.2",
"compression-webpack-plugin": "^3.1.0",
"node-sass": "^4.9.0",
"sass-loader": "^7.0.1",
"vue-template-compiler": "^2.6.10",
- "vue-video-player": "^5.0.2",
- "benz-amr-recorder": "^1.0.14"
- },
- "lint-staged": {
- "*.js": [
- "vue-cli-service lint",
- "git add"
- ],
- "*.vue": [
- "vue-cli-service lint",
- "git add"
- ]
+ "vue-video-player": "^5.0.2"
}
}
diff --git a/src/router/axios.js b/src/router/axios.js
index 15c5145..ce0cc1d 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -34,7 +34,7 @@
const TENANT_ID = getStore({ name: 'tenantId' })
const isToken = (config.headers || {}).isToken === false
// const token = window.android.getAppToken()
- const token = `8d3bcce6-c27b-4f98-92a7-12b3b9a02306`
+ const token = `8d47d31b-2c41-47e6-9870-b7208447b9fe`
if (token && !isToken) {
config.headers['Authorization'] = 'Bearer ' + token// token
}
diff --git a/src/router/pad/index.js b/src/router/pad/index.js
index 1f80958..6e8270e 100644
--- a/src/router/pad/index.js
+++ b/src/router/pad/index.js
@@ -5,7 +5,7 @@
path: '/pad',
component: padHome,
redirect: '/pad',
- meta: {noNeedLogin: true},
+ meta: { noNeedLogin: true },
children: [{
path: '/pad',
name: '绠�鏄撶▼搴忔浠�',
@@ -17,12 +17,12 @@
component: () =>
import(/* webpackChunkName: "page" */ '@/views/padSunmaryProcedure/padFrom')
},
- {
- path: '/padWord',
- name: '妗堜欢濉姤娴佺▼',
- component: () =>
- import(/* webpackChunkName: "page" */ '../../views/padSunmaryProcedure/padWord')
- }
+ {
+ path: '/padWord',
+ name: '妗堜欢濉姤娴佺▼',
+ component: () =>
+ import(/* webpackChunkName: "page" */ '../../views/padSunmaryProcedure/padWord')
+ }
/*,{
path: '/WordYulan',
name: 'word棰勮',
diff --git a/src/views/padSunmaryProcedure/Home.vue b/src/views/padSunmaryProcedure/Home.vue
index f0a2638..244253e 100644
--- a/src/views/padSunmaryProcedure/Home.vue
+++ b/src/views/padSunmaryProcedure/Home.vue
@@ -6,12 +6,15 @@
<script>
export default {
- name: "Home"
+ name: 'Home',
+ data() {
+ return {}
+ },
}
</script>
<style scoped>
-.padHome{
+.padHome {
height: 100%;
overflow: auto;
}
@@ -36,5 +39,4 @@
height: 100%;
}
}*/
-
</style>
diff --git a/src/views/padSunmaryProcedure/index.vue b/src/views/padSunmaryProcedure/index.vue
index 39745d1..34d1499 100644
--- a/src/views/padSunmaryProcedure/index.vue
+++ b/src/views/padSunmaryProcedure/index.vue
@@ -1,96 +1,124 @@
<template>
- <basic-container id="box" style="width: 100vw">
- <el-form :inline="true" :model="formInline" class="demo-form-inline">
- <el-form-item label="褰撲簨浜�">
- <el-input v-model="formInline.litigant" placeholder="褰撲簨浜�" style="width:110px!important"></el-input>
- </el-form-item>
- <el-form-item label="鐢佃瘽">
- <el-input v-model="formInline.phone" placeholder="鐢佃瘽" style="width:130px!important"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="getDataList(0)">鏌ヨ</el-button>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="getById">鏂板</el-button>
- </el-form-item>
- </el-form>
+ <basic-container>
+ <div class="nav">
+ <div class="peopleSeachInput">
+ <el-input v-model="formInline.litigant"
+ placeholder="褰撲簨浜�"></el-input>
+ <el-input v-model="formInline.phone"
+ placeholder="鐢佃瘽"></el-input>
+ </div>
+ <div class="peopleSeachBtn">
+ <el-button type="primary"
+ @click="getDataList(0)">鏌ヨ</el-button>
+ <el-button type="primary"
+ @click="getById">鏂板</el-button>
+ </div>
+ </div>
+
<div class="law-table-main">
- <el-table
- :height="tableHeight"
- @row-click="rowget"
- :data="tableData">
- <el-table-column
- prop="casePoint"
- label="妗堢敱"
- :show-overflow-tooltip="true"
- min-width="20%"
- ></el-table-column>
- <el-table-column
- prop="litigant"
- label="褰撲簨浜哄鍚�"
- min-width="20%">
+ <el-table :height="tableHeight"
+ @row-click="rowget"
+ :data="tableData"
+ :header-row-style="{height:tableRowHeight+'px'}"
+ :row-style="{ height: tableRowHeight+'px'}"
+ :cell-style="{padding:'0px'}"
+ height="calc(100% - 150px)"
+ :highlight-current-row='true'>
+ <el-table-column prop="casePoint"
+ label="妗堢敱"
+ :show-overflow-tooltip="true"
+ min-width="180"></el-table-column>
+ <el-table-column prop="litigant"
+ label="褰撲簨浜哄鍚�"
+ min-width="150"
+ align="center">
</el-table-column>
- <el-table-column
- prop="phone"
- label="鑱旂郴鐢佃瘽"
- min-width="22%"
- ></el-table-column>
- <el-table-column
- prop="createTime"
- label="鎻愪氦鏃堕棿"
- sortable
- min-width="18%"
- ></el-table-column>
- <el-table-column
- prop="hanlders"
- label="鎵ф硶浜�"
- :show-overflow-tooltip="true"
- min-width="18%"
- ></el-table-column>
+ <el-table-column prop="phone"
+ label="鑱旂郴鐢佃瘽"
+ min-width="160"
+ align="center"></el-table-column>
+ <el-table-column prop="createTime"
+ label="鎻愪氦鏃堕棿"
+ sortable
+ min-width="220"
+ align="center"></el-table-column>
+ <el-table-column prop="hanlders"
+ label="鎵ф硶浜�"
+ :show-overflow-tooltip="true"
+ min-width="150"></el-table-column>
</el-table>
</div>
<div class="avue-crud__pagination">
- <el-pagination
- @size-change="sizeChangeHandle"
- @current-change="currentChangeHandle"
- :current-page="pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="pageSize"
- :total="total"
- background
- layout="total, sizes, prev, pager, next, jumper"
- >
+ <el-pagination @size-change="sizeChangeHandle"
+ @current-change="currentChangeHandle"
+ :current-page="pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="pageSize"
+ :total="total"
+ background
+ layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</div>
- <SunmaryProcedureForm v-if="isShow" ref="sunmaryProcedure" @cancel="cancel"></SunmaryProcedureForm>
+ <SunmaryProcedureForm v-if="isShow"
+ ref="sunmaryProcedure"
+ @cancel="cancel"></SunmaryProcedureForm>
</basic-container>
</template>
<script>
-import {getObj} from '@/api/News/pad'
+import { getObj } from '@/api/News/pad'
export default {
- name: "index",
-
+ name: 'index',
+ // props: ['screenHomeHeight'],
data() {
return {
isShow: false,
formInline: {
litigant: '',
phone: '',
- current:this.pageIndex,
- size:this.pageSize
+ current: this.pageIndex,
+ size: this.pageSize,
},
pageSize: 10,
pageIndex: 1,
total: 10,
- tableHeight: 600,
- tableData: []
+ tableHeight: '100%',
+ tableData: [],
+ screenHeight: null,
+ tableRowHeight: '', //鏍规嵁灞忓箷璁剧疆琛ㄦ牸琛岄珮
}
},
created() {
this.getDataList(0)
// this.formInline.litigant = window.android.getAppToken()
+ },
+ mounted() {
+ // 鑾峰彇灞忓箷楂樺害
+ window.onresize = () => {
+ return (() => {
+ this.screenHeight = document.body.clientHeight
+ })()
+ }
+ this.screenHeight = document.body.clientHeight
+ },
+ watch: {
+ screenHeight: {
+ handler: function (newV) {
+ console.log('灞忓箷楂樺害鐨勫彉鍖�', newV, typeof newV)
+ this.tableRowHeight = (newV * 0.9) / 11
+ },
+ immediate: true,
+ },
+ // screenHomeHeight: function (newV) {
+ // console.log('鐖剁粍浠堕珮鍙樺寲锛屽瓙缁勪欢鎺ュ彈', newV)
+ // if (newV.indexOf('p') != -1) {
+ // this.tableRowHeight = (newV.slice(0, newV.indexOf('p')) * 0.9) / 11
+ // } else {
+ // this.tableRowHeight = (newV * 0.9) / 11
+ // }
+ // console.log('琛ㄦ牸鐨勯珮搴�', this.tableRowHeight)
+ // },
},
methods: {
/*look(){
@@ -101,19 +129,19 @@
getDataList(type) {
// this.$nextTick(()=>{
if (type == 0) {
- this.formInline.type = type;
- this.formInline.current=this.pageIndex;
- this.formInline.size=this.pageSize;
- getObj(this.formInline).then(res => {
+ this.formInline.type = type
+ this.formInline.current = this.pageIndex
+ this.formInline.size = this.pageSize
+ getObj(this.formInline).then((res) => {
this.tableData = res.data.data.records
- this.total =res.data.data.total
+ this.total = res.data.data.total
})
} else {
// this.formInline.type = type;
- this.formInline.current=this.pageIndex;
- this.formInline.size=this.pageSize;
+ this.formInline.current = this.pageIndex
+ this.formInline.size = this.pageSize
// this.formInline.user=333
- getObj(this.formInline).then(res => {
+ getObj(this.formInline).then((res) => {
this.tableData = res.data.data.records
})
}
@@ -126,11 +154,10 @@
path: '/padWord',
query: {
name: row.casePoint,
- }
+ },
})
this.$store.commit('SET_ID', row.id)
// }
-
},
//鎵撳紑鏂板寮规
getById() {
@@ -140,25 +167,90 @@
},
//鍏抽棴娣诲姞寮规
cancel() {
- this.isShow = false;
+ this.isShow = false
},
// 姣忛〉鏁�
sizeChangeHandle(val) {
- this.pageSize = val;
- this.pageIndex = 1;
- this.getDataList(0);
+ this.pageSize = val
+ this.pageIndex = 1
+ this.getDataList(0)
},
// 褰撳墠椤�
currentChangeHandle(val) {
- this.pageIndex = val;
- this.getDataList(0);
+ this.pageIndex = val
+ this.getDataList(0)
},
- }
+ },
}
</script>
+<style lang="scss">
+// Tab鏍囩椤电殑甯冨眬鏍峰紡(娴佺▼鍒楄〃锛岃繕鏈塸adword锛岀殑鍏叡鏍峰紡)
+.basic-container {
+ height: 100% !important;
+ width: 100vw;
+ // font-size: 30px !important;
+ padding-bottom: 0;
+ .el-card {
+ height: 100% !important;
+ .el-card__body {
+ height: 100% !important;
+ padding-top: 0 !important;
+ padding-right: 0 !important;
+ padding-bottom: 0 !important;
+ padding-left: 0 !important;
+ }
+ }
+}
+</style>
<style lang="scss" scoped>
-#box {
- font-size: 30px !important;
+.basic-container {
+ .nav {
+ height: 5%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .peopleSeachInput {
+ display: flex;
+ flex: 1;
+ .el-input {
+ margin-right: 10px;
+ }
+ }
+ .peopleSeachBtn {
+ display: flex;
+ }
+ }
+
+ // 涓棿琛ㄦ牸
+ ::v-deep .law-table-main {
+ height: 90%;
+ .el-table {
+ height: 100% !important;
+ @media screen and (max-width: 320px) {
+ font-size: 12px;
+ }
+ @media screen and (max-width: 480px) and (min-width: 321px) {
+ font-size: 16px;
+ }
+ @media screen and (max-width: 720px) and (min-width: 481px) {
+ font-size: 18px;
+ }
+ @media screen and (max-width: 800px) and (min-width: 721px) {
+ font-size: 22px;
+ }
+ }
+ }
+
+ // 搴曢儴椤电爜
+ .avue-crud__pagination {
+ padding: 0;
+ height: 5%;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ position: sticky;
+ bottom: 0;
+ }
}
</style>
diff --git a/src/views/padSunmaryProcedure/padFrom.vue b/src/views/padSunmaryProcedure/padFrom.vue
index 1f30d69..e64501a 100644
--- a/src/views/padSunmaryProcedure/padFrom.vue
+++ b/src/views/padSunmaryProcedure/padFrom.vue
@@ -1,24 +1,30 @@
<template>
- <el-main style="width: 100%;margin: 0 auto">
- <el-form ref="form" :rules="dataRules" :model="form" label-width="130px" size="medium">
- <el-form-item label="妗堢敱" prop="casePoint">
- <el-input v-model="form.casePoint" placeholder="璇峰～鍐欐鐢�"></el-input>
+ <!-- 鍒涘缓 -->
+ <el-main style="width: 96%;margin: 20px auto 0;">
+ <el-form ref="form"
+ :rules="dataRules"
+ :model="form"
+ label-width="130px"
+ size="medium">
+ <el-form-item label="妗堢敱"
+ prop="casePoint">
+ <el-input v-model="form.casePoint"
+ placeholder="璇峰～鍐欐鐢�"></el-input>
</el-form-item>
<el-row>
<el-col :span="12">
- <el-form-item label="褰撲簨浜哄鍚�" prop="litigant">
- <el-autocomplete
- style="width: 100%!important;"
- v-model="form.litigant"
- filterable
- :fetch-suggestions="querySearchHandle"
- placeholder="褰撲簨浜哄鍚�"
- :trigger-on-focus="false"
- @select="handleSelect"
- >
+ <el-form-item label="褰撲簨浜哄鍚�"
+ prop="litigant">
+ <el-autocomplete style="width: 100%!important;"
+ v-model="form.litigant"
+ filterable
+ :fetch-suggestions="querySearchHandle"
+ placeholder="褰撲簨浜哄鍚�"
+ :trigger-on-focus="false"
+ @select="handleSelect">
</el-autocomplete>
-<!-- <el-select v-model="form.litigant" placeholder="璇烽�夋嫨褰撲簨浜�"
+ <!-- <el-select v-model="form.litigant" placeholder="璇烽�夋嫨褰撲簨浜�"
style="width: 100%;" @change="marketChange">
<el-option
v-for="item in marketList"
@@ -30,30 +36,44 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="娉曚汉" prop="legalPerson">
- <el-input v-model="form.legalPerson" placeholder="璇峰～鍐欐硶浜哄鍚�"></el-input>
+ <el-form-item label="娉曚汉"
+ prop="legalPerson">
+ <el-input v-model="form.legalPerson"
+ placeholder="璇峰～鍐欐硶浜哄鍚�"></el-input>
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="璇佷欢鍙�/淇＄敤鐮�" prop="certNo">
- <el-input v-model="form.certNo" placeholder="璇峰～鍐欒瘉浠跺彿/淇＄敤鐮�"></el-input>
+ <el-form-item label="璇佷欢鍙�/淇＄敤鐮�"
+ prop="certNo">
+ <el-input v-model="form.certNo"
+ placeholder="璇峰～鍐欒瘉浠跺彿/淇＄敤鐮�"></el-input>
</el-form-item>
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
- <el-input v-model="form.phone" placeholder="璇峰～鍐欏綋浜嬩汉鐢佃瘽"></el-input>
+ <el-form-item label="鑱旂郴鐢佃瘽"
+ prop="phone">
+ <el-input v-model="form.phone"
+ placeholder="璇峰～鍐欏綋浜嬩汉鐢佃瘽"></el-input>
</el-form-item>
- <el-form-item label="浣忓潃" prop="address">
- <el-input v-model="form.address" placeholder="璇峰～鍐欏綋浜嬩汉浣忓潃"></el-input>
+ <el-form-item label="浣忓潃"
+ prop="address">
+ <el-input v-model="form.address"
+ placeholder="璇峰～鍐欏綋浜嬩汉浣忓潃"></el-input>
</el-form-item>
- <el-form-item label="鍔炴浜哄憳" prop="hanlderIds">
- <el-select v-model="form.hanlderIds" clearable filterable multiple :multiple-limit="2"
- placeholder="璇烽�夋嫨" style="width: 100%;" @change="setPersonname($event)">
- <el-option
- v-for="item in organPersons"
- :key="item.userId"
- :label="item.realName"
- :value="item.userId">
+ <el-form-item label="鍔炴浜哄憳"
+ prop="hanlderIds">
+ <el-select v-model="form.hanlderIds"
+ clearable
+ filterable
+ multiple
+ :multiple-limit="2"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%;"
+ @change="setPersonname($event)">
+ <el-option v-for="item in organPersons"
+ :key="item.userId"
+ :label="item.realName"
+ :value="item.userId">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">鎵ф硶璇佸彿锛歿{ item.lawCert }}</span>
</el-option>
@@ -61,36 +81,46 @@
</el-form-item>
<el-row>
<el-col :span="12">
- <el-form-item label="鎵�灞炲煄闀�" prop="city">
- <el-select v-model="form.city" filterable placeholder="璇烽�夋嫨鎵�灞炲煄闀�" style="width: 100%;">
- <el-option
- v-for="item in areaList"
- :label="item.label"
- :value="item.value">
+ <el-form-item label="鎵�灞炲煄闀�"
+ prop="city">
+ <el-select v-model="form.city"
+ filterable
+ placeholder="璇烽�夋嫨鎵�灞炲煄闀�"
+ style="width: 100%;">
+ <el-option v-for="item in areaList"
+ :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎵�灞為鍩�" prop="category">
- <el-select v-model="form.category" placeholder="璇烽�夋嫨鎵�灞為鍩�" style="width: 100%;">
- <el-option
- v-for="item in categoryList"
- :label="item.label"
- :value="item.value">
+ <el-form-item label="鎵�灞為鍩�"
+ prop="category">
+ <el-select v-model="form.category"
+ placeholder="璇烽�夋嫨鎵�灞為鍩�"
+ style="width: 100%;">
+ <el-option v-for="item in categoryList"
+ :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="缁忕含搴�" style="display:none;">
- <el-input v-model="form.latitude" placeholder="璇峰～鍐欑粡绾害"></el-input>
+ <el-form-item label="缁忕含搴�"
+ style="display:none;">
+ <el-input v-model="form.latitude"
+ placeholder="璇峰～鍐欑粡绾害"></el-input>
</el-form-item>
- <el-form-item label="杩濇硶鍦扮偣" prop="place">
- <el-input v-model="form.place" placeholder="璇峰～鍐欒繚娉曞湴鐐�"></el-input>
+ <el-form-item label="杩濇硶鍦扮偣"
+ prop="place">
+ <el-input v-model="form.place"
+ placeholder="璇峰～鍐欒繚娉曞湴鐐�"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="onSubmit">绔嬪嵆鍒涘缓</el-button>
+ <el-button type="primary"
+ @click="onSubmit">绔嬪嵆鍒涘缓</el-button>
<el-button @click="backAll">鍙栨秷</el-button>
</el-form-item>
</el-form>
@@ -98,35 +128,35 @@
</template>
<script>
-import {easycase, getMarketList, getIdByToken} from '../../api/News/pad'
-import {getfindAll} from "../../api/News/useres";
-import {remote} from "@/api/admin/dict"
+import { easycase, getMarketList, getIdByToken } from '../../api/News/pad'
+import { getfindAll } from '../../api/News/useres'
+import { remote } from '@/api/admin/dict'
export default {
- name: "padFrom",
+ name: 'padFrom',
data() {
var validatePerson = (rule, value, callback) => {
if (value.length != 2) {
- callback(new Error('鍔炴浜哄憳蹇呴』閫夋嫨涓や綅'));
+ callback(new Error('鍔炴浜哄憳蹇呴』閫夋嫨涓や綅'))
} else {
- callback();
+ callback()
}
- };
+ }
return {
form: {
casePoint: '',
- litigant: "",
- legalPerson: "",
- certNo: "",
- phone: "",
- address: "",
+ litigant: '',
+ legalPerson: '',
+ certNo: '',
+ phone: '',
+ address: '',
hanlderIds: [],
- place: "",
- category: "",
- city: "",
- latitude:"",
+ place: '',
+ category: '',
+ city: '',
+ latitude: '',
},
- latlng:'',
+ latlng: '',
//鍔炴浜哄憳鏁版嵁
organPersons: [],
//褰撲簨浜烘暟鎹�
@@ -138,37 +168,53 @@
// 濉啓楠岃瘉
dataRules: {
casePoint: [
- {required: true, message: "妗堜欢鏂囧彿涓嶈兘涓虹┖", trigger: "blur"},
+ { required: true, message: '妗堜欢鏂囧彿涓嶈兘涓虹┖', trigger: 'blur' },
],
litigant: [
- {required: true, message: "褰撲簨浜哄鍚嶄笉鑳戒负绌�", trigger: "blur"},
+ { required: true, message: '褰撲簨浜哄鍚嶄笉鑳戒负绌�', trigger: 'blur' },
],
/*legalPerson: [
{required: true, message: "娉曞畾浠ｈ〃浜哄鍚嶄笉鑳戒负绌�", trigger: "blur"},
],*/
certNo: [
- {required: true, message: "褰撲簨浜鸿瘉浠跺彿鐮佷笉鑳戒负绌�", trigger: "blur"},
+ {
+ required: true,
+ message: '褰撲簨浜鸿瘉浠跺彿鐮佷笉鑳戒负绌�',
+ trigger: 'blur',
+ },
],
address: [
- {required: true, message: "褰撲簨浜轰綇鍧�涓嶈兘涓虹┖", trigger: "blur"},
+ { required: true, message: '褰撲簨浜轰綇鍧�涓嶈兘涓虹┖', trigger: 'blur' },
],
phone: [
- {required: true, message: "鎵嬫満鍙锋牸寮忎笉姝ｇ‘", trigger: "blur"},
- {min: 11, message: "鎵嬫満鍙锋牸寮忎笉姝ｇ‘", trigger: "blur"},
+ { required: true, message: '鎵嬫満鍙锋牸寮忎笉姝ｇ‘', trigger: 'blur' },
+ { min: 11, message: '鎵嬫満鍙锋牸寮忎笉姝ｇ‘', trigger: 'blur' },
],
hanlderIds: [
- {required: true, message: "鍔炴浜哄憳涓嶈兘涓虹┖", trigger: "blur"},
- {validator: validatePerson, trigger: "blue"}
+ { required: true, message: '鍔炴浜哄憳涓嶈兘涓虹┖', trigger: 'blur' },
+ { validator: validatePerson, trigger: 'blue' },
],
category: [
- {required: true, message: "璇ユ浠剁殑鎵�灞為鍩熶笉鑳戒负绌�", trigger: ["blur", "change"]},
+ {
+ required: true,
+ message: '璇ユ浠剁殑鎵�灞為鍩熶笉鑳戒负绌�',
+ trigger: ['blur', 'change'],
+ },
],
city: [
- {required: true, message: "鎵�灞炲煄闀囦笉鑳戒负绌�", trigger: ["blur", "change"]},
+ {
+ required: true,
+ message: '鎵�灞炲煄闀囦笉鑳戒负绌�',
+ trigger: ['blur', 'change'],
+ },
],
place: [
- {required: true, message: "杩濇硶鍦板潃涓嶈兘涓虹┖", trigger: ["blur", "change"]}
- ]
+ {
+ required: true,
+ message: '杩濇硶鍦板潃涓嶈兘涓虹┖',
+ trigger: ['blur', 'change'],
+ },
+ ],
},
}
},
@@ -179,7 +225,7 @@
methods: {
tiaoZhuan() {
this.$router.push({
- path: '/padWord'
+ path: '/padWord',
})
},
init() {
@@ -187,44 +233,45 @@
// getIdByToken().then(res => {
// console.log(res, 'getIdByToken')
// let a = res.data.data;
- // let b = parseInt(a)
- // this.form.hanlderIds.push(a)
+ // let b = parseInt(a)
+ // this.form.hanlderIds.push(a)
// })
//鏌ヨ鍔炴浜哄憳淇℃伅
getfindAll().then((res) => {
- this.organPersons = res.data.data;
+ this.organPersons = res.data.data
})
//鎵�灞為鍩�
- remote('before_dept').then(res => {
- this.categoryList = res.data.data;
+ remote('before_dept').then((res) => {
+ this.categoryList = res.data.data
})
//鎵�灞炲煄甯�
- remote('area_address').then(res => {
- this.areaList = res.data.data;
+ remote('area_address').then((res) => {
+ this.areaList = res.data.data
})
- let obj = this.latlng.split(',');
- this.form.place = obj[2];
- let arr =[];
- arr.push(obj[0]);
+ let obj = this.latlng.split(',')
+ this.form.place = obj[2]
+ let arr = []
+ arr.push(obj[0])
arr.push(obj[1])
- this.form.latitude = arr.join(',');
+ this.form.latitude = arr.join(',')
// })
},
//妯＄硦鎼滅储鏌ヨ褰撲簨浜�
- querySearchHandle(queryString, cb) { //妯＄硦鎼滅礌
- getMarketList(queryString).then(res => {
- console.log(res.data.data,'res-------')
+ querySearchHandle(queryString, cb) {
+ //妯＄硦鎼滅礌
+ getMarketList(queryString).then((res) => {
+ console.log(res.data.data, 'res-------')
this.marketList = []
let resultList = res.data.data
- resultList.forEach(item => {
+ resultList.forEach((item) => {
this.marketList.push({
value: item.subjectName,
- address:item.address,
- legalPerson:item.legalPerson,
- idCard:item.idCard,
- subjectType:item.subjectType,
- phone:item.phone
+ address: item.address,
+ legalPerson: item.legalPerson,
+ idCard: item.idCard,
+ subjectType: item.subjectType,
+ phone: item.phone,
// id: item.id
})
})
@@ -232,41 +279,41 @@
})
},
handleSelect(item) {
- console.log(item,'item')
- this.form.litigant = item.value;
- this.form.phone = item.phone;
- this.form.subjectType = item.subjectType;
- this.form.certNo = item.idCard;
- this.form.legalPerson = item.legalPerson;
- this.form.address = item.address;
+ console.log(item, 'item')
+ this.form.litigant = item.value
+ this.form.phone = item.phone
+ this.form.subjectType = item.subjectType
+ this.form.certNo = item.idCard
+ this.form.legalPerson = item.legalPerson
+ this.form.address = item.address
},
marketChange(item) {
- this.form.litigant = "";
- this.form.legalPerson = "";
- this.form.litigantCert = "";
- this.form.certNo = "";
- this.form.address = "";
- this.form.phone = "";
- this.form.litigantId = item.id;
- if ("缁忚惀鑰�" == item.subjectType || "涓綋宸ュ晢鎴�" == item.subjectType) {
- this.form.litigant = item.subjectName;
- this.form.legalPerson = item.legalPerson;
- this.form.litigantCert = "钀ヤ笟鎵х収";
- this.form.certNo = item.idCard;
- this.form.address = item.address;
- this.form.phone = item.phone;
- } else if ("鍏皯" == item.subjectType) {
- this.form.litigant = item.subjectName;
- this.form.litigantCert = "灞呮皯韬唤璇�";
- this.form.certNo = item.idCard;
- this.form.address = item.address;
- this.form.phone = item.phone;
- } else if ("鍏朵粬缁勭粐" == item.subjectType) {
- this.form.litigant = item.subjectName;
- this.form.legalPerson = item.legalPerson;
- this.form.certNo = item.idCard;
- this.form.address = item.address;
- this.form.phone = item.phone;
+ this.form.litigant = ''
+ this.form.legalPerson = ''
+ this.form.litigantCert = ''
+ this.form.certNo = ''
+ this.form.address = ''
+ this.form.phone = ''
+ this.form.litigantId = item.id
+ if ('缁忚惀鑰�' == item.subjectType || '涓綋宸ュ晢鎴�' == item.subjectType) {
+ this.form.litigant = item.subjectName
+ this.form.legalPerson = item.legalPerson
+ this.form.litigantCert = '钀ヤ笟鎵х収'
+ this.form.certNo = item.idCard
+ this.form.address = item.address
+ this.form.phone = item.phone
+ } else if ('鍏皯' == item.subjectType) {
+ this.form.litigant = item.subjectName
+ this.form.litigantCert = '灞呮皯韬唤璇�'
+ this.form.certNo = item.idCard
+ this.form.address = item.address
+ this.form.phone = item.phone
+ } else if ('鍏朵粬缁勭粐' == item.subjectType) {
+ this.form.litigant = item.subjectName
+ this.form.legalPerson = item.legalPerson
+ this.form.certNo = item.idCard
+ this.form.address = item.address
+ this.form.phone = item.phone
}
},
backAll() {
@@ -275,24 +322,24 @@
})
},
setPersonname(val) {
- let names = "";
+ let names = ''
for (let i in this.organPersons) {
if (val.indexOf(this.organPersons[i].userId) > -1) {
- names += this.organPersons[i].realName + ",";
+ names += this.organPersons[i].realName + ','
}
}
- if (names != "") {
- this.form.hanlders = names.substring(0, names.length - 1);
- console.log(this.form.hanlders,'this.form.hanlders')
+ if (names != '') {
+ this.form.hanlders = names.substring(0, names.length - 1)
+ console.log(this.form.hanlders, 'this.form.hanlders')
}
},
onSubmit() {
console.log(this.form.hanlderIds, 'this.form.hanlderIds')
this.form.hanlderIds = this.form.hanlderIds.toString()
if (this.form.hanlderIds.length < 1) {
- this.form.hanlders = '';
+ this.form.hanlders = ''
}
- easycase(this.form).then(res => {
+ easycase(this.form).then((res) => {
this.backAll()
})
},
@@ -301,5 +348,4 @@
</script>
<style scoped>
-
</style>
diff --git a/src/views/padSunmaryProcedure/padWord.vue b/src/views/padSunmaryProcedure/padWord.vue
index 885b1e3..e76e486 100644
--- a/src/views/padSunmaryProcedure/padWord.vue
+++ b/src/views/padSunmaryProcedure/padWord.vue
@@ -1,43 +1,57 @@
<template>
- <basic-container>
+ <basic-container :style="{height: screenHeight+'px!important'}">
<!--澶撮儴瀵艰埅-->
- <div id="nav">
- <el-button icon="el-icon-arrow-left" @click="goHome">杩斿洖</el-button>
+ <div class="nav">
+ <el-button icon="el-icon-arrow-left"
+ @click="goHome">杩斿洖</el-button>
<p>{{ name }}</p>
<div>
- <el-button v-show="btn ==1" icon="el-icon-caret-top" @click="ShowHide(0)"></el-button>
- <el-button v-show="btn ==0" icon="el-icon-caret-bottom" @click="ShowHide(0)"></el-button>
- <el-button icon="el-icon-upload" @click="submit">鎻愪氦</el-button>
+ <el-button v-show="btn ==1"
+ icon="el-icon-caret-top"
+ @click="ShowHide(0)"></el-button>
+ <el-button v-show="btn ==0"
+ icon="el-icon-caret-bottom"
+ @click="ShowHide(0)"></el-button>
+ <el-button icon="el-icon-upload"
+ @click="submit">鎻愪氦</el-button>
</div>
</div>
<!--搴曢儴閫夐」鍗�-->
- <el-tabs type="border-card" v-model="activeName" :stretch="true"
- @tab-click="handleClick">
- <el-tab-pane label="璋冩煡璇㈤棶绗斿綍" name="first">
- <BiLu v-if="activeName == 'first'"></BiLu>
- </el-tab-pane>
- <el-tab-pane label="璐ｄ护闄愭湡鏀规閫氱煡涔�" name="second">
- <GaiZheng v-if="activeName == 'second'">璐ｄ护闄愭湡鏀规閫氱煡涔�</GaiZheng>
- </el-tab-pane>
- <el-tab-pane label="澶勭綒鍐冲畾涔�" name="third">
- <JueDingShu v-if="activeName == 'third'">澶勭綒鍐冲畾涔�</JueDingShu>
- </el-tab-pane>
- </el-tabs>
+ <div class="tagsContainer">
+ <el-tabs type="border-card"
+ v-model="activeName"
+ :stretch="true"
+ @tab-click="handleClick">
+ <el-tab-pane label="璋冩煡璇㈤棶绗斿綍"
+ name="first">
+ <BiLu v-if="activeName == 'first'"></BiLu>
+ </el-tab-pane>
+ <el-tab-pane label="璐ｄ护闄愭湡鏀规閫氱煡涔�"
+ name="second">
+ <GaiZheng v-if="activeName == 'second'">璐ｄ护闄愭湡鏀规閫氱煡涔�</GaiZheng>
+ </el-tab-pane>
+ <el-tab-pane label="澶勭綒鍐冲畾涔�"
+ name="third">
+ <JueDingShu v-if="activeName == 'third'">澶勭綒鍐冲畾涔�</JueDingShu>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+
</basic-container>
</template>
<script>
-import {submitcase} from "../../api/News/pad";
-import BiLu from "./word_mange/mangeBL"
+import { submitcase } from '../../api/News/pad'
+import BiLu from './word_mange/mangeBL'
import GaiZheng from './word_mange/mangeGZ'
import JueDingShu from './word_mange/mangeJD'
export default {
- name: "padWord1",
+ name: 'padWord1',
components: {
BiLu,
GaiZheng,
- JueDingShu
+ JueDingShu,
},
created() {
this.id = this.$store.state.user.id
@@ -50,11 +64,20 @@
},
data() {
return {
- name: "妗堜欢鍚嶇О",//灞曠ず鐨勬浠跺悕绉�
- btn: 1,//灞曞紑鍜屾敹璧�
- tabPosition: 'left',//榛樿宸︿晶閫夐」鍗�
- activeName: "first"//閫夐」鍗￠粯璁ゆ墦寮�绗竴涓�
+ name: '妗堜欢鍚嶇О', //灞曠ず鐨勬浠跺悕绉�
+ btn: 1, //灞曞紑鍜屾敹璧�
+ tabPosition: 'left', //榛樿宸︿晶閫夐」鍗�
+ activeName: 'first', //閫夐」鍗￠粯璁ゆ墦寮�绗竴涓�
+ screenHeight: null,
}
+ },
+ mounted() {
+ window.onresize = () => {
+ return () => {
+ this.screenHeight = document.body.clientHeight
+ }
+ }
+ this.screenHeight = document.body.clientHeight
},
methods: {
//杩斿洖妗堜欢鍒楄〃
@@ -65,31 +88,43 @@
},
//鏀剁缉椤堕儴
ShowHide(type) {
- this.btn = type;
+ this.btn = type
window.android.toShowHide()
},
//鎻愪氦锛堝幓瀹℃牳锛�
submit() {
- submitcase({id: this.id}).then(res => {
+ submitcase({ id: this.id }).then((res) => {
this.goHome()
})
},
//鐐瑰嚮閫夐」鍗℃晥鏋�
handleClick(tab, event) {
this.activeName = tab.name
- }
- }
+ },
+ },
}
</script>
<style lang="scss">
-.el-tabs__content {
- height: calc(100vh - 110px);
- overflow-y: auto;
+.tagsContainer {
+ height: 95%;
+ overflow: scroll;
+ .el-tabs {
+ .el-tabs__header {
+ position: sticky;
+ top: 0;
+ z-index: 10000;
+ }
+ .el-tabs__content {
+ // height: calc(100vh - 110px);
+ overflow-y: auto;
+ }
+ }
}
</style>
<style scoped>
-#nav {
+.nav {
+ height: 5%;
display: flex;
justify-content: space-between;
align-items: center;
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
index 698451a..49893c9 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
@@ -107,25 +107,28 @@
</el-form-item>
</el-col>
</el-row>
- <el-form-item class="qianzi">
- <span>琛ㄦ槑韬唤銆佸嚭绀鸿瘉浠讹細鎴戜滑鏄嘲宄扮熆鍖虹患鍚堣鏀挎墽娉曞眬鐨勮鏀挎墽娉曚汉鍛橈紝杩欐槸鎵ф硶璇佷欢璇蜂綘杩囩洰纭锛屽鏃犲紓璁鍦ㄦ绛惧瓧锛�</span>
+ <div class="sign">
+ <span style="font-size:16px;">琛ㄦ槑韬唤銆佸嚭绀鸿瘉浠讹細鎴戜滑鏄嘲宄扮熆鍖虹患鍚堣鏀挎墽娉曞眬鐨勮鏀挎墽娉曚汉鍛橈紝杩欐槸鎵ф硶璇佷欢璇蜂綘杩囩洰纭锛屽鏃犲紓璁鍦ㄦ绛惧瓧锛�</span>
+ <div class="imges">
+ <el-image v-if="form.signature"
+ style="height: 8em!important;width: 8em!important;"
+ :src="form.signature"
+ alt="璇风瀛�" />
+ <el-image v-if="form.fingerprint"
+ class="imgBox"
+ style="height: 5em!important;width: 5em!important;"
+ :src="form.fingerprint"
+ alt="璇峰綍鍏ユ寚绾�" />
+ </div>
<!-- <el-input v-model="form.interrogeeName" placeholder="璇峰～鍐欒璇㈤棶浜�" style="width: 160px!important;"></el-input>-->
- <div id="imges">
+ <div class="signButton">
<button v-if="form.signature ==''||form.signature ==null||form == null"
@click="goQianzi()">鍘荤鍚�</button>
<button v-if="form.fingerprint ==''||form.fingerprint ==null ||form == null"
@click="gozhiwen()">褰曟寚绾�</button>
- <el-image v-if="form.signature"
- style="height: 3em!important;width: 3em!important;"
- :src="form.signature"
- alt="璇风瀛�" />
- <el-image v-if="form.fingerprint"
- :class="form.fingerprint?'imgBox':''"
- style="height: 2em!important;width: 2em!important;"
- :src="form.fingerprint"
- alt="璇峰綍鍏ユ寚绾�" />
</div>
- </el-form-item>
+ </div>
+
<el-form-item>
<span>鍛婄煡鏉冨埄銆佷箟鍔★細鐜板湪灏�</span>
<el-input v-model="form.causePoint"
@@ -136,33 +139,21 @@
<el-input v-model="form.answer"
placeholder="鍙兘褰卞搷鍏澶勭悊妗堜欢鐨勶紝鏈夋彁鍑哄洖閬跨殑鏉冨埄锛屾竻妤氫簡鍚楋紵"></el-input>
</el-form-item>
- <h1 style="text-align: center;font-weight: bold;font-size: 20px">璇㈤棶闂瓟</h1>
- <el-form-item label-width="40px">
- <ul style="list-style: none!important;">
- <li v-for="(item,index) in form.questionsAnswers"
- :key="index">
- <el-form-item label="闂細"
- label-width="20px">
- <el-input type="textarea"
- :row="2"
- v-model="item.wen"></el-input>
- </el-form-item>
- <el-form-item label="绛旓細"
- label-width="20px">
- <el-input type="textarea"
- :row="2"
- v-model="item.da"></el-input>
- </el-form-item>
- </li>
- </ul>
- </el-form-item>
- <el-form-item label-width="50%">
- <el-button type="primary"
- icon="el-icon-circle-plus"
- @click="addEle">
- <!-- <img src="../../../assets/lawImg/addIcon.png" alt="">-->
- </el-button>
- </el-form-item>
+ <h1 style="text-align: center;font-weight: bold;font-size: 20px;line-height:30px">闂瓟绗斿綍</h1>
+ <div class="questionsAnswers"
+ v-for="(item,index) in form.questionsAnswers"
+ :key="index">
+ <el-form-item label="闂細">
+ <el-input type="textarea"
+ :row="2"
+ v-model="item.wen"></el-input>
+ </el-form-item>
+ <el-form-item label="绛旓細">
+ <el-input type="textarea"
+ :row="2"
+ v-model="item.da"></el-input>
+ </el-form-item>
+ </div>
</el-form>
<div style="text-align: center">
<el-button v-if="form.approvalState==null||form.approvalState=='2'"
@@ -172,6 +163,11 @@
<el-button v-if="form.approvalState=='1'"
type="success"
@click="downloadWord(form.id)">涓嬭浇</el-button>
+ <el-button type="primary"
+ icon="el-icon-circle-plus"
+ @click="addEle">
+ <!-- <img src="../../../assets/lawImg/addIcon.png" alt="">-->
+ </el-button>
</div>
</el-main>
</template>
@@ -318,12 +314,6 @@
</script>
<style lang="scss" scoped>
-//.qianzi {
-//display: flex;
-/*justify-content: space-between;*/
-//align-items: center;
-/*flex-wrap: wrap;*/
-//}
.el-input {
border: none !important;
}
@@ -332,14 +322,25 @@
width: 10rem!important;
height: 10rem!important;
}*/
-#imges {
- display: block;
- position: relative;
- .imgBox {
- position: absolute !important;
- left: 0;
- top: 50%;
+.sign {
+ width: 94%;
+ margin: 0 auto 18px;
+ .imges {
+ display: inline-block;
+ position: relative;
+ .imgBox {
+ position: absolute !important;
+ left: 0;
+ top: 50%;
+ }
+ }
+ .signButton {
+ display: inline-block;
+ margin-top: 18px;
+ button:nth-of-type(2) {
+ margin-left: 10px;
+ }
}
}
</style>
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
index d3c66b2..d7b4e45 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
@@ -69,7 +69,7 @@
<el-input v-model="form.illegalAct"
placeholder="杩濇硶琛屼负"></el-input>
</el-form-item>
- <el-form-item label="杩濇硶娉曞緥鏉′护">
+ <el-form-item label="杩濆弽娉曞緥鏉′护">
<el-autocomplete v-model="form.legalBasis"
filterable
style="width: 100%!important;"
@@ -79,9 +79,10 @@
@select="handleSelectOne">
</el-autocomplete>
</el-form-item>
- <el-row>
+ <el-row style="width:100%;margin:0 auto;">
<el-col :span="8">
- <el-form-item label="娉曞緥鏉�">
+ <el-form-item label="娉曞緥鏉�"
+ label-width="70px">
<el-select v-model="form.legalBasisTiao"
style="width: 100%!important;"
placeholder="璇烽�夋嫨鏉�">
@@ -93,13 +94,15 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="娉曞緥娆�">
+ <el-form-item label="娉曞緥娆�"
+ label-width="70px">
<el-input v-model="form.legalBasisKuan"
placeholder="璇疯緭鍏ユ硶寰嬬鍑犳"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="娉曞緥椤�">
+ <el-form-item label="娉曞緥椤�"
+ label-width="70px">
<el-input v-model="form.legalBasisXiang"
placeholder="璇疯緭鍏ユ硶寰嬬鍑犻」"></el-input>
</el-form-item>
@@ -115,9 +118,10 @@
@select="handleSelectTwo">
</el-autocomplete>
</el-form-item>
- <el-row>
+ <el-row style="width:100%;margin:0 auto;">
<el-col :span="8">
- <el-form-item label="娉曞緥鏉�">
+ <el-form-item label="娉曞緥鏉�"
+ label-width="70px">
<el-select v-model="form.legalClauseTiao"
style="width: 100%!important;"
filterable
@@ -130,13 +134,15 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="娉曞緥娆�">
+ <el-form-item label="娉曞緥娆�"
+ label-width="70px">
<el-input v-model="form.legalClauseKuan"
placeholder="璇疯緭鍏ユ硶寰嬬鍑犳"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="娉曞緥椤�">
+ <el-form-item label="娉曞緥椤�"
+ label-width="70px">
<el-input v-model="form.legalClauseXiang"
placeholder="璇疯緭鍏ユ硶寰嬬鍑犻」"></el-input>
</el-form-item>
@@ -176,7 +182,7 @@
</el-form-item>
<div class="accountInfomation"
v-if="form.fines== 2">
- <el-form-item label="缂寸撼閾惰鍚嶇О锛�">
+ <el-form-item label="閾惰鍚嶇О">
<el-input v-model="form.bank"
placeholder="璇疯緭鍏ョ即绾抽摱琛岀殑鍚嶇О"
style="width: 100%!important;"></el-input>
@@ -285,6 +291,9 @@
this.$nextTick(() => {
nowpenaltydecision(this.id).then((res) => {
this.form = res.data.data
+ if (this.form.penalty || this.form.penaltyNumber) {
+ this.fineStatus = true
+ }
})
})
},
--
Gitblit v1.9.1