Merge branch 'sit'

src/components/Breadcrumb/index.vue

@@ -1,78 +0,0 @@
-<template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
-    <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
-      </el-breadcrumb-item>
-    </transition-group>
-  </el-breadcrumb>
-</template>
-
-<script>
-import pathToRegexp from 'path-to-regexp'
-
-export default {
-  data() {
-    return {
-      levelList: null
-    }
-  },
-  watch: {
-    $route() {
-      this.getBreadcrumb()
-    }
-  },
-  created() {
-    this.getBreadcrumb()
-  },
-  methods: {
-    getBreadcrumb() {
-      // only show routes with meta.title
-      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-      const first = matched[0]
-
-      if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
-      }
-
-      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
-    },
-    isDashboard(route) {
-      const name = route && route.name
-      if (!name) {
-        return false
-      }
-      return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase()
-    },
-    pathCompile(path) {
-      // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
-      const { params } = this.$route
-      var toPath = pathToRegexp.compile(path)
-      return toPath(params)
-    },
-    handleLink(item) {
-      const { redirect, path } = item
-      if (redirect) {
-        this.$router.push(redirect)
-        return
-      }
-      this.$router.push(this.pathCompile(path))
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-breadcrumb.el-breadcrumb {
-  display: inline-block;
-  font-size: 14px;
-  line-height: 50px;
-  margin-left: 8px;
-
-  .no-redirect {
-    color: #97a8be;
-    cursor: text;
-  }
-}
-</style>

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

@@ -128,7 +128,7 @@ export default {
       this.options = [];
       this.formValue.supplierNo = this.companyCode || "";
       this.formValue.companyNo = this.companyNo || "";
-      // this.formValue.wsm_type = this.wsmtype || "";
+      this.formValue.wsm_type = this.wsmtype || "";
       const { code, data, message } = await asyncRequest.list(this.formValue);
       if (code === 0) {
         const { list } = data;

src/views/sellOut/stockApply/components/purchaseBack.vue

@@ -42,7 +42,7 @@
             :value="ruleForm.wsm_code"
             :placeholder="'仓库名称'"
             :isRelation="true"
-               :wsmtype="'5'"
+            :wsmtype="'5'"
             :companyNo="sitem.companyNo"
             :companyCode="supplier_code"
             :names="''"

src/views/serviceParam/storeSet/index.vue

@@ -38,8 +38,76 @@
                   @numReturned="numReturned($event, 0)"
                 />
               </el-col>
+              <el-col :span="18" style="width: 340px; padding: 0">
+                <!-- <search-customer
+                  :value="supplierNo"
+                  :size="searchSize"
+                  :code="parmValue.supplierNo"
+                  :companyNo="parmValue.supplierNo"
+                  :placeholder="'供应商公司名称'"
+                  :is-detail="true"
+                  :disabled="false"
+                  :names="''"
+                  @searchChange="supplierChange"
+                /> -->
+                <search-supplier
+                  :value="supplierNo"
+                  :size="searchSize"
+                  :code="parmValue.supplierNo"
+                  :placeholder="'供应商公司名称'"
+                  :is-detail="false"
+                  :disabled="false"
+                  :names="''"
+                  @searchChange="supplierChange"
+                />
+                <!-- <search-customer
+                  :value="supplierNo"
+                  :size="searchSize"
 
-              <el-col :span="18" style="width: 420px; padding: 0">
+                  :placeholder="'供应商公司名称'"
+                  :disabled="false"
+                  @searchChange="supplierChange"
+                /> -->
+              </el-col>
+
+              <el-col
+                :span="3"
+                style="width: 56px; margin-left: 10px"
+                class="fr"
+              >
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  @click="searchList"
+                >
+                  刷新
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-row style="padding: 0">
+              <el-col :span="4" style="width: 120px; padding: 0">
+                <el-select
+                  v-model="parmValue.wsm_type"
+                  style="width: 100%"
+                  clearable
+                  :size="searchSize"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                  placeholder="仓库类型"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="18" style="width: 420px; padding: 0 0 0 10px">
                 <el-input
                   placeholder="关键字"
                   v-model="input"
@@ -64,7 +132,11 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <el-col :span="4" style="width: 66px; padding-left: 10px">
+              <el-col
+                :span="4"
+                style="width: 66px; padding-left: 10px"
+                class="fr"
+              >
                 <el-button
                   type="warning"
                   class="fl"
@@ -74,53 +146,6 @@
                   重置
                 </el-button>
               </el-col>
-              <el-col
-                :span="3"
-                style="width: 56px; margin-left: 10px"
-                class="fr"
-              >
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-            </el-row>
-            <el-row style="padding: 0">
-              <el-col :span="18" style="width: 340px; padding: 0">
-                <!-- <search-customer
-                  :value="supplierNo"
-                  :size="searchSize"
-                  :code="parmValue.supplierNo"
-                  :companyNo="parmValue.supplierNo"
-                  :placeholder="'供应商公司名称'"
-                  :is-detail="true"
-                  :disabled="false"
-                  :names="''"
-                  @searchChange="supplierChange"
-                /> -->
-                <search-supplier
-                  :value="supplierNo"
-                  :size="searchSize"
-                  :code="parmValue.supplierNo"
-                  :placeholder="'供应商公司名称'"
-                  :is-detail="false"
-                  :disabled="false"
-                  :names="''"
-                  @searchChange="supplierChange"
-                />
-                <!-- <search-customer
-                  :value="supplierNo"
-                  :size="searchSize"
-
-                  :placeholder="'供应商公司名称'"
-                  :disabled="false"
-                  @searchChange="supplierChange"
-                /> -->
-              </el-col>
-
               <el-col
                 :span="3"
                 style="width: 56px"
@@ -149,17 +174,7 @@
             "
           ></el-tag>
         </template>
-         <template #wsmtype="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type=" ''"
-            v-text="
-              (options.find((item) => item.value == scope.row.wsmtype) || {})
-                .label || '--'
-            "
-          ></el-tag>
-        </template>
-        
+
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((item) => item == '007')"
@@ -263,7 +278,7 @@ export default {
   },
   data() {
     return {
-        options: [
+      options: [
         // {
         //   value: "1",
         //   label: "系统仓",
@@ -298,6 +313,7 @@ export default {
       parmValue: {
         supplierNo: "", //供应商编码
         wsm_code: "", //仓库编码
+        wsm_type: "",
         start: "", //新建起始时间
         end: "", //新建结束时间
         mobile: "", //手机号
@@ -332,10 +348,10 @@ export default {
           prop: "name",
           label: "仓库名称",
         },
-         {
-          prop: "wsmtype",
+        {
+          prop: "type_name",
           label: "仓库类型",
-          _slot_: "wsmtype",
+          width: "80px",
         },
         {
           prop: "supplierNo",
@@ -391,7 +407,6 @@ export default {
 
   methods: {
     supplierChange(e) {
-      
       if (e && e.id) {
         this.supplierNo = [e.code];
         this.parmValue.supplierNo = e.code; //供应商编码
@@ -432,6 +447,7 @@ export default {
       this.parmValue = {
         supplierNo: "", //供应商编码
         wsm_code: "", //仓库编码
+        wsm_type:"",
         start: "", //新建起始时间
         end: "", //新建结束时间
         mobile: "", //手机号
@@ -448,7 +464,7 @@ export default {
       this.isDetail = isDetail;
     },
     async searchList() {
-         if (
+      if (
         (this.parmValue.start !== "" && this.parmValue.end === "") ||
         (this.parmValue.start == "" && this.parmValue.end != "")
       ) {
@@ -461,7 +477,7 @@ export default {
       this.parmValue.mobile = this.select === "3" ? this.input : "";
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
-        console.log("aaaaaaaaaaaaaaaa",res)
+        console.log("aaaaaaaaaaaaaaaa", res);
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {