build

src/views/purchaseIn/purchaseDiffOrder/columns.js

@@ -1,63 +1,92 @@
 export default [
-        {
-          prop: "cgdNo",
-          label: "采购单编号",
-          width: "160px",
-        },
-        {
-          prop: "status",
-          label: "状态",
-          _slot_: "status",
-          width: "120px",
-        },
-        {
-          prop: "company_name",
-          label: "申请人部门",
-          minWidth: "100px",
-        },
-        {
-          prop: "apply_name",
-          label: "申请人",
-          width: "65px",
-        },
-        {
-          prop: "good_code",
-          label: "商品编码",
-          width: "150px",
-        },
-        {
-          prop: "good_name",
-          label: "商品名称",
-        },
-        // {
-        //   prop: "class_cat",
-        //   label: "商品分类",
-        // },
+  {
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '160px'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
+  },
+  {
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '100px'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编码',
+    width: '155px'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '155px'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编码',
+    width: '155px'
+  },
+  {
+    prop: 'supplier_name',
+    label: '供应商名称',
+    width: '155px'
+  },
+  {
+    prop: 'order_source',
+    _slot_: 'order_source',
+    label: '订单来源'
+  },
+  {
+    prop: 'is_stock',
+    _slot_: 'is_stock',
+    label: '商品类型'
+  },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '65px'
+  },
+  {
+    prop: 'good_code',
+    label: '商品编码',
+    width: '150px'
+  },
+  {
+    prop: 'good_name',
+    label: '商品名称'
+  },
+  // {
+  //   prop: "class_cat",
+  //   label: "商品分类",
+  // },
 
-        {
-          prop: "good_weight",
-          label: "商品总重量(g)",
-          width: "110px",
-        },
-        {
-          prop: "diff_weight",
-          label: "工差总重量(g)",
-          width: "110px",
-        },
+  {
+    prop: 'good_weight',
+    label: '商品总重量(g)',
+    width: '110px'
+  },
+  {
+    prop: 'diff_weight',
+    label: '工差总重量(g)',
+    width: '110px'
+  },
 
-       
-        {
-          prop: "addtime",
-          label: "创建时间",
-          width: "140px",
-          sortable: true,
-        },
-        {
-          prop: "",
-          label: "操作",
-          fixed: "right",
-          _noset_: true,
-          width: "52px",
-          _slot_: "operation",
-        },
-      ]
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    width: '140px',
+    sortable: true
+  },
+  {
+    prop: '',
+    label: '操作',
+    fixed: 'right',
+    _noset_: true,
+    width: '52px',
+    _slot_: 'operation'
+  }
+]

src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -26,7 +26,9 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="4" style="width: 140px">
+              <el-row>
+
+                <el-col :span="4" style="width: 140px">
                 <el-select
                   :size="searchSize"
                   v-model="parmValue.status"
@@ -80,8 +82,69 @@
                   重置
                 </el-button>
               </el-col>
-            </el-row>
-            <el-row style="padding: 10px 0 0 0">
+              </el-row>
+
+              <el-row style="margin-top:10px;margin-left:-80px">
+                <el-col :span="4" style="width: 130px; margin-right:10px">
+                    <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="'order_type' + item.id"
+                     :label="item.label"
+                     :value="item.id"
+                    />
+                  </el-select>
+                </el-col>
+
+                <el-col :span="4" style="width: 130px; margin-right:10px">
+                    <el-select
+                      :size="searchSize"
+                      v-model="parmValue.is_stock"
+                      filterable
+                      clearable
+                      placeholder="商品类型"
+                      style="width: 100%"
+                      @change="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                  >
+                   <el-option value="0" label="非库存品" />
+                   <el-option value="1" label="库存品" />
+                  </el-select>
+                </el-col>
+
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+             </el-col>
+              </el-row>
+
+
+
+            <el-row style="padding: 10px 0 0 0;margin-left:-80px">
               <el-col :span="6" style="width: 400px; padding: 0 0 0 0px">
                 <el-input
                   clearable
@@ -114,6 +177,7 @@
                 </el-input>
               </el-col>
             </el-row>
+            </el-row>
           </div>
         </template>
         <template #status="{ scope }">
@@ -126,6 +190,26 @@
             "
           ></el-tag>
         </template>
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (cg_order_source_options.find((item) => item.id == scope.row.order_source) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #is_stock="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (is_stock_options.find((item) => item.id == String(scope.row.is_stock)) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((i) => i == '007')"
@@ -163,6 +247,8 @@ import asyncRequest from "@/apis/service/purchaseIn/purchaseDiffOrder";
 import columns from "./columns";
 import { mapGetters } from "vuex";
 import companyHelper from "@/mixins/companyHelper"
+import { cg_order_source_options } from "@/assets/js/statusList";
+
 
 export default {
   name: "purchaseDiffOrder",
@@ -183,6 +269,8 @@ export default {
   },
   data() {
     return {
+      cg_order_source_options,
+      supplierNo:"",
       sitem: null,
       select: "cgdNo",
       s_input: "", //下拉搜索框内容
@@ -191,11 +279,17 @@ export default {
         { id: "1", label: "待业务部门审核" },
         { id: "2", label: "工差单审核完成" },
       ],
+      is_stock_options: [
+        { id: '0', name: '非库存品' },
+        { id: '1', name: '库存品' }
+      ],
       loading: true,
       showModel: false,
       isDetail: false,
       modelId: 0,
       parmValue: {
+        is_stock: '',
+        order_source: '',
         name: "", // 业务员名字
         username: "", // 账号
         apply_name: "", //申请人
@@ -262,7 +356,12 @@ export default {
     this.searchList();
   },
 
-  methods: {
+  methods: {    
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
     getRouter(toRouter, queryId){
       if (toRouter && queryId) {
         let model = {
@@ -369,6 +468,7 @@ export default {
       
       const res = await asyncRequest.list({
        ...this.parmValue,
+       supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
        needRela: true
       });
 

src/views/purchaseIn/purchaseOrder/columns.js

@@ -138,7 +138,7 @@ const columns = [
   },
   {
     prop: 'order_id',
-    label: '采购单来源',
+    label: '商品类型',
     _slot_: 'order_id',
     width: '110px'
   },

src/views/purchaseIn/purchaseOrder/index.vue

@@ -105,7 +105,7 @@
                   v-model="parmValue.order_type"
                   filterable
                   clearable
-                  placeholder="采购单来源"
+                  placeholder="商品类型"
                   style="width: 100%"
                   @change="
                     pageInfo.curr = 1;
@@ -122,7 +122,7 @@
                 </el-select>
               </el-col>
 
-              <el-col :span="4" style="width: 130px; margin-right:10px">
+            <el-col :span="4" style="width: 130px; margin-right:10px">
                 <el-select
                   :size="searchSize"
                   v-model="parmValue.order_source"
@@ -143,9 +143,54 @@
                     :value="item.id"
                   />
                 </el-select>
+            </el-col>
+            
+            <el-col :span="4">
+              <search-supplier
+                  :size="'mini'"
+                  style="width: 220px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+            </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-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-col :span="6" style="width: 500px; padding: 0 0 0 0px">
+            <el-row>
+              <el-col :span="6" style="width: 500px; margin-top: 10px">
                 <el-input
                   clearable
                   placeholder="关键字"
@@ -177,39 +222,13 @@
                     <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="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
-                  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 == '087')"
-              >
-                <el-button
-                  type="primary"
-                  style="margin-left: 30px"
-                  @click="download"
-                  :size="searchSize"
-                  class="fr"
-                >
-                  导出
-                </el-button>
-              </el-col>
             </el-row>
           </div>
         </template>
@@ -296,6 +315,11 @@ export default {
   },
   data() {
     return {
+      is_stock: [
+        { id: '0', name: '非库存品' },
+        { id: '1', name: '库存品' }
+      ],
+      supplierNo: [],
       //入库公司
       supplierName: "",
       cg_order_type_options,
@@ -320,7 +344,7 @@ export default {
       isDetail: false,
       modelId: 0,
       wsm_code: [],
-      wsm_supplierNo: [],
+      // wsm_supplierNo: [],
       parmValue: {
         order_source: "",
         orderCode: "", // 订单编号
@@ -404,6 +428,11 @@ export default {
   },
 
   methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
@@ -637,25 +666,25 @@ export default {
         await this.searchList();
       }
     },
-    async supplierChange(e) {
-      if (e && e.id) {
-        //入库公司
-        // localStorage.setItem("wsm_supplierNo",e.label)
-        // this.supplierName = localStorage.getItem("rkNm")
-        this.parmValue.wsm_supplierNo = e.code;
-        this.wsm_supplierNo = [e.code];
-      } else {
-        //入库公司
-        // localStorage.setItem("wsm_supplierNo","")
-        this.parmValue.wsm_supplierNo = "";
-        this.wsm_supplierNo = [];
-      }
-      this.parmValue.wsm_code = "";
-      this.wsm_code = [];
-      this.parmValue.page = 1;
-      this.pageInfo.curr = 1;
-      await this.searchList();
-    },
+    // async supplierChange(e) {
+    //   if (e && e.id) {
+    //     //入库公司
+    //     // localStorage.setItem("wsm_supplierNo",e.label)
+    //     // this.supplierName = localStorage.getItem("rkNm")
+    //     this.parmValue.wsm_supplierNo = e.code;
+    //     this.wsm_supplierNo = [e.code];
+    //   } else {
+    //     //入库公司
+    //     // localStorage.setItem("wsm_supplierNo","")
+    //     this.parmValue.wsm_supplierNo = "";
+    //     this.wsm_supplierNo = [];
+    //   }
+    //   this.parmValue.wsm_code = "";
+    //   this.wsm_code = [];
+    //   this.parmValue.page = 1;
+    //   this.pageInfo.curr = 1;
+    //   await this.searchList();
+    // },
     async stockChange(e) {
       if (e && e.id) {
         //入库仓库
@@ -690,15 +719,15 @@ export default {
       this.parmValue.good_code = this.select === "4" ? this.input : ""; // 产品属性编号
       this.parmValue.good_name = this.select === "5" ? this.input : ""; // 产品名称
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
-      this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
+      // this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 采购供应商编号
       this.parmValue.company_name = this.select === "9" ? this.input : ""; // 部门
-      this.parmValue.supplier_name = this.select === "10" ? this.input : ""; // 采购供应商名称
-      console.log(this.pageInfo);
+      // this.parmValue.supplier_name = this.select === "10" ? this.input : ""; // 采购供应商名称
       // this.wsm_supplierNo = [];
-      
+
       const res = await asyncRequest.list({
         ...this.parmValue,
+        supplierNo:Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
         needRela: true
       });
 

src/views/purchaseIn/purchaseReturn/columns.js

@@ -1,13 +1,13 @@
 export default [
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "160"
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '160'
   },
   {
-    prop: "returnCode",
-    label: "退货单编号",
-    width: "160"
+    prop: 'returnCode',
+    label: '退货单编号',
+    width: '160'
   },
   // {确认单编号}
   // {order_type类型}
@@ -22,35 +22,73 @@ export default [
   //   width: "120px",
   // },
   {
-    prop: "order_type",
-    label: "退货来源",
+    prop: 'order_type',
+    label: '退货来源',
     // 1备库 2竞价
-    _slot_: "order_type",
-    width: "80px"
+    _slot_: 'order_type',
+    width: '80px'
   },
   {
-    prop: "spuCode",
-    label: "商品编号",
-    width: "160px"
+    prop: 'spuCode',
+    label: '商品编号',
+    width: '160px'
   },
   {
-    prop: "good_class",
-    label: "商品分类",
-    width: "130",
+    prop: 'good_class',
+    label: '商品分类',
+    width: '130'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    width: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    width: '150'
   },
   {
-    prop: "return_num",
-    label: "退货数量",
+    prop: 'is_stock',
+    _slot_: 'is_stock',
+    label: '商品类型',
+    width: '150'
   },
   {
-    prop: "return_fee",
-    label: "退货总金额",
-    width: "100"
+    prop: 'companyNo',
+    label: '业务公司编码',
+    width: '155px'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '155px'
+  },
+  {
+    prop: 'order_source',
+    _slot_: 'order_source',
+    label: '订单来源',
+    width: '155px'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号',
+    width: '155px'
+  },
+  {
+    prop: 'supplier_name',
+    label: '供应商名称',
+    width: '155px'
+  },
+  {
+    prop: 'order_source',
+    _slot_: 'order_source',
+    label: '订单来源',
+    width: '150'
+  },
+  {
+    prop: 'return_num',
+    label: '退货数量'
+  },
+  {
+    prop: 'return_fee',
+    label: '退货总金额',
+    width: '100'
   },
   // {
   //   prop: "post_company",
@@ -80,12 +118,12 @@ export default [
   // },
 
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
-    width: "50px",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
+    width: '50px',
     _noset_: true,
-    _slot_: "operation",
-  },
+    _slot_: 'operation'
+  }
 
-]
+]

src/views/purchaseIn/purchaseReturn/index.vue

@@ -87,6 +87,52 @@
                   ></el-button>
                 </el-input>
               </el-col>
+              
+
+
+              <el-col :span="4" style="width: 130px;margin-left:10px">
+                <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="'order_type' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="4" style="width: 130px;margin-left:10px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.is_stock"
+                  filterable
+                  clearable
+                  placeholder="商品类型"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option value="0" label="非库存品" />
+                  <el-option value="1" label="库存品" />
+                </el-select>
+              </el-col>
+              
+              
 
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
@@ -113,6 +159,23 @@
                 </el-button>
               </el-col>
             </el-row>
+
+
+            <el-row>
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px;margin-top:10px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+             </el-col>
+            </el-row>
           </div>
         </template>
        
@@ -192,7 +255,7 @@ import resToken from "@/mixins/resToken";
 import columns from "./columns";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseReturn";
 import { mapGetters } from "vuex";
-import { cg_order_type_options } from "@/assets/js/statusList";
+import { cg_order_type_options , cg_order_source_options} from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper";
 export default {
   name: "purchaseReturn",
@@ -227,11 +290,14 @@ export default {
         // { id: "5", label: "完成退货" },
       ],
       cg_order_type_options,
+      cg_order_source_options,
       loading: true,
       showModel: false,
       isDetail: false,
       modelId: 0,
       parmValue: {
+        order_source: "",
+        is_stock: "",
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号
         good_type_code: "", //商品属性编号
@@ -289,6 +355,11 @@ export default {
   },
 
   methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
     getRouter(toRouter, queryId){
       if (toRouter && queryId) {
         let model = {
@@ -372,6 +443,7 @@ export default {
       let model = JSON.parse(JSON.stringify(this.parmValue));
       const res = await asyncRequest.list({
         ...model,
+        supplierNo:Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
         needRela: true
       });
       if (res && res.code === 0 && res.data) {

src/views/purchaseIn/wsmInOrder/columns.js

@@ -72,7 +72,7 @@ export default [
 
   {
     prop: 'order_type',
-    label: '入库单来源',
+    label: '商品类型',
     _slot_: 'order_type',
     width: '130px'
   },
@@ -135,20 +135,35 @@ export default [
   //   width: "145px",
   // },
   {
-    prop: 'wsm_supplierNo',
-    label: '仓库公司编号',
-    width: '145px'
+    prop: 'companyNo',
+    label: '业务公司编码',
+    width: '155px'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '155px'
   },
   {
-    prop: 'wsm_supplier',
-    label: '仓库公司名称',
+    prop: 'supplierNo',
+    label: '供应商编码',
     width: '155px'
   },
   {
-    prop: 'wsm_code',
-    label: '仓库编号',
-    width: '172px'
+    prop: 'supplier_name',
+    label: '供应商名称',
+    width: '155px'
   },
+  // {
+  //   prop: 'wsm_supplier',
+  //   label: '仓库公司名称',
+  //   width: '155px'
+  // },
+  // {
+  //   prop: 'wsm_code',
+  //   label: '仓库编号',
+  //   width: '172px'
+  // },
   {
     prop: 'wsm_name',
     label: '仓库名称',

src/views/purchaseIn/wsmInOrder/index.vue

@@ -30,7 +30,7 @@
                   v-model="parmValue.order_type"
                   filterable
                   clearable
-                  placeholder="入库单来源"
+                  placeholder="商品类型"
                   style="width: 100%"
                   @change="
                     pageInfo.curr = 1;
@@ -90,48 +90,8 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
-              <!-- <el-col :span="4" style="width: 120px">
-                <el-dropdown @command="handleClick($event)" :size="searchSize">
-                  <el-button :size="searchSize" style="width: 120px">
-                    {{ sselect }}
-                    <i
-                      class="el-icon-arrow-down el-icon--right"
-                      :size="searchSize"
-                    ></i>
-                  </el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item
-                      v-for="item in options"
-                      :key="item"
-                      :command="item"
-                      >{{ item }}</el-dropdown-item
-                    >
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </el-col> -->
-              <el-col :span="4" style="width: 130px; margin-right:10px">
-                <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="'order_type' + item.id"
-                    :label="item.label"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-col>
 
+            <el-row>
               <el-col :span="6" style="width: 520px; padding: 0 0 0 0px">
                 <el-input
                   clearable
@@ -162,7 +122,7 @@
                     <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="7"></el-option> -->
                     <el-option label="申请人部门" value="8"></el-option>
                   </el-select>
                   <el-button
@@ -176,6 +136,7 @@
                   ></el-button>
                 </el-input>
               </el-col>
+            </el-row>
 
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
@@ -187,7 +148,69 @@
                   重置
                 </el-button>
               </el-col>
+
+
+              <el-col :span="4" style="width: 130px; margin-top:10px">
+                <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="'order_type' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px;margin-top:10px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+             </el-col>
             </el-row>
+
+                  <!-- <el-col :span="4" style="width: 120px">
+                <el-dropdown @command="handleClick($event)" :size="searchSize">
+                  <el-button :size="searchSize" style="width: 120px">
+                    {{ sselect }}
+                    <i
+                      class="el-icon-arrow-down el-icon--right"
+                      :size="searchSize"
+                    ></i>
+                  </el-button>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item
+                      v-for="item in options"
+                      :key="item"
+                      :command="item"
+                      >{{ item }}</el-dropdown-item
+                    >
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </el-col> -->
+
+
+
+
           </div>
         </template>
         <template #good_name="{ scope }">
@@ -218,6 +241,19 @@
             "
           ></el-tag>
         </template>
+
+        <template #is_stock="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+              is_stock.find((item) => item.id == scope.row.is_stock) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
@@ -274,6 +310,7 @@ export default {
   },
   data() {
     return {
+      supplierNo: "",
       sitem: null,
       select: "1",
       input: "",
@@ -281,6 +318,7 @@ export default {
         start: "", //起始时间
         end: "", // 结束时间
       },
+      supplierNo:[],
       options: ["创建时间", "最晚入库时间"],
       sselect: "创建时间",
       cg_order_type_options,
@@ -324,6 +362,7 @@ export default {
       wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
+        order_source: "",
         order_type: "",
         // bk_code: "", // 备库编码
         wsm_in_code: "", // 入库单号
@@ -392,7 +431,12 @@ export default {
     this.searchList();
   },
 
-  methods: {
+  methods: {    
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
@@ -469,20 +513,20 @@ export default {
         await this.searchList();
       }
     },
-    async supplierChange(e) {
-      if (e && e.id) {
-        this.parmValue.wsm_supplierNo = e.code;
-        this.wsm_supplierNo = [e.code];
-      } else {
-        this.parmValue.wsm_supplierNo = "";
-        this.wsm_supplierNo = [];
-      }
-      this.parmValue.wsm_code = "";
-      this.wsm_code = [];
-      this.parmValue.page = 1;
-      this.pageInfo.curr = 1;
-      await this.searchList();
-    },
+    // async supplierChange(e) {
+    //   if (e && e.id) {
+    //     this.parmValue.wsm_supplierNo = e.code;
+    //     this.wsm_supplierNo = [e.code];
+    //   } else {
+    //     this.parmValue.wsm_supplierNo = "";
+    //     this.wsm_supplierNo = [];
+    //   }
+    //   this.parmValue.wsm_code = "";
+    //   this.wsm_code = [];
+    //   this.parmValue.page = 1;
+    //   this.pageInfo.curr = 1;
+    //   await this.searchList();
+    // },
     async stockChange(e) {
       if (e && e.id) {
         this.parmValue.wsm_code = e.code;
@@ -529,11 +573,12 @@ export default {
         wsm_code: model.wsm_code,
         good_name: model.good_name,
         supplie: "",
-        supplierNo: model.supplierNo,
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo, 
         status: model.status,
         page: model.page,
         size: model.size,
         company_name: model.company_name,
+        order_source: model.order_source,
         needRela: true
       };
       const res = await asyncRequest.list(_model);