Commit ff6c52b4 authored by dcy's avatar dcy

Merge remote-tracking branch 'origin/dev' into dev

parents 9d3b15fb 7c54a6ee
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
"vue-ueditor-wrap": "^2.5.6", "vue-ueditor-wrap": "^2.5.6",
"vuedraggable": "2.24.3", "vuedraggable": "2.24.3",
"vuex": "3.6.0", "vuex": "3.6.0",
"xlsx": "^0.18.5",
"xml-js": "^1.6.11" "xml-js": "^1.6.11"
}, },
"devDependencies": { "devDependencies": {
......
...@@ -37,25 +37,32 @@ export default { ...@@ -37,25 +37,32 @@ export default {
.flex-1{ .flex-1{
flex: 1; flex: 1;
} }
.ml-10{ .center{
margin-left: 10px; align-content: center;
text-align: center;
} }
.mr-10{ .flex-center{
margin-right: 10px; display: flex;
} align-items: center;
.mb-10{ justify-content: center;
margin-bottom: 10px;
}
.mt-10{
margin-top: 10px;
}
.w-100{
width: 100px;
}
.w-150{
width: 150px;
} }
.w-200{ $sizes: 10,20,30,50,100,200,500,800,1000;
width: 200px; @for $i from 1 through length($sizes){
$item: nth($sizes, $i);
.ml-#{$item}{
margin-left: #{$item}px;
}
.mr-#{$item}{
margin-right: #{$item}px;
}
.mb-#{$item}{
margin-bottom: #{$item}px;
}
.mt-#{$item}{
margin-top: #{$item}px;
}
.w-#{$item}{
width: #{$item}px;
}
} }
</style> </style>
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<el-select v-model="formData.country"> <el-select v-model="formData.country">
<el-option v-for="(item) in treeList" :value="item.id" :label="item.titleZh" :key="item.id" /> <el-option v-for="(item) in treeList" :value="item.id" :label="item.titleZh" :key="item.id" />
</el-select> </el-select>
<el-select v-model="formData.province"> <el-select v-model="formData.province" class="ml-10">
<el-option v-for="(item) in provinceList" :value="item.id" :label="item.titleZh" :key="item.id" /> <el-option v-for="(item) in provinceList" :value="item.id" :label="item.titleZh" :key="item.id" />
</el-select> </el-select>
<el-select v-model="formData.city"> <el-select v-model="formData.city" class="ml-10">
<el-option v-for="(item) in cityList" :value="item.id" :label="item.titleZh" :key="item.id" /> <el-option v-for="(item) in cityList" :value="item.id" :label="item.titleZh" :key="item.id" />
</el-select> </el-select>
</div> </div>
......
This diff is collapsed.
This diff is collapsed.
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
v-hasPermi="['ecw:order:update']">特价</el-button> v-hasPermi="['ecw:order:update']">特价</el-button>
<el-button type="text" size="mini" @click="$router.push(`/order/release?orderId=${scope.row.orderId}`)">确认放货</el-button> <el-button type="text" size="mini" @click="$router.push(`/order/release?orderId=${scope.row.orderId}`)">确认放货</el-button>
<el-button type="text" size="mini" @click="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)">合单申请</el-button>
</div> </div>
</el-popover> </el-popover>
......
...@@ -185,11 +185,10 @@ export default { ...@@ -185,11 +185,10 @@ export default {
}, },
created() { created() {
if (this.$route.query.orderNo) { if (this.$route.query.orderNo) {
this.queryParams.mergedOrderNo = op.orderNo this.queryParams.mergedOrderNo = this.$route.query.orderNo
this.getList()
}else{
this.getList()
} }
this.getList()
getTradeCityList().then(res => this.tradeCityList = res.data) getTradeCityList().then(res => this.tradeCityList = res.data)
}, },
methods: { methods: {
......
...@@ -25,7 +25,11 @@ ...@@ -25,7 +25,11 @@
</el-select> </el-select>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="是否备案">{{ isBeian }}</el-descriptions-item> <el-descriptions-item label="是否备案">{{ isBeian }}</el-descriptions-item>
<el-descriptions-item label="填单参数"></el-descriptions-item> <el-descriptions-item label="填单参数">
箱数:{{ warehousing.num }}<br>
体积:{{ warehousing.volume }}<br>
重量:{{ warehousing.weight }}Kg
</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px"> <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
<el-form-item label="材质"> <el-form-item label="材质">
...@@ -160,18 +164,25 @@ export default { ...@@ -160,18 +164,25 @@ export default {
mounted() { mounted() {
getProductBrankPage({pageSize: 100000}).then(r => { getProductBrankPage({pageSize: 100000}).then(r => {
this.brandList = r.data.list.map(e => { this.brandList = [
if(e.id){ {
e.id = e.id.toString() "titleZh":"",
} "titleEn":"",
const boxGauge = e.boxGauge "id":'0'
if (boxGauge && boxGauge.length > 0) { },
const boxGaugeList = boxGauge.split('*') ...r.data.list.map(e => {
const [boxGauge1, boxGauge2, boxGauge3] = boxGaugeList if(e.id){
return {...e, boxGauge1, boxGauge2, boxGauge3} e.id = e.id.toString()
} }
return e const boxGauge = e.boxGauge
}) if (boxGauge && boxGauge.length > 0) {
const boxGaugeList = boxGauge.split('*')
const [boxGauge1, boxGauge2, boxGauge3] = boxGaugeList
return {...e, boxGauge1, boxGauge2, boxGauge3}
}
return e
})
]
}) })
}, },
......
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