snow 2 vuotta sitten
vanhempi
commit
a82a40d762

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 8 - 0
dist/static/js/0.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/app.js


+ 1 - 0
src/assets/js/statusList.js

@@ -35,6 +35,7 @@ const xs_order_source_options = [
   { id: "4", label: "平台导入" },
   { id: "5", label: "有赞平台" },
   { id: "6", label: "售后补换货" },
+  { id: "7", label: "报备转单" },
   // { id: "8", label: "支付渠道" },
   { id: "9", label: "采销录单" },
   // { id: "10", label: "结算录单" }

+ 116 - 0
src/views/sellOut/hawbWorkbench/columns.js

@@ -0,0 +1,116 @@
+const showColumns = [
+  {
+    prop: 'outCode',
+    label: '发货申请单号',
+    span: 6
+  },
+  {
+    prop: 'status',
+    label: '发货申请单状态',
+    _slot_: 'status',
+    span: 6
+  },
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    span: 6
+  },
+  {
+    prop: 'order_type',
+    label: '商品来源',
+    _slot_: 'order_type',
+    span: 6
+  },
+
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    span: 6
+  },
+
+  {
+    prop: 'sendtime',
+    label: '发货时间',
+    span: 6
+  },
+
+  {
+    prop: 'send_num',
+    label: '发货数量',
+    span: 6
+  },
+  {
+    prop: 'check_num',
+    label: '验收数量',
+    span: 6
+  },
+
+  {
+    prop: 'error_num',
+    label: '异常数量',
+    span: 6
+  },
+  {
+    prop: 'sale_price',
+    label: '商品单价',
+    _slot_: 'sale_price',
+    span: 6
+  },
+  {
+    prop: 'total_price',
+    label: '总价',
+    _slot_: 'total_price',
+    span: 6
+  },
+
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'post_name',
+    label: '快递公司',
+    span: 6
+  },
+
+  {
+    prop: 'post_fee',
+    label: '物流费用',
+    span: 6
+  },
+  {
+    prop: 'contactor',
+    label: '收货联系人',
+    span: 6
+  },
+  {
+    prop: 'mobile',
+    label: '收货联系人电话',
+    span: 6
+  },
+  {
+    prop: 'post_code',
+    label: '物流编号',
+    span: 12
+  },
+  {
+    prop: 'addr',
+    label: '收货地址',
+    span: 12
+  },
+
+  {
+    prop: 'remark',
+    label: '发货申请备注',
+    span: 24
+  },
+  {
+    prop: 'saleinfo',
+    label: 'bn仓库',
+    _slot_: 'saleinfo',
+    span: 24
+  }
+]
+
+export { showColumns }

+ 169 - 0
src/views/sellOut/hawbWorkbench/index.vue

@@ -0,0 +1,169 @@
+<template>
+  <div class="hawbWorkbench">
+    <ul class="hawbWorkbench-slider">
+      <h4 style="margin-top:15px;margin-bottom:15px">发货申请单</h4>
+      <li
+        v-for="item in list"
+        :key="item.id"
+        :class="{ active: activeKey === item.outCode}"
+        @click="onActiveKey(item)"
+      >{{ item.outCode }}</li>
+    </ul>
+
+    <div class="hawbWorkbench-main">
+      <el-collapse v-model="collapseValues">
+        <el-collapse-item title="发货申请详情" name="1">
+          <show-data-table
+            v-if="newTime"
+            :new-time="newTime"
+            :sitem="activeItem"
+            :columns="showColumns"
+          >
+            <template slot="order_type">
+              <el-tag
+                :size="'mini'"
+                v-text="
+                  (
+                    xs_order_type_options.find(
+                      (item) => item.id == activeItem.order_type
+                    ) || {}
+                  ).label || '--'
+                "
+              />
+            </template>
+
+            <template slot="status">
+              <el-tag
+                :size="'mini'"
+                :type="activeItem.status == '0' ? 'warning' : ''"
+                v-text="
+                  (statusOptions.find((item) => item.value == activeItem.status) || {})
+                    .label || '--'
+                "
+              />
+            </template>
+
+            <template slot="sale_price">
+              <span>{{ displayPrivateField(isDisplayPrivateField('2'), activeItem.sale_price) }}</span>
+            </template>
+            <template slot="total_price">
+              <span>
+                {{ displayPrivateField(isDisplayPrivateField('2'), activeItem.sale_price) }}
+              </span>
+            </template>
+          </show-data-table>
+        </el-collapse-item>
+
+        <el-collapse-item title="待分单" name="2">
+          <div style="width:100%">
+            <el-table size="mini">
+              <el-table-column prop="ckbm" label="仓库号码" />
+              <el-table-column prop="ckmc" label="仓库名称" />
+              <el-table-column prop="ywgsbm" label="业务公司编码" />
+              <el-table-column prop="ywgsmc" label="业务公司名称" />
+              <el-table-column prop="ckszgys" label="仓库所在供应商编码" />
+              <el-table-column prop="ckszgys" label="仓库所在供应商名称" />
+              <el-table-column prop="ckfzr" label="仓库负责人" />
+              <el-table-column prop="kykc" label="可用库存" />
+              <el-table-column prop="ckkfs" label="仓库可发数">
+                <el-input placeholder="仓库可发数" />
+              </el-table-column>
+            </el-table>
+
+            <div style="width:100;display: flex;justify-content: flex-end;">
+              <el-button type="primary" size="mini">保存</el-button>
+              <el-button size="mini">取消</el-button>
+            </div>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+  </div>
+</template>
+
+<script>
+import asyncRequest from '@/apis/service/sellOut/sellOutOrder'
+import { xs_order_type_options } from '@/assets/js/statusList'
+import privateField from '@/mixins/privateField'
+import { showColumns } from './columns'
+
+export default {
+  name: 'HawbWorkbench',
+  mixins: [privateField],
+  data: () => ({
+    list: [],
+    showColumns,
+    activeKey: null,
+    newTime: null,
+    activeItem: {},
+    collapseValues: ['1', '2'],
+    xs_order_type_options,
+    statusOptions: [
+      { value: '0', label: '待采购备货' },
+      { value: '1', label: '待库管发货' },
+      { value: '2', label: '已发货待收货' },
+      { value: '3', label: '已收货' },
+      { value: '4', label: '已全部退货' }
+    ]
+  }),
+  mounted() {
+    this.onSearch()
+  },
+  methods: {
+    async onSearch() {
+      const { data } = await asyncRequest.list({ size: '200' })
+      if (data.list.length > 0) {
+        this.onActiveKey(data.list[0])
+        this.list = data.list
+      }
+    },
+    onActiveKey(activeItem) {
+      this.activeItem = activeItem
+      this.activeKey = activeItem.outCode
+      this.computeTime()
+    },
+    computeTime() {
+      this.newTime = new Date().valueOf()
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "~@/styles/mixin.scss";
+.hawbWorkbench{
+  height: calc(100vh - 50px);
+  position: relative;
+  width: 100%;
+  display: flex;
+
+  &-slider{
+    height: 100%;
+    min-width: 220px;
+    padding: 0px 10px;
+    overflow-y: auto;
+    border-right: 1px solid #ccc;
+    @include scrollBar();
+
+    li{
+      width: 100%;
+      line-height: 25px;
+      margin-bottom: 8px;
+      border-radius: 5px;
+      user-select: none;
+      cursor: pointer;
+
+      &.active{
+        background-color: #f7f7f7;
+        color:#6954f0;
+      }
+    }
+  }
+
+  &-main{
+    flex: 1;
+    box-sizing: border-box;
+    padding: 10px;
+  }
+}
+</style>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä