snow %!s(int64=2) %!d(string=hai) anos
pai
achega
af544b8942

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/0.js


+ 180 - 181
src/views/businessReportQuery/businessSaleReport/components/table7.vue

@@ -1,68 +1,68 @@
 <template>
-    <div>
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="table7"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @screen-submit="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @selection="selection_change"
-      >
-        <template #table-header="{}">
-          <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
-             
-               <el-col :span="6" style="width: 363px;">
-                <periodDatePickerActive
-                      :start="parmValue.start_date"
-                      :end="parmValue.end_date"
-                      :placeholder="'下单'"
-                      :width="'165px'"
-                      :size="searchSize"
-                      @timeReturned="time"
-                    />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
-              </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>
-              </el-col>
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>  
-            </el-row>
-            <!-- <el-row style="padding: 10px 0 0 0">
-              
+  <div>
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table7"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @selection="selection_change"
+    >
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 0 80px">
+
+            <el-col :span="6" style="width: 363px;">
+              <periodDatePickerActive
+                :start="parmValue.start_date"
+                :end="parmValue.end_date"
+                :placeholder="'下单'"
+                :width="'165px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
+                导出
+              </el-button>
+            </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>
+            </el-col>
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button
+                type="warning"
+                class="fr"
+                :size="searchSize"
+                @click="restSearch"
+              >
+                重置
+              </el-button>
+            </el-col>
+          </el-row>
+          <!-- <el-row style="padding: 10px 0 0 0">
+
               <el-col :span="6" style="width: 363px;">
                 <periodDatePickerActive
                       :start="parmValue.start_date"
@@ -72,8 +72,8 @@
                       :size="searchSize"
                       @timeReturned="time"
                     />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
+              </el-col>
+              <el-col :span="4" style="width: 66px; float: right">
                 <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
                     导出
                 </el-button>
@@ -97,54 +97,52 @@
                 >
                   重置
                 </el-button>
-              </el-col>     
+              </el-col>
             </el-row> -->
-          </div>
-       </template>
+        </div>
+      </template>
 
-        
-      </ex-table>
-    </div>
+    </ex-table>
+  </div>
 
-  
 </template>
-   <script>
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-import urlConfig from "@/apis/url-config";
-import asyncRequest from "@/apis/service/reportQuery/saleReport";
-import periodDatePickerActive from "../period-date-picker/main.vue";
-import { table7} from "./columns";
-import { mapGetters } from "vuex";
+<script>
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
+import urlConfig from '@/apis/url-config'
+import asyncRequest from '@/apis/service/reportQuery/saleReport'
+import periodDatePickerActive from '../period-date-picker/main.vue'
+import { table7 } from './columns'
+import { mapGetters } from 'vuex'
 
 export default {
-  name: "saleReport",
-  mixins: [mixinPage, resToken],
+  name: 'SaleReport',
   components: {
     periodDatePickerActive
   },
+  mixins: [mixinPage, resToken],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
+
   },
   data() {
     return {
-      //选中数组
+      // 选中数组
       changeList: [],
-      //全局url
+      // 全局url
       fileUrl: urlConfig.baseURL,
-      //loading
+      // loading
       loading: false,
-      //请求参数集合
+      // 请求参数集合
       parmValue: {
-        
-        start_date: "", //起始时间
-        end_date: "", // 结束时间
+
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
         // is_export:0,//是否导出0/1
 
         page: 1, // 页码
-        size: 15, // 每页显示条数
-       
+        size: 15 // 每页显示条数
+
       },
       // 表格 - 数据集合
       tableData: [],
@@ -152,166 +150,167 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ['setcol']
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格表头 - 列参数
-      table7: table7,
-    };
+      table7: table7
+    }
   },
   mounted() {
-
-    this.searchList();
+    this.searchList()
   },
 
   methods: {
-    //初始化http请求
+    // 初始化http请求
     async searchList() {
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("时间区间不完整!");
-        return;
+        this.$message.warning('时间区间不完整!')
+        return
       }
-      this.loading = true;
-      
-      const res = await asyncRequest.saleexportgoodrankinglist(this.parmValue);
+      this.loading = true
+
+      const res = await asyncRequest.saleexportgoodrankinglist(this.parmValue)
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
+        this.tableData = res.data.list
+        this.pageInfo.total = Number(res.data.count)
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
         this.$message.warning(res.message)
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
-      this.loading = false;
+      this.loading = false
     },
-   
-    //重置
+
+    // 重置
     restSearch() {
       this.parmValue = {
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
+        start_date: '', // 新建起始时间
+        end_date: '', // 新建结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
+        size: 15 // 每页显示条数
+      }
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      this.searchList();
+        total: 0
+      }
+      this.searchList()
     },
-    
+
     // 时间函数
     async time(e) {
-      this.parmValue.start_date = e.startTime || "";
-      this.parmValue.end_date = e.endTime || "";
+      this.parmValue.start_date = e.startTime || ''
+      this.parmValue.end_date = e.endTime || ''
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("时间区间不完整!");
-        return;
+        this.$message.warning('时间区间不完整!')
+        return
       }
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
 
-     //选中触发函数
+    // 选中触发函数
     selection_change(e) {
-      const { list } = e;
-      //选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
+      const { list } = e
+      // 选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
     },
-    //导出文件 
+    // 导出文件
     async download() {
       // if(this.changeList.length<=0){
       //   this.$message.warning("请选择有效数据")
       //   return;
       // }
-      let model = JSON.parse(JSON.stringify(this.parmValue))
+      const model = JSON.parse(JSON.stringify(this.parmValue))
       // model.is_export = 1;
-      let start_date = new Date(this.parmValue.start_date).valueOf();
-      let end_date = new Date(this.parmValue.end_date).valueOf();
-      let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
-      if(this.parmValue.start_date != "" && this.parmValue.end_date != ""){
-        if(flag){
-          this.$message.warning("导出文件的时间区间不能超过30天")
-          return;
+      const start_date = new Date(this.parmValue.start_date).valueOf()
+      const end_date = new Date(this.parmValue.end_date).valueOf()
+      const flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000
+      if (this.parmValue.start_date != '' && this.parmValue.end_date != '') {
+        if (flag) {
+          this.$message.warning('导出文件的时间区间不能超过30天')
+          return
         }
-      }else{
-        this.$message.warning("请选择导出文件的时间区间")
-        return;
+      } else {
+        this.$message.warning('请选择导出文件的时间区间')
+        return
       }
       if (!this.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
+        this.loading = true
+        const httpType = `aplication/zip`
         axios({
-          method: "post",
-          url: this.fileUrl + "admin/saleexportgoodrankinglistexport",
-          responseType: "blob",
-          data: model,
+          method: 'post',
+          url: this.fileUrl + 'admin/saleexportgoodrankinglistexport',
+          responseType: 'blob',
+          data: {
+            ...model
+          },
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
+            Accept: httpType
+          }
         })
           .then((res) => {
             // console.log(res)
             // console.log(this.fileUrl)
             // return;
             if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
+              const url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
                   type: httpType
                 })
-              );
-              let link = document.createElement("a");
-              link.style.display = "none";
-              link.href = url;
-              let excelName = "产品热销排行.zip";
-              link.setAttribute("download", excelName);
-              document.body.appendChild(link);
-              link.click();
-              link.remove();
-              window.URL.revokeObjectURL(url); //释放掉blob对象
-              this.$message.success(`导出成功!`);
+              )
+              const link = document.createElement('a')
+              link.style.display = 'none'
+              link.href = url
+              const excelName = '产品热销排行.zip'
+              link.setAttribute('download', excelName)
+              document.body.appendChild(link)
+              link.click()
+              link.remove()
+              window.URL.revokeObjectURL(url) // 释放掉blob对象
+              this.$message.success(`导出成功!`)
               setTimeout(() => {
-                this.loading = false;
-              }, 500);
+                this.loading = false
+              }, 500)
             } else {
-              this.$message.error(res.data.message);
+              this.$message.error(res.data.message)
               setTimeout(() => {
-                this.loading = false;
-              }, 500);
+                this.loading = false
+              }, 500)
             }
           })
           .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
+            console.log(error)
+            this.loading = false
+          })
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
    <style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }
 </style>
-   
+

+ 11 - 2
src/views/goodStore/active/components/baseForm.vue

@@ -14,7 +14,7 @@
           <el-form-item label="业务企业" prop="company_id">
             <search-work-company
               :value="ruleForm.company_id"
-              :disabled="status !== ''"
+              disabled
               :size="'mini'"
               :isDetail="false"
               :placeholder="'业务企业'"
@@ -320,10 +320,11 @@ import { mapGetters } from "vuex";
 import goodOnlinePlatformModal from "@/components/good-online-platform-modal";
 import showGoodDataModal from "@/components/show-good-data-modal";
 import addStock from "./addStock";
+import companyHelper from "@/mixins/companyHelper";
 
 export default {
   name: "activeAdd",
-  mixins: [resToken],
+  mixins: [resToken, companyHelper],
   props: ["showModel", "id", "type", "sitem", "newTime"],
   components: {
     goodOnlinePlatformModal,
@@ -470,6 +471,9 @@ export default {
     this.initForm();
   },
   methods: {
+    onCompanyChange(){
+      this.ruleForm.company_id = this.currentCompany
+    },
     async initForm() {
       this.loading = true;
       this.resetFormData();
@@ -579,6 +583,11 @@ export default {
         is_stock: is_stock || "",
         good_list: info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [],
       };
+
+      if(this.id === 'add'){
+        this.ruleForm.company_id = this.currentCompany
+      }
+
       this.status = status || "";
       this.tableData = info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : [];
     },

+ 5 - 1
src/views/goodStore/active/index.vue

@@ -129,7 +129,7 @@
                 :size="searchSize"
                 type="success"
                 style="float: right"
-                @click="routeGoto('activeDetail', { id: 'add', type: 'add' })"
+                @click="toCreateActiveRoute"
               >
                 添加
               </el-button>
@@ -277,6 +277,10 @@ export default {
     this.searchList();
   },
   methods: {
+    toCreateActiveRoute(){
+      if(!this.isHasCurrentCompany()) return
+      this.routeGoto('activeDetail', { id: 'add', type: 'add' })
+    },
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {

+ 73 - 70
src/views/supplierPurchaseIn/supplierPurchaseOrder/columns.js

@@ -6,19 +6,19 @@ const columns = [
   //   _noset_: true,
   // },
   {
-    type: "selection",
-    fixed: "left",
+    type: 'selection',
+    fixed: 'left',
     _noset_: true
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "155px",
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '155px'
   },
   {
-    prop: "orderCode",
-    label: "订单编号",
-    width: "155px",
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '155px'
   },
   // {
   //   prop: "bkcode",
@@ -26,7 +26,6 @@ const columns = [
   //   width: "155px",
   // },
 
-
   // {
   //   prop: "wsm_supplierNo",
   //   label: "仓库公司编号",
@@ -48,19 +47,18 @@ const columns = [
   //   width: "80px",
   // },
   {
-    prop: "spuCode",
-    label: "商品成本编号",
-    width: "158px",
+    prop: 'spuCode',
+    label: '商品成本编号',
+    width: '158px'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    'min-width': "145px",
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    'min-width': '145px'
   },
 
-
-  // 
+  //
   // {
   //   prop: "apply_name",
   //   label: "申请人",
@@ -106,21 +104,21 @@ const columns = [
   //   label: "验货人",
   //   width: "60px",
   // },
-  // 
+  //
   {
-    prop: "good_price",
-    label: "单价",
-    width: "110px",
+    prop: 'good_price',
+    label: '单价',
+    width: '110px'
   },
   {
-    prop: "good_num",
-    label: "数量",
-    width: "110px",
+    prop: 'good_num',
+    label: '数量',
+    width: '110px'
   },
   {
-    prop: "total_fee",
-    label: "总货款",
-    width: "110px",
+    prop: 'total_fee',
+    label: '总货款',
+    width: '110px'
   },
   // {
   //   prop: "send_num",
@@ -133,70 +131,75 @@ const columns = [
   //   width: "105px",
   // },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
+  },
+  {
+    prop: 'order_id',
+    label: '采购单来源',
+    _slot_: 'order_id',
+    width: '110px'
   },
   {
-    prop: "order_id",
-    label: "采购单来源",
-    _slot_: "order_id",
-    width: "110px",
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '110px'
   },
-  
   {
-    prop: "lasttime",
-    label: "预计最晚入库时间",
-    width: "145px",
+    prop: 'lasttime',
+    label: '预计最晚入库时间',
+    width: '145px'
   },
   {
-    prop: "supplierNo",
-    label: "采购供应商编号",
-    width: "145px",
+    prop: 'supplierNo',
+    label: '采购供应商编号',
+    width: '145px'
   },
   {
-    prop: "supplier_name",
-    label: "采购供应商名称",
-    width: "155px",
+    prop: 'supplier_name',
+    label: '采购供应商名称',
+    width: '155px'
   },
   // {
   //   prop: "company_name",
   //   label: "供应商负责人部门",
   //   minWidth: "100px",
   // },
-  
+
   {
-    prop: "supplier_cgder",
-    label: "供应商负责人",
-    width: "95",
+    prop: 'supplier_cgder',
+    label: '供应商负责人',
+    width: '95'
   },
   {
-    prop: "cgder",
-    label: "商品创建人",
-    width: "85px",
+    prop: 'cgder',
+    label: '商品创建人',
+    width: '85px'
   },
-  
+
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "145px",
+    prop: 'addtime',
+    label: '创建时间',
+    width: '145px'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
-    _slot_: "operation",
-  },
+    width: '50px',
+    _slot_: 'operation'
+  }
 ]
 const statusOptions = [
-  { value: "0", label: "待与供应商确认" },
-  { value: "1", label: "待入库" },
-  { value: "2", label: "部分入库" },
-  { value: "3", label: "入库完成" },
-  { value: "4", label: "已取消订单" },
-];
+  { value: '0', label: '待与供应商确认' },
+  { value: '1', label: '待入库' },
+  { value: '2', label: '部分入库' },
+  { value: '3', label: '入库完成' },
+  { value: '4', label: '已取消订单' }
+]
 
-export { columns, statusOptions, }
+export { columns, statusOptions }

+ 87 - 44
src/views/supplierPurchaseIn/supplierPurchaseOrder/index.vue

@@ -95,55 +95,48 @@
                 </el-button>
               </el-col>
             </el-row>
-            <el-row style="padding: 10px 0 0 0">
-              <el-col :span="4" style="margin-right: 10px">
-                <search-work-company
-                  :value="parmValue.companyNo"
-                  :placeholder="'业务公司'"
-                  :size="searchSize"
-                  @searchChange="companyNosearchChange"
-                />
-              </el-col>
 
-              <el-col :span="6" style="width: 500px; padding: 0 0 0 0px">
-                <el-input
-                  clearable
-                  placeholder="关键字"
-                  v-model="input"
-                  maxlength="40"
-                  :size="searchSize"
-                  class="input-with-select"
-                  @blur="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-select
-                    v-model="select"
-                    style="width: 125px"
-                    slot="prepend"
-                    placeholder="关键字类型"
-                    @change="
+
+            <el-row style="margin-top:10px">
+                <el-col :span="6" style="width: 500px; padding: 0 0 0 0px">
+                  <el-input
+                    clearable
+                    placeholder="关键字"
+                    v-model="input"
+                    maxlength="40"
+                    :size="searchSize"
+                    class="input-with-select"
+                    @blur="
                       pageInfo.curr = 1;
                       parmValue.page = 1;
                       searchList();
                     "
                   >
-                    <el-option label="采购单编号" value="1"></el-option>
-                    <!-- <el-option label="入库单编号" value="2"></el-option> -->
-                    <!-- 列表未渲染备库编号,注释 -->
-                    <!-- <el-option label="备库编号" value="3"></el-option> -->
-                    <el-option label="商品成本编号" value="4"></el-option>
-                    <el-option label="商品名称" value="5"></el-option>
-                    <el-option label="商品创建人" value="6"></el-option>
-                    <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
-                    <!-- <el-option label="采购供应商名称" value="10"></el-option> -->
-                    <el-option label="订单编号" value="8"></el-option>
-                    <el-option label="商品创建人部门" value="9"></el-option>
-                  </el-select>
-                </el-input>
-              </el-col>
+                    <el-select
+                      v-model="select"
+                      style="width: 125px"
+                      slot="prepend"
+                      placeholder="关键字类型"
+                      @change="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                    >
+                      <el-option label="采购单编号" value="1"></el-option>
+                      <!-- <el-option label="入库单编号" value="2"></el-option> -->
+                      <!-- 列表未渲染备库编号,注释 -->
+                      <!-- <el-option label="备库编号" value="3"></el-option> -->
+                      <el-option label="商品成本编号" value="4"></el-option>
+                      <el-option label="商品名称" value="5"></el-option>
+                      <el-option label="商品创建人" value="6"></el-option>
+                      <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
+                      <!-- <el-option label="采购供应商名称" value="10"></el-option> -->
+                      <el-option label="订单编号" value="8"></el-option>
+                      <el-option label="商品创建人部门" value="9"></el-option>
+                    </el-select>
+                  </el-input>
+                </el-col>
 
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
@@ -169,6 +162,41 @@
                 </el-button>
               </el-col>
             </el-row>
+
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="4" style="margin-right: 10px">
+                <search-work-company
+                  :value="parmValue.companyNo"
+                  :placeholder="'业务公司'"
+                  :size="searchSize"
+                  @searchChange="companyNosearchChange"
+                />
+              </el-col>
+
+
+              <el-col :span="4" style="width: 150px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_source"
+                  filterable
+                  clearable
+                  placeholder="订单来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in cg_order_source_options"
+                    :key="'status' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+            </el-row>
           </div>
         </template>
         <template #good_name="{ scope }">
@@ -186,6 +214,19 @@
             "
           ></el-tag>
         </template>
+
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                cg_order_source_options.find((item) => item.id == scope.row.order_source) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
         <template #order_id="{ scope }">
           <el-tag
             :size="tablebtnSize"
@@ -218,7 +259,7 @@ import companyHelper from "@/mixins/companyHelper";
 import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/supplierPurchaseIn/supplierPurchaseOrder";
 import { columns, statusOptions } from "./columns";
-import { cg_order_type_options } from "@/assets/js/statusList";
+import { cg_order_type_options, cg_order_source_options } from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
 
 export default {
@@ -241,6 +282,7 @@ export default {
       //入库公司
       supplierName: "",
       cg_order_type_options,
+      cg_order_source_options,
       //入库仓库
       stockName: "",
       changeList: [],
@@ -263,6 +305,7 @@ export default {
       wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
+        order_source: "",
         companyNo: "",
         orderCode: "", // 订单编号
         bk_code: "", // 备库编码

+ 38 - 12
src/views/supplierPurchaseIn/supplierWsmInOrder/index.vue

@@ -119,6 +119,42 @@
                 />
               </el-col>
 
+              <el-col :span="4" style="width: 150px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_source"
+                  filterable
+                  clearable
+                  placeholder="订单来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in cg_order_source_options"
+                    :key="'status' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="4" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  class="fr"
+                  :size="searchSize"
+                  @click="restSearch"
+                >
+                  重置
+                </el-button>
+              </el-col>
+            </el-row>
+
+            <el-row style="margin-top:10px">
               <el-col :span="6" style="width: 520px; padding: 0 0 0 0px">
                 <el-input
                   clearable
@@ -164,17 +200,6 @@
                   ></el-button>
                 </el-input>
               </el-col>
-
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
             </el-row>
           </div>
         </template>
@@ -232,7 +257,7 @@ import resToken from "@/mixins/resToken";
 import companyHelper from "@/mixins/companyHelper";
 
 import asyncRequest from "@/apis/service/supplierPurchaseIn/supplierWsmInOrder";
-import { cg_order_type_options } from "@/assets/js/statusList";
+import { cg_order_type_options, cg_order_source_options } from "@/assets/js/statusList";
 import columns from "./columns"; //表格列参数
 import { mapGetters } from "vuex";
 
@@ -262,6 +287,7 @@ export default {
       options: ["创建时间", "最晚入库时间"],
       sselect: "创建时间",
       cg_order_type_options,
+      cg_order_source_options,
 
       // 状态
       statusOptions: [

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio