Skip to content

J
jiedao-app-operator-master
Commit c9c44cdf authored by 我在何方's avatar 我在何方
Browse files
Options

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents df58e1f4 d746090f
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 50 deletions
src/api/ecw/product.js
View file @ c9c44cdf
......@@ -35,10 +35,11 @@ export function getProduct(id) {
}
// 获得产品列表
export function getProductList() {
export function getProductList(params) {
return request({
url: '/ecw/product/list',
method: 'get'
method: 'get',
params
})
}
......
src/components/CustomerContactsSelector/index.vue
View file @ c9c44cdf
......@@ -48,6 +48,7 @@ export default {
list:[],
queryParams:{
page: 1,
pageSize: 500,
searchKey: null,
// level: null
},
......@@ -96,7 +97,7 @@ export default {
},
getList(){
getCustomerContactsSelect(this.queryParams).then(res => {
this.list = res.data
this.list = res.data.list
})
},
choose(item){
......
src/components/CustomersSelector/index.vue
View file @ c9c44cdf
......@@ -46,6 +46,7 @@ export default {
list:[],
queryParams:{
page: 1,
pageSize: 500,
name: null,
level: null
},
......@@ -101,7 +102,7 @@ export default {
},
getList(){
getCustomerSelect(this.queryParams).then(res => {
this.list = res.data
this.list = res.data.list
})
},
choose(customer){
......
src/components/ProductsSelector/index.vue
View file @ c9c44cdf
......@@ -41,7 +41,7 @@
</div>
</template>
<script>
import { getProductPage } from '@/api/ecw/product'
import { getProductPage, getProductList } from '@/api/ecw/product'
import { getProductTypeList } from '@/api/ecw/productType'
import { getProductAttrList } from '@/api/ecw/productAttr'
......@@ -94,6 +94,9 @@ export default {
},
isAllProduct(isAllProduct){
this.$emit('setall', isAllProduct)
},
defaultIds(){
this.loadDefaultProds()
}
},
created() {
......@@ -101,11 +104,23 @@ export default {
getProductAttrList().then(res => this.attrList = res.data)
this.reLoad()
this.ids = this.defaultIds //数据回显
// 如果有默认商品则获取内容供回显
if(this.defaultIds.length){
this.loadDefaultProds()
}
},
methods: {
/* setAllProduct(status){
this.isAllProduct = true
}, */
loadDefaultProds(){
getProductList({ids: this.defaultIds.join(',')}).then(res => {
res.data.forEach(item => {
this.choose(item)
})
})
},
toggleAll(status){
this.list.forEach(item => {
this.toggleCheck(item, status)
......@@ -129,8 +144,8 @@ export default {
this.page = res.data.page
this.pages = res.data.pages
this.total = res.data.total
this.choosedList = [] //搜搜重置，数据回显
if (this.defaultIds.length > 0) {
// this.choosedList = [] //搜搜重置，数据回显
/* if (this.defaultIds.length > 0) {
this.defaultIds.map(item => {
this.list.map(items => {
if (items.id == item) {
......@@ -138,7 +153,7 @@ export default {
}
})
})
}
} */
})
},
toggleCheck(item, checked) {
......
src/views/ecw/box/ladingBill/index.vue
View file @ c9c44cdf
......@@ -118,7 +118,7 @@ export default {
dialogCfg: {
title: "",
type: "",
width: "80%",
width: "100px",
// 是否显示弹出层
visible: false,
fullscreen: false,
......@@ -198,7 +198,7 @@ export default {
}
this.currRow = row;
this.$set(this.dialogCfg, "type", type);
this.$set(this.dialogCfg, "width", "750px");
this.$set(this.dialogCfg, "width", "1000px");
this.$set(this.dialogCfg, "visible", true);
},
makeBill(row) {
......
src/views/ecw/box/ladingBill/makeLadingBill.vue
View file @ c9c44cdf
......@@ -4,7 +4,7 @@
<div class="title-orderNo">{{$t('订单号')}}：{{orderNo}}</div>
</el-row>
<el-row class="ueditor-row">
<vue-ueditor-wrap v-model="billContent" :config="editorConfig" editor-id="billUeditor" style="max-width: 690px;" />
<vue-ueditor-wrap v-model="billContent" :config="editorConfig" editor-id="billUeditor" />
</el-row>
<!-- 审核流程 -->
......@@ -71,7 +71,7 @@ export default {
"redo", //重做
"bold", //加粗
"indent", //首行缩进
"snapscreen", //截图
//"snapscreen", //截图
"italic", //斜体
"underline", //下划线
"strikethrough", //删除线
......@@ -86,9 +86,9 @@ export default {
"preview", //预览
"horizontal", //分隔线
"removeformat", //清除格式
"time", //时间
"date", //日期
"unlink", //取消链接
//"time", //时间
//"date", //日期
//"unlink", //取消链接
"insertrow", //前插入行
"insertcol", //前插入列
"mergeright", //右合并单元格
......@@ -104,7 +104,7 @@ export default {
"deletetable", //删除表格
"cleardoc", //清空文档
"insertparagraphbeforetable", //"表格前插入行"
"insertcode", //代码语言
//"insertcode", //代码语言
"fontfamily", //字体
"fontsize", //字号
"paragraph", //段落格式
......@@ -112,11 +112,11 @@ export default {
"insertimage", //多图上传
"edittable", //表格属性
"edittd", //单元格属性
"link", //超链接
"emotion", //表情
//"link", //超链接
//"emotion", //表情
"spechars", //特殊字符
"searchreplace", //查询替换
"insertvideo", //视频
//"searchreplace", //查询替换
//"insertvideo", //视频
"justifyleft", //居左对齐
"justifyright", //居右对齐
"justifycenter", //居中对齐
......@@ -131,25 +131,25 @@ export default {
"rowspacingtop", //段前距
"rowspacingbottom", //段后距
"pagebreak", //分页
"insertframe", //插入Iframe
//"insertframe", //插入Iframe
"imagenone", //默认
"imageleft", //左浮动
"imageright", //右浮动
"attachment", //附件
//"attachment", //附件
"imagecenter", //居中
"wordimage", //图片转存
"lineheight", //行间距
"edittip ", //编辑提示
//"edittip ", //编辑提示
"customstyle", //自定义标题
"autotypeset", //自动排版
"touppercase", //字母大写
"tolowercase", //字母小写
//"touppercase", //字母大写
//"tolowercase", //字母小写
"background", //背景
"scrawl", //涂鸦
"music", //音乐
//"scrawl", //涂鸦
//"music", //音乐
"inserttable", //插入表格
"drafts", // 从草稿箱加载
"charts", // 图表
//"charts", // 图表
],
],
serverUrl:
......@@ -221,7 +221,7 @@ export default {
.shipping-makeLadingBill {
.title-orderNo {
text-align: center;
font-size: 28px;
font-size: 18px;
font-weight: normal;
margin-bottom: 10px;
}
......@@ -245,4 +245,10 @@ export default {
justify-content: center;
}
}
.shippingSea-dialog{
::v-deep .el-dialog__body{
padding-top: 0;
}
}
</style>
src/views/ecw/coupon/edit.vue
View file @ c9c44cdf
......@@ -52,7 +52,8 @@
</div>
</el-form-item>
<el-form-item label="*运费" v-if="[2,3,4,5,6,7].indexOf(form.type) > -1">
<el-form-item label="运费" v-if="[2,3,4,5,6,7].indexOf(form.type) > -1">
<span slot="label"><span style="color: red">*</span>运费</span>
<div class="fee-item" v-for="(item, index) in fee[1]" :key="index">
<template v-if="[1,2,3,4,5].indexOf(form.type) > -1">
{{$t('满')}}
......@@ -178,7 +179,8 @@
prop="suitableLineType"
v-if="form.type != 1"
>
<dict-selector :type="DICT_TYPE.ECW_SUITABLE_LINE_TYPE" v-model="form.suitableLineType" />
<!---第一个不是全部，所以不能使用defaultable-->
<dict-selector :type="DICT_TYPE.ECW_SUITABLE_LINE_TYPE" v-model="form.suitableLineType" formatter="number" />
<routers-selector v-if="showRouterSelector" v-model="form.lineIds" style="margin-top:5px" />
</el-form-item>
<el-form-item
......@@ -187,7 +189,7 @@
v-if="form.type != 1"
>
<!-- <dict-selector :type="DICT_TYPE.ECW_SUITABLE_PROD_TYPE" v-model="form.suitableProdType" /> -->
<products-selector v-model="form.prodIds" />
<products-selector v-model="form.prodIds" :default-ids="form.prodIds" />
</el-form-item>
<el-form-item
:label="$t('订单属性')"
......@@ -358,6 +360,7 @@ export default {
this.$set(this.form, 'isCargoControlArr', ["0"])
this.$set(this.form, 'orderAttrArr', ["2","3","1"])
this.$set(this.form, 'brandArr', ["0","1"])
this.$set(this.form, 'suitableLineType', 0)
}
},
'form.isSimilarSuperposition'(val){
......@@ -420,6 +423,13 @@ export default {
if(this.$route.query.action == 'copy'){
this.form.couponId = null
}
// 对没有默认值的给一个空表单
[1,2].forEach(type => {
if(!this.fee[type].length){
this.fee[type] = [{type}]
}
})
})
}
// 不是编辑查看则给默认的费用表格
......
src/views/ecw/order/cargoControl.vue
View file @ c9c44cdf
......@@ -166,7 +166,7 @@ import TransferCargo from '@/views/ecw/order/components/TransferCargo'
import Fallback from './components/Fallback'
export default {
name: "OrderCargonControl",
name: "EcwOrderCargonControl",
components: {
CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo, Fallback
},
......@@ -224,6 +224,9 @@ export default {
return Object.assign({}, this.queryParams, timeParams)
}
},
activated(){
this.handleQuery()
},
created() {
this.getList();
getProductAttrList().then(res => this.productAttrList = res.data)
......
src/views/ecw/order/detail.vue
View file @ c9c44cdf
......@@ -45,7 +45,7 @@
<el-descriptions border :title="$t('物流信息')" :column="2">
<el-descriptions-item :label="$t('始发仓')">{{order.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')">{{order.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
<el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
<el-descriptions-item :label="$t('运输方式')" :span="2">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item>
......@@ -145,7 +145,11 @@
{{order.inWarehouseState > 1 && row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : row.weight}}
</template>
</el-table-column>
<el-table-column prop="warehouseInInfoVO.quantityAll" :label="$t('数量') + '(个)'" width="90px"/>
<el-table-column prop="warehouseInInfoVO.quantityAll" :label="$t('数量') + '(个)'" width="90px">
<template slot-scope="{row}">
{{order.inWarehouseState > 1 ? row.warehouseInInfoVO.quantityAll : row.quantity}}
</template>
</el-table-column>
<el-table-column prop="" :label="$t('费用类型')">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.isPayAdvance" />
......
src/views/ecw/order/edit.vue
View file @ c9c44cdf
......@@ -163,7 +163,7 @@
{{$t('件数')}} <span class="red">*</span>
</template>
<template slot-scope="{row}">
<el-input v-model.number="row.num" :disabled="!canAddProduct || !productEditable" />
<el-input v-model.number="row.num" @keyup.native="checkPositiveInterge(row, 'num')" :disabled="!canAddProduct || !productEditable" />
</template>
</el-table-column>
<el-table-column :label="$t('包装单位')" width="100px">
......@@ -176,17 +176,33 @@
</el-table-column>
<el-table-column :label="$t('数量') + '(个)'" width="120px">
<template slot-scope="{row}">
<el-input v-model="row.quantity" type="number" @keyup.native="checkQuantity(row)" :disabled="!canAddProduct || !productEditable" />
<el-input v-model="row.quantity" @keyup.native="checkPositiveInterge(row, 'quantity')" :disabled="!canAddProduct || !productEditable" />
</template>
</el-table-column>
<el-table-column :label="$t('总体积') + '(m³)'" width="100px">
<template slot-scope="{row}">
<el-input v-model="row.volume" :disabled="!canAddProduct || !productEditable" />
<template slot-scope="scope">
<el-form-item label=""
:prop="`orderItemVOList.${scope.$index}.volume`"
:rules="[
{ type: 'number', min: 0, message: $t('体积错误'), trigger: 'blur'}
]"
class="mb-0 mr-0"
>
<el-input v-model.number="scope.row.volume" :disabled="!canAddProduct || !productEditable" />
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="$t('总重量') + '(kg)'" width="100px">
<template slot-scope="{row}">
<el-input v-model="row.weight" :disabled="!canAddProduct || !productEditable" />
<template slot-scope="scope">
<el-form-item label=""
:prop="`orderItemVOList.${scope.$index}.weight`"
:rules="[
{ type: 'number', min: 0, message: $t('重量错误'), trigger: 'blur'}
]"
class="mb-0 mr-0"
>
<el-input v-model.number="scope.row.weight" :disabled="!canAddProduct || !productEditable" />
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="$t('总货值') + '(RMB)'" width="100px">
......@@ -196,12 +212,13 @@
<template slot-scope="scope">
<el-form-item label=""
:prop="`orderItemVOList.${scope.$index}.worth`"
:rules="{
required: true, message: $t('货值不能为空'), trigger: 'blur'
}"
:rules="[
{ required: true, message: $t('货值不能为空'), trigger: 'blur'},
{ type: 'number', min: 0, message: $t('货值错误'), trigger: 'blur'}
]"
class="mb-0 mr-0"
>
<el-input v-model="scope.row.worth" :disabled="!canAddProduct" @input="calculationPrice" type="number" />
<el-input v-model.number="scope.row.worth" :disabled="!canAddProduct" @input="calculationPrice" type="number" />
</el-form-item>
</template>
</el-table-column>
......@@ -509,7 +526,7 @@ import WorkFlow from '@/components/WorkFlow'
// 缓存默认的表单数据
let defaultFormData = null
window.Decimal = Decimal
export default {
name: "EcwOrderEdit",
components: {
......@@ -925,9 +942,16 @@ export default {
this.$set(row, 'link', value)
})
},
checkQuantity(row){
row.quantity = row.quantity.replace(/[^\d]/g, '')
// 检查正整数
checkPositiveInterge(row, field){
row[field] = row[field].replace(/[^\d]/g, '')
},
/* // 检查正数
checkPositive(row, field){
if(row.field < 0){
row[field] = 0
}
}, */
/* onFileChoosed(e){
window.choosed = e
console.log('onFileChoosed', e)
......
src/views/ecw/order/exception/index.vue
View file @ c9c44cdf
......@@ -157,7 +157,7 @@ import CustomerSelector from '@/components/CustomerSelector'
import ProductSelector from '@/components/ProductSelector'
export default {
name: "Exception",
name: "EcwOrderException",
components: {
CustomerSelector,ProductSelector
},
......@@ -181,6 +181,9 @@ export default {
tradeCityList:[],
};
},
activated(){
this.handleQuery()
},
created() {
this.getList();
getTradeCityList().then(res => this.tradeCityList = res.data)
......
src/views/ecw/order/index.vue
View file @ c9c44cdf
......@@ -416,7 +416,7 @@ import PickupLog from './components/PickupLog'
import {getWarehouseList} from '@/api/ecw/warehouse'
import { getCurrencyPage } from "@/api/ecw/currency";
export default {
name: "Order",
name: "EcwOrderIndex",
components: {
UserSelector,
FeeApplication,
......@@ -526,6 +526,9 @@ export default {
}
}
},
activated(){
this.handleQuery()
},
created() {
this.getTransportFromRoute()
this.getList();
......
src/views/ecw/order/mine.vue
View file @ c9c44cdf
......@@ -4,6 +4,7 @@
<script>
import Index from './index'
export default {
name: 'EcwOrderMine',
components: {Index}
}
</script>
\ No newline at end of file
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