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

package.json

@@ -69,6 +69,7 @@
     "vue-ueditor-wrap": "^2.5.6",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
+    "xlsx": "^0.18.5",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {

src/App.vue

@@ -37,25 +37,32 @@ export default  {
 .flex-1{
   flex: 1;
 }
-.ml-10{
-  margin-left: 10px;
+.center{
+  align-content: center;
+  text-align: center;
 }
-.mr-10{
-  margin-right: 10px;
-}
-.mb-10{
-  margin-bottom: 10px;
-}
-.mt-10{
-  margin-top: 10px;
-}
-.w-100{
-  width: 100px;
-}
-.w-150{
-  width: 150px;
+.flex-center{
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
-.w-200{
-  width: 200px;
+$sizes: 10,20,30,50,100,200,500,800,1000;
+@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>

src/components/AreaSelector/index.vue

@@ -3,10 +3,10 @@
         <el-select v-model="formData.country">
             <el-option v-for="(item) in treeList" :value="item.id" :label="item.titleZh" :key="item.id" />
         </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-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-select>
     </div>

src/views/ecw/order/index.vue

@@ -177,6 +177,7 @@
                      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/singleApply?orderNo=${scope.row.orderNo}`)">合单申请</el-button>
             </div>
 
           </el-popover>

src/views/ecw/order/singleApply.vue

@@ -185,11 +185,10 @@ export default {
   },
   created() {
     if (this.$route.query.orderNo) {
-      this.queryParams.mergedOrderNo = op.orderNo
-       this.getList()
-    }else{
-      this.getList()
+      this.queryParams.mergedOrderNo = this.$route.query.orderNo
     }
+    this.getList()
+    
     getTradeCityList().then(res => this.tradeCityList = res.data)
   },
   methods: {

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -25,7 +25,11 @@
           </el-select>
         </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 }}m³<br>
+          重量：{{ warehousing.weight }}Kg
+        </el-descriptions-item>
       </el-descriptions>
       <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
         <el-form-item label="材质">
@@ -160,18 +164,25 @@ export default {
 
   mounted() {
     getProductBrankPage({pageSize: 100000}).then(r => {
-      this.brandList = r.data.list.map(e => {
-        if(e.id){
-          e.id = e.id.toString()
-        }
-        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
-      })
+      this.brandList = [
+        {
+          "titleZh":"无",
+          "titleEn":"",
+          "id":'0'
+        },
+        ...r.data.list.map(e => {
+          if(e.id){
+            e.id = e.id.toString()
+          }
+          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
+        })
+      ]
     })
   },