From 9530e7c7687f5032e58419954185f2e3b1fd77c9 Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期五, 28 十月 2022 18:31:55 +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 | 118 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 83 insertions(+), 35 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 5a989a5..6bd30a2 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 @@ -18,8 +18,8 @@ </el-form-item> </div> <!-- 杩濇硶绫诲瀷 --> - <el-form-item label="杩濇硶绫诲瀷:" prop="illegalType" placeholder="璇疯緭鍏ヨ繚娉曠被鍨�"> - <el-input v-model="book.illegalType" placeholder="璇疯緭鍏ヨ繚娉曠被鍨�"></el-input> + <el-form-item label="杩濇硶绫诲瀷:" prop="illegalType" > + <el-input v-model="basecase" ></el-input> </el-form-item> <!-- 鏂囦功鍙戞斁鏃堕棿 --> <el-form-item label="鏂囦功鍙戞斁鏃堕棿:" prop="sendTime"> @@ -51,7 +51,7 @@ <!-- 鏂囦功鐓х墖涓婁紶 --> <el-form-item label="鏂囦功鐓х墖涓婁紶:" prop="writPic"> <div class="upImg"> - <div class="img-list" v-if="book.writPic.length!==0"> + <!-- <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> @@ -63,14 +63,15 @@ :limit="4" :on-success="handleSuccess1" :headers="getToken()"> <i class="el-icon-plus"></i> </el-upload> - </div> + </div> --> + <MyUpload @setPictureUrl="writPic" @delPictureUrl="delWritPic"></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="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> @@ -82,7 +83,8 @@ :limit="4" :on-success="handleSuccess2" :headers="getToken()"> <i class="el-icon-plus"></i> </el-upload> - </div> + </div> --> + <MyUpload @setPictureUrl="originalPic" @delPictureUrl="delOriginalPic"></MyUpload> <div class="tip">{{book.originalPic.length}} / 4</div> </div> </el-form-item> @@ -102,15 +104,15 @@ <i class="el-icon-plus"></i> </el-upload> </div> --> - <MyUpload @setPictureUrl="setPicUrl" @delPictureUrl="delPicUrl"></MyUpload> + <MyUpload @setPictureUrl="rectifiedPic" @delPictureUrl="delRectifiedPic"></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"> + <!-- <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> @@ -121,7 +123,8 @@ :limit="4" :on-success="handleSuccess4" :headers="getToken()"> <i class="el-icon-plus"></i> </el-upload> - </div> + </div> --> + <MyUpload @setPictureUrl="otherPic" @delPictureUrl="delOtherPic"></MyUpload> <div class="tip">{{book.otherPic.length}} / 4</div> </div> </el-form-item> @@ -239,11 +242,11 @@ trigger: 'blur', validator: checkId } ], - illegalType: [ - { - trigger: 'blur', validator: checkVio - } - ], + // illegalType: [ + // { + // trigger: 'blur', validator: checkVio + // } + // ], sendTime: [ { trigger: 'blur', validator: checkGiveTime @@ -298,15 +301,31 @@ label: '涔︾睄2', value: 2, }, - ] + ], + basecase:"" } }, created() { const {getBookType} = this getBookType(); + const {mycode}=this; + console.log(121,mycode) + this.getEventInfo(mycode) }, - props: ['caseId', 'closeDialog'], + props: ['caseId', 'closeDialog','mycode'], 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) { @@ -338,34 +357,63 @@ return { Authorization: tokenHead + token } } }, - // 鍒犻櫎鍥剧墖 - handleRemove(index, flag) { - if (flag === 1) { - this.book.writPic.splice(index, 1); - } else if (flag === 2) { - this.book.originalPic.splice(index, 1); - } else if (flag === 3) { - this.book.rectifiedPic.splice(index, 1); - } else { - this.book.otherPic.splice(index, 1); - } - - }, + // 璁剧疆涓婁紶鎴愬姛涔嬪悗鐨勫浘鐗囧湴鍧� - setPicUrl({ url }) { + writPic({ url }) { const baseUrl = 'http://140.143.152.226:8410/'; 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 }) { + 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}){ + const baseUrl = 'http://140.143.152.226:8410/'; + this.book.otherPic.splice(this.book.otherPic.indexOf(baseUrl + url),1); + }, + + // 璁剧疆涓婁紶鎴愬姛涔嬪悗鐨勫浘鐗囧湴鍧� + rectifiedPic({ url }) { + const baseUrl = 'http://140.143.152.226:8410/'; + if (this.book.otherPic.length < 4) { + this.book.rectifiedPic.push(baseUrl + url) + } + console.log(url); + }, + //鍒犻櫎鍥剧墖 + delRectifiedPic({url}){ + const baseUrl = 'http://140.143.152.226:8410/'; + this.book.rectifiedPic.splice(this.book.rectifiedPic.indexOf(baseUrl + url),1); + }, + // 璁剧疆涓婁紶鎴愬姛涔嬪悗鐨勫浘鐗囧湴鍧� + originalPic({ url }) { + const baseUrl = 'http://140.143.152.226:8410/'; + if (this.book.otherPic.length < 4) { this.book.originalPic.push(baseUrl + url) } console.log(url); }, //鍒犻櫎鍥剧墖 - delPicUrl({url}){ + delOriginalPic({url}){ const baseUrl = 'http://140.143.152.226:8410/'; - console.log(url); this.book.originalPic.splice(this.book.originalPic.indexOf(baseUrl + url),1); - console.log(this.book.originalPic); }, + // 鑾峰彇鏂囦功绉嶇被 async getBookType(){ let arr -- Gitblit v1.8.0