snow 2 jaren geleden
bovenliggende
commit
4b706659f7

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


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


+ 1 - 1
src/views/sellOut/sellAfterApply/index.vue

@@ -104,7 +104,7 @@
                   >
                     <el-option label="售后申请编号" value="serviceNum"></el-option>
                     <el-option label="发货单编号" value="sellOutNum"></el-option>
-                    <el-option label="销售订单编号" value="sellOrderNum"></el-option>
+                    <el-option label="销售订单编号" value="orderCode"></el-option>
                     <el-option label="商品编号" value="goodsNum"></el-option>
                     <el-option label="商品名称" value="goodsName"></el-option>
                     <el-option label="申请人部门" value="company_name"></el-option>

+ 5 - 0
src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/columns.js

@@ -20,6 +20,11 @@ export default [
     label: '发货工单号',
     width: '160px'
   },
+  {
+    prop: 'use_type',
+    label: '平台类型',
+    _slot_: 'use_type'
+  },
   {
     prop: 'status',
     label: '状态',

+ 32 - 2
src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/index.vue

@@ -84,7 +84,30 @@
                 </el-col>
 
                 <el-col :span="24">
-                  <el-col :span="4" style="width: 150px;margin-top:10px;margin-left:-80px">
+                  <el-col :span="3" style="margin-right: 10px;margin-top: 10px;">
+                     <el-select
+                       :size="searchSize"
+                       v-model="parmValue.use_type"
+                       style="width: 100%;"
+                       filterable
+                       clearable
+                       placeholder="平台类型"
+                       @change="
+                         pageInfo.curr = 1;
+                         parmValue.page = 1;
+                         searchList();
+                       "
+                     >
+                       <el-option
+                         v-for="item in usetypeOtions"
+                         :key="'use_type' + item.id"
+                         :label="item.label"
+                         :value="item.value"
+                       />
+                     </el-select>
+                 </el-col>
+
+                  <el-col :span="4" style="margin-top:10px;">
                     <el-select
                       :size="searchSize"
                       v-model="parmValue.order_type"
@@ -122,6 +145,12 @@
           ></el-tag>
         </template>
 
+        <template #use_type="{ scope }">
+          <el-tag size="mini">
+            {{(usetypeOtions.find(({value}) => value === scope.row.use_type) || {}).label || '---'}}        
+          </el-tag>
+        </template>
+
         <template #returnWsm="{scope}">
           <el-popover placement="top" width="360" trigger="hover">
             <i class="el-icon-warning-outline" slot="reference"></i>
@@ -210,7 +239,7 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/beforeReturnGoodWorkOrder";
-import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
+import { xs_order_type_options ,xs_order_source_options,usetypeOtions} from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper"
 import urlConfig from "@/apis/url-config";
 import { mapGetters } from "vuex";
@@ -234,6 +263,7 @@ export default {
   data() {
     return {
       companyNo:"",
+      usetypeOtions,
       xs_order_type_options,
       xs_order_source_options,
       fileUrl: urlConfig.baseURL,

+ 5 - 0
src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -25,6 +25,11 @@ export default [
     label: '订单编号',
     width: '160px'
   },
+  {
+    prop: 'use_type',
+    label: '平台类型',
+    _slot_: 'use_type'
+  },
   {
     prop: 'type',
     label: '仓库类型',

+ 34 - 1
src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -106,6 +106,30 @@
                 </el-col>
               </el-col>
             </el-row>
+
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="3">
+               <el-select
+                 :size="searchSize"
+                 v-model="parmValue.use_type"
+                 filterable
+                 clearable
+                 placeholder="平台类型"
+                 @change="
+                   pageInfo.curr = 1;
+                   parmValue.page = 1;
+                   searchList();
+                 "
+               >
+                 <el-option
+                   v-for="item in usetypeOtions"
+                   :key="'use_type' + item.id"
+                   :label="item.label"
+                   :value="item.value"
+                 />
+               </el-select>
+             </el-col>
+             </el-row>
           </div>
         </template>
         <template #status="{ scope }">
@@ -119,6 +143,12 @@
           ></el-tag>
         </template>
 
+        <template #use_type="{ scope }">
+          <el-tag size="mini">
+            {{(usetypeOtions.find(({value}) => value === scope.row.use_type) || {}).label || '---'}}        
+          </el-tag>
+        </template>
+
         <template #returnWsm="{scope}">
           <el-popover placement="top" width="360" trigger="hover">
              <i class="el-icon-warning-outline" slot="reference"></i>
@@ -241,12 +271,14 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/returnGoodWorkOrder";
-import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
+import { xs_order_type_options ,xs_order_source_options, usetypeOtions} from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper"
 import urlConfig from "@/apis/url-config";
 import { mapGetters } from "vuex";
 import columns from "./columns";
 
+
+
 export default {
   name: "sellReturn",
   mixins: [mixinPage, resToken, companyHelper],
@@ -263,6 +295,7 @@ export default {
   },
   data() {
     return {
+      usetypeOtions,
       companyNo: "",
       xs_order_type_options,
       xs_order_source_options,

+ 5 - 0
src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -15,6 +15,11 @@ const columns = [
     label: '订单编号',
     width: '160'
   },
+  {
+    prop: 'use_type',
+    label: '平台类型',
+    _slot_: 'use_type'
+  },
   {
     prop: 'status',
     label: '状态',

+ 30 - 0
src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -130,6 +130,28 @@
             </el-row>
 
             <el-row style="padding-top: 10px">
+              <el-col :span="3">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.use_type"
+                  filterable
+                  clearable
+                  placeholder="平台类型"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                 <el-option
+                   v-for="item in usetypeOtions"
+                   :key="'use_type' + item.id"
+                   :label="item.label"
+                   :value="item.value"
+                 />
+               </el-select>
+             </el-col>
+
               <el-col :span="4" style="width: 150px">
                 <el-select
                   :size="searchSize"
@@ -204,6 +226,12 @@
           ></el-tag>
         </template>
 
+        <template #use_type="{ scope }">
+          <el-tag size="mini">
+            {{(usetypeOtions.find(({value}) => value === scope.row.use_type) || {}).label || '---'}}        
+          </el-tag>
+        </template>
+
         <template #has_account="{ scope }">
           <el-tag
             :size="tablebtnSize"
@@ -303,6 +331,7 @@ import {
   xs_order_source_options,
   xs_order_type_options,
   has_account_list,
+  usetypeOtions
 } from "@/assets/js/statusList";
 
 export default {
@@ -321,6 +350,7 @@ export default {
   },
   data() {
     return {
+      usetypeOtions,
       fileUrl: urlConfig.baseURL,
       select: "serviceNum",
       select_list:[],

+ 6 - 1
src/views/supplierSellOut/supplierSellReturn/columns.js

@@ -14,11 +14,16 @@ export default [
     label: '销售订单编号',
     width: '160'
   },
+  {
+    prop: 'use_type',
+    label: '平台类型',
+    _slot_: 'use_type'
+  },
   {
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    width: '180px'
+    width: '120px'
   },
   {
     prop: 'good_code',

+ 29 - 0
src/views/supplierSellOut/supplierSellReturn/index.vue

@@ -90,6 +90,28 @@
             </el-row>
 
             <el-row style="padding: 10px 0 0 0">
+              <el-col :span="3">
+               <el-select
+                 :size="searchSize"
+                 v-model="parmValue.use_type"
+                 filterable
+                 clearable
+                 placeholder="平台类型"
+                 @change="
+                   pageInfo.curr = 1;
+                   parmValue.page = 1;
+                   searchList();
+                 "
+               >
+                 <el-option
+                   v-for="item in usetypeOtions"
+                   :key="'use_type' + item.id"
+                   :label="item.label"
+                   :value="item.value"
+                 />
+               </el-select>
+             </el-col>
+
               <el-col :span="4" >
                   <search-work-company
                    :value="parmValue.companyNo"
@@ -149,6 +171,11 @@
             "
           ></el-tag>
         </template>
+        <template #use_type="{ scope }">
+          <el-tag size="mini">
+            {{(usetypeOtions.find(({value}) => value === scope.row.use_type) || {}).label || '---'}}        
+          </el-tag>
+        </template>
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((i) => i == '007')"
@@ -177,6 +204,7 @@ import columns from "./columns";
 import asyncRequest from "@/apis/service/supplierSellOut/supplierSellReturn";
 import { mapGetters } from "vuex";
 import urlConfig from "@/apis/url-config";
+import { usetypeOtions } from "@/assets/js/statusList";
 
 export default {
   name: "sellReturn",
@@ -194,6 +222,7 @@ export default {
   },
   data() {
     return {
+      usetypeOtions,
       fileUrl: urlConfig.baseURL,
       select: "returnCode", //默认选择下拉框
       s_input: "", //搜索框内容

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