From 1ec00a645693dbc08b7ea70855451bbd72c43a6a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 08 十二月 2022 16:21:35 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue | 108 +++++++++--------------------------------------------
1 files changed, 19 insertions(+), 89 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
index 6bd30a2..f17f970 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
@@ -23,12 +23,12 @@
</el-form-item>
<!-- 鏂囦功鍙戞斁鏃堕棿 -->
<el-form-item label="鏂囦功鍙戞斁鏃堕棿:" prop="sendTime">
- <el-date-picker v-model="book.sendTime" type="datetime" placeholder="璇烽�夋嫨骞存湀鏃�">
+ <el-date-picker v-model="book.sendTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨骞存湀鏃�">
</el-date-picker>
</el-form-item>
<!-- 鏂囦功闄愬畾鏃堕棿 -->
<el-form-item label="鏂囦功闄愬畾鏃堕棿" prop="limitTime">
- <el-date-picker v-model="book.limitTime" type="datetime" placeholder="璇烽�夋嫨骞存湀鏃�">
+ <el-date-picker v-model="book.limitTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨骞存湀鏃�">
</el-date-picker>
</el-form-item>
<!-- 鏂囦功鍙戞斁鍐呭 -->
@@ -37,7 +37,7 @@
</el-form-item>
<!-- 瀹為檯鏁存敼鏃堕棿 -->
<el-form-item label="瀹為檯鏁存敼鏃堕棿:" prop="rectifyTime">
- <el-date-picker v-model="book.rectifyTime" type="datetime" placeholder="璇烽�夋嫨骞存湀鏃�">
+ <el-date-picker v-model="book.rectifyTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨骞存湀鏃�">
</el-date-picker>
</el-form-item>
<!-- 鏁存敼鎯呭喌 -->
@@ -51,80 +51,28 @@
<!-- 鏂囦功鐓х墖涓婁紶 -->
<el-form-item label="鏂囦功鐓х墖涓婁紶:" prop="writPic">
<div class="upImg">
- <!-- <div class="img-list" v-if="book.writPic.length!==0">
- <div class="img" v-for="(item,index) in book.writPic" :key="index">
- <img :src="item" alt="">
- <i class="el-icon-close myicon" @click="handleRemove(index,1)"></i>
- </div>
- </div>
- <div class="upload" v-if="book.writPic.length<4">
- <el-upload :file-list="fileList" class="upload-demo"
- action="/sccg/file/medias" multiple :show-file-list="false"
- :limit="4" :on-success="handleSuccess1" :headers="getToken()">
- <i class="el-icon-plus"></i>
- </el-upload>
- </div> -->
- <MyUpload @setPictureUrl="writPic" @delPictureUrl="delWritPic"></MyUpload>
+ <MyUpload @setPictureUrl="writPic" @delPictureUrl="delWritPic" :picture-list="book.writPic"></MyUpload>
<div class="tip">{{book.writPic.length}} / 4</div>
</div>
</el-form-item>
<!-- 鏁存敼鍓嶇収鐗� -->
<el-form-item label="鏁存敼鍓嶇収鐗�:" prop="originalPic">
<div class="upImg">
- <!-- <div class="img-list" v-if="book.originalPic.length!==0">
- <div class="img" v-for="(item,index) in book.originalPic" :key="index">
- <img :src="item" alt="">
- <i class="el-icon-close myicon" @click="handleRemove(index,2)"></i>
- </div>
- </div>
- <div class="upload" v-if="book.originalPic.length<4">
- <el-upload :file-list="fileList" class="upload-demo"
- action="/sccg/file/medias" multiple :show-file-list="false"
- :limit="4" :on-success="handleSuccess2" :headers="getToken()">
- <i class="el-icon-plus"></i>
- </el-upload>
- </div> -->
- <MyUpload @setPictureUrl="originalPic" @delPictureUrl="delOriginalPic"></MyUpload>
+ <MyUpload @setPictureUrl="originalPic" @delPictureUrl="delOriginalPic" :picture-list="book.originalPic"></MyUpload>
<div class="tip">{{book.originalPic.length}} / 4</div>
</div>
</el-form-item>
<!-- 鏁存敼鍚庣収鐗� -->
<el-form-item label="鏁存敼鍚庣収鐗�:" prop="rectifiedPic">
<div class="upImg">
- <!-- <div class="img-list" v-if="book.rectifiedPic.length!==0">
- <div class="img" v-for="(item,index) in book.rectifiedPic" :key="index">
- <img :src="item" alt="">
- <i class="el-icon-close myicon" @click="handleRemove(index,3)"></i>
- </div>
- </div> -->
- <!-- <div class="upload" v-if="book.rectifiedPic.length<4">
- <el-upload :file-list="fileList" class="upload-demo"
- action="/sccg/file/medias" multiple :show-file-list="false"
- :limit="4" :on-success="handleSuccess3" :headers="getToken()">
- <i class="el-icon-plus"></i>
- </el-upload>
- </div> -->
- <MyUpload @setPictureUrl="rectifiedPic" @delPictureUrl="delRectifiedPic"></MyUpload>
+ <MyUpload @setPictureUrl="rectifiedPic" @delPictureUrl="delRectifiedPic" :picture-list="book.rectifiedPic"></MyUpload>
<div class="tip">{{book.rectifiedPic.length}} / 4</div>
</div>
</el-form-item>
<!-- 鍏朵粬鐓х墖 -->
<el-form-item label="鍏朵粬:" prop="otherPic">
<div class="upImg">
- <!-- <div class="img-list" v-if="book.otherPic.length!==0"> -->
- <!-- <div class="img" v-for="(item,index) in book.otherPic" :key="index">
- <img :src="item" alt="">
- <i class="el-icon-close myicon" @click="handleRemove(index,4)"></i>
- </div>
- </div>
- <div class="upload" v-if="book.otherPic.length<4">
- <el-upload :file-list="fileList" class="upload-demo"
- action="/sccg/file/medias" multiple :show-file-list="false"
- :limit="4" :on-success="handleSuccess4" :headers="getToken()">
- <i class="el-icon-plus"></i>
- </el-upload>
- </div> -->
- <MyUpload @setPictureUrl="otherPic" @delPictureUrl="delOtherPic"></MyUpload>
+ <MyUpload @setPictureUrl="otherPic" @delPictureUrl="delOtherPic" :picture-list="book.otherPic"></MyUpload>
<div class="tip">{{book.otherPic.length}} / 4</div>
</div>
</el-form-item>
@@ -133,7 +81,7 @@
</div>
</template>
<script>
-import {getCodeList} from '@/utils/helper'
+import {deepClone, getCodeList} from '@/utils/helper'
import MyUpload from "@/components/myUpload"
export default {
components: {
@@ -242,11 +190,6 @@
trigger: 'blur', validator: checkId
}
],
- // illegalType: [
- // {
- // trigger: 'blur', validator: checkVio
- // }
- // ],
sendTime: [
{
trigger: 'blur', validator: checkGiveTime
@@ -306,26 +249,18 @@
}
},
created() {
- const {getBookType} = this
- getBookType();
- const {mycode}=this;
- console.log(121,mycode)
- this.getEventInfo(mycode)
+ this.getBookType();
+ this.basecase = this.illegalType;
+ if (this.writ) {
+ this.book = deepClone(this.writ);
+ this.book.originalPic = this.writ.originalPic.split(',');
+ this.book.writPic = this.writ.writPic.split(',');
+ this.book.otherPic = this.writ.otherPic.split(',');
+ this.book.rectifiedPic = this.writ.rectifiedPic.split(',');
+ }
},
- props: ['caseId', 'closeDialog','mycode'],
+ props: ['caseId', 'closeDialog','mycode', 'writ', 'illegalType'],
methods: {
- // 鑾峰彇妗堜欢淇℃伅
- async getEventInfo(mycode) {
- await this.$axios({
- method: 'get',
- url: `sccg/base_case/baseCaseDetail/${mycode}`
- })
- .then(res => {
- this.basecase = res.data.baseCase.illegalBuilding.categoryText;
- this.book.illegalType=res.data.baseCase.illegalBuilding.categoryId;
- })
- },
-
handleSuccess1(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
if (this.book.writPic.length < 4) {
@@ -364,22 +299,19 @@
if (this.book.originalPic.length < 4) {
this.book.writPic.push(baseUrl + url)
}
- console.log(url);
},
//鍒犻櫎鍥剧墖
delWritPic({url}){
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(url);
this.book.writPic.splice(this.book.writPic.indexOf(baseUrl + url),1);
},
// 璁剧疆涓婁紶鎴愬姛涔嬪悗鐨勫浘鐗囧湴鍧�
- otherPic({ url }) {
+ otherPic({ url }) {
const baseUrl = 'http://140.143.152.226:8410/';
if (this.book.otherPic.length < 4) {
this.book.otherPic.push(baseUrl + url)
}
- console.log(url);
},
//鍒犻櫎鍥剧墖
delOtherPic({url}){
@@ -393,7 +325,6 @@
if (this.book.otherPic.length < 4) {
this.book.rectifiedPic.push(baseUrl + url)
}
- console.log(url);
},
//鍒犻櫎鍥剧墖
delRectifiedPic({url}){
@@ -406,7 +337,6 @@
if (this.book.otherPic.length < 4) {
this.book.originalPic.push(baseUrl + url)
}
- console.log(url);
},
//鍒犻櫎鍥剧墖
delOriginalPic({url}){
--
Gitblit v1.8.0