build

src/views/sellOut/sellAfterApply/components/supplier-confirm.vue

@@ -80,7 +80,7 @@ export default {
   },
   computed: {
     displayExpressField() {
-      return this.formData.status === '4'
+      return this.formData.status === '4' && (this.sitem && this.sitem.is_receive !== '0')
     },
     rules() {
       const { status } = this.formData

src/views/sellOut/sellAfterApply/components/supplier_exam.vue

@@ -63,7 +63,7 @@ const validatemobile = (rule, value, callback) => {
 export default {
   name: 'SupplierExam',
   mixins: [],
-  props: [],
+  props: ['sitem'],
   data() {
     return {
       formData: {
@@ -82,7 +82,7 @@ export default {
   },
   computed: {
     displayExpressField() {
-      return this.formData.status === '4'
+      return this.formData.status === '4' && (this.sitem && this.sitem.is_receive !== '0')
     },
     rules() {
       const { status } = this.formData

src/views/sellOut/sellAfterApply/detail.vue

@@ -159,15 +159,15 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item name="4" title="供应商驳回，待采购审核" v-if="!isSupertube && String(sitem.status) === '2' && this.ppowers.includes('2')">
+            <el-collapse-item name="4" title="供应商驳回,待供应商负责人审核"  v-if="!isSupertube && String(sitem.status) === '2' && this.ppowers.includes('2')">
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseConfirm" />
             </el-collapse-item>
 
-            <el-collapse-item name="5" title="供应商审核"  v-if="!isSupertube && String(sitem.status) === '9' && this.ppowers.includes('9')">
+            <el-collapse-item name="5" title="供应商审核" v-if="!isSupertube && String(sitem.status) === '9' && this.ppowers.includes('9')">
               <supplier-exam :sitem="sitem" @changeStatus="handleSupplierExam" />
             </el-collapse-item>
 
-            <el-collapse-item name="6" title="待客户退货"  v-if="!isSupertube && String(sitem.status) === '4' && this.ppowers.includes('4')">
+            <el-collapse-item name="6" title="待客户退货" v-if="!isSupertube && String(sitem.status) === '4' && this.ppowers.includes('4')">
               <wait-return :sitem="sitem" @changeStatus="handleExpress" />
             </el-collapse-item>
 
@@ -295,7 +295,7 @@ export default {
       // 收到货状态
       status1Options: [
         { value: "1", label: "待业务审核" },
-        { value: "2", label: "供应商驳回,待采购审核" },
+        { value: "2", label: "供应商驳回,待供应商负责人审核" },
         { value: "4", label: "待客户退货" },
         { value: "5", label: "售后已完成" },
         { value: "6", label: "业务已驳回" },
@@ -306,7 +306,7 @@ export default {
       // 未收到货状态
       status2Options: [
         { value: "1", label: "待业务审核" },
-        { value: "2", label: "供应商驳回,待采购审核" },
+        { value: "2", label: "供应商驳回,待供应商负责人审核" },
         // { id: "3", label: "待设置仓库" }, // 废弃
         { value: "4", label: "待客户退货" },
         { value: "5", label: "售后已完成" },

src/views/sellOut/sellAfterApply/index.vue

@@ -359,7 +359,7 @@ export default {
       // 收到货状态
       status1Options: [
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },
+        { id: "2", label: "供应商驳回,待供应商负责人审核" },
         { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
@@ -370,7 +370,7 @@ export default {
        // 未收到货状态
       status2Options: [
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },
+        { id: "2", label: "供应商驳回,待供应商负责人审核" },
         { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
@@ -419,7 +419,7 @@ export default {
       // 处理状态
       serviceOptions: [
         { value: "1", label: "待业务审核" },
-        { value: "2", label: "供应商驳回,待采购审核" },
+        { value: "2", label: "供应商驳回,待供应商负责人审核" },
         { value: "4", label: "待客户退货" },
         { value: "5", label: "售后已完成" },
         { value: "6", label: "业务已驳回" },

src/views/sellOut/sellReturn/components/approval-results.vue

@@ -43,7 +43,7 @@ import companyHelper from '@/mixins/companyHelper'
 export default {
   name: 'ApprovalResults',
   mixins: [companyHelper],
-  props: [],
+  props: ['sitem'],
   data() {
     return {
       company: '',
@@ -59,6 +59,7 @@ export default {
   },
   computed: {
     displayExpressField() {
+      console.log(this.sitem)
       return this.formData.status === '4'
     },
     rules() {
@@ -99,8 +100,6 @@ export default {
       }
     }
   },
-  mounted() {
-  },
   methods: {
     async stockChange(e) {
       const { code, label, contactor, mobile, addr_cn } = e

src/views/sellOut/sellReturn/detail.vue

@@ -174,7 +174,6 @@
                   is_stock + '' === '1'
                 ) &&
                 ppowers.some((i) => i == '1') && -->
-
             <el-collapse-item
               title="供应商审核"
               name="4"
@@ -190,9 +189,8 @@
               />
             </el-collapse-item>
 
-
-            <el-collapse-item title="供应商已驳回,待采购审核" name="5"  v-if="hasPermission({status:'8', process:'8'})">
-              <approval-results @changeStatus="handlePurchaseExam" />
+            <el-collapse-item title="供应商已驳回,待采购审核" name="5" v-if="hasPermission({status:'8', process:'8'})">
+              <approval-results :sitem="sitem" @changeStatus="handlePurchaseExam" />
             </el-collapse-item>
 
             <el-collapse-item title="业务公司修改待供应商确认" name="6" v-if="hasPermission({status:'10', process:'10'})">
@@ -292,7 +290,6 @@ export default {
   components: {
     comExamForm,
     ApprovalResults
-    // ReturnCheck,
   },
   computed: {
     ...mapGetters(['isSupertube']),
@@ -319,7 +316,7 @@ export default {
         { value: "1", label: "待业务审批" },
         { value: "4", label: "退货完成" },
         { value: "5", label: "业务驳回" },
-        { value: '8', label:'供应商驳回,待采购审核'},
+        { value: '8', label:'供应商驳回,待供应商负责人审核'},
         { value: '9', label:'待供应商审核'},
         { value: '10', label:'业务公司修改待供应商确认'},
       ],

src/views/sellOut/sellReturn/index.vue

@@ -310,7 +310,7 @@ export default {
         { value: "5", label: "业务驳回" },
         // { value: "6", label: "采购驳回" }, // 废弃
         // { value: "7", label: "专员审批不通过" },
-        { value: '8', label:'供应商驳回,待采购审核'},
+        { value: '8', label:'供应商驳回,待供应商负责人审核'},
         { value: '9', label:'待供应商审核'},
         { value: '10', label:'业务公司修改,待供应商确认'},
       ],

src/views/supplierPurchaseIn/supplierPurchaseDiffOrder/columns.js

@@ -1,63 +1,68 @@
 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: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '85px'
+  },
+  {
+    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: "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/supplierPurchaseIn/supplierPurchaseDiffOrder/index.vue

@@ -79,16 +79,8 @@
                 </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-row style="margin-top:10px">
               <el-col :span="6" style="width: 400px; padding: 0 0 0 0px">
                 <el-input
                   clearable
@@ -121,6 +113,39 @@
                 </el-input>
               </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 #status="{ scope }">
@@ -133,6 +158,17 @@
             "
           ></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 #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((i) => i == '007')"
@@ -167,8 +203,10 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/supplierPurchaseIn/supplierPurchaseDiffOrder";
 import companyHelper from "@/mixins/companyHelper";
 // import addEditModel from "./addEditModel";
+
 import columns from "./columns";
 import { mapGetters } from "vuex";
+import { cg_order_source_options } from "@/assets/js/statusList";
 
 export default {
   name: "purchaseDiffOrder",
@@ -193,6 +231,7 @@ export default {
       select: "cgdNo",
       s_input: "", //下拉搜索框内容
       // 状态
+      cg_order_source_options,
       statusOptions: [
         { id: "1", label: "待业务部门审核" },
         { id: "2", label: "工差单审核完成" },

src/views/supplierPurchaseIn/supplierPurchaseReturn/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,49 @@ 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: 'order_source',
+  //   label: '退货来源',
+  //   // 1备库 2竞价
+  //   _slot_: 'order_source',
+  //   width: '80px'
+  // },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    // 1备库 2竞价
+    _slot_: 'order_source',
+    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: 'return_num',
+    label: '退货数量'
   },
   {
-    prop: "return_fee",
-    label: "退货总金额",
-    width: "100"
+    prop: 'return_fee',
+    label: '退货总金额',
+    width: '100'
   },
   // {
   //   prop: "post_company",
@@ -80,12 +94,12 @@ export default [
   // },
 
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
-    width: "50px",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
+    width: '50px',
     _noset_: true,
-    _slot_: "operation",
-  },
+    _slot_: 'operation'
+  }
 
-]
+]

src/views/supplierPurchaseIn/supplierPurchaseReturn/index.vue

@@ -55,6 +55,52 @@
                 />
               </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="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" class="fr" style="width: 66px; padding: 0 0 0 10px">
+                <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: 400px">
                 <el-input
@@ -88,41 +134,34 @@
                   ></el-button>
                 </el-input>
               </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" class="fr" style="width: 66px; padding: 0 0 0 10px">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
             </el-row>
           </div>
         </template>
 
         <template #order_type="{ scope }">
-          <p
+          <el-tag
+            size="mini"
             v-text="
               (
                 cg_order_type_options.find((item) => item.id == scope.row.order_type) ||
                 {}
               ).label || '--'
             "
-          ></p>
+          ></el-tag>
+        </template>
+        
+        <template #order_source="{ scope }">
+          <el-tag
+            size="mini"
+            v-text="
+              (
+                cg_order_source_options.find((item) => item.id == scope.row.order_source) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
         </template>
+
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((i) => i == '007')"
@@ -183,7 +222,7 @@ import companyHelper from "@/mixins/companyHelper";
 import columns from "./columns";
 import asyncRequest from "@/apis/service/supplierPurchaseIn/supplierPurchaseReturn";
 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";
 export default {
   name: "purchaseReturn",
   mixins: [mixinPage, resToken, companyHelper],
@@ -217,11 +256,13 @@ export default {
         // { id: "5", label: "完成退货" },
       ],
       cg_order_type_options,
+      cg_order_source_options,
       loading: true,
       showModel: false,
       isDetail: false,
       modelId: 0,
       parmValue: {
+        order_source: "",
         companyNo: "",
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号

src/views/supplierPurchaseIn/supplierWsmInOrder/columns.js

@@ -1,20 +1,20 @@
 export default [
 
   {
-    prop: "wsm_in_code",
-    label: "入库单编号",
-    width: "155"
+    prop: 'wsm_in_code',
+    label: '入库单编号',
+    width: '155'
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "155px",
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '155px'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "110px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '110px'
   },
   // {
   //   prop: "bkcode",
@@ -33,26 +33,26 @@ export default [
   // },
 
   {
-    prop: "spuCode",
-    label: "商品成本编号",
-    width: "145px",
+    prop: 'spuCode',
+    label: '商品成本编号',
+    width: '145px'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    'min-width': "145px",
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    'min-width': '145px'
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    'width': "95px",
+    prop: 'brand_name',
+    label: '品牌',
+    'width': '95px'
   },
- 
+
   {
-    prop: "send_num",
-    label: "发货数量",
-    width: "80px",
+    prop: 'send_num',
+    label: '发货数量',
+    width: '80px'
   },
   // {
   //   prop: "post_company",
@@ -65,16 +65,22 @@ export default [
   //   width: "140px",
   // },
   {
-    prop: "post_fee",
-    label: "物流费用",
-    width: "100px",
+    prop: 'post_fee',
+    label: '物流费用',
+    width: '100px'
   },
 
   {
-    prop: "order_type",
-    label: "备货单",
-    _slot_: "order_type",
-    width: "130px",
+    prop: 'order_type',
+    label: '备货单',
+    _slot_: 'order_type',
+    width: '130px'
+  },
+  {
+    prop: 'order_source',
+    _slot_: 'order_source',
+    label: '订单来源',
+    width: '130px'
   },
   // {
   //   prop: "wsm_num",
@@ -91,7 +97,7 @@ export default [
   //   label: "验货人",
   //   width: "60px",
   // },
-  // 
+  //
   // {
   //   prop: "cgder",
   //   label: "供应商负责人",
@@ -129,24 +135,24 @@ export default [
   //   width: "145px",
   // },
   {
-    prop: "wsm_supplierNo",
-    label: "仓库公司编号",
-    width: "145px",
+    prop: 'wsm_supplierNo',
+    label: '仓库公司编号',
+    width: '145px'
   },
   {
-    prop: "wsm_supplier",
-    label: "仓库公司名称",
-    width: "155px",
+    prop: 'wsm_supplier',
+    label: '仓库公司名称',
+    width: '155px'
   },
   {
-    prop: "wsm_code",
-    label: "仓库编号",
-    width: "172px",
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '172px'
   },
   {
-    prop: "wsm_name",
-    label: "仓库名称",
-    width: "80px",
+    prop: 'wsm_name',
+    label: '仓库名称',
+    width: '80px'
   },
   // {
   //   prop: "company_name",
@@ -154,19 +160,19 @@ export default [
   //   minWidth: "150px",
   // },
   {
-    prop: "cgder",
-    label: "供应商负责人",
-    width: "95",
+    prop: 'cgder',
+    label: '供应商负责人',
+    width: '95'
   },
   {
-    prop: "good_creater",
-    label: "商品创建人",
-    width: "85px",
+    prop: 'good_creater',
+    label: '商品创建人',
+    width: '85px'
   },
   {
-    prop: "sendtime",
-    label: "发货时间",
-    width: "145px",
+    prop: 'sendtime',
+    label: '发货时间',
+    width: '145px'
   },
   // {
   //   prop: "addtime",
@@ -174,11 +180,11 @@ export default [
   //   width: "145px",
   // },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
-    _slot_: "operation",
-  },
-]
+    width: '50px',
+    _slot_: 'operation'
+  }
+]

src/views/supplierPurchaseIn/supplierWsmInOrder/index.vue

@@ -90,6 +90,51 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
+              <el-col :span="6" style="width: 520px; padding: 0 0 0 0px">
+                <el-input
+                  clearable
+                  placeholder="关键字"
+                  v-model="input"
+                  :size="searchSize"
+                  class="input-with-select"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-select
+                    v-model="select"
+                    style="width: 145px"
+                    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="8"></el-option>
+                  </el-select>
+
+                  <el-button
+                    slot="append"
+                    @click="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                    icon="el-icon-search"
+                  ></el-button>
+                </el-input>
+              </el-col>
               <!-- <el-col :span="4" style="width: 120px">
                 <el-dropdown @command="handleClick($event)" :size="searchSize">
                   <el-button :size="searchSize" style="width: 120px">
@@ -110,6 +155,21 @@
                 </el-dropdown>
               </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="4" style="margin-right: 10px">
                 <search-work-company
                   :value="parmValue.companyNo"
@@ -141,65 +201,6 @@
                   />
                 </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
-                  placeholder="关键字"
-                  v-model="input"
-                  :size="searchSize"
-                  class="input-with-select"
-                  @blur="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-select
-                    v-model="select"
-                    style="width: 145px"
-                    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="8"></el-option>
-                  </el-select>
-
-                  <el-button
-                    slot="append"
-                    @click="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                    icon="el-icon-search"
-                  ></el-button>
-                </el-input>
-              </el-col>
             </el-row>
           </div>
         </template>
@@ -220,6 +221,17 @@
             "
           ></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 #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
@@ -327,6 +339,7 @@ export default {
       wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
+        order_source: "",
         companyNo: "",
         order_type: "",
         // bk_code: "", // 备库编码
@@ -525,6 +538,8 @@ export default {
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
       this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
       this.parmValue.company_name = this.select === "8" ? this.input : ""; // 部门
+
+
       // this.wsm_supplierNo = [];
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.supplierNo = this.currentCompany;
@@ -547,6 +562,7 @@ export default {
         company_name: model.company_name,
         companyNo: model.companyNo,
         noRelation: true,
+        order_source: model.order_source
       };
 
       const res = await asyncRequest.list(_model);

src/views/supplierSellOut/supplierSellAfterApply/components/supplier-confirm.vue

@@ -80,7 +80,7 @@ export default {
   },
   computed: {
     displayExpressField() {
-      return this.formData.status === '4'
+      return this.formData.status === '4' && (this.sitem && this.sitem.is_receive !== '0')
     },
     rules() {
       const { status } = this.formData

src/views/supplierSellOut/supplierSellAfterApply/components/supplier_exam.vue

@@ -63,7 +63,7 @@ const validatemobile = (rule, value, callback) => {
 export default {
   name: 'SupplierExam',
   mixins: [],
-  props: [],
+  props: ['sitem'],
   data() {
     return {
       formData: {
@@ -82,7 +82,7 @@ export default {
   },
   computed: {
     displayExpressField() {
-      return this.formData.status === '4'
+      return this.formData.status === '4' && (this.sitem && this.sitem.is_receive !== '0')
     },
     rules() {
       const { status } = this.formData

src/views/supplierSellOut/supplierSellAfterApply/detail.vue

@@ -104,7 +104,8 @@
             <!-- <el-collapse-item name="6" title="待客户退货"  v-if="isSupertube && String(sitem.status) === '4' && this.ppowers.includes('4')">
               <wait-return :sitem="sitem" @changeStatus="handleExpress" />
             </el-collapse-item> -->
-            <el-collapse-item name="7" title="业务公司修改待供应商确认" v-if="!isSupertube && String(sitem.status) === '10' && this.ppowers.includes('10')">
+            
+            <el-collapse-item name="7" title="业务公司修改,待供应商确认"  v-if="!isSupertube && String(sitem.status) === '10' && this.ppowers.includes('10')">
               <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
             </el-collapse-item>
             
@@ -221,7 +222,7 @@ export default {
       // 收到货状态
       status1Options: [
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },
+        { id: "2", label: "供应商驳回,待供应商负责人审核" },
         // { id: "3", label: "待设置仓库" }, // 废弃
         { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
@@ -234,7 +235,7 @@ export default {
       // 未收到货状态
       status2Options: [
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },
+        { id: "2", label: "供应商驳回,待供应商负责人审核" },
         // { id: "3", label: "待设置仓库" }, // 废弃
         { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },

src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -283,7 +283,7 @@ export default {
         // { id: "7", label: "采购已驳回" },
         // { id: "8", label: "申请已取消" },
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },
+        { id: "2", label: "供应商驳回,待供应商负责人审核" },
         // { id: "3", label: "待设置仓库" }, // 废弃
         { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
@@ -303,7 +303,7 @@ export default {
         // { id: "7", label: "采购已驳回" },
         // { id: "8", label: "申请已取消" },
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },
+        { id: "2", label: "供应商驳回,待供应商负责人审核" },
         // { id: "3", label: "待设置仓库" }, // 废弃
         { id: "4", label: "待客户退货" },
         { id: "5", label: "售后已完成" },
@@ -353,7 +353,7 @@ export default {
       // 处理状态
       serviceOptions: [
         { value: "1", label: "待业务审核" },
-        { value: "2", label: "供应商驳回,待采购审核" },
+        { value: "2", label: "供应商驳回,待供应商负责人审核" },
         // { id: "3", label: "待设置仓库" }, // 废弃
         { value: "4", label: "待客户退货" },
         { value: "5", label: "售后已完成" },

src/views/supplierSellOut/supplierSellReturn/components/approval-results.vue

@@ -42,7 +42,7 @@ import companyHelper from '@/mixins/companyHelper'
 export default {
   name: 'ApprovalResults',
   mixins: [companyHelper],
-  props: [],
+  props: ['sitem'],
   data() {
     return {
       company: '',

src/views/supplierSellOut/supplierSellReturn/detail.vue

@@ -174,7 +174,6 @@
                   is_stock + '' === '1'
                 ) &&
                 ppowers.some((i) => i == '1') && -->
-
             <el-collapse-item
               title="供应商审核"
               name="4"
@@ -195,7 +194,7 @@
               <approval-results @changeStatus="handlePurchaseExam" />
             </el-collapse-item> -->
 
-            <el-collapse-item title="业务公司修改待供应商确认" name="6" v-if="hasPermission({status:'10', process:'10'})">
+            <el-collapse-item title="业务公司修改,待供应商确认" name="6" v-if="hasPermission({status:'10', process:'10'})">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"
@@ -330,7 +329,7 @@ export default {
         { value: "5", label: "业务驳回" },
         // { value: "6", label: "采购驳回" }, // 废弃
         // { value: "7", label: "专员审批不通过" },
-        { value: '8', label:'供应商驳回,待采购审核'},
+        { value: '8', label:'供应商驳回,待供应商负责人审核'},
         { value: '9', label:'待供应商审核'},
         { value: '10', label:'业务公司修改,待供应商确认'}
       ],

src/views/supplierSellOut/supplierSellReturn/index.vue

@@ -218,7 +218,7 @@ export default {
         { value: "5", label: "业务驳回" },
         // { value: "6", label: "采购驳回" }, // 废弃
         // { value: "7", label: "专员审批不通过" },
-        { value: '8', label:'供应商驳回,待采购审核'},
+        { value: '8', label:'供应商驳回,待供应商负责人审核'},
         { value: '9', label:'待供应商审核'},
         { value: '10', label:'业务公司修改,待供应商确认'},
       ],