Browse Source

build:添加筛选字段

snow 2 years ago
parent
commit
2b12c9893a

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 0 - 0
dist/static/css/chunk-056405f8.cc3d506f.css → dist/static/css/chunk-c216e422.cc3d506f.css


+ 0 - 0
dist/static/css/chunk-056405f8.cc3d506f.css.gz → dist/static/css/chunk-c216e422.cc3d506f.css.gz


BIN
dist/static/js/app.2e2d84f1.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.ff60b315.js


BIN
dist/static/js/app.ff60b315.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-056405f8.4bd0a447.js


BIN
dist/static/js/chunk-056405f8.4bd0a447.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-c216e422.b3852619.js


BIN
dist/static/js/chunk-c216e422.b3852619.js.gz


+ 2 - 0
src/config/env.development.js

@@ -5,6 +5,8 @@ module.exports = {
   api: {
     userApi: 'http://inv.test241.wanyuhengtong.com/',
     baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    // baseApi: 'http://stock.api.wanyuhengtong.com/',
     tableApi: 'http://inv.sit.wanyuhengtong.com/',
   },
   webUrl: "http://share.sitw.wanyuhengtong.com/#/test-good-share?id=",

+ 34 - 2
src/views/goodStore/goodsOffline/index.vue

@@ -24,6 +24,34 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
+              <el-col :span="6" style="width: 163px;margin-right: 10px;">
+                <el-input
+                :size="searchSize"
+                v-model="parmValue.good_name"
+                :maxlength="40"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="下线商品名称"
+                ></el-input> 
+              </el-col> 
+
+              
+              <el-col :span="6" style="width: 163px;margin-right: 10px;">
+                <el-input
+                :size="searchSize"
+                v-model="parmValue.spuCode"
+                :maxlength="40"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="商品成本编码"
+                ></el-input> 
+              </el-col> 
              
                <el-col :span="6" style="width: 363px;">
                 <periodDatePickerActive
@@ -35,7 +63,8 @@
                       @timeReturned="time"
                     />
               </el-col>  
-              <el-col :span="6" style="width: 163px;">
+              
+              <el-col :span="6" style="width: 163px;margin-right: 10px;">
                 <el-input
                 :size="searchSize"
                 v-model="parmValue.creater"
@@ -47,6 +76,8 @@
                 "
                 placeholder="创建人"
                 ></el-input> 
+
+
               </el-col>  
               
               <el-col :span="3" style="width: 66px; float: right">
@@ -129,7 +160,8 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        
+        spuCode:"", //商品成本编码
+        good_name:"",//商品名称
         start_date: "", //起始时间
         end_date: "", // 结束时间
         // is_export:0,//是否导出0/1

+ 6 - 1
src/views/goodStore/goodsOnline/columns.js

@@ -74,6 +74,11 @@ const listCol = [
   //   label: "平台编号",
   //   width: "170px",
   // },
+  {
+    prop:'supplier_name',
+    label:'供应商',
+    width: "150px",
+  },
   {
     prop: "platform_name",
     label: "平台名称",
@@ -170,4 +175,4 @@ const rules = {
 
 }
 
-export { options1, options2, options3, options4, options5, options6, options7, options8, listCol, rules }
+export { options1, options2, options3, options4, options5, options6, options7, options8, listCol, rules }

+ 4 - 1
src/views/goodStore/goodsOnline/index.vue

@@ -150,10 +150,10 @@
                   placeholder="关键字类型"
                 >
                   <el-option label="商品名称" value="1" />
+                  <el-option label="供应商名称" value="3" />
                   <el-option label="成本商品编号" value="2" />
                   <el-option label="上线商品编号" value="8" />
                   <!-- <el-option label="平台编号" value="3" /> -->
-                  <!-- <el-option label="供应商编号" value="4" /> -->
                   <el-option label="业务企业编号" value="5" />
                   <el-option label="平台商品编号" value="6" />
                   <el-option label="创建人" value="7" />
@@ -881,6 +881,9 @@ export default {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.good_name = this.select === "1" ? this.sinput : ""; //商品名称
+
+      model.supplier_name = this.select === "3" ? this.sinput : "";
+
       model.spucode = this.select === "2" ? this.sinput : ""; //商品编号
       model.skucode = this.select === "8" ? this.sinput : ""; //商品编号
       // model.platform_code = this.select === "1" ? this.sinput : ""; //平台编码

+ 6 - 2
src/views/sellOut/sellOutOrder/columns.js

@@ -25,7 +25,11 @@ const columns = [
     label: "申请人部门",
     minWidth: "150px",
   },
-
+  {
+    prop:'wsm_supplier',
+    label:'供应商',
+    minWidth: "150px",
+  },
   {
     prop: "apply_name",
     label: "申请人",
@@ -54,7 +58,7 @@ const columns = [
     width: "80px",
   },
   {
-    prop: "good_class",
+  prop: "good_class",
     label: "商品分类",
     width: "150",
   },

+ 52 - 160
src/views/sellOut/sellOutOrder/index.vue

@@ -1,170 +1,87 @@
 <template>
   <div class="sellOutOrder pagePadding">
     <div v-if="powers.some((i) => i == '001')">
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="columns"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
+      <ex-table v-loading="loading" :table="table" :data="tableData" :columns="columns" :page="pageInfo" :size="size"
+        @page-curr-change="handlePageChange" @page-size-change="handleSizeChange" @screen-reset="
           pageInfo.curr = 1;
           parmValue.page = 1;
           searchList();
-        "
-        @screen-submit="
+        " @screen-submit="
           pageInfo.curr = 1;
           parmValue.page = 1;
           searchList();
-        "
-        @selection="selection_change"
-      >
+        " @selection="selection_change">
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="4" style="width: 375px; display: flex; align-items: center">
                 <p style="margin-right: 10px">添加时间:</p>
-                <period-date-picker
-                  :type="1"
-                  :start="parmValue.start"
-                  :end="parmValue.end"
-                  :width="'134px'"
-                  :size="searchSize"
-                  @timeReturned="handleTime"
-                />
+                <period-date-picker :type="1" :start="parmValue.start" :end="parmValue.end" :width="'134px'"
+                  :size="searchSize" @timeReturned="handleTime" />
               </el-col>
               <el-col :span="4" style="width: 375px; display: flex; align-items: center">
                 <p style="margin-right: 10px">发货时间:</p>
-                <period-date-picker
-                  :type="1"
-                  :start="parmValue.start_sendtime"
-                  :end="parmValue.end_sendtime"
-                  :width="'134px'"
-                  :size="searchSize"
-                  @timeReturned="handleTime($event, true)"
-                />
+                <period-date-picker :type="1" :start="parmValue.start_sendtime" :end="parmValue.end_sendtime"
+                  :width="'134px'" :size="searchSize" @timeReturned="handleTime($event, true)" />
               </el-col>
 
               <el-col :span="4" style="width: 230px; padding: 0px 0 0 10px">
-                <search-customer
-                  :value="customerCode"
-                  :size="searchSize"
-                  :placeholder="'客户公司名称'"
-                  :names="parmValue.supplierName"
-                  :is-detail="true"
-                  @searchChange="customerChange"
-                />
+                <search-customer :value="customerCode" :size="searchSize" :placeholder="'客户公司名称'"
+                  :names="parmValue.supplierName" :is-detail="true" @searchChange="customerChange" />
               </el-col>
+
               <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
+                <el-button :size="searchSize" type="primary" style="float: right; margin-left: 5px" @click="searchList">
                   刷新
                 </el-button>
               </el-col>
-              <el-col
-                :span="4"
-                style="width: 66px; float: right"
-                v-if="powers.some((i) => i == '087')"
-              >
-                <el-button
-                  type="primary"
-                  style="margin-left: 30px"
-                  @click="download"
-                  :size="searchSize"
-                  class="fr"
-                >
+              <el-col :span="4" style="width: 66px; float: right" v-if="powers.some((i) => i == '087')">
+                <el-button type="primary" style="margin-left: 30px" @click="download" :size="searchSize" class="fr">
                   导出
                 </el-button>
               </el-col>
             </el-row>
             <el-row style="padding-top: 10px">
               <el-col :span="4" style="width: 150px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.status"
-                  filterable
-                  clearable
-                  placeholder="状态"
-                  style="width: 100%"
-                  @change="
+                <el-select :size="searchSize" v-model="parmValue.status" filterable clearable placeholder="状态"
+                  style="width: 100%" @change="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
                     searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in statusOptions"
-                    :key="'status' + item.id"
-                    :label="item.label"
-                    :value="item.id"
-                  />
+                  ">
+                  <el-option v-for="item in statusOptions" :key="'status' + item.id" :label="item.label"
+                    :value="item.id" />
                 </el-select>
               </el-col>
               <el-col :span="4" style="width: 500px; padding: 0 0 0 10px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  placeholder="关键字"
-                  v-model="s_input"
-                  maxlength="40"
-                  class="input-with-select"
-                >
-                  <el-select
-                    style="width: 140px"
-                    v-model="select"
-                    slot="prepend"
-                    placeholder="关键字类型"
-                  >
+                <el-input clearable :size="searchSize" placeholder="关键字" v-model="s_input" maxlength="40"
+                  class="input-with-select">
+                  <el-select style="width: 140px" v-model="select" slot="prepend" placeholder="关键字类型">
                     <el-option label="销售订单编号" value="orderCode" />
                     <el-option label="发货申请单编号" value="outCode" />
-                    <!-- <el-option label="供应商编号" value="supplierNo" /> -->
+                    <el-option label="供应商名称" value="supplier_name" />
                     <el-option label="商品编号" value="good_code" />
                     <el-option label="商品名称" value="good_name" />
                     <el-option label="申请人部门" value="company_name" />
                     <el-option label="申请人" value="apply_name" />
                     <el-option label="采购单编号" value="cgdNo" />
                   </el-select>
-                  <el-button
-                    slot="append"
-                    icon="el-icon-search"
-                    @click="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      handleValue();
-                    "
-                  ></el-button>
+                  <el-button slot="append" icon="el-icon-search" @click="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    handleValue();
+                  "></el-button>
                 </el-input>
               </el-col>
               <el-col :span="4" style="width: 66px" class="fr">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
+                <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">
                   重置
                 </el-button>
               </el-col>
 
-              <el-col
-                :span="4"
-                style="width: 66px; float: right"
-                v-if="powers.some((i) => i == '090')"
-              >
-                <el-button
-                  type="primary"
-                  style="margin-left: 30px"
-                  @click="routeGoto('sendOutOrder', {})"
-                  :size="searchSize"
-                  class="fr"
-                >
+              <el-col :span="4" style="width: 66px; float: right" v-if="powers.some((i) => i == '090')">
+                <el-button type="primary" style="margin-left: 30px" @click="routeGoto('sendOutOrder', {})"
+                  :size="searchSize" class="fr">
                   批量发货
                 </el-button>
               </el-col>
@@ -172,57 +89,31 @@
           </div>
         </template>
         <template #status="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
-              '--'
-            "
-          ></el-tag>
+          <el-tag :size="tablebtnSize" :type="scope.row.status == '0' ? 'warning' : ''" v-text="
+            (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+            '--'
+          "></el-tag>
         </template>
         <template #order_type="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            v-text="
-              (
-                xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
-                {}
-              ).label || '--'
-            "
-          ></el-tag>
+          <el-tag :size="tablebtnSize" v-text="
+            (
+              xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
+              {}
+            ).label || '--'
+          "></el-tag>
         </template>
 
         <template #operation="{ scope }">
-          <el-tooltip
-            v-if="powers.some((i) => i == '007')"
-            effect="dark"
-            content="详情"
-            placement="top"
-          >
-            <i
-              class="el-icon-view tb-icon"
-              @click="getRouter('sellOutOrderDetail', scope.row.outCode)"
-            ></i>
+          <el-tooltip v-if="powers.some((i) => i == '007')" effect="dark" content="详情" placement="top">
+            <i class="el-icon-view tb-icon" @click="getRouter('sellOutOrderDetail', scope.row.outCode)"></i>
           </el-tooltip>
-          <el-tooltip
-            v-if="Number(scope.row.status) >= 2"
-            effect="dark"
-            content="分享"
-            placement="top"
-          >
+          <el-tooltip v-if="Number(scope.row.status) >= 2" effect="dark" content="分享" placement="top">
             <i class="el-icon-share tb-icon" @click="handleShare(scope.row.outCode)"></i>
           </el-tooltip>
         </template>
       </ex-table>
-      <add-edit
-        :id="modelId"
-        :sitem="sitem"
-        :show-model="showModel"
-        :is-detail="isDetail"
-        @refresh="searchList"
-        @cancel="showModel = false"
-      />
+      <add-edit :id="modelId" :sitem="sitem" :show-model="showModel" :is-detail="isDetail" @refresh="searchList"
+        @cancel="showModel = false" />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -292,7 +183,7 @@ export default {
         start_sendtime: "",
         end_sendtime: "",
 
-        // supplierNo: "",
+        supplier_name: "",
         companyNo: "",
         good_code: "",
         good_name: "",
@@ -629,7 +520,9 @@ export default {
     async handleValue() {
       this.parmValue.orderCode = this.select === "orderCode" ? this.s_input : "";
       this.parmValue.outCode = this.select === "outCode" ? this.s_input : "";
-      // this.parmValue.supplierNo =
+      this.parmValue.supplier_name = this.select === 'supplier_name' ? this.s_input : "";
+
+      // this.parmValue.supplierName =
       //   this.select === "supplierNo" ? this.s_input : "";
       this.parmValue.good_code = this.select === "good_code" ? this.s_input : "";
       this.parmValue.good_name = this.select === "good_name" ? this.s_input : "";
@@ -643,6 +536,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.zxoutOrder {
-}
+.zxoutOrder {}
 </style>

Some files were not shown because too many files changed in this diff