Merge branch 'live' into sit

src/apis/components/goods-class.js

@@ -0,0 +1,7 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 列表
+  list: (data, params) => http(api + "catlist", data, "post", params),
+};
+   

src/apis/components/process-time-line.js

@@ -0,0 +1,7 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 列表
+  list: (data, params) => http(api + "process", data, "post", params),
+};
+   

src/apis/components/search-customer.js

@@ -2,6 +2,6 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 列表
-  list: (data, params) => http(api + "customerlist", data, "post", params),
+  list: (data, params) => http(api + "infolist", data, "post", params),
 };
    

src/apis/components/search-express.js

@@ -0,0 +1,7 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+    // 快递列表
+    list: (data, params) => http(api + "express", data, "post", params),
+
+};

src/apis/service/goodsService/index.js

@@ -0,0 +1,26 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "aftercreate", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "afterlist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "afterinfo", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "afterstatus", data, "post", params),
+  // 异常原因接口
+  reasonList: (data, params) => http(api + "resultlist", data, "post", params),
+  // 物流反馈
+  afterFeed: (data, params) => http(api + "afterfeed", data, "post", params),  
+  
+ // 售后快递录入
+  afterPost : (data, params) => http(api + "afterpost ", data, "post", params),  
+
+};
+   

src/apis/service/process/oing/index.js

@@ -7,7 +7,7 @@ export default {
   // 删除
   delete: (data, params) => http(api + 'delete', data, 'post', params),
   // 分页查询
-  list: (data, params) => http(api + 'grouplist', data, 'post', params),
+  list: (data, params) => http(api + 'processlist', data, 'post', params),
   // 详情
   detail: (data, params) => http(api + 'groupinfo', data, 'post', params),
   // 更新

src/apis/service/purchaseIn/goodsClass/index.js

@@ -0,0 +1,21 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "catcreate", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "catplist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "catinfo", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "catedit", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "catstatus", data, "post", params),
+  // 商品分类列表
+  goodsList: (data, params) => http(api + "catlist", data, "post", params),
+
+};
+   

src/apis/service/purchaseIn/purchaseDiffOrder/index.js

@@ -0,0 +1,18 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "cgddiffcreat", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "cgddifflist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "cgddiffinfo", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "accountstatus", data, "post", params),
+};
+   

src/apis/service/sellOut/consultSheet/index.js

@@ -0,0 +1,18 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "Consultdel", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "Consultlist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "Consultinfo", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "accountstatus", data, "post", params),
+};
+   

src/apis/service/sellOut/returnOrder/index.js

@@ -0,0 +1,25 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "orderbacklist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "orderbackinfo", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "orderbackexam", data, "post", params),
+  // 验货审核
+  check: (data, params) => http(api + "orderbce", data, "post", params),
+  // 退货验货
+  returnCheck: (data, params) => http(api + "orderbackcheck", data, "post", params),
+  // 获取异常原因
+  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
+
+};
+   

src/apis/service/sellOut/salesOrder/detail.js

@@ -3,17 +3,25 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 添加
-  add: (data, params) => http(api + "add", data, "post", params),
+  add: (data, params) => http(api + "salecreate", data, "post", params),
   // 删除
-  delete: (data, params) => http(api + "delete", data, "post", params),
+  delete: (data, params) => http(api + "saledelect", data, "post", params),
   // 详情
-  detail: (data, params) => http(api + "cgdinfo", data, "post", params),
+  detail: (data, params) => http(api + "saleinfo", data, "post", params),
   // 更新
-  update: (data, params) => http(api + "cgdedit", data, "post", params),
+  update: (data, params) => http(api + "saleedit", data, "post", params),
   // 修改状态
-  status: (data, params) => http(api + "cgdstatus", data, "post", params),
-  // 新建入库单
-  orderinadd: (data, params) => http(api + "orderinadd", data, "post", params),
+  status: (data, params) => http(api + "salestatus", data, "post", params),
+  // 获取仓库商品列表
+  getGoodStock: (data, params) => http(api + "checkflist", data, "post", params),
+  // 采购反馈物流费用
+  salefee: (data, params) => http(api + "salefee", data, "post", params),
+  // 新建销售出库单
+  saleout: (data, params) => http(api + "saleout", data, "post", params),
+
+
+
+
   // 新建入库单详情
   orderininfo: (data, params) => http(api + "orderininfo", data, "post", params),
   // 异常原因列表

src/apis/service/sellOut/sellReturnList/index.js

@@ -0,0 +1,21 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "orderbacklist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "detail", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "accountstatus", data, "post", params),
+  // 
+  getReason: (data, params) => http(api + "resultlist", data, "post", params),
+
+};
+   

src/apis/service/sellOut/serviceDetail/index.js

@@ -0,0 +1,18 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "list", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "detail", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "accountstatus", data, "post", params),
+};
+   

src/apis/service/sellOut/customer/index.js → src/apis/service/serviceParam/customer/index.js

@@ -6,7 +6,7 @@ export default {
   // 删除
   delete: (data, params) => http(api + "resultdel", data, "post", params),
   // 列表
-  list: (data, params) => http(api + "infolist", data, "post", params),
+  list: (data, params) => http(api + "customerlist", data, "post", params),
   // 详情
   detail: (data, params) => http(api + "resultselect", data, "post", params),
   // 更新

src/apis/service/serviceParam/expressSet/index.js

@@ -0,0 +1,22 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 快递列表
+  list: (data, params) => http(api + "expresslist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "detail", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改快递状态
+  status: (data, params) => http(api + "expressuse", data, "post", params),
+  // 可用快递列表
+  
+  canList: (data, params) => http(api + "express", data, "post", params),
+
+};
+   

src/apis/service/serviceParam/purchaseInReturn/index.js

@@ -0,0 +1,21 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 商品列表查询
+  list: (data, params) => http(api + "resultlist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "detail", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改商品上下架状态
+  status: (data, params) => http(api + "resultstatu", data, "post", params),
+  // 供应商列表
+  // supplierlist: (data, params) => http(api + "supplierlist", data, "post", params),
+
+};
+   

src/apis/service/serviceParam/sellReturn/index.js

@@ -0,0 +1,21 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 商品列表查询
+  list: (data, params) => http(api + "resultlist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "detail", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改商品上下架状态
+  status: (data, params) => http(api + "resultstatu", data, "post", params),
+  // 供应商列表
+  // supplierlist: (data, params) => http(api + "supplierlist", data, "post", params),
+
+};
+   

src/apis/service/stock/survey/index.js

@@ -15,6 +15,6 @@ export default {
   // 修改状态
   status: (data, params) => http(api + "accountstatus", data, "post", params),
   // 库存数据
-  stockLisk:(data, params) => http(api + "goodstock", data, "post", params)
+  getstockwsm:(data, params) => http(api + "goodstat", data, "post", params)
 };
    

src/assets/js/btnList.js

@@ -31,6 +31,17 @@ const btnList = [
   { code: "030", name: "备货入库验收审核" },
   { code: "031", name: "入库审核" },
   { code: "032", name: "退货物流" },
+  { code: "033", name: "采购反馈物流费" },
+  { code: "034", name: "售后业务审核" },
+  { code: "035", name: "供货商反馈" },
+  { code: "036", name: "采购审核" },
+  { code: "037", name: "通知库管岗" },
+  { code: "038", name: "通知采购部门" },
+  { code: "039", name: "通知财务部门" },
+  { code: "040", name: "物流反馈" },
+  { code: "041", name: "退货业务审核" },
+  { code: "042", name: "退货验收审核" },
+
   
 ];
 export default btnList;

src/components/github-corner/main.vue

@@ -1,63 +0,0 @@
-<template>
-  <a
-    href="https://github.com/PanJiaChen/vue-element-admin"
-    target="_blank"
-    class="github-corner"
-    aria-label="View source on Github"
-  >
-    <svg
-      width="80"
-      height="80"
-      viewBox="0 0 250 250"
-      style="fill: #40c9c6; color: #fff"
-      aria-hidden="true"
-    >
-      <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z" />
-      <path
-        d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
-        fill="currentColor"
-        style="transform-origin: 130px 106px"
-        class="octo-arm"
-      />
-      <path
-        d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z"
-        fill="currentColor"
-        class="octo-body"
-      />
-    </svg>
-  </a>
-</template>
-<script>
-export default {
-  name: "GithubCorner",
-};
-</script>
-<style scoped>
-.github-corner:hover .octo-arm {
-  animation: octocat-wave 560ms ease-in-out;
-}
-
-@keyframes octocat-wave {
-  0%,
-  100% {
-    transform: rotate(0);
-  }
-  20%,
-  60% {
-    transform: rotate(-25deg);
-  }
-  40%,
-  80% {
-    transform: rotate(10deg);
-  }
-}
-
-@media (max-width: 500px) {
-  .github-corner:hover .octo-arm {
-    animation: none;
-  }
-  .github-corner .octo-arm {
-    animation: octocat-wave 560ms ease-in-out;
-  }
-}
-</style>

src/components/globalComponents/class-tree/main.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="staff-tree">
+    <div v-if="list && list.length > 0">
+      <div class="staff" v-for="(item, index) in list" :key="'user' + index">
+        <i class="el-icon-s-custom user-box"></i>
+        <span class="staff-name">{{ item.nickname }}</span>
+        <span class="btn-list" @click="(e) => e.stopPropagation()">
+          <el-button
+            v-if="powers.some((item) => item == '005')"
+            :type="item.position === '1' ? 'primary' : 'info'"
+            size="mini"
+            @click="setUpEdit($event, item.id, item.position)"
+          >
+            设为负责人
+          </el-button></span
+        >
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "goodsTree",
+  components: {},
+  props: ["list", "level"],
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "goodsTree"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    return {
+      newlist: "",
+      index: 0, // icon 箭头
+    };
+  },
+  methods: {
+    setUpEdit(e, id, position) {
+      this.$emit("setUpEdit", id, position);
+    },
+  },
+};
+</script>
+<style lang="scss" >
+.staff-tree {
+  margin-left: 18px;
+  cursor: pointer;
+  // border: 1px solid #ccc;
+  // border-radius: 6px;
+  .no-data {
+    text-align: center;
+    line-height: 50px;
+    color: #666;
+    border: 1px solid #ccc;
+    border-radius: 6px;
+  }
+  .el-button--mini {
+    padding: 6px 10px;
+    margin-top: 5px;
+  }
+  .staff-tree-node:nth-of-type(odd) {
+    background: rgba(75, 157, 177, 0.1);
+  }
+  .staff-tree-node:nth-of-type(even) {
+    background: rgba(249, 168, 110, 0.1);
+  }
+
+  .staff {
+    // padding:0 0 0 5px;
+    // background: #eee;
+    .btn-list {
+      display: block;
+      float: right;
+    }
+    .user-box {
+      display: inline-block;
+      vertical-align: top;
+      width: 25px;
+      height: 25px;
+      line-height: 25px;
+      font-size: 15px;
+      text-align: center;
+      border-radius: 50%;
+      overflow: hidden;
+      background: #63cbe7;
+      color: #fff;
+      margin: 6px 5px 0 3px;
+      small {
+        font-size: 8px;
+      }
+    }
+    .staff-name {
+      display: inline-block;
+      height: 38px;
+      line-height: 38px;
+      vertical-align: top;
+    }
+  }
+}
+</style>

src/components/globalComponents/goodClass/main.vue

@@ -0,0 +1,142 @@
+<template>
+  <div class="select-goodsClass">
+    <el-cascader
+     v-loading="loading"
+      style="width: 100%"
+      :disabled="disabled"
+      v-model="value"
+      :options="options"
+      :placeholder="placeholder || ''"
+      :size="size || 'medium'"
+      :props="props"
+      @change="handleChange"
+    ></el-cascader>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/components/goods-class";
+import resToken from "@/mixins/resToken";
+import { isArray } from "@/utils/validate";
+export default {
+  name: "goodClass",
+  mixins: [resToken],
+  props: ["size", "value", "placeholder", "isDetail", "disabled"],
+  /**
+   * 属性集合
+   * @param {String}        size             : 组件大小            非必填
+   * @param {Array}         value            : 选中值              必填
+   * @param {String}        placeholder      : 提示信息            非必填
+   * @param {Boolean}       isDetail         : 是否是详情逻辑       必填
+   * @param {Boolean}       disabled         : 是否禁用            必填
+   */
+  /**
+   * 事件集合
+   * @searchChange             : 选中值变化调用   抛出选中数据
+   */
+  data() {
+    return {
+      loading: false,
+      options: [],
+      selectLoading: false,
+      props: {
+        label: "cat_name",
+        value: "id",
+        children: "child",
+        checkStrictly: true
+      },
+    };
+  },
+  // watch: {
+  //   // value: function (val, old) {
+  //   //   if (val) {
+  //   //     this.loading = true;
+  //   //     setTimeout(() => {
+  //   //       this.loading = false;
+  //   //     }, 10);
+  //   //   }
+  //   // },
+  // },
+  created() {
+    this.options = [];
+    this.getInfo();
+    this.selectLoading = false;
+  },
+  methods: {
+    handleChange(value) {
+      this.$emit("handleChange", value);
+    },
+    async selectChange(e) {
+      if (e && e.length > 0) {
+        let index = this.options.findIndex((v) => v.code === e[0]);
+        if (index !== -1) {
+          let model = {
+            id: this.options[index].id,
+            code: this.options[index].code,
+            label: this.options[index].name,
+          };
+          this.$emit("searchChange", model);
+        } else {
+          this.$emit("searchChange", {});
+        }
+      } else {
+        this.$emit("searchChange", {});
+      }
+    },
+    delChild(list) {
+      let arr = [];
+      list.forEach((v) => {
+        let sitem = JSON.parse(JSON.stringify(v));
+        if (isArray(sitem.child) && sitem.child.length === 0) {
+          delete sitem["child"];
+        } else if (isArray(sitem.child) && sitem.child.length > 0) {
+          sitem.child = this.delChild(sitem.child);
+        }
+        arr.push(sitem);
+      });
+      return arr;
+    },
+    async getInfo() {
+      this.selectLoading = true;
+      let res = await asyncRequest.list({});
+      if (res && res.code === 0 && res.data) {
+        let arr = res.data;
+        let list = [];
+
+        list = this.delChild(arr);
+        this.options = list;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.selectLoading = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.select-goodsClass {
+  .loading-input {
+    background-color: transparent;
+    border: 1px solid #dfe4ed;
+    color: #c0c4cc;
+    width: 100%;
+    height: 36px;
+    line-height: 36px;
+    padding: 0 30px 0 12px;
+    border-radius: 4px;
+    &.disabled {
+      background-color: #f5f7fa;
+    }
+    span {
+      font-size: 16px;
+      height: 36px;
+      line-height: 36px;
+      padding: 0 0 0 3px;
+      vertical-align: top;
+    }
+  }
+}
+</style>

src/components/globalComponents/goodsClass-tree/main.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="organize-tree">
+    <div v-if="list && list.length > 0">
+      <div
+        v-for="item in list"
+        :key="item.updatetime"
+        class="organize-tree-node"
+        @click="openChildren($event, item)"
+      >
+        <div class="organize-box">
+          <span class="label">
+            {{ item.name }}
+          </span>
+          <i class="el-icon-arrow-right"></i>
+          <span class="btn-list" @click="(e) => e.stopPropagation()">
+            <el-button
+              v-if="powers.some((item) => item == '005')"
+              type="warning"
+              size="mini"
+              @click="
+                addEdit(
+                  $event,
+                  item.id,
+                  level === 3 ? item.menuid : item.pid,
+                  level,
+                  false,
+                  false,
+                  item
+                )
+              "
+            >
+              修改
+            </el-button>
+
+            <el-button
+              v-if="powers.some((item) => item == '004')"
+              :type="item.status === '1' ? 'primary' : 'info'"
+              size="mini"
+              @click="
+                status(
+                  $event,
+                  item.id,
+                  level === 3 ? item.menuid : item.pid,
+                  level,
+                  item.status
+                )
+              "
+            >
+              {{ item.status === "1" ? "禁用" : "启用" }}
+            </el-button>
+
+            <!-- <el-button
+              v-if="powers.some((item) => item == '006')"
+              type="danger"
+              size="mini"
+              @click="
+                detail(
+                  $event,
+                  item.id,
+                  level === 3 ? item.menuid : item.pid,
+                  level,
+                  item.status
+                )
+              "
+            >
+              详情
+            </el-button> -->
+          </span>
+        </div>
+      </div>
+    </div>
+    <!--  -->
+    <!-- vif{{ page }}--{{ page.total }}--{{}} -->
+    <div
+      class="Pagination"
+      style="text-align: right; margin-top: 10px"
+      v-if="page.total > 0"
+    >
+      <el-pagination
+        :current-page="page.curr"
+        :page-sizes="[15, 50, 100]"
+        :page-size="page.size"
+        :size="searchSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="page.total"
+        @size-change="$emit('page-size-change', $event)"
+        @current-change="$emit('page-curr-change', $event)"
+      />
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "goodsClassTree",
+  props: ["list", "level", "page"],
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "goodsClass"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    return {
+      newlist: "",
+      index: 0, // icon 箭头
+      // page: {
+      //   type: [Boolean, Object],
+      //   default: false,
+      // },
+    };
+  },
+  methods: {
+    addEdit(e, id, pid, level, isDetail, isAdd, formData) {
+      e.stopPropagation();
+      this.$emit("addEdit", id, pid, level, isDetail, isAdd, formData);
+    },
+    openChildren(e, item) {
+      e.stopPropagation();
+      this.$emit("openChildren", item);
+    },
+    status(e, id, pid, level, status) {
+      e.stopPropagation();
+      this.$emit("status", id, pid, level, status);
+    },
+    // detail(e, id, pid, level, status) {
+    //   e.stopPropagation();
+    //   this.$emit("detail", id, pid, level, status);
+    // },
+  },
+};
+</script>
+<style lang="scss" >
+.organize-tree {
+  margin-left: 18px;
+  cursor: pointer;
+  .el-button--mini {
+    padding: 6px 10px;
+    margin-top: 5px;
+  }
+  .organize-tree-node:nth-of-type(odd) {
+    background: rgba(75, 157, 177, 0.1);
+  }
+  .organize-tree-node:nth-of-type(even) {
+    background: rgba(249, 168, 110, 0.1);
+  }
+  .organize-tree-node {
+    display: block;
+    margin: 5px 0 5px 5px;
+    padding: 0 7px 2px 10px;
+    line-height: 35px;
+
+    .btn-list {
+      display: block;
+      float: right;
+    }
+    i.el-icon-arrow-right {
+      font-size: 16px;
+      width: 22px;
+      height: 35px;
+      line-height: 38px;
+      vertical-align: top;
+      margin: auto;
+    }
+    .label {
+      font-size: 16px;
+    }
+
+    .staff {
+      // padding:0 0 0 5px;
+      // background: #eee;
+      .user-box {
+        display: inline-block;
+        vertical-align: top;
+        width: 25px;
+        height: 25px;
+        line-height: 25px;
+        font-size: 15px;
+        text-align: center;
+        border-radius: 50%;
+        overflow: hidden;
+        background: #63cbe7;
+        color: #fff;
+        margin: 6px 5px 0 3px;
+        small {
+          font-size: 8px;
+        }
+      }
+      .staff-name {
+        display: inline-block;
+        height: 38px;
+        line-height: 38px;
+        vertical-align: top;
+      }
+    }
+  }
+}
+</style>

src/components/globalComponents/process-time-line/main.vue

@@ -0,0 +1,95 @@
+<template>
+    <div class="processTimeLine">
+    <el-steps
+      direction="vertical"
+      :active="options.length"
+      :space="80"
+      :finish-status="finishStatus"
+      :process-status="finishStatus"
+    >
+      <el-step
+        icon="el-icon-success"
+        v-for="(item, index) in options"
+        :key="item.time + index"
+        :finish-status="finishStatus"
+        :process-status="finishStatus"
+        style="margin: 0 0 0 150px; position: relative"
+      >
+        <div
+          slot="title"
+          style="
+            position: absolute;
+            width: 142px;
+            left: -150px;
+            text-align: right;
+          "
+        >
+          {{ item.status_name }}
+        </div>
+        <div slot="description">
+          <p class="name">
+           操作人： {{ item.action_name?item.action_name:'未知'}}
+          </p>
+          <p class="item">
+            {{ item.action_name?item.action_name:'未知'}}
+          </p>
+          <p class="time">
+            {{ item.addtime }}
+          </p>
+        </div>
+      </el-step>
+    </el-steps>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/components/process-time-line";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "processTimeLine",
+  props: ["type", "orderCode", "newTime"],
+  mixins: [resToken],
+  data() {
+    return {
+      options: [],
+      loading: false,
+    };
+  },
+  watch: {
+    newTime: function (val) {
+      console.log(val);
+      if (val) {
+        this.getList();
+      }
+    },
+  },
+  mounted() {
+    this.getList();
+  },
+
+  methods: {
+    async getList() {
+      console.log(123456);
+      if (!this.loading) {
+        this.loading = true;
+        this.options = [];
+        const res = await asyncRequest.list({
+          type: this.type,
+          orderCode: this.orderCode,
+        });
+        if (res && res.code === 0 && res.data) {
+          this.options = res.data;
+        } else {
+          this.options = [];
+        }
+        this.loading = false;
+      }
+    },
+  },
+};
+</script>
+<style lang="scss">
+.date-picker.el-input {
+  // width: 150px !important;
+}
+</style>

src/components/search-customer/main.vue → src/components/globalComponents/search-customer/main.vue

@@ -8,7 +8,7 @@
     reserve-keyword
     :size="size || 'medium'"
     style="width: 100%"
-     :placeholder="placeholder||''"
+    :placeholder="placeholder || ''"
     :disabled="disabled"
     :remote-method="remoteMethod"
     :loading="selectLoading"
@@ -16,10 +16,10 @@
   >
     <el-option
       v-for="(item, index) in options"
-      :key="item.pid + index"
-      :label="item.name"
-      :value="item.pid"
-      :disabled="item.status!=='1'"
+      :key="item.companyNo + index"
+      :label="item.companyName"
+      :value="item.companyNo"
+      :disabled="item.status !== '1'"
     >
     </el-option>
   </el-select>
@@ -54,7 +54,7 @@ export default {
   },
   watch: {
     names: function (val, old) {
-      console.log(val, old);
+      // console.log(val, old);
       this.searchName = val;
       if (this.isDetail && this.searchName) {
         this.remoteMethod(this.searchName);
@@ -68,12 +68,12 @@ export default {
   methods: {
     async selectChange(e) {
       if (e && e.length > 0) {
-        let index = this.options.findIndex((v) => v.id === e[0]);
+        let index = this.options.findIndex((v) => v.companyNo === e[0]);
         if (index !== -1) {
           let model = {
-            id: this.options[index].pid,
-            code: this.options[index].pid,
-            label: this.options[index].name,
+            id: this.options[index].id,
+            code: this.options[index].companyNo,
+            label: this.options[index].companyName,
           };
           this.$emit("searchChange", model);
         } else {
@@ -90,14 +90,15 @@ export default {
         let formValue = {
           page: 1,
           size: 100,
-          name: query,
-          code: "",
+          companyName: query,
+          companyNo: "",
+          itemid: "",
         };
 
         let res = await asyncRequest.list(formValue);
         if (res && res.code === 0 && res.data) {
-          const { list } = res.data;
-          this.options = list;
+          const { item } = res.data;
+          this.options = item;
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
         } else {

src/components/globalComponents/search-express/main.vue

@@ -0,0 +1,149 @@
+<template>
+  <el-select
+    v-model="value"
+    multiple
+    filterable
+    remote
+    :multiple-limit="1"
+    reserve-keyword
+    :size="size || 'medium'"
+    style="width: 100%"
+    :placeholder="placeholder || ''"
+    :disabled="disabled"
+    :remote-method="remoteMethod"
+    :loading="selectLoading"
+    :type="type"
+    :name="name"
+    @change="selectChange"
+  >
+    <el-option
+      v-for="(item, index) in options"
+      :key="item.id + index"
+      :label="item.label"
+      :value="item.value"
+      :disabled="item.canOrder !== '1'"
+    >
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+import asyncRequest from "@/apis/components/search-express";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "SearchExpress",
+  mixins: [resToken],
+  props: [
+    "size",
+    "value",
+    "placeholder",
+    "isDetail",
+    "disabled",
+    "names",
+    "type",
+    "name",
+  ],
+  /**
+   * 属性集合
+   * @param {String}        size             : 组件大小            非必填
+   * @param {Array}         value            : 选中值              必填
+   * @param {String}        placeholder      : 提示信息            非必填
+   * @param {Boolean}       isDetail          : 是否是详情逻辑       必填
+   * @param {Boolean}       disabled         : 是否禁用            必填
+   * @param {String}        names            : 选中值label         展示详情必填
+   * @param {String}        type            :快递列表状态
+   * @param {String}        name            : 快递模糊查询
+   *
+   *
+   */
+  /**
+   * 事件集合
+   * @searchChange             : 选中值变化调用   抛出选中数据
+   */
+  data() {
+    return {
+      selectLoading: false,
+      searchName: "",
+      options: [],
+      formValue: {
+        type: "",
+        name: "",
+      },
+    };
+  },
+  watch: {
+    names: function (val, old) {
+      console.log(val, old);
+      this.searchName = val;
+      if (this.isDetail && this.searchName) {
+        this.remoteMethod(this.searchName);
+      }
+    },
+  },
+  created() {
+    this.options = [];
+    this.selectLoading = false;
+  },
+  methods: {
+    async selectChange(e) {
+      // console.log(e);
+      if (e && e.length > 0) {
+        let index = this.options.findIndex((v) => v.value === e[0]);
+        if (index !== -1) {
+          let model = {
+            id: this.options[index].id,
+            code: this.options[index].value,
+            label: this.options[index].label,
+            shortName: this.options[index].shortName,
+          };
+          this.$emit("searchChange", model);
+        } else {
+          this.$emit("searchChange", {});
+        }
+      } else {
+        this.$emit("searchChange", {});
+      }
+    },
+    async remoteMethod(query) {
+      console.log(query);
+      this.selectLoading = true;
+      if (query !== "") {
+        this.options = [];
+        let formValue = {
+          //看接口入参字段
+          type: "",
+          name: query,
+        };
+        console.log(formValue);
+        let res = await asyncRequest.list(formValue);
+        if (res && res.code === 0 && res.data) {
+          console.log(res.data);
+          let arr = res.data;
+          arr.forEach((element) => {
+            let obj = {
+              value: element.id,
+              label: element.name,
+              type: element.type,
+              id: element.id,
+              canOrder: element.canOrder,
+              shortName: element.shortName,
+            };
+            this.options.push(obj);
+          });
+          console.log(this.options, "options");
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
+      } else {
+        this.options = [];
+      }
+      this.selectLoading = false;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/components/select-area/main.vue → src/components/globalComponents/select-area/main.vue

@@ -11,6 +11,7 @@
       :props="props"
       :disabled="disabled"
       @change="handleChange"
+      @getCheckedNodes="getCheckedNodes"
     ></el-cascader>
     <div class="loading-input" :class="{ disabled: disabled }" v-else>
       <i class="el-icon-loading"></i>
@@ -86,7 +87,11 @@ export default {
     };
   },
   methods: {
+    getCheckedNodes(e) {
+      console.log(e);
+    },
     handleChange(value) {
+      console.log(this.props);
       this.$emit("selectChange", value);
     },
   },
@@ -111,7 +116,7 @@ export default {
       font-size: 16px;
       height: 36px;
       line-height: 36px;
-      padding:0 0 0 3px;
+      padding: 0 0 0 3px;
       vertical-align: top;
     }
   }