Skip to content

J
jiedao-app-operator-master
Commit 1ea531c3 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

解决一些bug

parent 8bfd7470
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 48 deletions
public/static/LodopFuncs.js
View file @ 1ea531c3
......@@ -123,7 +123,7 @@ function getLodop(oOBJECT, oEMBED) {
if (!LODOP && LoadJsState !== "complete") {
if (!LoadJsState)
alert("未曾加载Lodop主JS文件，请先调用loadCLodop过程."); else
alert("网页还没下载完毕，请稍等一下再操作." + LoadJsState);
alert("打印插件未初始化完毕，请稍等一下再操作");
return;
}
var strAlertMessage;
......@@ -134,7 +134,8 @@ function getLodop(oOBJECT, oEMBED) {
strAlertMessage = strLodop7Install_ARM;
else
strAlertMessage = strCLodopInstallA + (CLodopIsLocal ? strCLodopInstallB : "");
document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
// document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
window.open('', '_blank', 'width=500,height=300,menubar=no,toolbar=no, status=no,scrollbars=no').document.write(strAlertMessage + strInstallOK)
return;
} else {
if (isLinuxX86 && LODOP.CVERSION < "7.0.4.3")
......@@ -144,8 +145,10 @@ function getLodop(oOBJECT, oEMBED) {
else if (CLODOP.CVERSION < "6.5.6.6")
strAlertMessage = strCLodopUpdate;
if (strAlertMessage)
document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
if (strAlertMessage){
window.open('', '_blank', 'width=500,height=300,menubar=no,toolbar=no, status=no,scrollbars=no').document.write(strAlertMessage + strInstallOK)
}
/* document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML; */
}
} else {
//==如果页面有Lodop插件就直接使用,否则新建:==
......
src/components/ProductsSelector/index.vue
View file @ 1ea531c3
......@@ -10,7 +10,7 @@
<el-option v-for="item in attrList" :key="item.id" :label="item.attrName" :value="item.id" />
</el-select>
<el-input v-model="queryParams.titleZh" placeholder="产品关键字" style="width:120px" clearable />
<el-button type="primary" @click="reLoad">搜搜</el-button>
<el-button type="primary" @click="reLoad">搜索</el-button>
</div>
<div class="list">
<div class="item" v-for="item in list" :key="item.id">
......@@ -55,7 +55,8 @@ export default {
page: 1,
pages: 1,
queryParams: {
page: 1,
pageNo: 1,
pageSize: 100000,
attrId: null,
titleZh: null,
typeId: null
......
src/views/ecw/order/components/PrintLadingBill.vue
View file @ 1ea531c3
......@@ -98,7 +98,7 @@ export default {
// 直接打印 */
}).catch(err => {
console.error('lodop异常', err)
alert('请检查LODOP打印控件是否安装并启动');
// alert('请检查LODOP打印控件是否安装并启动');
})
......
src/views/ecw/order/components/PrintWarehouseReceipt.vue
View file @ 1ea531c3
......@@ -164,7 +164,7 @@ export default {
// 直接打印 */
}).catch(err => {
console.error('lodop异常', err)
alert('请检查LODOP打印控件是否安装并启动');
// alert('请检查LODOP打印控件是否安装并启动');
})
})
......
src/views/ecw/order/edit.vue
View file @ 1ea531c3
......@@ -6,44 +6,44 @@
<div slot="header" class="card-title">新建订单</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="*发货人" >
<el-descriptions-item label="*发货人" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consignorContactsId" required error="发货人不能为空">
<customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="电话">
<el-descriptions-item label="电话" :labelStyle="labelStyle">
{{consignorContact.phoneNew || '无'}}
</el-descriptions-item>
<el-descriptions-item label="发货人公司">
<el-descriptions-item label="发货人公司" :labelStyle="labelStyle">
{{consignorContact.customerName || '无'}}
</el-descriptions-item>
<el-descriptions-item label="Email">
<el-descriptions-item label="Email" :labelStyle="labelStyle">
{{consignorContact.email || '无'}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="3" border>
<el-descriptions-item label="*收货人" >
<el-descriptions-item label="*收货人" :labelStyle="labelStyle" >
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeContactsId" required error="收货人不能为空">
<customer-contact-selector v-model="form.consigneeContactsId" @change="consigneeContact = $event" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="电话">
<el-descriptions-item label="电话" :labelStyle="labelStyle">
{{consigneeContact.phoneNew || '无'}}
</el-descriptions-item>
<el-descriptions-item label="收货人公司">
<el-descriptions-item label="收货人公司" :labelStyle="labelStyle">
{{consigneeContact.customerName || '无'}}
</el-descriptions-item>
<el-descriptions-item label="Email">
<el-descriptions-item label="Email" :labelStyle="labelStyle">
{{consigneeContact.email || '无'}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="3" border>
<el-descriptions-item label="*运输方式">
<el-descriptions-item label="*运输方式" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="transportId" required error="请选择运输方式">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="出货渠道">
<el-descriptions-item label="出货渠道" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="channelId" :required="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'" error="请选择出货渠道">
<selector
:disabled="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass != 'channel'"
......@@ -56,21 +56,21 @@
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="2" border>
<el-descriptions-item label="*始发城市">
<el-descriptions-item label="*始发城市" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="departureId" required error="始发地必选">
<el-select v-model="form.departureId" placeholder="请选择始发地">
<el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="*目的城市">
<el-descriptions-item label="*目的城市" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="objectiveId" required error="目的城市必选">
<el-select v-model="form.objectiveId" placeholder="请选择目的地">
<el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="*请选择线路" :span="2">
<el-descriptions-item label="*请选择线路" :span="2" :labelStyle="labelStyle">
<el-row :gutter="10">
<el-col :span="12">
<el-input :value="getRouterNameById(form.lineId)" readonly placeholder="请在右侧选择线路"></el-input>
......@@ -437,7 +437,8 @@ export default {
// 表单校验
rules: {
}
},
labelStyle: 'width:120px'
};
},
computed:{
......
src/views/ecw/order/index.vue
View file @ 1ea531c3
......@@ -178,16 +178,17 @@
</div>
</el-popover>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:order:update']">编辑</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/warehousing?id=' + scope.row.orderId)"
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:order:update']">编辑</el-button> -->
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/warehousing?id=' + scope.row.orderId)"
v-hasPermi="['ecw:order:update']">入仓</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:order:update']">退仓</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/special?id=' + scope.row.orderId)"
v-hasPermi="['ecw:order:update']">特价</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:order:delete']">删除</el-button>
v-hasPermi="['ecw:order:update']">退仓</el-button> -->
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/special?id=' + scope.row.orderId)"
v-hasPermi="['ecw:order:update']">特价</el-button> -->
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:order:delete']">删除</el-button> -->
<!--仓库相关的-->
<el-popover
style="margin-left: 10px;"
......
src/views/ecw/productAttr/edit.vue
View file @ 1ea531c3
......@@ -7,38 +7,30 @@
</el-form-item>
<el-form-item label="货柜位置" prop="containerLocation">
<el-checkbox style="width: 100px" v-model="checked[0]">需要修改</el-checkbox>
<dict-selector v-if="checked[0]" :type="DICT_TYPE.ECW_CONTAINER_LOCATION" v-model="form.containerLocation" />
<dict-selector :type="DICT_TYPE.ECW_CONTAINER_LOCATION" v-model="form.containerLocation" />
</el-form-item>
<el-form-item label="出运要求" prop="requirements">
<el-checkbox style="width: 100px;margin-right: 0;" v-model="checked[1]">需要修改</el-checkbox>
<el-checkbox v-if="checked[1]" true-label="1" v-model="form.requirements">证书要求（支持多证书）</el-checkbox>
<el-checkbox true-label="1" v-model="form.requirements">证书要求（支持多证书）</el-checkbox>
</el-form-item>
<el-form-item label="方数要求" prop="square">
<el-checkbox style="width: 100px" v-model="checked[2]">需要修改</el-checkbox>
<el-input v-if="checked[2]" v-model="form.square" placeholder="" style="width: 200px"></el-input>
<el-input v-model="form.square" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="包装要求" prop="packaging">
<el-checkbox style="width: 100px" v-model="checked[3]">需要修改</el-checkbox>
<dict-selector v-if="checked[3]" :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="form.packaging" />
<dict-selector :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="form.packaging" />
</el-form-item>
<el-form-item label="需要预约入仓" prop="needBook">
<el-checkbox style="width: 100px" v-model="checked[4]">需要修改</el-checkbox>
<dict-selector v-if="checked[4]" formatter="bool" form-type="radio" :type="DICT_TYPE.ECW_YESNO" v-model="form.needBook" :formater="Boolean" />
<dict-selector formatter="bool" form-type="radio" :type="DICT_TYPE.ECW_YESNO" v-model="form.needBook" :formater="Boolean" />
</el-form-item>
<el-form-item label="每日入仓上限" prop="dayLimit">
<el-checkbox style="width: 100px" v-model="checked[5]">需要修改</el-checkbox>
<el-input v-if="checked[5]" placeholder="" v-model="form.dayLimit" style="width: 200px">
<el-input placeholder="" v-model="form.dayLimit" style="width: 200px">
<template slot="suffix">立方米</template>
</el-input>
</el-form-item>
<el-form-item label="商品特性" prop="attrId">
<el-checkbox style="width: 100px" v-model="checked[6]">需要修改</el-checkbox>
<dict-selector v-if="checked[6]" form-type="checkbox" :type="DICT_TYPE.ECW_ORDER_ATTR" v-model="form.attrId" multiple />
<dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_ORDER_ATTR" v-model="form.attrId" multiple />
</el-form-item>
<el-form-item label="商品材质" prop="materialType">
<el-checkbox style="width: 100px" v-model="checked[7]">需要修改</el-checkbox>
<dict-selector v-if="checked[7]" form-type="checkbox" :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.materialType" multiple />
<dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.materialType" multiple />
</el-form-item>
<el-form-item>
......@@ -80,7 +72,7 @@ export default {
},
// 表单校验
rules: {},
checked: [false, false, false, false, false, false, false, false]
// checked: [false, false, false, false, false, false, false, false]
};
},
computed: {
......
src/views/ecw/productAttr/index.vue
View file @ 1ea531c3
......@@ -25,6 +25,7 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="属性名称" align="center" prop="attrName" />
<el-table-column label="属性代码" align="center" prop="attrCode" />
......
src/views/ecw/productPrice/edit.vue
View file @ 1ea531c3
......@@ -160,7 +160,7 @@
<div style="margin: 20px 0">
<el-button @click="submitForm" type="primary">确认提交</el-button>
<el-button type="default" @click="$router.back">返回上一页</el-button>
<el-button type="default" @click="$router.back()">返回上一页</el-button>
</div>
</div>
</template>
......
src/views/ecw/productPrice/index.vue
View file @ 1ea531c3
......@@ -366,11 +366,13 @@ export default {
},
activated() {
console.log('activated')
let typeId = this.$route.query.product_type;
if(typeId) {
if(!this.queryParams.typeId || this.queryParams.typeId != typeId)
this.$set(this.queryParams, 'typeId', +typeId);
}
this.handleQuery()
},
created() {
......
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