build

src/apis/service/sellOut/sellOutOrder/index.js

@@ -22,9 +22,9 @@ export default {
   reasonList: (data, params) => http(api + 'resultlist', data, 'post', params),
   // 物流填写
   setdelivery: (data, params) => http(api + 'setdelivery', data, 'post', params),
-  // 售后退货详情
+  // 售后申请详情
   afterinfo: (data, params) => http(api + 'afterinfo', data, 'post', params),
-  // 取消售后退货
+  // 取消售后申请
   aftercancel: (data, params) => http(api + 'aftercancel', data, 'post', params),
   // 售后单审核状态
   afterstatus: (data, params) => http(api + 'afterstatus', data, 'post', params),

src/apis/service/supplierSellOut/supplierSellOutOrder/index.js

@@ -22,9 +22,9 @@ export default {
   reasonList: (data, params) => http(api + 'resultlist', data, 'post', params),
   // 物流填写
   setdelivery: (data, params) => http(api + 'setdelivery', data, 'post', params),
-  // 售后退货详情
+  // 售后申请详情
   afterinfo: (data, params) => http(api + 'afterinfo', data, 'post', params),
-  // 取消售后退货
+  // 取消售后申请
   aftercancel: (data, params) => http(api + 'aftercancel', data, 'post', params),
   // 售后单审核状态
   afterstatus: (data, params) => http(api + 'afterstatus', data, 'post', params),

src/assets/js/btnList.js

@@ -25,7 +25,7 @@ const btnList = [
   { code: "024", name: "采购反馈" },
   { code: "025", name: "反馈认同" },
   { code: "026", name: "同意退货" },
-  { code: "027", name: "取消售后退货" },
+  { code: "027", name: "取消售后申请" },
   { code: "028", name: "新建入库单" },
   { code: "029", name: "备库入库验收" },
   { code: "030", name: "备库入库验收审核" },
@@ -47,8 +47,8 @@ const btnList = [
   { code: "046", name: "供应商反馈" },
   { code: "047", name: "退货验收记录" },
   { code: "048", name: "添加发货单" },
-  { code: "049", name: "添加售后退货" },
-  { code: "050", name: "添加售后退货" },
+  { code: "049", name: "添加售后申请" },
+  { code: "050", name: "添加售后申请" },
   { code: "051", name: "添加未发货退货" },
   { code: "052", name: "客户验收" },
   { code: "053", name: "修改成本信息" },

src/components/flow-chart/tasks/_normal.js

@@ -13,55 +13,23 @@ class NormalTaskModel extends RectNodeModel {
 
     return style
   }
-  // getDefaultAnchor() {
-  //   const { x, y, id } = this
-  //   const position = this.properties.position
-
-  //   switch (position) {
-  //     case 'x':
-  //       return [
-  //         {
-  //           x: 0,
-  //           y: y - 15,
-  //           name: 'left',
-  //           id: `${id}_1`
-  //         },
-  //         {
-  //           x: 0,
-  //           y: y - 15,
-  //           name: 'right',
-  //           id: `${id}_2`
-  //         },
-  //         {
-  //           x: x,
-  //           y: y + 15,
-  //           name: 'bottom',
-  //           id: `${id}_3`
-  //         },
-  //         {
-  //           x: x,
-  //           y: y - 15,
-  //           name: 'top',
-  //           id: `${id}_4`
-  //         }
-  //       ]
-  //     default:
-  //       return [
-  //         {
-  //           x: x,
-  //           y: y + 15,
-  //           name: 'bottom',
-  //           id: `${id}_0`
-  //         },
-  //         {
-  //           x: x,
-  //           y: y - 15,
-  //           name: 'top',
-  //           id: `${id}_0`
-  //         }
-  //       ]
-  //   }
-  // }
+  getDefaultAnchor() {
+    const { x, y, id } = this
+    return [
+      {
+        x: x,
+        y: y + 15,
+        name: 'bottom',
+        id: `${id}_0`
+      },
+      {
+        x: x,
+        y: y - 15,
+        name: 'top',
+        id: `${id}_0`
+      }
+    ]
+  }
 }
 
 class NormalTaskView extends RectNode {}

src/components/flow-chart/utils/createProcessData.js

@@ -8,8 +8,8 @@ function createNode(raw, level = 0, index = 0, max = 0, _middle = -1) {
   const middle = _middle >= 0 ? _middle + 1 : Math.ceil(max / 2);
 
   if (_index === middle || max === 0) x = MIDDMLE_X;
-  if (_index > middle) x = MIDDMLE_X + (middle * GAP_X)
-  if (_index < middle) x = MIDDMLE_X - (middle * GAP_X)
+  if (_index > middle && max !== 0) x = MIDDMLE_X + (_index * GAP_X)
+  if (_index < middle && max !== 0) x = MIDDMLE_X - (_index * GAP_X)
 
   return ({
     id: raw.order_process,
@@ -111,10 +111,10 @@ function createNodesWithRecord(nodesRaw, edgesRaw, record) {
     if (sourceEdgeIndex >= 0) edgesRaw[sourceEdgeIndex].type = 'polyline';
   }
 
-  console.log(JSON.stringify({
+  console.log({
     edges: edgesRaw,
     nodes: nodesRaw
-  }))
+  })
 
   return {
     edges: edgesRaw,

src/views/businessReportQuery/businessSaleReport/components/columns.js

@@ -1189,7 +1189,7 @@ const table13 = [
   },
   {
     prop: 'returnCode',
-    label: '售后退货编号',
+    label: '售后申请编号',
     minWidth: '155px'
   },
   {

src/views/login/index.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="login-container">
     <div class="login-form-main">
-      <img src="@/assets/sheji/loginlan.png" alt="">
-      <div class="main-title">
-        <h1>欢迎登录</h1>
-        <h3>采销bate 3.0公测版</h3>
-      </div>
       <el-form
         ref="loginForm"
         :model="loginForm"
@@ -94,7 +89,7 @@
           type="primary"
           style="width: 100%; margin-top: 5px"
           @click.native.prevent="handleLogin()"
-        >登&nbsp;&nbsp;&nbsp;&nbsp;录</el-button>
+        >登&nbsp;&nbsp;录</el-button>
 
         <!-- <div style="position: relative; padding: 12px 0 0 0"> -->
         <!-- <div class="tips" style="float: left">
@@ -404,30 +399,30 @@ $dark_gray: #38c1e7;
 $light_gray: #f2f2f2;
 
 .login-container {
-  position: fixed;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
-  min-width: 1000px;
-  min-height: 700px;
-  z-index: 2;
+  transition: all 0.20s cubic-bezier(0.4, 0, 0.2, 1);
+  background-image: url("~@/assets/design/bg-pc.jpg");
   zoom: 1;
   background-repeat: no-repeat;
-  background-size: cover;
-  background-position: center 0;
-  background-image: url("~@/assets/sheji/loginbg.png");
+  background-size: 100% 100%;
+  // background-position: center 0;
   text-align: center;
   .login-form-main {
-    display: inline-block;
-    width: 600px;
     height: 500px;
-    margin: 23vh auto 0 auto;
-    position: relative;
+    position: absolute;
+    right: 200px;
+    top: 50%;
+    transform: translateY(-50%);
+    transition: all 0.20s cubic-bezier(0.4, 0, 0.2, 1);
+
     img {
       width: 400px;
       height: 350px;
     }
+
     .main-title {
       position: absolute;
       top: 0;
@@ -444,24 +439,31 @@ $light_gray: #f2f2f2;
         font-size: 22px;
       }
     }
+
     .login-form {
-      position: absolute;
-      width: 320px;
+      width: 400px;
       top: -40px;
-      left: 380px;
+      right: 100px;
       z-index: 3;
       max-width: 100%;
       padding: 50px 28px 35px 28px;
       margin: 0 auto;
       overflow: hidden;
-      background: #fff;
       border-radius: 20px;
+
+      .el-form-item{
+        border: 1px solid transparent;
+        border-bottom: 1px solid #ccc;
+        border-radius: 0px;
+      }
+
       .el-button--primary {
-        background-color: #38c1e7;
-        border-color: #38c1e7;
+        background-color: #087af5;
+        border-color: #087af5;
         height: 46px;
         font-size: 16px;
         text-align: center;
+        border-radius: 20px;
       }
     }
   }
@@ -523,7 +525,7 @@ $light_gray: #f2f2f2;
 
     .title {
       font-size: 26px;
-      color: #04a2ce;
+      color: #087af5;
       margin: 0px auto 30px auto;
       text-align: center;
       font-weight: bold;
@@ -563,4 +565,80 @@ $light_gray: #f2f2f2;
   margin: 0px;
   height: 38px;
 }
+
+.el-icon-key,.el-icon-user,.el-icon-unlock{
+  color:#087af5 !important;
+  font-weight: 700;
+}
+
+@media screen and (max-width: 1800px) {
+  .login-container{
+    .login-form-main {
+      right: 100px;
+    }
+  }
+}
+
+@media screen and (max-width: 1200px) {
+  .login-container{
+    .login-form-main {
+      right: 50px;
+    }
+  }
+}
+
+@media screen and (max-width: 1024px) {
+  .login-container{
+    background-image: url("~@/assets/design/bg-pad.jpg");
+    .login-form-main {
+      right: 50px;
+      width: 300px;
+    }
+  }
+}
+
+@media screen and (max-width: 992px) {
+  .login-container{
+    background-image: url("~@/assets/design/bg-pad.jpg");
+    .login-form-main {
+      right: 20px;
+      width: 360px;
+    }
+  }
+}
+
+@media screen and (max-width: 840px) {
+  .login-container{
+    background-image: url("~@/assets/design/bg-pad.jpg");
+    .login-form-main {
+      right: 5px;
+    }
+  }
+}
+
+@media screen and (max-width: 768px) {
+  .login-container{
+    background-image: url("~@/assets/design/bg-phone.jpg");
+    .login-form-main {
+      right: 20px;
+      width: 95%;
+      background: #fff;
+      left: 50%;
+      transform: translate(-50%,-50%);
+      border-radius: 20px;
+      height: auto;
+    }
+  }
+
+  .beian{
+    position: fixed;
+    left: 50%;
+    transform: translateX(-50%);
+    padding: 0px !important;
+
+    a{
+      color: #fff !important;
+    }
+  }
+}
 </style>

src/views/process/columns.js

@@ -120,14 +120,14 @@ const routerList = [
     to: 'code'
   },
   {
-    name: '销售售后退货单流程',
+    name: '销售售后申请单流程',
     type: 'SHD',
     toRouter: '/sellOut/sellAfterApplyDetail',
     to: 'code',
     isok: true
   },
   {
-    name: '销售售后退货流程',
+    name: '销售售后申请流程',
     type: 'CKTHD',
     toRouter: '/sellOut/returnOrderDetail',
     to: 'code',

src/views/reportQuery/saleReport/components/columns.js

@@ -1189,7 +1189,7 @@ const table13 = [
   },
   {
     prop: 'returnCode',
-    label: '售后退货编号',
+    label: '售后申请编号',
     minWidth: '155px'
   },
   {

src/views/sellOut/bargainList/index.vue

@@ -224,7 +224,7 @@ export default {
         infoNo: "", // 竞价单编号
         status: "", // 状态
         bargainNo: "", //议价编号
-        status: "", //售后退货单处理状态
+        status: "", //售后申请单处理状态
         start: "",
         end: "",
         page: 1, // 页码

src/views/sellOut/beforeReturnGoodWorkOrder/index.vue

@@ -89,7 +89,7 @@
                 </el-col>
 
                 <el-col :span="24">
-                  <el-col :span="4" style="width: 150px;margin-top:10px">
+                  <el-col :span="4" style="width: 150px;margin-top:10px;margin-left: -80px;">
                     <el-select
                       :size="searchSize"
                       v-model="parmValue.order_type"
@@ -158,7 +158,7 @@
         </template>
 
         <template #type="{scope}">
-          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
+          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后申请' }}</el-tag>
         </template>
 
         <template #order_type="{ scope }">

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -7,7 +7,7 @@ export default [
   },
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     width: '160'
   },
   {

src/views/sellOut/returnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -2,7 +2,7 @@
 const showColumns = [
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     span: 7
   },
   {

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -32,7 +32,7 @@
                 <el-input placeholder="关键字" size="mini" v-model="queryValue" @blur="pageInfo.curr=1;parmValue.page=1;searchList()">
                   <template #prepend>
                     <el-select style="width:130px" v-model="queryKey" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
-                      <el-option value="returnCode" label="售后退货单编码" />
+                      <el-option value="returnCode" label="售后申请单编码" />
                       <el-option value="orderCode" label="订单编码" />
                       <el-option value="outChildCode" label="发货工单编码" />
                       <el-option value="return_wsm_code" label="退货仓库编码" />
@@ -193,7 +193,7 @@
         </template>
 
         <template #type="{scope}">
-          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
+          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后申请' }}</el-tag>
         </template>
         
         <template #order_type="{ scope }">

src/views/sellOut/returnOrder/ShowDataTableColumns.js

@@ -2,18 +2,18 @@ export default [
 
   {
     prop: 'thNo',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     span: 6
   },
   {
     prop: 'status',
-    label: '售后退货单状态',
+    label: '售后申请单状态',
     _slot_: 'status',
     span: 6
   },
   {
     prop: 'returnCode',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     span: 6
   },
   {

src/views/sellOut/returnOrder/columns.js

@@ -1,12 +1,12 @@
 export default [
   {
     prop: 'thNo',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     width: '160'
   },
   // {
   //   prop: "returnCode",
-  //   label: "售后退货单编号",
+  //   label: "售后申请单编号",
   //   width: "160"
 
   // },

src/views/sellOut/returnOrder/detail.vue

@@ -10,7 +10,7 @@
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="售后退货单详情" name="-1">
+            <el-collapse-item title="售后申请单详情" name="-1">
               <show-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"

src/views/sellOut/returnOrder/index.vue

@@ -184,8 +184,8 @@
                     slot="prepend"
                     placeholder="关键字类型"
                   >
-                    <el-option label="售后退货单编号" value="returnNo" />
-                    <el-option label="售后退货单编号" value="serviceNo" />
+                    <el-option label="售后申请单编号" value="returnNo" />
+                    <el-option label="售后申请单编号" value="serviceNo" />
                     <el-option label="发货单编号" value="outOrderNo" />
                     <el-option label="销售订单编号" value="orderNo" />
                     <el-option label="快递单号" value="expressNo" />
@@ -329,7 +329,7 @@ export default {
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
-        return_code: "", //售后退货编号
+        return_code: "", //售后申请编号
         post_compay: "", //物流公司
         post_code: "", //物流单号
         start: "", //
@@ -423,7 +423,7 @@ export default {
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
-        return_code: "", //售后退货编号
+        return_code: "", //售后申请编号
         post_compay: "", //物流公司
         post_code: "", //物流单号
         start: "", //

src/views/sellOut/sellAfterApply/columns.js

@@ -2,7 +2,7 @@ const columns = [
   { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'returnCode',
-    label: '售后退货单',
+    label: '售后申请单',
     width: '160'
   },
   {
@@ -134,7 +134,7 @@ const columns = [
 const sellshowColumns = [
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     span: 6
   },
   {
@@ -149,7 +149,7 @@ const sellshowColumns = [
   },
   {
     prop: 'status',
-    label: '售后退货单状态',
+    label: '售后申请单状态',
     _slot_: 'status',
     span: 6
   },

src/views/sellOut/sellAfterApply/detail.vue

@@ -4,7 +4,7 @@
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="售后退货详情" name="1">
+            <el-collapse-item title="售后申请详情" name="1">
               <show-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -163,7 +163,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="售后退货工单" name="10" v-if="sitem.status === '5'">
+            <el-collapse-item title="售后申请工单" name="10" v-if="sitem.status === '5'">
                 <show-work-order :sitem="sitem"  />
             </el-collapse-item>
 

src/views/sellOut/sellAfterApply/index.vue

@@ -102,7 +102,7 @@
                     slot="prepend"
                     placeholder="关键字类型"
                   >
-                    <el-option label="售后退货编号" value="serviceNum"></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>
@@ -457,7 +457,7 @@ export default {
     },
     handleExport() {
       if (this.select_list.length === 0) {
-        this.$message.warning("请选择一条售后退货单");
+        this.$message.warning("请选择一条售后申请单");
         return;
       }
       const returnCode = this.select_list.map(({ returnCode }) => returnCode);
@@ -482,7 +482,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "售后退货单.zip";
+              let excelName = "售后申请单.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

src/views/sellOut/sellOutOrder/columns.js

@@ -261,7 +261,7 @@ const showColumns = [
 const rshowColumns = [
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     span: 6
   },
   {

src/views/sellOut/sellOutOrder/components/addEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新建售后退货"
+    title="新建售后申请"
     :center="true"
     align="left"
     top="22vh"
@@ -58,7 +58,7 @@ export default {
     async initForm() {
       this.loading = true
       if (this.id === 'add') {
-        this.title = '新建售后退货'
+        this.title = '新建售后申请'
         this.rulesThis = this.rules
       } else {
         if (this.isDetail) {

src/views/sellOut/sellOutOrder/components/addEditA.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新建售后退货"
+    title="新建售后申请"
     :center="true"
     align="left"
     top="14vh"
@@ -61,7 +61,7 @@ export default {
     async initForm() {
       this.loading = true
       if (this.id === 'add') {
-        this.title = '新建售后退货'
+        this.title = '新建售后申请'
         this.rulesThis = this.rules
       } else {
         if (this.isDetail) {

src/views/sellOut/sellOutOrder/components/addEdit_sellReturnOrder.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新建售后退货"
+    title="新建售后申请"
     :center="true"
     align="left"
     top="14vh"
@@ -58,7 +58,7 @@ export default {
     async initForm() {
       this.loading = true
       if (this.id === 'add') {
-        this.title = '新建售后退货'
+        this.title = '新建售后申请'
         this.rulesThis = this.rules
       } else {
         if (this.isDetail) {

src/views/sellOut/sellOutOrder/detail.vue

@@ -16,7 +16,7 @@
           :size="'mini'"
           style="margin: 0 0 0 10px"
           @click="wellReturnCode"
-          >新建售后退货单
+          >新建售后申请单
         </el-button>
         <el-button
           class="fr"
@@ -150,7 +150,7 @@
             </el-collapse-item> -->
 
             <el-collapse-item
-              title="售后退货单结果"
+              title="售后申请单结果"
               name="4"
               v-if="
                 returnCode && returnCode_type && sitem && sitem.order_return && resitem
@@ -700,7 +700,7 @@ export default {
         this.returnCode_type + '' === "2" ||
         this.returnCode_type + '' === "3"
       ) {
-        this.$message.warning("当前售后退货单未完成审批！");
+        this.$message.warning("当前售后申请单未完成审批！");
         return;
       }
       this.showModel = true;

src/views/sellOut/sellReturn/components/set-work-order.vue

@@ -138,7 +138,7 @@ export default {
   }),
   computed: {
     confirmText() {
-      return Number(this.workOrderCount) === Number(this.currentWorkOrder) ? '保存' : '保存当前设置'
+      return Number(this.workOrderCount) === Number(this.currentWorkOrder + 1) ? '保存当前设置,并切换至下一个' : '保存当前设置'
     },
     state() {
       const { order_type, is_addr } = this.sitem || {}

src/views/sellOut/zixunOrder/ShowDataTableColumns.js

@@ -1,11 +1,11 @@
 export default [
   {
     prop: 'returnCode',
-    label: '售后退货单号'
+    label: '售后申请单号'
   },
   {
     prop: 'status',
-    label: '售后退货单状态',
+    label: '售后申请单状态',
     _slot_: 'status'
   },
   {

src/views/sellOut/zixunOrder/index.vue

@@ -247,7 +247,7 @@ export default {
         zxNo: "",
         salesman: "",
         cpName: "",
-        status: "", //售后退货单处理状态
+        status: "", //售后申请单处理状态
         start: "",
         end: "",
         page: 1, // 页码
@@ -336,7 +336,7 @@ export default {
         zxNo: "",
         salesman: "",
         cpName: "",
-        status: "", //售后退货单处理状态
+        status: "", //售后申请单处理状态
         start: "",
         end: "",
         page: 1, // 页码

src/views/standingBook/columns.js

@@ -62,13 +62,13 @@ const schTahead = [
   // },
   // {
   //   prop: "returnCode",
-  //   label: "售后退货单",
+  //   label: "售后申请单",
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
   // {
   //   prop: "thNo",
-  //   label: "售后退货单",
+  //   label: "售后申请单",
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
@@ -184,13 +184,13 @@ const columns = [
   // },
   // {
   //   prop: "returnCode",
-  //   label: "售后退货单编号",
+  //   label: "售后申请单编号",
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
   // {
   //   prop: "thNo",
-  //   label: "售后退货单编号",
+  //   label: "售后申请单编号",
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },

src/views/standingBook/components/detail12/columns.js

@@ -1,12 +1,12 @@
 const columns = [
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     span: 6
   },
   {
     prop: 'status',
-    label: '售后退货单状态',
+    label: '售后申请单状态',
     _slot_: 'status',
     span: 6
   },
@@ -100,7 +100,7 @@ const columns = [
 const listColumns = [
   {
     prop: 'returnCode',
-    label: '售后退货单',
+    label: '售后申请单',
     width: '160'
   },
   {

src/views/standingBook/components/detail13/columns.js

@@ -2,18 +2,18 @@ const columns = [
 
   {
     prop: 'thNo',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     span: 6
   },
   {
     prop: 'status',
-    label: '售后退货单状态',
+    label: '售后申请单状态',
     _slot_: 'status',
     span: 6
   },
   {
     prop: 'returnCode',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     span: 6
   },
   {
@@ -70,12 +70,12 @@ const columns = [
 const listColumens = [
   {
     prop: 'thNo',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     minWidth: '160px'
   },
   // {
   //   prop: "returnCode",
-  //   label: "售后退货单编号",
+  //   label: "售后申请单编号",
   //   minWidth: "160"
 
   // },

src/views/standingBook/components/detail13/main.vue

@@ -96,7 +96,7 @@ export default {
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
-        return_code: "", //售后退货编号
+        return_code: "", //售后申请编号
         post_compay: "", //物流公司
         post_code: "", //物流单号
         start: "", //

src/views/standingBook/components/detail19/main.vue

@@ -96,7 +96,7 @@ export default {
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
-        return_code: "", //售后退货编号
+        return_code: "", //售后申请编号
         post_compay: "", //物流公司
         post_code: "", //物流单号
         start: "", //

src/views/standingBook/detail.vue

@@ -83,13 +83,13 @@
             </div>
             <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
             <div id="detail12" v-if="tableData.orderCode">
-              <el-collapse-item title="销售售后退货单" name="12" v-if="newTime !== ''">
+              <el-collapse-item title="销售售后申请单" name="12" v-if="newTime !== ''">
                 <detail12 :queryId="tableData.orderCode"> </detail12>
               </el-collapse-item>
             </div>
             <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
             <div id="detail13" v-if="tableData.orderCode">
-              <el-collapse-item title="销售售后退货单" name="13" v-if="newTime !== ''">
+              <el-collapse-item title="销售售后申请单" name="13" v-if="newTime !== ''">
                 <detail13 :queryId="tableData.orderCode"> </detail13>
               </el-collapse-item>
             </div>
@@ -222,8 +222,8 @@ export default {
         // { tar: "#detail9", title: "销售：备货申请单" },
         // { tar: "#detail10", title: "销售：销售订单" },
         // { tar: "#detail11", title: "销售：发货单" },
-        // { tar: "#detail12", title: "销售：售后退货单" },
-        // { tar: "#detail13", title: "销售：售后退货单" },
+        // { tar: "#detail12", title: "销售：售后申请单" },
+        // { tar: "#detail13", title: "销售：售后申请单" },
         // { tar: "#detail14", title: "销售：退货单" },
         // { tar: "#detail15", title: "销售：工差单" },
         // { tar: "#detail16", title: "供应商详情" },
@@ -333,11 +333,11 @@ export default {
         : (flag = false);
       //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
       (orderCode ?? "") != ""
-        ? arr.push({ tar: "#detail12", title: "销售售后退货单" })
+        ? arr.push({ tar: "#detail12", title: "销售售后申请单" })
         : (flag = false);
       //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
       (orderCode ?? "") != ""
-        ? arr.push({ tar: "#detail13", title: "销售售后退货单" })
+        ? arr.push({ tar: "#detail13", title: "销售售后申请单" })
         : (flag = false);
 
         (orderCode ?? "") != ""

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/index.vue

@@ -84,7 +84,7 @@
                 </el-col>
 
                 <el-col :span="24">
-                  <el-col :span="4" style="width: 150px;margin-top:10px">
+                  <el-col :span="4" style="width: 150px;margin-top:10px;margin-left:-80px">
                     <el-select
                       :size="searchSize"
                       v-model="parmValue.order_type"
@@ -153,7 +153,7 @@
         </template>
 
         <template #type="{scope}">
-          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
+          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后申请' }}</el-tag>
         </template>
 
         <template #stock_type="{scope}">

src/views/supplierSellOut/supplierReturnOrder/ShowDataTableColumns.js

@@ -2,18 +2,18 @@ export default [
 
   {
     prop: 'thNo',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     span: 6
   },
   {
     prop: 'status',
-    label: '售后退货单状态',
+    label: '售后申请单状态',
     _slot_: 'status',
     span: 6
   },
   {
     prop: 'returnCode',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     span: 6
   },
   {

src/views/supplierSellOut/supplierReturnOrder/columns.js

@@ -1,12 +1,12 @@
 export default [
   {
     prop: 'thNo',
-    label: '售后退货单编号',
+    label: '售后申请单编号',
     width: '160'
   },
   // {
   //   prop: "returnCode",
-  //   label: "售后退货单编号",
+  //   label: "售后申请单编号",
   //   width: "160"
 
   // },

src/views/supplierSellOut/supplierReturnOrder/detail.vue

@@ -10,7 +10,7 @@
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="售后退货单详情" name="-1">
+            <el-collapse-item title="售后申请单详情" name="-1">
               <show-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"

src/views/supplierSellOut/supplierReturnOrder/index.vue

@@ -119,8 +119,8 @@
                     slot="prepend"
                     placeholder="关键字类型"
                   >
-                    <el-option label="售后退货单编号" value="returnNo" />
-                    <el-option label="售后退货单编号" value="serviceNo" />
+                    <el-option label="售后申请单编号" value="returnNo" />
+                    <el-option label="售后申请单编号" value="serviceNo" />
                     <el-option label="发货单编号" value="outOrderNo" />
                     <el-option label="销售订单编号" value="orderNo" />
                     <el-option label="快递单号" value="expressNo" />
@@ -252,7 +252,7 @@ export default {
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
-        return_code: "", //售后退货编号
+        return_code: "", //售后申请编号
         post_compay: "", //物流公司
         post_code: "", //物流单号
         start: "", //
@@ -346,7 +346,7 @@ export default {
         order_code: "", //销售订单编号
         thNo: "", //退货编号
         out_code: "", //销售出库编号
-        return_code: "", //售后退货编号
+        return_code: "", //售后申请编号
         post_compay: "", //物流公司
         post_code: "", //物流单号
         start: "", //

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -7,7 +7,7 @@ export default [
   },
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     width: '160'
   },
   {

src/views/supplierSellOut/supplierReturnWorkOrder/components/ShowDataTableColumns.js

@@ -2,7 +2,7 @@
 const showColumns = [
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     span: 7
   },
   {

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -188,7 +188,7 @@
         </template>
 
         <template #type="{scope}">
-          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
+          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后申请' }}</el-tag>
         </template>
         
         <template #order_type="{ scope }">

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -2,7 +2,7 @@ const columns = [
   { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'returnCode',
-    label: '售后退货单',
+    label: '售后申请单',
     width: '160'
   },
   {
@@ -155,7 +155,7 @@ const columns = [
 const sellshowColumns = [
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     span: 6
   },
   {
@@ -170,7 +170,7 @@ const sellshowColumns = [
   },
   {
     prop: 'status',
-    label: '售后退货单状态',
+    label: '售后申请单状态',
     _slot_: 'status',
     span: 6
   },

src/views/supplierSellOut/supplierSellAfterApply/detail.vue

@@ -4,7 +4,7 @@
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="售后退货详情" name="1">
+            <el-collapse-item title="售后申请详情" name="1">
               <show-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"

src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -102,7 +102,7 @@
                     slot="prepend"
                     placeholder="关键字类型"
                   >
-                    <el-option label="售后退货编号" value="serviceNum"></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>
@@ -433,7 +433,7 @@ export default {
     },
     handleExport(){
       if(this.select_list.length === 0){
-        this.$message.warning('请选择一条售后退货单');
+        this.$message.warning('请选择一条售后申请单');
         return
       }
       const returnCode = this.select_list.map(({returnCode}) => returnCode)
@@ -458,7 +458,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "售后退货单.zip";
+              let excelName = "售后申请单.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

src/views/supplierSellOut/supplierSellOutOrder/columns.js

@@ -257,7 +257,7 @@ const showColumns = [
 const rshowColumns = [
   {
     prop: 'returnCode',
-    label: '售后退货单号',
+    label: '售后申请单号',
     span: 6
   },
   {

src/views/supplierSellOut/supplierSellOutOrder/components/addEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新建售后退货"
+    title="新建售后申请"
     :center="true"
     align="left"
     top="22vh"
@@ -58,7 +58,7 @@ export default {
     async initForm() {
       this.loading = true
       if (this.id === 'add') {
-        this.title = '新建售后退货'
+        this.title = '新建售后申请'
         this.rulesThis = this.rules
       } else {
         if (this.isDetail) {

src/views/supplierSellOut/supplierSellOutOrder/components/addEditA.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新建售后退货"
+    title="新建售后申请"
     :center="true"
     align="left"
     top="14vh"
@@ -61,7 +61,7 @@ export default {
     async initForm() {
       this.loading = true
       if (this.id === 'add') {
-        this.title = '新建售后退货'
+        this.title = '新建售后申请'
         this.rulesThis = this.rules
       } else {
         if (this.isDetail) {

src/views/supplierSellOut/supplierSellOutOrder/components/addEdit_sellReturnOrder.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新建售后退货"
+    title="新建售后申请"
     :center="true"
     align="left"
     top="14vh"
@@ -58,7 +58,7 @@ export default {
     async initForm() {
       this.loading = true
       if (this.id === 'add') {
-        this.title = '新建售后退货'
+        this.title = '新建售后申请'
         this.rulesThis = this.rules
       } else {
         if (this.isDetail) {

src/views/supplierSellOut/supplierSellOutOrder/detail.vue

@@ -16,7 +16,7 @@
           :size="'mini'"
           style="margin: 0 0 0 10px"
           @click="wellReturnCode"
-          >新建售后退货单
+          >新建售后申请单
         </el-button> -->
         <!-- <el-button
           class="fr"
@@ -149,7 +149,7 @@
             </el-collapse-item> -->
 
             <el-collapse-item
-              title="售后退货单结果"
+              title="售后申请单结果"
               name="4"
               v-if="
                 returnCode && returnCode_type && sitem && sitem.order_return && resitem
@@ -653,7 +653,7 @@ export default {
         this.returnCode_type + '' === "2" ||
         this.returnCode_type + '' === "3"
       ) {
-        this.$message.warning("当前售后退货单未完成审批！");
+        this.$message.warning("当前售后申请单未完成审批！");
         return;
       }
       this.showModel = true;