|
|
@@ -37,18 +37,14 @@
|
|
|
<div class="inner-right">
|
|
|
<div style="overflow: hidden;" v-if="showExcel == false">
|
|
|
<toolList @iconCli='iconCli' :tooltit='tooltit' style="margin: 10px"></toolList>
|
|
|
- <div style="margin-top: 20px;float: left;display: flex;" class="bigbtns">
|
|
|
- <el-button style="margin:0 20px 0 20px;" class="btn-check" size="medium" type="primary"
|
|
|
+ <div style="margin-top: 20px;float: left;" class="bigbtns">
|
|
|
+ <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
|
|
|
@click="addNewStatus = true">新建
|
|
|
</el-button>
|
|
|
- <div>
|
|
|
- <input id="upload-file" @click="handleUpload" name="file" type="file" />
|
|
|
- <el-button type="primary">导入</el-button>
|
|
|
-
|
|
|
- </div>
|
|
|
-
|
|
|
+ <!-- <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
|
|
|
+ @click="shareStatus = true">新建2222
|
|
|
+ </el-button> -->
|
|
|
</div>
|
|
|
-
|
|
|
<div style="margin-top: 20px;float: right;margin-right: 20px" class="bigbtns"
|
|
|
v-if="selectionSize != 0">
|
|
|
<el-button style="margin-left: 5px;" class="btn-check" size="small" type="primary"
|
|
|
@@ -99,28 +95,22 @@
|
|
|
|
|
|
<div class="container" id="container" v-else>
|
|
|
<fullscreen :fullscreen.sync="excelFullScreen" class="container">
|
|
|
- <iframe id="excelIframe" height="100%" width="100%" src="/static/views/onlineShareExcel.html"
|
|
|
- frameborder="0"></iframe>
|
|
|
+ <iframe id="excelIframe" height="100%" width="100%"
|
|
|
+ src="/marketfront/static/views/onlineShareExcel.html" frameborder="0"></iframe>
|
|
|
</fullscreen>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-dialog :title="'新建'" :visible.sync="addNewStatus" width="450px" :destroy-on-close="true"
|
|
|
+ <el-dialog :title="'新建'" :visible.sync="addNewStatus" width="300px" :destroy-on-close="true"
|
|
|
:modal-append-to-body="false" :close-on-click-modal="false">
|
|
|
<div>
|
|
|
<!-- <el-button type="primary" @click="addExcel()" plain class="iconfont icon-wenjian">在线文档</el-button>-->
|
|
|
<!-- <el-button type="primary" @click="addFolderStatus = true" plain class="iconfont icon-wenjianjia">文件夹</el-button>-->
|
|
|
- <div style="padding-bottom: 30px;display:flex">
|
|
|
+ <div style="padding-bottom: 30px">
|
|
|
<div style="width: 85px;display: inline-block;cursor: pointer" @click="addExcel()">
|
|
|
<span class="iconfont icon-wenjian" style="font-size: 80px;color: dodgerblue"></span>
|
|
|
<p style="margin-left: 20px;margin-top: 10px">在线文档</p>
|
|
|
</div>
|
|
|
- <div style="width: 85px;display: inline-block;margin-left: 70px;cursor: pointer">
|
|
|
- <span class="iconfont icon-excel" style="font-size: 80px;color: dodgerblue"></span>
|
|
|
- <input id="upload-file" style="height: 130px;bottom: 20px;
|
|
|
- right: 44%;" name="file" type="file" @change="handleUpload">
|
|
|
- <span style="top: 10px;position: relative;left: 10px;">在线导入</span>
|
|
|
- </div>
|
|
|
<div style="width: 85px;display: inline-block;margin-left: 70px;cursor: pointer"
|
|
|
@click="addFolderStatus = true">
|
|
|
<span class="iconfont icon-wenjianjia" style="font-size: 80px;color: dodgerblue"></span>
|
|
|
@@ -154,28 +144,38 @@
|
|
|
<el-button type="primary" @click="checkexa = true" plain>指定人可编辑</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="选择填报人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
|
|
|
- :modal-append-to-body="false" :close-on-click-modal="false" v-loading="shareLoading">
|
|
|
- <div>
|
|
|
- <el-form :model="exaList" ref="addInfoList">
|
|
|
- <el-form-item prop="processUserId" class="info-line online">
|
|
|
- <span style="width: 80px;margin-right: 20px">审批人员</span>
|
|
|
- <deptTreeUserNew class="tree" @treeCheck="treeCheckonly" :defaultList="defaultList"
|
|
|
- :type="depttype" :closeList="closeList"></deptTreeUserNew>
|
|
|
- <div class="tree treeUser">
|
|
|
- <p v-for="(item, index) in treeList" :key="index">{{ item.receiveName }}
|
|
|
- <i @click="deletes(item, index)" class="el-icon-error"></i>
|
|
|
+ <div class="flex-dialog">
|
|
|
+ <el-dialog title="选择填报人" :visible.sync="checkexa" width="86%" style="height:100% ;"
|
|
|
+ :destroy-on-close="true" :modal-append-to-body="false" :close-on-click-modal="false"
|
|
|
+ v-loading="shareLoading">
|
|
|
+ <div class="flex-dialog">
|
|
|
+ <el-row style="height:80% ;">
|
|
|
+ <el-col :span="24" style="height:100% ;">
|
|
|
+ <deptTreeUserNew class="tree" @treeCheck="treeCheckonly" :defaultList="defaultList"
|
|
|
+ :type="depttype" :closeList="closeList"></deptTreeUserNew>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+ <!-- <el-form :model="exaList" ref="addInfoList"> -->
|
|
|
+ <!-- <el-form-item prop="processUserId" class="info-line online"> -->
|
|
|
+ <!-- <span style="width: 80px;margin-right: 20px">审批人员</span> -->
|
|
|
+
|
|
|
+ <!-- <div class="tree treeUser">
|
|
|
+ <p v-for="(item,index) in treeList" :key="index">{{ item.receiveName }}
|
|
|
+ <i @click="deletes(item,index)" class="el-icon-error"></i>
|
|
|
</p>
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
+ </div> -->
|
|
|
+ <!-- </el-form-item> -->
|
|
|
+ <!-- </el-form> -->
|
|
|
|
|
|
- <div slot="footer" style="text-align: right;padding-bottom: 20px">
|
|
|
- <el-button type="primary" @click="checkProcessUser(3)">确 定</el-button>
|
|
|
- <el-button @click="checkexa = false">取 消</el-button>
|
|
|
+ <div slot="footer" style="text-align: right;padding-bottom: 20px">
|
|
|
+ <el-button type="primary" @click="checkProcessUser(3)">确 定</el-button>
|
|
|
+ <el-button @click="checkexa = false">取 消</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </el-dialog>
|
|
|
+ </el-dialog>
|
|
|
+ </div>
|
|
|
+
|
|
|
<el-dialog title="移动到" :visible.sync="moveStatus" width="500px" :destroy-on-close="true"
|
|
|
:modal-append-to-body="false" :close-on-click-modal="false">
|
|
|
<div>
|
|
|
@@ -212,14 +212,12 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import LuckyExcel from "luckyexcel";
|
|
|
import pForm from "../../../components/p-form";
|
|
|
import toolList from "../../../components/toolList";
|
|
|
import myMessage from "../../../components/myMessage.vue";
|
|
|
import myMessageNew from "../../../components/myMessageNew.vue";
|
|
|
import myMessageRadio from "../../../components/myMessageRadio.vue";
|
|
|
-import deptTreeUserNew from "../../../components/deptTreeUserNew.vue"
|
|
|
-import { ajaxJson } from '../../../../public/static/js/util'
|
|
|
+import deptTreeUserNew from "../../../components/newTree.vue"
|
|
|
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -285,71 +283,6 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- //外部导入
|
|
|
- addExport(e) {
|
|
|
- this.$http({
|
|
|
- url: '/market/cOnlineExcel/addExcel',
|
|
|
- method: "post",
|
|
|
- headers: {
|
|
|
- "Content-Type": "application/json",
|
|
|
- },
|
|
|
- data: {
|
|
|
- folderId: '',
|
|
|
- },
|
|
|
- }).then((res) => {
|
|
|
- console.log(res);
|
|
|
- res.data.desc
|
|
|
- this.startUpload(e, res.data.desc)
|
|
|
- });
|
|
|
- },
|
|
|
- startUpload(e, res) {
|
|
|
- let _this = this;
|
|
|
- let files = e.target.files;
|
|
|
- if (files == null || files.length == 0) {
|
|
|
- window.top.$vm.$message({
|
|
|
- message: '没有文件导入',
|
|
|
- type: 'info'
|
|
|
- })
|
|
|
- return;
|
|
|
- }
|
|
|
- let name = files[0].name;
|
|
|
- let suffixArr = name.split("."),
|
|
|
- suffix = suffixArr[suffixArr.length - 1];
|
|
|
- if (suffix != "xlsx") {
|
|
|
- window.top.$vm.$message({
|
|
|
- message: '目前只支持xlsx文件的导入',
|
|
|
- type: 'info'
|
|
|
- })
|
|
|
- return;
|
|
|
- }
|
|
|
- // 解析文件
|
|
|
- LuckyExcel.transformExcelToLucky(files[0], function (exportJson, luckysheetfile) {
|
|
|
- if (exportJson.sheets == null || exportJson.sheets.length == 0) {
|
|
|
- window.top.$vm.$message({
|
|
|
- message: '无法读取excel文件的内容，当前不支持xls文件',
|
|
|
- type: 'info'
|
|
|
- })
|
|
|
- return;
|
|
|
- }
|
|
|
- let exceljson = JSON.stringify(exportJson)
|
|
|
- _this.$util.ajaxJson("正在导入中", "http://10.149.85.91:7777/sheet/excel/importFile", { exceldata: exceljson, id: res }, function (res) {
|
|
|
- // console.log('[ res ] >', res)
|
|
|
- _this.addNewStatus = false;
|
|
|
- document.getElementById('excelId').setAttribute("value", res.id);
|
|
|
- _this.showExcel = true;
|
|
|
-
|
|
|
-
|
|
|
- });
|
|
|
- }
|
|
|
- );
|
|
|
- console.log(e); //文件
|
|
|
- console.log(res);//excel id
|
|
|
-
|
|
|
- },
|
|
|
- handleUpload(e) {
|
|
|
- this.addExport(e)
|
|
|
-
|
|
|
- },
|
|
|
processWoNo() {
|
|
|
console.log(this.woNo);
|
|
|
var _this = this;
|
|
|
@@ -379,7 +312,6 @@ export default {
|
|
|
//放入id，切换到excel模式
|
|
|
document.getElementById('excelId').setAttribute("value", id);
|
|
|
_this.showExcel = true;
|
|
|
- console.log(_this.showExcel);
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -461,7 +393,7 @@ export default {
|
|
|
_this.shareLoading = true;
|
|
|
if (shareType == 3) {
|
|
|
this.treeList.map((o) => {
|
|
|
- deptList.push(o.receiveNo);
|
|
|
+ deptList.push(o.key);
|
|
|
});
|
|
|
}
|
|
|
if (shareType == 1) {
|
|
|
@@ -539,7 +471,6 @@ export default {
|
|
|
},
|
|
|
//打开excel
|
|
|
moveToEdit(row) {
|
|
|
-
|
|
|
//放入id，切换到excel模式
|
|
|
document.getElementById('excelId').setAttribute("value", row.id);
|
|
|
this.showExcel = true;
|
|
|
@@ -561,7 +492,6 @@ export default {
|
|
|
folderId: folderId,
|
|
|
},
|
|
|
}).then((res) => {
|
|
|
- console.log(res);
|
|
|
if (res.data.result === 1) {
|
|
|
_this.$message({
|
|
|
message: res.data.desc,
|
|
|
@@ -867,11 +797,20 @@ export default {
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
-#upload-file {
|
|
|
- position: absolute;
|
|
|
- width: 70px;
|
|
|
- height: 40px;
|
|
|
- opacity: 0;
|
|
|
+::v-deep .flex-dialog .el-dialog {
|
|
|
+ height: 600px !important;
|
|
|
+}
|
|
|
+
|
|
|
+.flex-dialog {
|
|
|
+ height: 100%;
|
|
|
+}
|
|
|
+
|
|
|
+.el-dialog {
|
|
|
+ height: 100% !important;
|
|
|
+}
|
|
|
+
|
|
|
+::v-deep .flex-dialog .el-dialog__body {
|
|
|
+ height: 100% !important;
|
|
|
}
|
|
|
|
|
|
.container {
|
yangbifan