snow 2 gadi atpakaļ
vecāks
revīzija
426f07d918

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/0.js


+ 5 - 5
src/views/sellOut/beforeReturnGoodWorkOrder/columns.js

@@ -78,11 +78,11 @@ export default [
     label: '客户名称',
     width: '150px'
   },
-  // {
-  //   prop: 'apply_name',
-  //   label: '创建人',
-  //   span: 5
-  // },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    span: 5
+  },
   {
     prop: 'addtime',
     label: '创建时间',

+ 5 - 0
src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -82,6 +82,11 @@ export default [
     label: '业务公司名称',
     width: '150px'
   },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '120px'
+  },
   {
     prop: '',
     width: 50,

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

@@ -78,11 +78,11 @@ export default [
     label: '客户名称',
     width: '150px'
   },
-  // {
-  //   prop: 'apply_name',
-  //   label: '创建人',
-  //   span: 5
-  // },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    span: 5
+  },
   {
     prop: 'addtime',
     label: '创建时间',

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

@@ -82,6 +82,11 @@ export default [
     label: '业务公司名称',
     width: '150px'
   },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '80px'
+  },
   {
     prop: '',
     width: 50,

+ 2 - 2
src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -469,9 +469,9 @@ export default {
       const res = await asyncRequest.list({
         ...model,
         [this.select]: this.s_input,
+        is_authority: "1",
         customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
-        companyNo: this.currentCompany,
+        supplierNo: this.currentCompany,
         noRelation: true
       });
 

+ 0 - 49
src/views/supplierSellOut/supplierSellAfterApply/detail.vue

@@ -78,61 +78,12 @@
                 :spucode="sitem.good_code"
               />
             </el-collapse-item>
-
-            <!-- <el-collapse-item
-              title="业务审核"
-              name="3"
-              v-if="isSupertube && String(sitem.status) === '1' && this.ppowers.includes('1')"
-            >
-              <exam-form
-                :statusList="statusList"
-                :newTime="newTime"
-                :disabled="false"
-                :isMust="false"
-                @searchChange="examForm"
-              />
-            </el-collapse-item> -->
-
-            <!-- <el-collapse-item name="4" title="供应商驳回,待采购审核"  v-if="isSupertube && String(sitem.status) === '2' && this.ppowers.includes('2')">
-              <purchase-exam :sitem="sitem" @changeStatus="handlePurchaseConfirm" />
-            </el-collapse-item> -->
-
             <el-collapse-item name="5" title="供应商审核" v-if="isHasPermission({status:'9', process:'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')">
-              <wait-return :sitem="sitem" @changeStatus="handleExpress" />
-            </el-collapse-item> -->
-            
             <el-collapse-item name="7" title="业务公司修改,待供应商确认" v-if="isHasPermission({status:'10', process:'10'})">
               <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
             </el-collapse-item>
-            
-            <!-- <el-collapse-item
-              title="设置退货仓库"
-              name="4"
-              v-if="
-                sitem &&
-                sitem.is_receive === '1' &&
-                (status == '3' || status == '4' || status == '5')
-              "
-            >
-              <express-feedback
-                :sitem="sitem"
-                :newTime="newTime"
-                v-if="newTime != ''"
-                @refresh="initData"
-              ></express-feedback>
-            </el-collapse-item> -->
-
-            <el-collapse-item name="8" title="待设置工单" v-if="isHasPermission({status:'11', process:'11'})">
-              <set-work-order :sitem="sitem" @reload="() => initData()" />
-            </el-collapse-item>
-
-            <el-collapse-item name="9" title="待库管收货" v-if="isHasPermission({status:'12', process:'12'})">
-              <wait-stockman :sitem="sitem" @reload="() => initData()" />
-            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
 

+ 135 - 67
src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="sellAfterApply pagePadding">
-    <div
-      v-if=" powers.some((i) => i == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -80,50 +78,20 @@
                   </el-button>
                 </el-col>
 
-                <el-col :span="4" style="width: 66px; float: right;">
-                  <el-button type="primary" size="mini" @click="handleExport">导出</el-button>
+                <el-col :span="4" style="width: 56px; float: right; margin-right: 0px">
+                  <el-button type="primary" size="mini" @click="handleExport"
+                    >导出</el-button
+                  >
                 </el-col>
               </el-col>
             </el-row>
-            <el-row style="padding-top: 10px">
-              <!-- 期望意愿 -->
-              <!-- <el-col :span="4" style="width: 130px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.except_code"
-                  clearable
-                  placeholder="期望意愿"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in expectOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                padding: 0 0 0 10px
-              </el-col> -->
-
-              <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="4" style="width: 620px">
                 <el-input
                   clearable
                   :size="searchSize"
-                   maxlength="40"
+                  maxlength="40"
                   placeholder="关键字"
                   v-model="s_input"
                   class="input-with-select"
@@ -134,19 +102,9 @@
                     slot="prepend"
                     placeholder="关键字类型"
                   >
-                    <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="serviceNum"></el-option>
+                    <el-option label="发货单编号" value="sellOutNum"></el-option>
+                    <el-option label="销售订单编号" value="sellOrderNum"></el-option>
                     <el-option label="商品编号" value="goodsNum"></el-option>
                     <el-option label="商品名称" value="goodsName"></el-option>
                     <el-option label="申请人部门" value="company_name"></el-option>
@@ -159,7 +117,7 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <el-col :span="4" style="width: 66px">
+              <el-col :span="2" style="width: 65px; float: right">
                 <el-button
                   type="warning"
                   class="fr"
@@ -170,15 +128,123 @@
                 </el-button>
               </el-col>
             </el-row>
+
+            <el-row style="padding-top: 10px">
+              <el-col :span="4" style="width: 150px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_type"
+                  filterable
+                  clearable
+                  placeholder="商品类型"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_type_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="4" style="width: 150px; 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 xs_order_source_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="3">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 100%; margin: 0px 10px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                /> </el-col
+              >s
+            </el-row>
           </div>
         </template>
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #has_account="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="
+              (
+                has_account_list.find(
+                  (item) => item.code == scope.row.has_account + ''
+                ) || {}
+              ).type || '--'
+            "
+            v-text="
+              (
+                has_account_list.find(
+                  (item) => item.code == scope.row.has_account + ''
+                ) || {}
+              ).name || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
             :type="''"
             v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
-                .label || '--'
+              (
+              statusOptions.find((item) => item.id == scope.row.status) || {}
+              ).label || '--'
             "
           ></el-tag>
         </template>
@@ -188,10 +254,8 @@
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
-              (
-                post_ownOptions.find((item) => item.id == scope.row.post_own) ||
-                {}
-              ).label || '--'
+              (post_ownOptions.find((item) => item.id == scope.row.post_own) || {})
+                .label || '--'
             "
           ></el-tag>
         </template>
@@ -201,11 +265,8 @@
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
-              (
-                except_codeOptions.find(
-                  (item) => item.id == scope.row.except_code
-                ) || {}
-              ).label || '--'
+              (except_codeOptions.find((item) => item.id == scope.row.except_code) || {})
+                .label || '--'
             "
           ></el-tag>
         </template>
@@ -218,9 +279,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="
-                routeGoto('supplierSellAfterApplyDetail', { id: scope.row.returnCode })
-              "
+              @click="routeGoto('sellAfterApplyDetail', { id: scope.row.returnCode })"
             ></i>
           </el-tooltip>
         </template>
@@ -231,6 +290,7 @@
     </div>
   </div>
 </template>
+
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
@@ -239,6 +299,11 @@ import { columns } from "./columns";
 import { mapGetters } from "vuex";
 import urlConfig from "@/apis/url-config";
 import companyHelper from "@/mixins/companyHelper";
+import {
+  xs_order_source_options,
+  xs_order_type_options,
+  has_account_list,
+} from "@/assets/js/statusList";
 
 export default {
   name: "sellAfterApply",
@@ -260,6 +325,9 @@ export default {
       select: "serviceNum",
       select_list:[],
       s_input: "",
+      xs_order_source_options,
+      xs_order_type_options,
+      has_account_list,
       customerCode: [], //客户公司code
       except_codeOptions: [
         { id: "1", label: "退货" },

+ 0 - 4
src/views/supplierSellOut/supplierSellReturn/detail.vue

@@ -170,10 +170,6 @@
                 @searchChange="handleSupplierConfirm"
               />
             </el-collapse-item>
-
-            <el-collapse-item title="待设置工单" name="7" v-if="isHasPermission({status:'11', process:'11'})">
-              <set-work-order :sitem="sitem" />
-            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
 

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels