Commit fba7eef1 by Lyan

Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

parents c866a932 bb0fbfdf
...@@ -11,10 +11,10 @@ import "./assets/css/layout.scss"; ...@@ -11,10 +11,10 @@ import "./assets/css/layout.scss";
// import "bootstrap/dist/js/bootstrap.min.js"; // import "bootstrap/dist/js/bootstrap.min.js";
import "./plugins/element.js"; import "./plugins/element.js";
import "./plugins/qrcode.js"; import "./plugins/qrcode.js";
import ElementUI from 'element-ui'
import "./assets/css/element-variables.scss"; import "./assets/css/element-variables.scss";
import GsTable from './components/table/index' import GsTable from './components/table/index'
import './utils/codeTable' import './utils/codeTable'
// 百度地图 // 百度地图
import BaiduMap from 'vue-baidu-map' import BaiduMap from 'vue-baidu-map'
...@@ -23,6 +23,7 @@ Vue.use(BaiduMap, { ...@@ -23,6 +23,7 @@ Vue.use(BaiduMap, {
ak: 'EoRpk2HWln2YKTEYYH5wutFX' ak: 'EoRpk2HWln2YKTEYYH5wutFX'
}) })
// 公共样式、布局样式 // 公共样式、布局样式
Vue.use(ElementUI)
// 主题色调修改在assets/_style.scss 修改里面的变量即可 // 主题色调修改在assets/_style.scss 修改里面的变量即可
......
...@@ -53,6 +53,12 @@ ...@@ -53,6 +53,12 @@
<el-button @click="auditEvent(2)" class="plain-with-border">审核不通过</el-button> <el-button @click="auditEvent(2)" class="plain-with-border">审核不通过</el-button>
<el-button class="plain-with-border" v-if="reset">重置</el-button> <el-button class="plain-with-border" v-if="reset">重置</el-button>
</div> </div>
<el-image
id="image"
style="width: 10px; height: 10px;opacity: 0;"
:src="url"
:preview-src-list="srcList">
</el-image>
</div> </div>
</div> </div>
</template> </template>
...@@ -74,6 +80,8 @@ export default { ...@@ -74,6 +80,8 @@ export default {
subCenterName: '', subCenterName: '',
status: '', //1.首次 2.变更 status: '', //1.首次 2.变更
id: '', //各个表的主键 id: '', //各个表的主键
url: '',
srcList: [],
// 原静态页面定义数据 // 原静态页面定义数据
// entInfoFields: [ // entInfoFields: [
// { // {
...@@ -395,13 +403,14 @@ export default { ...@@ -395,13 +403,14 @@ export default {
fileType: '1', //1.第一步文件 2.第二步文件 fileType: '1', //1.第一步文件 2.第二步文件
id: this.id id: this.id
} }
this.getFile(form) this.showImage(form)
} }
}, },
getFile(form) { showImage(form) {
const result = this.$api.myManage.tycpdmfirmReturnFile(form) const result = this.$api.myManage.tycpdmfirmReturnFile(form)
window.open(result, '_black') this.url = result
console.log(result) this.srcList = [result]
document.getElementById('image').click()
}, },
getBranchLabel(branchCode) { getBranchLabel(branchCode) {
return (this.branchList.find(item => item.value === branchCode) || {label: '--'}).label return (this.branchList.find(item => item.value === branchCode) || {label: '--'}).label
...@@ -439,6 +448,12 @@ export default { ...@@ -439,6 +448,12 @@ export default {
this.id = this.$route.query.type === 'new' ? this.detailInfo.fid : this.detailInfo.id this.id = this.$route.query.type === 'new' ? this.detailInfo.fid : this.detailInfo.id
this.status = this.$route.query.type === 'new' ? 1 : 2 this.status = this.$route.query.type === 'new' ? 1 : 2
// 需要对预览图片进行初始化
const form = { status: this.status, fileType: '1', id: this.id }
const result = this.$api.myManage.tycpdmfirmReturnFile(form)
this.url = result
this.srcList = [result]
this.branchCode = this.detailInfo.branchcode this.branchCode = this.detailInfo.branchcode
this.subCenterName = this.getBranchLabel(this.branchCode) this.subCenterName = this.getBranchLabel(this.branchCode)
......
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