Skip to content

E
ElectricitySheep
Commit 6b65504c authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

1

parent 8a0d882c
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 73 deletions
src/assets/js/LodopFuncs.js
View file @ 6b65504c
...@@ -87,11 +87,13 @@ function getLodop(oOBJECT, oEMBED) { ...@@ -87,11 +87,13 @@ function getLodop(oOBJECT, oEMBED) {
return; return;
} }
if (!LODOP) { if (!LODOP) {
document.body.innerHTML = strCLodopInstall_1 + (CLodopIsLocal ? strCLodopInstall_2 : "") + strCLodopInstall_3 + document.body.innerHTML; // document.body.innerHTML = strCLodopInstall_1 + (CLodopIsLocal ? strCLodopInstall_2 : "") + strCLodopInstall_3 + document.body.innerHTML;
alert("本地未安装Lodop此控件，请复制链接到(http://www.lodop.net/download.html)下载控件");
return; return;
} else { } else {
if (CLODOP.CVERSION < "4.0.9.9") { if (CLODOP.CVERSION < "4.0.9.9") {
document.body.innerHTML = strCLodopUpdate + document.body.innerHTML; // document.body.innerHTML = strCLodopUpdate + document.body.innerHTML;
alert("Web打印服务CLodop需升级!，请复制链接到(http://www.lodop.net/download.html)下载控件");
} }
if (oEMBED && oEMBED.parentNode) if (oEMBED && oEMBED.parentNode)
oEMBED.parentNode.removeChild(oEMBED); //清理旧版无效元素 oEMBED.parentNode.removeChild(oEMBED); //清理旧版无效元素
...@@ -122,16 +124,19 @@ function getLodop(oOBJECT, oEMBED) { ...@@ -122,16 +124,19 @@ function getLodop(oOBJECT, oEMBED) {
//==Lodop插件未安装时提示下载地址:== //==Lodop插件未安装时提示下载地址:==
if ((!LODOP) || (!LODOP.VERSION)) { if ((!LODOP) || (!LODOP.VERSION)) {
if (ua.indexOf('Chrome') >= 0) if (ua.indexOf('Chrome') >= 0)
document.body.innerHTML = strHtmChrome + document.body.innerHTML; // document.body.innerHTML = strHtmChrome + document.body.innerHTML;
alert('(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）');
if (ua.indexOf('Firefox') >= 0) if (ua.indexOf('Firefox') >= 0)
document.body.innerHTML = strHtmFireFox + document.body.innerHTML; // document.body.innerHTML = strHtmFireFox + document.body.innerHTML;
document.body.innerHTML = (is64IE ? strHtm64_Install : strHtmInstall) + document.body.innerHTML; alert('（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）');
// document.body.innerHTML = (is64IE ? strHtm64_Install : strHtmInstall) + document.body.innerHTML;
return LODOP; return LODOP;
} }
} }
if (LODOP.VERSION < "6.2.2.6") { if (LODOP.VERSION < "6.2.2.6") {
if (!needCLodop()) if (!needCLodop())
document.body.innerHTML = (is64IE ? strHtm64_Update : strHtmUpdate) + document.body.innerHTML; // document.body.innerHTML = (is64IE ? strHtm64_Update : strHtmUpdate) + document.body.innerHTML;
alert("Web打印服务CLodop需升级!，请复制链接到(http://www.lodop.net/download.html)下载控件");
} }
//===如下空白位置适合调用统一功能(如注册语句、语言选择等):== //===如下空白位置适合调用统一功能(如注册语句、语言选择等):==
......
src/components/CommodityMan/goodsListEdit.vue
View file @ 6b65504c
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
<p style="color:#c9c9c9;margin-bottom: 12px;"> <p style="color:#c9c9c9;margin-bottom: 12px;">
第一张图片为缩略图,其它图片为轮播图,建议像素750*750,最多支持上传9张 第一张图片为缩略图,其它图片为轮播图,建议像素750*750,最多支持上传9张
</p> </p>
<div flex="dir:left">
<div flex="dir:left"> <!-- <div flex="dir:left">
<div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'" <div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'"
style="margin-right: 20px; position: relative; "> style="margin-right: 20px; position: relative; ">
<div class="colapp-image" :style="{ <div class="colapp-image" :style="{
...@@ -79,8 +79,26 @@ ...@@ -79,8 +79,26 @@
<div @click="openChangeDig(1)" class="add-image-btn 2222"> <div @click="openChangeDig(1)" class="add-image-btn 2222">
+ 添加图片 + 添加图片
</div> </div>
</div> </div> -->
</div> <div class="nav_Main">
<div class="nav_IconContent">
<draggable v-model="addMsg.CarouselImageList">
<div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'"
style="margin-right: 20px; position: relative; ">
<div class="colapp-image" :style="{
backgroundImage: 'url(' + item.Path + ')'
}"></div>
<el-button @click="ClearCarouse(index)" class="delBtn" type="danger" icon="el-icon-close"
circle></el-button>
</div>
</draggable>
</div>
<div @click="openChangeDig(1)" class="add-image-btn 2222">
+ 添加图片
</div>
</div>
</el-form-item> </el-form-item>
<el-form-item label="商品视频"> <el-form-item label="商品视频">
<el-input v-model="addMsg.VideoAddress" size="small" placeholder="请输入内容"> <el-input v-model="addMsg.VideoAddress" size="small" placeholder="请输入内容">
...@@ -950,12 +968,14 @@ ...@@ -950,12 +968,14 @@
import Choosevideo from "@/components/global/Choosevideo.vue"; import Choosevideo from "@/components/global/Choosevideo.vue";
import region_Choice from "@/components/setup/view/regionChoice"; import region_Choice from "@/components/setup/view/regionChoice";
import UE from "@/components/global/UE.vue"; import UE from "@/components/global/UE.vue";
import draggable from "vuedraggable"
export default { export default {
components: { components: {
ChooseImg, ChooseImg,
Choosevideo, Choosevideo,
region_Choice, region_Choice,
UE UE,
draggable
}, },
data() { data() {
return { return {
...@@ -2368,4 +2388,14 @@ ...@@ -2368,4 +2388,14 @@
.edui1_imagescale img{ .edui1_imagescale img{
max-width: 100%; max-width: 100%;
} }
.goodsListEdit .nav_Main {
display: flex;
justify-content: flex-start;
}
.goodsListEdit .nav_IconContent {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
}
</style> </style>
src/components/authorize.vue
View file @ 6b65504c
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
</div> </div>
<div class="mainRightContent"> <div class="mainRightContent">
<div class="mainRightTop"> <div class="mainRightTop">
<div class="mainRightLeft">授权中心</div> <div class="mainRightLeft">资产管理</div>
<div class="marinRightList"> <div class="marinRightList">
<ul> <ul>
<li style="display:none">缓存</li> <li style="display:none">缓存</li>
......
src/components/empower/printManage.vue
View file @ 6b65504c
...@@ -69,22 +69,20 @@ ...@@ -69,22 +69,20 @@
<div> <div>
<el-checkbox v-model="allchecked" @change="allcheckbtn">全选</el-checkbox> <el-checkbox v-model="allchecked" @change="allcheckbtn">全选</el-checkbox>
<span style='margin-left:10px'>入库批次</span> <span style='margin-left:10px'>入库批次</span>
<el-select v-model="msg.StockInId" placeholder="请选择" size="small" clearable @change="allchecked = false,checkList=[],xzCreateDate='',GoodsNames='',getList()"> <el-select v-model="msg.StockInId" placeholder="请选择" size="small" clearable @change="allchecked = false,checkList=[],getList()">
<el-option label="不限" :value="0" ></el-option> <el-option label="不限" :value="0" ></el-option>
<el-option :label="item.StockInNum" :value="item.StockInId" v-for="(item,index2) in options" :key="index2"></el-option> <el-option :label="item.StockInNum" :value="item.StockInId" v-for="(item,index2) in options" :key="index2"></el-option>
</el-select> </el-select>
<span style='margin-left:10px'>入库时间</span>
<el-select v-model="xzCreateDate" placeholder="请选择" size="small" clearable @change="allchecked = false,GoodsNames='',checkList=[],getxzdate()">
<el-option :label="item.CreateDate" :value="item.CreateDate" v-for="(item,index2) in CreateDatelist" :key="index2"></el-option>
</el-select>
<el-input @keyup.enter.native="allchecked = false,checkList=[],xzCreateDate='',getGoodsName()" style="display:inline-block;width:225px;height:30px"
placeholder="请输入商品名称" v-model="GoodsNames" @clear="allchecked = false,checkList=[],xzCreateDate='',getList()" size="small" clearable>
</el-input>
</div> </div>
<div style="margin-top:30px"> <div style="margin-top:10px" v-for="(i,j) in dataList" :key="j">
<div style="margin:20px 0;font-size:16px;color:rgb(64, 158, 255)">
<span > 商品名称：{{i.GoodsName}}</span>
</div>
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="6" v-for="(item,index) in dataList" :key="index" > <el-col :span="6" v-for="(item,index) in i.list" :key="index" >
<div :class="item.Ischeck ==true? 'print_item2':'print_item'" @click="gocheke(index)"> <div :class="item.Ischeck ==true? 'print_item2':'print_item'" @click="gocheke(j,index)">
<div>{{item.GoodsName}}</div> <div>{{item.GoodsName}}</div>
<div> <div>
<el-row :gutter="10"> <el-row :gutter="10">
...@@ -216,10 +214,10 @@ export default { ...@@ -216,10 +214,10 @@ export default {
for(var j=0;j<fieldList.length;j++){ for(var j=0;j<fieldList.length;j++){
//过滤出匹配到的数据 //过滤出匹配到的数据
var arr = list.filter((e)=>{ var arr = list.filter((e)=>{
return e.CreateDate==fieldList[j]; return e.GoodsName==fieldList[j];
}) })
att.push({ att.push({
CreateDate:arr[0].CreateDate, GoodsName:arr[0].GoodsName,
list:arr list:arr
}) })
} }
...@@ -238,25 +236,29 @@ export default { ...@@ -238,25 +236,29 @@ export default {
getList(){//获取采购单 入库商品标签 getList(){//获取采购单 入库商品标签
this.assetsApipost("/api/property/GetProcurementStockInLableList", this.msg, res => { this.assetsApipost("/api/property/GetProcurementStockInLableList", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList =res.data.data let data =res.data.data
this.dataList.forEach(x=>{ data.forEach(x=>{
x.Ischeck = false x.Ischeck = false
}) })
this.stagingData = this.dataList this.stagingData = this.dataList
this.CreateDatelist = this.groupArr(this.dataList,'CreateDate') this.CreateDatelist = this.groupArr(data,'GoodsName')
this.dataList = this.CreateDatelist
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}) })
}, },
gocheke(index){ gocheke(j,index){
this.dataList[index].Ischeck = ! this.dataList[index].Ischeck; this.dataList[j].list[index].Ischeck = ! this.dataList[j].list[index].Ischeck;
let data = []; let data = [];
this.dataList.forEach((x,i)=>{ this.dataList.forEach((x,i)=>{
if(x.Ischeck==true){ x.list.forEach((j)=>{
let obj = x; if(j.Ischeck==true){
let obj = j;
data.push(obj) data.push(obj)
} }
})
}) })
...@@ -264,6 +266,7 @@ export default { ...@@ -264,6 +266,7 @@ export default {
this.checkList.forEach((x,i)=>{ this.checkList.forEach((x,i)=>{
x.page = 'page'+(i+1) x.page = 'page'+(i+1)
}); });
console.log(this.checkList)
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -272,48 +275,30 @@ export default { ...@@ -272,48 +275,30 @@ export default {
if(this.allchecked==true){ if(this.allchecked==true){
let data = []; let data = [];
this.dataList.forEach((x,i)=>{ this.dataList.forEach((x,i)=>{
x.Ischeck = true; x.list.forEach((j,i2)=>{
let obj = x; j.Ischeck = true;
obj.page = 'page'+(i+1) let obj = j;
data.push(obj) // obj.page = 'page'+(i+1)
data.push(obj)
})
}) })
this.checkList = data this.checkList = data;
this.checkList.forEach((x,i)=>{
x.page = 'page'+(i+1)
})
}else{ }else{
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
x.Ischeck = false; x.list.forEach((j)=>{
j.Ischeck = false;
})
}) })
this.checkList=[] this.checkList=[]
} }
console.log(this.checkList)
this.$forceUpdate() this.$forceUpdate()
}, },
getxzdate(){
this.dataList.forEach(x=>{
x.Ischeck = false
})
if(this.xzCreateDate==''){
this.getList()
}else{
this.CreateDatelist.forEach(x=>{
if(x.CreateDate == this.xzCreateDate ){
this.dataList=x.list
}
})
}
},
getGoodsName(){
let data = [];
this.stagingData.forEach(x=>{
x.Ischeck = false
if(x.GoodsName.indexOf(this.GoodsNames)!=-1){
data.push(x)
}
})
this.dataList =data;
console.log(this.dataList)
},
batchprint(n){//批量打印 batchprint(n){//批量打印
// debugger; // debugger;
...@@ -321,9 +306,7 @@ export default { ...@@ -321,9 +306,7 @@ export default {
let that = this let that = this
if(conunt>0){ if(conunt>0){
// http://www.c-lodop.com/LodopDemo.html 官网地址 // http://www.c-lodop.com/LodopDemo.html 官网地址
if(n ==1){
this.loading = true
}
 let page = 'page'+n  let page = 'page'+n
let LODOP = getLodop()//调用getLodop获取LODOP对象 let LODOP = getLodop()//调用getLodop获取LODOP对象
...@@ -336,6 +319,9 @@ export default { ...@@ -336,6 +319,9 @@ export default {
// LODOP.PRINT()//直接打印打印 // LODOP.PRINT()//直接打印打印
console.log(page) console.log(page)
let num = n let num = n
if(n ==1){
this.loading = true
}
if(LODOP.CVERSION){ if(LODOP.CVERSION){
LODOP.On_Return = function(TaskID, Value){ LODOP.On_Return = function(TaskID, Value){
if(Value){ if(Value){
...@@ -354,7 +340,10 @@ export default { ...@@ -354,7 +340,10 @@ export default {
that.loading = false; that.loading = false;
that.checkList=[]; that.checkList=[];
that.dataList.forEach((x,i)=>{ that.dataList.forEach((x,i)=>{
x.Ischeck = false; x.list.forEach((j)=>{
j.Ischeck = false;
})
}) })
......
src/components/empower/procurementMange.vue
View file @ 6b65504c
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<el-table-column prop="WareHouseName" label="仓库名称"></el-table-column> <el-table-column prop="WareHouseName" label="仓库名称"></el-table-column>
<el-table-column prop="TotalCostMoney" label="总价格"></el-table-column> <el-table-column prop="TotalCostMoney" label="总价格"></el-table-column>
<el-table-column prop="TotalNumber" label="总数量" width="150"></el-table-column> <el-table-column prop="TotalNumber" label="总数量" width="150"></el-table-column>
<el-table-column prop="FinanceId" label="绑定财务单据id" width="150"></el-table-column> <!-- <el-table-column prop="FinanceId" label="绑定财务单据id" width="150"></el-table-column> -->
<el-table-column prop="Remark" label="备注" width="260"></el-table-column> <el-table-column prop="Remark" label="备注" width="260"></el-table-column>
<el-table-column prop="StockInStatus" label="入库状态" width="150"> <el-table-column prop="StockInStatus" label="入库状态" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -237,7 +237,12 @@ ...@@ -237,7 +237,12 @@
<img :src="scope.row.CoverImage" alt="" style="width: 50px; height: 50px;"> <img :src="scope.row.CoverImage" alt="" style="width: 50px; height: 50px;">
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CostPrice" label="成本价格" width="100"></el-table-column> <el-table-column prop="CostPrice" label="成本价格" width="130">
<template slot-scope="scope">
<el-input placeholder="请输入内容" size='small' v-model="scope.row.CostPrice" :min="0 " type="number" style="width:100px"></el-input>
</template>
</el-table-column>
</el-table> </el-table>
<div class="Attrlist2"> <div class="Attrlist2">
<span v-for="(item,index) in x.SpecificationList" :key="index" class="Attrlist_item" v-if="item.IScheck==true" :style="{height:item.IScheck==true?'32px':'0',' margin-top':item.IScheck==true?'20px':'0'}"> <span v-for="(item,index) in x.SpecificationList" :key="index" class="Attrlist_item" v-if="item.IScheck==true" :style="{height:item.IScheck==true?'32px':'0',' margin-top':item.IScheck==true?'20px':'0'}">
...@@ -339,7 +344,7 @@ ...@@ -339,7 +344,7 @@
<span >仓库名称：{{Detaildata.WareHouseName}}</span> <span >仓库名称：{{Detaildata.WareHouseName}}</span>
<span style="margin-left:30px">总价格：￥{{Detaildata.TotalCostMoney}}</span> <span style="margin-left:30px">总价格：￥{{Detaildata.TotalCostMoney}}</span>
<span style="margin-left:30px">总数量：{{Detaildata.TotalNumber}}</span> <span style="margin-left:30px">总数量：{{Detaildata.TotalNumber}}</span>
<span style="margin-left:30px">绑定财务单据id：{{Detaildata.FinanceId}}</span> <!-- <span style="margin-left:30px">绑定财务单据id：{{Detaildata.FinanceId}}</span> -->
<div style="margin-top:10px"> <div style="margin-top:10px">
<span >创建时间:{{Detaildata.CreateDate}}</span> <span >创建时间:{{Detaildata.CreateDate}}</span>
......
src/components/sallCenter/pluginCenter.vue
View file @ 6b65504c
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<div flex="dir:left box:first" class="plugin-item"> <div flex="dir:left box:first" class="plugin-item">
<div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/em.png" style="width: 50px; height: 50px; display: block;"></div> <div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/em.png" style="width: 50px; height: 50px; display: block;"></div>
<div> <div>
<div class="display-name">授权中心</div> <div class="display-name">资产管理</div>
<div flex="box:last"><div class="name">authorize</div> <div flex="box:last"><div class="name">authorize</div>
</div> </div>
</div> </div>
......
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