Merge branch 'live' into edit

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/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/components/globalComponents/Hamburger/main.vue

@@ -1,46 +0,0 @@
-<template>
-  <div style="padding: 0 15px;" @click="toggleClick">
-    <svg
-      :class="{ 'is-active': isActive }"
-      class="hamburger"
-      viewBox="0 0 1024 1024"
-      xmlns="http://www.w3.org/2000/svg"
-      width="64"
-      height="64"
-    >
-      <path
-        d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z"
-      />
-    </svg>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Hamburger',
-  props: {
-    isActive: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    toggleClick() {
-      this.$emit('toggleClick')
-    }
-  }
-}
-</script>
-
-<style scoped>
-.hamburger {
-  display: inline-block;
-  vertical-align: middle;
-  width: 20px;
-  height: 20px;
-}
-
-.hamburger.is-active {
-  transform: rotate(180deg);
-}
-</style>

src/components/globalComponents/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/goodsClass/main.vue → src/components/globalComponents/goodClass/main.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="select-goodsClass">
-    <!-- <el-cascader
-      filterable
-      clearable
-      :props="props"
-      @getCheckedNodes="getCheckedNodes"
-    ></el-cascader> -->
     <el-cascader
-      v-if="!loading"
+     v-loading="loading"
       style="width: 100%"
       :disabled="disabled"
       v-model="value"
@@ -16,12 +10,7 @@
       :size="size || 'medium'"
       :props="props"
       @change="handleChange"
-      @getCheckedNodes="getCheckedNodes"
     ></el-cascader>
-    <div class="loading-input" :class="{ disabled: disabled }" v-else>
-      <i class="el-icon-loading"></i>
-      <span>{{ placeholder || "" }}</span>
-    </div>
   </div>
 </template>
 
@@ -30,7 +19,7 @@ import asyncRequest from "@/apis/components/goods-class";
 import resToken from "@/mixins/resToken";
 import { isArray } from "@/utils/validate";
 export default {
-  name: "goodsClasss",
+  name: "goodClass",
   mixins: [resToken],
   props: ["size", "value", "placeholder", "isDetail", "disabled"],
   /**
@@ -73,11 +62,7 @@ export default {
     this.selectLoading = false;
   },
   methods: {
-    getCheckedNodes(e) {
-      console.log(e);
-    },
     handleChange(value) {
-      console.log(value);
       this.$emit("handleChange", value);
     },
     async selectChange(e) {

src/components/globalComponents/goodsClass/index.js

@@ -1,2 +0,0 @@
-import Main from './main.vue'
-export default Main

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/globalComponents/search-customer/main.vue

@@ -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);

src/components/globalComponents/status-bar/main.vue

@@ -1,44 +1,18 @@
 <template>
-  <div class="statusBar">
-    <el-steps
-      v-if="options && options.length > 0"
-      direction="vertical"
-      :active="options.length"
-      :space="100"
-      :finish-status="finishStatus"
-      :process-status="finishStatus"
-    >
+  <div class="statusBar" style="padding: 0 0 12px 0;">
+    <el-steps :active="sIndex" align-center>
       <el-step
-        icon="el-icon-success"
-        v-for="item in options"
-        :key="item.title"
-        :finish-status="finishStatus"
-        :process-status="finishStatus"
-        style="margin: 0 0 0 100px; position: relative"
-      >
-        <div
-          slot="title"
-          style="
-            position: absolute;
-            width: 92px;
-            left: -100px;
-            text-align: right;
-          "
-        >
-          {{ item.title }}
-        </div>
-        <div slot="description">
-          <p class="name">
-            {{ item.desc && item.desc.name ? item.desc.name : "" }}
-          </p>
-          <p class="item">
-            {{ item.desc && item.desc.item ? item.desc.item : "" }}
-          </p>
-          <p class="time">
-            {{ item.desc && item.desc.time ? item.desc.time : "" }}
-          </p>
-        </div>
-      </el-step>
+        :title="item.label"
+        :icon="
+          index < sIndex
+            ? 'el-icon-success'
+            : index === sIndex
+            ? 'el-icon-s-check'
+            : ''
+        "
+        v-for="(item, index) in options"
+        :key="item.value + index"
+      ></el-step>
     </el-steps>
   </div>
 </template>
@@ -46,60 +20,31 @@
 <script>
 export default {
   name: "statusBar",
-   props: ["options"],
-
+  props: ["options", "status"],
   /**
    * 属性集合
-   * @param {Boolean}       showModel             : 是否弹出弹窗        必填
-   * @param {Boolean}       once                  : 是否只选一条        非必填
-   * @param {Boolean}       code                  : 仓库CODE           非必填
-   */
-  /**
-   * 事件集合
-   * @searchChange             : 选中值变化调用   抛出选中数据
+   * @param {Array}       options                 : 状态条数组        必填
+   * @param {String}       status                  : 当前状态          必填
    */
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.getList();
+      }
+    },
+  },
+  mounted() {
+    this.sIndex = this.options.findIndex((v) => v.value === this.status);
+    console.log(this.sIndex);
+  },
   data() {
     return {
+      sIndex: 0,
     };
   },
-  methods: {
-  
-  },
+  methods: {},
 };
 </script>
 
 <style lang="scss" scoped>
-.noAuth {
-  width: 800px;
-  max-width: 100%;
-  margin: 100px auto;
-  text-align: left;
-  .pan-back-btn {
-    background: #008489;
-    color: #fff;
-    border: none !important;
-  }
-  .pan-gif {
-    margin: 0 auto;
-    display: block;
-  }
-  .pan-img {
-    display: block;
-    margin: 0 auto;
-    width: 100%;
-  }
-  .text-jumbo {
-    font-size: 60px;
-    font-weight: 700;
-    color: #484848;
-    padding-top: 45px;
-  }
-  .list-unstyled {
-    padding: 0 0 0 4px;
-    font-size: 14px;
-    li {
-      line-height: 30px;
-    }
-  }
-}
 </style>

src/components/search-stock-good-modal/index.vue

@@ -98,6 +98,7 @@ export default {
       showModelThis: false,
       parmValue: {
         wsm_code: "", //仓库code
+        cat_id,
         page: 1, // 页码
         size: 10, // 每页显示条数
       },
@@ -145,6 +146,7 @@ export default {
     restSearch() {
       this.parmValue = {
         wsm_code: "", //仓库code
+        cat_id:"",
         page: 1, // 页码
         size: 10, // 每页显示条数
       };
@@ -161,6 +163,7 @@ export default {
       this.parmValue.wsm_code = this.code || "";
       this.parmValue.type_code = this.good_code || "";
       this.parmValue.stock_max="1"
+      this.parmValue.cat_id=cat_id
 
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/styles/index.scss

@@ -247,9 +247,9 @@ aside {
   display: block;
   clear: both;
 }
-.el-steps--simple {
-  background: transparent;
-}
+// .el-steps--simple {
+//   background: transparent;
+// }
 
 .code-main {
   float: left;
@@ -539,7 +539,7 @@ aside {
   }
 }
 
-.statusBar {
+.processTimeLine {
   .el-step__head.is-finish {
     color: #e8e8e8 !important;
       border-color: #e8e8e8 !important;

src/views/process/oing/index.vue

@@ -132,7 +132,7 @@
 <script>
 import addEdit from "./addEdit";
 // import asyncRequest from "@/apis/service/process/oing";
-// import asyncRequest from "@/mock/service/process/oing"; //引入mock数据
+import asyncRequest from "@/apis/service/process/oing"; //引入mock数据
 import statusList from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
@@ -239,7 +239,7 @@ export default {
     };
   },
   mounted() {
-    // this.searchList();
+    this.searchList();
   },
   methods: {
     restSearch() {
@@ -305,9 +305,10 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       // console.log(...res.data.list);
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
-        console.log(this.tableData);
-        this.pageInfo.total = Number(res.data.count);
+        console.log(res.data);
+        // this.tableData = res.data.list;
+        // console.log(this.tableData);
+        // this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {

src/views/purchaseIn/storeManage/addModel.vue

@@ -3,7 +3,7 @@
     title="新建备货申请"
     :center="true"
     align="left"
-    top="18vh"
+    top="15vh"
     width="600px"
     @close="closeModel"
     :close-on-click-modal="false"

src/views/purchaseIn/storeManage/components/addEdit.vue

@@ -9,7 +9,16 @@
       class="demo-ruleForm"
     >
       <el-row>
-        <el-col :span="24">
+        <el-col :span="type === '1' ? 12 : 24">
+          <el-form-item label="商品分类" prop="goods_name">
+            <good-class
+              :value="ruleForm.goods_class"
+              @handleChange="goods_class_change"
+              :placeholder="'商品分类'"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="type === '1' ? 12 : 24">
           <el-form-item label="商品名称" prop="goods_name">
             <el-input
               :disabled="
@@ -20,12 +29,13 @@
               "
               v-model="ruleForm.goods_name"
               readonly="true"
+              :placeholder="'商品名称'"
               @focus="hand"
             ></el-input>
           </el-form-item>
         </el-col>
         <!-- 采购数量 -->
-        <el-col :span="24">
+        <el-col :span="type === '1' ? 12 : 24">
           <el-form-item label="采购数量" prop="goods_num">
             <el-input
               :disabled="
@@ -40,7 +50,7 @@
           </el-form-item>
         </el-col>
         <!-- 最晚入库时间 -->
-        <el-col :span="24">
+        <el-col :span="type === '1' ? 12 : 24">
           <el-form-item label="最晚入库时间" prop="last_go_stock">
             <el-date-picker
               v-model="ruleForm.last_go_stock"
@@ -61,8 +71,8 @@
           </el-form-item>
         </el-col>
         <!-- 供应商选择 -->
-        <el-col :span="24">
-          <el-form-item label="供应商名称" prop="supplier_code">
+        <el-col :span="type === '1' ? 12 : 24">
+          <el-form-item label="入库公司" prop="supplier_code">
             <search-supplier
               :disabled="
                 !(
@@ -71,19 +81,19 @@
                 )
               "
               :value="ruleForm.supplier_code"
-              :placeholder="'请选择供应商'"
+              :placeholder="'入库公司'"
               :names="''"
               @searchChange="selectSupplier"
             />
           </el-form-item>
         </el-col>
         <!-- 仓库名称 -->
-        <el-col :span="24">
-          <el-form-item label="仓库名称" prop="stock_code">
+        <el-col :span="type === '1' ? 12 : 24">
+          <el-form-item label="入库仓库" prop="stock_code">
             <search-stock
               :disabled="!(id == 'add' || status === '0')"
               :value="ruleForm.stock_code"
-              :placeholder="'请选择备库仓库'"
+              :placeholder="'入库仓库'"
               :isRelation="true"
               :names="''"
               :companyCode="companyCode"
@@ -120,7 +130,7 @@ import { isnumber } from "@/utils/validate";
 import searchStockGoodModal from "@/components/search-stock-good-modal";
 export default {
   name: "storeManage",
-  props: ["id", "sitem", "newTime"],
+  props: ["id", "sitem", "newTime", "type"],
   mixins: [resToken],
   components: { searchStockGoodModal },
   computed: {
@@ -169,6 +179,7 @@ export default {
       loading: false,
       ruleForm: {
         id: "",
+        goods_class: [],
         good_code: "",
         good_type_code: "",
         goods_name: "",
@@ -180,6 +191,14 @@ export default {
       },
       rulesThis: this.rules,
       rules: {
+        goods_class: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择商品分类",
+            trigger: "change",
+          },
+        ],
         //出入库规则
         goods_name: [
           {
@@ -206,7 +225,7 @@ export default {
           {
             type: "array",
             required: true,
-            message: "请选择供应商",
+            message: "请选择供入库公司",
             trigger: "change",
           },
         ],
@@ -214,7 +233,7 @@ export default {
           {
             type: "array",
             required: true,
-            message: "请选择仓库",
+            message: "请选择入库仓库",
             trigger: "change",
           },
         ],
@@ -236,6 +255,14 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
+    goods_class_change(e) {
+      this.ruleForm.goods_class = e;
+      this.$refs.ruleForm.validateField("goods_class");
+      this.ruleForm.good_type_code = "";
+      this.ruleForm.goods_name = "";
+      this.ruleForm.goods_num = "";
+      this.$refs.ruleForm.validateField("good_type_code");
+    },
     // 最晚入库时间选择
     selectTime(e) {
       this.ruleForm.expecttime = e;
@@ -273,6 +300,10 @@ export default {
       this.$refs.ruleForm.validateField("goods_name");
     },
     hand() {
+      if (this.ruleForm.goods_class.length === 0) {
+        this.$message.warning("请选择商品分类！");
+        return;
+      }
       this.showGoodsModel = true;
     },
     // 最晚入库时间选择
@@ -306,6 +337,7 @@ export default {
             this.companyCode = wsm_supplierNo;
             this.ruleForm = {
               id,
+              goods_class: [],
               good_code,
               good_type_code,
               goods_name: good_name,

src/views/purchaseIn/storeManage/detail.vue

@@ -34,6 +34,7 @@
         :sitem="sitem"
         :id="queryId"
         :newTime="newTime"
+        :type="'1'"
         @refresh="initData"
         v-if="newTime != ''"
       />

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -256,7 +256,7 @@ export default {
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
-        console.log(this.$refs.addrForm);
+        // console.log(this.$refs.addrForm);
         // if (this.$refs.addrForm) {
         //   this.$refs.addrForm.resetFields();
         //   this.$refs.addrForm.clearValidate();

src/views/sellOut/salesOrder/detail.vue

@@ -5,7 +5,7 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <div class="tl" style="padding: 10px 0">
-        <span>status: {{ status }}----{{ powers }}</span>
+        <!-- <span> {{ status }}----{{ powers }}</span> -->
 
         <el-button
           type="primary"
@@ -44,8 +44,16 @@
           >作废该条信息</el-button
         >
       </div>
-
+  <status-bar
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :options="statusOptions"
+            :status="status"
+          />
       <el-collapse v-model="activeNames">
+        <!-- <el-collapse-item title="审批节点" name="-1">
+        
+        </el-collapse-item> -->
         <el-collapse-item title="销售订单信息" name="0">
           <add-form
             :newTime="newTime"
@@ -73,6 +81,14 @@
             @refresh="initData()"
           />
         </el-collapse-item>
+        <el-collapse-item title="审批记录" name="10">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'XSQRD'"
+            :orderCode="orderCode"
+          />
+        </el-collapse-item>
       </el-collapse>
     </div>
     <div v-else>
@@ -115,9 +131,17 @@ export default {
   data() {
     return {
       finishStatus: "finish",
-      activeNames: ["0", "1", "2", "3", "4", "5"],
+      activeNames: ["-1", "0", "1", "2", "3", "4", "5", "10"],
+      statusOptions: [
+        { value: "0", label: "取消" },
+        { value: "1", label: "发起" },
+        { value: "2", label: "反馈物流费" },
+        { value: "3", label: "同意下单" },
+        { value: "4", label: "发货中" },
+        { value: "5", label: "已发货" },
+      ],
       sitem: null,
-
+      orderCode: "",
       status: "",
       newTime: "",
       loading: false,
@@ -130,10 +154,6 @@ export default {
     this.initData();
   },
   methods: {
-    handClick(value) {
-      console.log("执行子组件事件", value);
-      this.company = value;
-    },
     async statusConfirm(status, message) {
       await this.$confirm(`确定要${message}？`, {
         confirmButtonText: "确定",
@@ -152,7 +172,9 @@ export default {
         });
     },
     getNewTime() {
-      this.newTime = new Date().valueOf();
+      this.newTime = new Date().valueOf() + "";
+      console.log(this.orderCode);
+      console.log(this.newTime);
     },
 
     async deleteById(message) {
@@ -203,6 +225,7 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         this.status = this.sitem.status;
+        this.orderCode = this.sitem.orderCode;
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/stock/check/components/addEdit.vue

@@ -82,11 +82,6 @@
         </el-col>
       </el-row>
     </el-form>
-    <search-good-modal
-      :show-model="showGoodsModel"
-      @cancel="showGoodsModel = false"
-      @resultList="addGoodsRes"
-    />
   </div>
 </template>
    <script>
@@ -117,7 +112,6 @@ export default {
       companyCode: "",
       companyName: "",
       loading: false,
-      showGoodsModel: false,
       typeList: [
         {
           value: "2",
@@ -177,7 +171,6 @@ export default {
     closeModel() {
       console.log("closeModel!!");
     },
-    addGoodsRes(e) {},
     //供应商选择
     supplierChange(e) {
       if (e && e.id) {