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

src/api/ecw/order.js

@@ -27,9 +27,17 @@ export function deleteOrder(id) {
 }
 
 // 获得订单
-export function getOrder(id) {
+export function getOrder(orderId) {
   return request({
-    url: '/ecw/order/get?id=' + id,
+    url: '/ecw/order/info/' + orderId,
+    method: 'get'
+  })
+}
+
+// 获得订单
+export function getOrderInfo(id) {
+  return request({
+    url: '/ecw/order/info/' + id,
     method: 'get'
   })
 }

src/api/ecw/productPrice.js

@@ -52,3 +52,21 @@ export function exportProductPriceExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 批量获得产品价格
+export function getProductPriceList(query) {
+  return request({
+    url: '/ecw/product-price/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 批量修改产品价格
+export function batchUpdateProductPrice(query) {
+  return request({
+    url: '/ecw/product-price/batchUpdate',
+    method: 'put',
+    data: query
+  })
+}

src/api/ecw/warehouseArea.js

@@ -34,6 +34,14 @@ export function getWarehouseArea(id) {
   })
 }
 
+// 获得仓库查询库域
+export function getByWarehouseId() {
+  return request({
+    url: '/ecw/warehouse-area/getByWarehouseId',
+    method: 'get'
+  })
+}
+
 // 获得库区库域分页
 export function getWarehouseAreaPage(query) {
   return request({

src/components/CustomerSelector/index.vue

@@ -26,15 +26,15 @@ export default {
     },
     data(){
         return {
-            index: {},
+            index: null,
             list:[],
             loading: false
         }
     },
     watch:{
         index(val){
-            this.$emit('input', val !== null ? this.list[val].id : null)
-            this.$emit('change', val !== null ? this.list[val] : null)
+            this.$emit('input', val !== null ? this.list[val].id: null)
+            this.$emit('change', val !== null ? this.list[val]: null)
         },
         value(val){
             this.init()
@@ -45,7 +45,7 @@ export default {
     },
     methods:{
         init(){
-            if(!this.value) return null
+            if(!this.value) return
             let index = this.list.findIndex(item => item.id == this.value)
             if(index < 0){
                 getCustomer(this.value).then(res => {

src/components/CustomersSelector/index.vue

@@ -34,7 +34,12 @@
 import {getCustomerSelect, getCustomerList} from '@/api/ecw/customer'
 export default {
     props:{
-        value: [Array]
+        value: {
+            type: Array,
+            default: () => {
+                return []
+            }
+        }
     },
     data(){
         return {
@@ -60,16 +65,16 @@ export default {
         customerIds(val){
             this.$emit('input', val)
         },
-        value(val, old){
-            if(val.sort().join(',') != old.sort().join(',')){
+        value(val){
+            if(Array.from(new Set(val)).sort().join(',') != Array.from(new Set(this.customerIds)).sort().join(',')){
                 this.getChoosedList()
             }
         }
     },
     created(){
-        if(this.value && this.value.length){
+        /* if(this.value && this.value.length){
             this.getChoosedList()
-        }
+        } */
         this.reLoad()
     },
     methods:{

src/components/ProductsSelector/index.vue

@@ -44,7 +44,9 @@ export default {
   props: {
     defaultIds: {
       type: Array,
-      default: []
+      default: () => {
+        return []
+      }
     }
   },
   data() {

src/store/modules/permission.js

@@ -55,6 +55,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       title: route.name,
       icon: route.icon
     }
+    route.hidden = typeof route.isShowInMenuBar != 'undefined' && (route.isShowInMenuBar == 'false' || !route.isShowInMenuBar)
     // 处理 component 属性
     if (route.children) { // 父节点
       // debugger

src/views/ecw/offer/edit.vue

@@ -670,7 +670,7 @@ export default {
         // 添加的提交
         createOffer(data).then(response => {
           this.$modal.msgSuccess("新增成功");
-          this.$router.replace('offer/index')
+          this.$router.replace('index')
         });
       });
     },

src/views/ecw/order/detail.vue

+<template>
+  <div class="app-container">
+    <el-card class="card">
+      <div slot="header" class="card-title">订单详情-EC00636U-CNG2506-01</div>
+      <div slot="header" class="card-title">订单编号：EC00636U</div>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-descriptions class="margin-top" border title="发货人" :column="2">
+            <el-descriptions-item label="发货人">kooriookami</el-descriptions-item>
+            <el-descriptions-item label="发货人电话">18100000000</el-descriptions-item>
+            <el-descriptions-item label="发货人邮箱">18100000000</el-descriptions-item>
+            <el-descriptions-item label="发货人公司名称">
+              <el-tag size="small">学校学校学校学校</el-tag>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+        <el-col :span="12">
+          <el-descriptions class="margin-top" border title="收货人" :column="2">
+            <el-descriptions-item label="收货人">kooriookami</el-descriptions-item>
+            <el-descriptions-item label="收货人电话">18100000000</el-descriptions-item>
+            <el-descriptions-item label="收货人邮箱">18100000000</el-descriptions-item>
+            <el-descriptions-item label="收货人公司名称">
+              <el-tag size="small">学校学校学校学校</el-tag>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card class="card">
+      <div slot="header" class="card-title">物流信息/基础信息</div>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-descriptions class="margin-top" border title="物流信息" :column="2">
+            <el-descriptions-item label="始发仓">广州仓</el-descriptions-item>
+            <el-descriptions-item label="目的仓">Dubai</el-descriptions-item>
+            <el-descriptions-item label="地址" :span="2">广州市白云区鹤边鹤泰二横路民通院内第一栋捷道仓库E&C（收货时间周一至周六10:00-19：30）
+            </el-descriptions-item>
+            <el-descriptions-item label="运输方式">海运拼柜</el-descriptions-item>
+            <el-descriptions-item label="出货渠道">/</el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+        <el-col :span="12">
+          <el-descriptions class="margin-top" border title="基础信息" :column="2">
+            <el-descriptions-item label="唛头">kooriookami</el-descriptions-item>
+            <el-descriptions-item label="送货时间">2022-05-22</el-descriptions-item>
+            <el-descriptions-item label="是否控货">否</el-descriptions-item>
+            <el-descriptions-item label="填单信息">22箱 1000KG 14m³</el-descriptions-item>
+            <el-descriptions-item label="仓库实测">123箱 900Kg 11.23m³</el-descriptions-item>
+            <el-descriptions-item label="收款数据">123箱 900Kg 11.23m³</el-descriptions-item>
+            <el-descriptions-item label="入仓类型">一次到齐</el-descriptions-item>
+            <el-descriptions-item label="单证报关">我司全代</el-descriptions-item>
+            <el-descriptions-item label="代收货款">是（50000美元）</el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card class="card">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="货物详情" name="first">
+          <el-table :data="tableData" border style="width: 100%">
+            <el-table-column prop="date" label="中文品名" />
+            <el-table-column prop="name" label="英文品名" />
+            <el-table-column prop="address" label="品牌" />
+            <el-table-column prop="address" label="填单件数" />
+            <el-table-column prop="address" label="入仓件数" />
+            <el-table-column prop="address" label="单位" />
+            <el-table-column prop="address" label="货值" />
+            <el-table-column prop="address" label="材质" />
+            <el-table-column prop="address" label="体积(m3)" />
+            <el-table-column prop="address" label="重量(kg)" />
+          </el-table>
+          <!-- 分页组件 -->
+          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </el-tab-pane>
+        <el-tab-pane label="订单动态" name="second">
+          <el-timeline :reverse="true">
+            <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.timestamp">
+              {{ activity.content }}
+            </el-timeline-item>
+          </el-timeline>
+        </el-tab-pane>
+        <el-tab-pane label="运单资料/提货单" name="three">
+          <el-descriptions class="margin-top" border title="" :column="3">
+            <el-descriptions-item label="单票立即转运">是</el-descriptions-item>
+            <el-descriptions-item label="包装类型">纸箱</el-descriptions-item>
+            <el-descriptions-item label="包装要求备注">多个订单一起打包，不要单独打</el-descriptions-item>
+          </el-descriptions>
+          <el-button type="text">查看入仓单</el-button>
+          <el-button type="text" disabled>
+            <el-dropdown>
+              <span class="el-dropdown-link">
+                查看提货单<i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>海运提货单</el-dropdown-item>
+                <el-dropdown-item>空运提货单</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-button>
+          <el-button :disabled="true" type="text">装箱单未上传</el-button>
+
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { getOrder } from '@/api/ecw/order'
+export default {
+  name: "detail",
+  components: {
+
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      list: [],
+      activeName: 'first',
+      orderId: 17,
+      tableData: [],
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+      },
+      activities: [{
+        content: '活动按期开始',
+        timestamp: '2018-04-15'
+      }, {
+        content: '通过审核',
+        timestamp: '2018-04-13'
+      }, {
+        content: '创建成功',
+        timestamp: '2018-04-11'
+      }]
+    };
+  },
+  created() {
+    if (this.$route.query.orderId) {
+      this.orderId = this.$route.query.orderId
+      this.getList();
+    }
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      let that = this
+      that.loading = true;
+      // 执行查询
+      getOrder(that.orderId).then(response => {
+        that.list = response.data;
+      });
+    },
+  }
+};
+</script>
+
+<style scoped>
+.card {
+  margin-bottom: 20px;
+}
+
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409EFF;
+}
+
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+</style>

src/views/ecw/order/edit.vue

@@ -67,7 +67,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item label="*目的城市">
                     <el-form-item label="" label-width="0" style="margin-bottom: 0" prop="objectiveId" required error="目的城市必选">
-                        <el-select v-model="form.objectiveId" placeholder="请选择始发地">
+                        <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>

src/views/ecw/order/warehousing/components/warehouse-area-dialog.vue

+<template>
+  <div>
+    <el-dialog
+      title="选择储位"
+      :visible.sync="opened"
+      width="600px"
+      :before-close="handleClose()"
+    >
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane :label="item.name" :name="'' + index" v-for="(item, index) in area" :key="index">
+          <div>
+            <div style="text-align: center">区域</div>
+            <div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px">
+              <el-row :gutter="10">
+               <el-col :span="12" v-for="(warehouse, i) in item.children" :key="i">
+                 <div
+                   class="warehouse-block warehouse-block-selected"
+                   :class="{active: selected.find(domain => domain.pid === warehouse.id)}"
+                   @click="handleSelectWarehouse(warehouse)"
+                 >
+                   {{ warehouse.name }}
+                 </div>
+               </el-col>
+              </el-row>
+            </div>
+          </div>
+          <div>
+            <div style="text-align: center">仓位</div>
+
+          </div>
+          <el-divider></el-divider>
+          已选择：
+          <el-divider></el-divider>
+        </el-tab-pane>
+      </el-tabs>
+      <span slot="footer">
+        <el-button @click="opened = false">关 闭</el-button>
+        <el-button type="primary" @click="opened = false">提 交</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getByWarehouseId } from '@/api/ecw/warehouseArea'
+
+export default {
+  name: 'WarehouseAreaDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+  },
+
+  data() {
+    return {
+      opened: false,
+      key: 0,
+
+      area: [],
+      activeName: '0',
+      selected: []
+    };
+  },
+
+  watch: {
+    visible(val) {
+      if (val) {
+        this.opened = true
+      } else {
+      }
+    },
+    opened(val) {
+      if (val) {
+      } else {
+        this.$emit('update:visible', false)
+      }
+    }
+  },
+
+  methods: {
+    handleClose() {},
+    handleSelectWarehouse(warehouse) {
+      console.log(warehouse)
+    }
+  },
+
+  mounted() {
+    if (this.visible) {
+      this.opened = true
+    }
+
+    getByWarehouseId().then(r => {
+      this.area = r.data
+    })
+  },
+}
+</script>
+
+<style scoped>
+.warehouse-block{
+  background-color: white;
+  border-radius: 5px;
+  height: 42px;
+  line-height: 42px;
+  text-align: center;
+  margin-bottom: 10px;
+  cursor: pointer;
+}
+.warehouse-block:hover, .warehouse-block .active{
+  color: #ffffff;
+  background-color: #388fe5;
+}
+.warehouse-block-selected{
+  border: #388fe5 solid 5px;
+}
+</style>

src/views/ecw/order/warehousing/index.vue

+<template>
+  <div class="app-container">
+    <h2>入仓操作-NC1231231N</h2>
+    <el-descriptions border>
+      <el-descriptions-item label="唛头"></el-descriptions-item>
+      <el-descriptions-item label="已到箱数"></el-descriptions-item>
+      <el-descriptions-item label="订单状态"></el-descriptions-item>
+      <el-descriptions-item label="送货时间"></el-descriptions-item>
+      <el-descriptions-item label="运输方式"></el-descriptions-item>
+      <el-descriptions-item label="始发地"></el-descriptions-item>
+      <el-descriptions-item label="目的地"></el-descriptions-item>
+      <el-descriptions-item label="发货人姓名"></el-descriptions-item>
+      <el-descriptions-item label="发货人公司"></el-descriptions-item>
+      <el-descriptions-item label="发货人电话"></el-descriptions-item>
+      <el-descriptions-item label="收货人姓名"></el-descriptions-item>
+      <el-descriptions-item label="收货人公司"></el-descriptions-item>
+      <el-descriptions-item label="收货人电话"></el-descriptions-item>
+      <el-descriptions-item label="入仓类型"></el-descriptions-item>
+      <el-descriptions-item label="订单号"></el-descriptions-item>
+      <el-descriptions-item label="储位">
+        <el-button type="primary">选择</el-button>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <h2>货物信息</h2>
+    <el-table
+      :data="[{},{}]"
+      style="width: 100%">
+      <el-table-column
+        prop="address"
+        label="序号">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="品名">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="填单货物属性">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="入库货物属性">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="快递单号">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="最后操作时间">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="状态">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="操作">
+        <template v-slot="{row}">
+          <el-button size="mini" type="text">入仓</el-button>
+          <el-button size="mini" type="text">追加</el-button>
+          <el-button size="mini" type="text">退仓</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <h2>特殊需求</h2>
+    <el-form ref="form" :model="form" label-width="180px" style="max-width: 600px;">
+      <el-form-item label="套编织袋费">
+        <el-input v-model="form.a" placeholder="请输入套编织袋费">
+          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
+            <el-option
+              v-for="item in currencyList"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="木架包装费">
+        <el-input v-model="form.a" placeholder="请输入木架包装费">
+          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
+            <el-option
+              v-for="item in currencyList"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="纸箱包装费">
+        <el-input v-model="form.a" placeholder="请输入纸箱包装费">
+          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
+            <el-option
+              v-for="item in currencyList"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="内陆运输费">
+        <el-input v-model="form.a" placeholder="请输入内陆运输费">
+          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
+            <el-option
+              v-for="item in currencyList"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="打包费">
+        <el-input v-model="form.a" placeholder="请输入打包费">
+          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
+            <el-option
+              v-for="item in currencyList"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="易碎标签">
+        <el-input v-model="form.a" placeholder="请输入易碎标签">
+          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
+            <el-option
+              v-for="item in currencyList"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="其他费用">
+        <el-input v-model="form.a" placeholder="请输入其他费用">
+          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
+            <el-option
+              v-for="item in currencyList"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-input>
+      </el-form-item>
+
+      <div style="text-align: center">
+        <el-button type="primary">转异</el-button>
+        <el-button type="primary">完成入仓</el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import {getCurrencyList} from "@/api/ecw/currency"
+import {getOrder, getOrderInfo} from "@/api/ecw/order"
+
+export default {
+  name: "Warehousing",
+  mounted() {
+    getCurrencyList().then(res => this.currencyList = res.data)
+    getOrder(17).then(r => this.order = r.data)
+    getOrderInfo(17).then(r => this.order = r.data)
+  },
+  data() {
+    return {
+      form: {
+        a: '',
+        b: 3
+      },
+      currencyList:[],
+      order: {}
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/productPrice/index.vue

@@ -60,8 +60,10 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['ecw:product-price:create']">新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ecw:product-price:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="multiple" v-hasPermi="['ecw:product:attr']">批量设置路线</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
@@ -71,7 +73,8 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"></el-table-column>
       <el-table-column label="序号" prop="id" width="50" />
 
       <el-table-column label="商品编码" align="center" prop="productCode" >
@@ -347,6 +350,12 @@ export default {
   },
   data() {
     return {
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
       //特性列表
       attrList:[],
       typeList: [],
@@ -708,6 +717,10 @@ export default {
       this.open = true;
       this.title = "添加路线价格";
     },
+    // 批量设置路线
+    handleEdit() {
+      this.$router.push('product-price/edit?id=' + this.ids)
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       return this.$router.push('product-price/edit?id=' + row.id)
@@ -826,6 +839,12 @@ export default {
           this.$download.excel(response, '${table.classComment}.xls');
           this.exportLoading = false;
         }).catch(() => {});
+    },
+    // 表格多选
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
     }
   }
 };

src/views/system/menu/index.vue

@@ -78,6 +78,11 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="form.type == 2">
+            <el-form-item label="显示菜单" prop="isShowInMenuBar">
+              <dict-selector v-model="form.isShowInMenuBar" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" form-type="radio" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item v-if="form.type != '3'" label="菜单图标">
               <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
@@ -242,6 +247,7 @@ export default {
         parentId: 0,
         name: undefined,
         icon: undefined,
+        isShowInMenuBar: undefined,
         type: SystemMenuTypeEnum.DIR,
         sort: undefined,
         status: CommonStatusEnum.ENABLE