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,7 +47,7 @@ const btnList = [
   { code: "046", name: "供应商反馈" },
   { code: "047", name: "退货验收记录" },
   { code: "048", name: "添加发货单" },
-  { code: "049", name: "添加售后申请" },
+  { code: "049", name: "添加售后退货" },
   { code: "050", name: "添加售后退货" },
   { code: "051", name: "添加未发货退货" },
   { code: "052", name: "客户验收" },

src/views/process/columns.js

@@ -1,311 +1,305 @@
 const routerList = [
-  //库存管理
+  // 库存管理
   {
-    name: "调拨流程",
-    type: "DBD",
-    toRouter: "/stock/allotDetail",
-    to: "id",
+    name: '调拨流程',
+    type: 'DBD',
+    toRouter: '/stock/allotDetail',
+    to: 'id',
     isok: true
   },
   {
-    name: "盘点流程",
-    type: "PDD",
-    toRouter: "/stock/checkDetail",
-    to: "id",
+    name: '盘点流程',
+    type: 'PDD',
+    toRouter: '/stock/checkDetail',
+    to: 'id',
     isok: true
   },
 
-  //采购
+  // 采购
   {
-    name: "采购单流程",
-    type: "CGD",
-    toRouter: "/purchaseIn/purchaseOrderDetail",
-    to: "code",
+    name: '采购单流程',
+    type: 'CGD',
+    toRouter: '/purchaseIn/purchaseOrderDetail',
+    to: 'code',
     isok: true
   },
 
   {
-    name: "采购入库单流程",
-    type: "RKD",
-    toRouter: "/purchaseIn/wsmInOrderDetail",
-    to: "code",
+    name: '采购入库单流程',
+    type: 'RKD',
+    toRouter: '/purchaseIn/wsmInOrderDetail',
+    to: 'code',
     isok: true
   },
 
   {
-    name: "采购单退货流程",
-    type: "CGTHD",
-    toRouter: "/purchaseIn/purchaseReturnDetail",
-    to: "code",
+    name: '采购单退货流程',
+    type: 'CGTHD',
+    toRouter: '/purchaseIn/purchaseReturnDetail',
+    to: 'code'
   },
 
   {
-    name: "采购工差单流程",
-    type: "CGGCD",
-    toRouter: "/purchaseIn/purchaseDiffOrderDetail",
-    to: "id",
+    name: '采购工差单流程',
+    type: 'CGGCD',
+    toRouter: '/purchaseIn/purchaseDiffOrderDetail',
+    to: 'id'
   },
 
-
-
-  //商品管理
+  // 商品管理
   {
-    name: "商品成本流程",
-    type: "SPCB",
-    toRouter: "/goodStore/goodsCostDetail",
-    to: "code",
+    name: '商品成本流程',
+    type: 'SPCB',
+    toRouter: '/goodStore/goodsCostDetail',
+    to: 'code'
   },
   {
-    name: "商品上线流程",
-    type: "SPSX",
-    toRouter: "/goodStore/goodsOnlineDetail",
-    to: "code",
+    name: '商品上线流程',
+    type: 'SPSX',
+    toRouter: '/goodStore/goodsOnlineDetail',
+    to: 'code'
   },
   {
-    name: "商品下线流程",
-    type: "GOL",
-    toRouter: "/goodStore/goodsOfflineDetail",
-    to: "id",
+    name: '商品下线流程',
+    type: 'GOL',
+    toRouter: '/goodStore/goodsOfflineDetail',
+    to: 'id'
   },
   {
-    name: "活动流程",
-    type: "HD",
-    toRouter: "/goodStore/activeDetail",
-    to: "code",
+    name: '活动流程',
+    type: 'HD',
+    toRouter: '/goodStore/activeDetail',
+    to: 'code'
   },
-  //权限
+  // 权限
   {
-    name: "离职交接流程",
-    type: "LZJJ",
-    toRouter: "/interest/handoverDetail",
-    to: "id",
+    name: '离职交接流程',
+    type: 'LZJJ',
+    toRouter: '/interest/handoverDetail',
+    to: 'id'
   },
 
-
-  //销售
+  // 销售
   {
-    name: "项目流程",
-    type: "PRO",
-    toRouter: "/sellOut/projectDetail",
-    to: "code",
+    name: '项目流程',
+    type: 'PRO',
+    toRouter: '/sellOut/projectDetail',
+    to: 'code'
   },
   {
-    name: "竞价单流程",
-    type: "ZXD",
-    toRouter: "/sellOut/zixunOrderDetail",
-    to: "code",
+    name: '竞价单流程',
+    type: 'ZXD',
+    toRouter: '/sellOut/zixunOrderDetail',
+    to: 'code',
     isok: false
   },
   {
-    name: "议价单流程",
-    type: "YJD",
-    toRouter: "/sellOut/bargainListDetail",
-    to: "code",
+    name: '议价单流程',
+    type: 'YJD',
+    toRouter: '/sellOut/bargainListDetail',
+    to: 'code'
   },
   {
-    name: "备库申请流程",
-    type: "BHD",
-    toRouter: "/sellOut/stockApplyDetail",
-    to: "id",
+    name: '备库申请流程',
+    type: 'BHD',
+    toRouter: '/sellOut/stockApplyDetail',
+    to: 'id',
     isok: true
   },
 
-
   {
-    name: "销售订单流程",
-    type: "XSQRD",
-    toRouter: "/sellOut/salesOrderDetail",
-    to: "id",
+    name: '销售订单流程',
+    type: 'XSQRD',
+    toRouter: '/sellOut/salesOrderDetail',
+    to: 'id'
   },
   {
-    name: "发货单流程",
-    type: "CKD",
-    toRouter: "/sellOut/sellOutOrderDetail",
-    to: "code",
+    name: '发货单流程',
+    type: 'CKD',
+    toRouter: '/sellOut/sellOutOrderDetail',
+    to: 'code'
   },
   {
-    name: "销售售后申请单流程",
-    type: "SHD",
-    toRouter: "/sellOut/sellAfterApplyDetail",
-    to: "code",
+    name: '销售售后退货单流程',
+    type: 'SHD',
+    toRouter: '/sellOut/sellAfterApplyDetail',
+    to: 'code',
     isok: true
   },
   {
-    name: "销售售后退货流程",
-    type: "CKTHD",
-    toRouter: "/sellOut/returnOrderDetail",
-    to: "code",
+    name: '销售售后退货流程',
+    type: 'CKTHD',
+    toRouter: '/sellOut/returnOrderDetail',
+    to: 'code',
     isok: true
   },
   {
-    name: "销售退货流程",
-    type: "XSTHD",
-    toRouter: "/sellOut/sellReturnDetail",
-    to: "code",
+    name: '销售退货流程',
+    type: 'XSTHD',
+    toRouter: '/sellOut/sellReturnDetail',
+    to: 'code',
     isok: true
   },
   {
-    name: "销售工差单流程",
-    type: "XSGCD",
-    toRouter: "/sellOut/zxDiffOrderDetail",
-    to: "id",
+    name: '销售工差单流程',
+    type: 'XSGCD',
+    toRouter: '/sellOut/zxDiffOrderDetail',
+    to: 'id'
   },
   {
-    name: "有赞商品上架流程",
-    type: "YZSX",
-    toRouter: "/youzan/othgoodsOnlineDetail",
-    to: "id",
+    name: '有赞商品上架流程',
+    type: 'YZSX',
+    toRouter: '/youzan/othgoodsOnlineDetail',
+    to: 'id'
   },
   {
-    name: "有赞订单转单流程",
-    type: "YZQRD",
-    toRouter: "/youzan/othTransferOrderLogDetail",
-    to: "id",
-  },
-  
+    name: '有赞订单转单流程',
+    type: 'YZQRD',
+    toRouter: '/youzan/othTransferOrderLogDetail',
+    to: 'id'
+  }
 
-];
+]
 const columns = [
   {
-    prop: "order_code",
-    label: "业务编号",
-    width:'170px'
+    prop: 'order_code',
+    label: '业务编号',
+    width: '170px'
   },
   {
-    prop: "process_name",
-    label: "流程名称",
-    width:'170px'
+    prop: 'process_name',
+    label: '流程名称',
+    width: '170px'
     // sortable: true,
 
   },
   {
-    prop: "status_name",
-    label: "流程状态",
-    width:'170px'
+    prop: 'status_name',
+    label: '流程状态',
+    width: '170px'
     // sortable: true,
 
   },
   {
-    prop: "apply_name",
-    label: "申请人",
-    width:'70px'
+    prop: 'apply_name',
+    label: '申请人',
+    width: '70px'
   },
 
   {
-    prop: "action_name",
-    label: "上一步的提交人",
-    width:'110px'
+    prop: 'action_name',
+    label: '上一步的提交人',
+    width: '110px'
   },
   {
-    prop: "handle_user_list",
-    label: "当前可操作人",
-    _slot_:'current_handle_name'
+    prop: 'handle_user_list',
+    label: '当前可操作人',
+    _slot_: 'current_handle_name'
   },
   {
-    prop: "addtime",
-    label: "申请时间",
-    width:'150px'
+    prop: 'addtime',
+    label: '申请时间',
+    width: '150px'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: "50",
+    _slot_: 'operation',
+    width: '50'
   }
 ]
-const doneColumns=[
+const doneColumns = [
   {
-    prop: "order_code",
-    label: "业务编号",
+    prop: 'order_code',
+    label: '业务编号'
   },
   {
-    prop: "process_name",
-    label: "流程名称",
+    prop: 'process_name',
+    label: '流程名称'
   },
   {
-    prop: "status_name",
-    label: "流程状态",
+    prop: 'status_name',
+    label: '流程状态'
 
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人'
   },
   {
-    prop: "action_name",
-    label: "上一步的提交人",
+    prop: 'action_name',
+    label: '上一步的提交人'
   },
 
   {
-    prop: "addtime",
-    label: "申请时间",
+    prop: 'addtime',
+    label: '申请时间'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: "50",
+    _slot_: 'operation',
+    width: '50'
   }
 ]
-const readUnRead =[
+const readUnRead = [
   {
-    type: "selection",
-    fixed: "left",
-    _noset_: true,
+    type: 'selection',
+    fixed: 'left',
+    _noset_: true
   },
   {
-    prop: "orderCode",
-    label: "业务编号",
-    minWidth:"155px",
+    prop: 'orderCode',
+    label: '业务编号',
+    minWidth: '155px'
   },
   {
-    prop: "process_name",
-    label: "流程名称",
-    minWidth:"155px",
+    prop: 'process_name',
+    label: '流程名称',
+    minWidth: '155px'
     // sortable: true,
   },
   {
-    prop: "order_name",
-    label: "流程状态",
-    minWidth:"155px",
+    prop: 'order_name',
+    label: '流程状态',
+    minWidth: '155px'
     // sortable: true,
   },
 
   {
-    prop: "content",
-    minWidth:"155px",
-    label: "内容",
+    prop: 'content',
+    minWidth: '155px',
+    label: '内容'
   },
 
   {
-    prop: "apply_name",
-    minWidth:"95px",
-    label: "申请人",
+    prop: 'apply_name',
+    minWidth: '95px',
+    label: '申请人'
   },
   {
-    prop: "action_name",
-    minWidth:"95px",
-    label: "操作人",
+    prop: 'action_name',
+    minWidth: '95px',
+    label: '操作人'
   },
 
   {
-    prop: "addtime",
-    minWidth:"155px",
-    label: "申请时间",
+    prop: 'addtime',
+    minWidth: '155px',
+    label: '申请时间'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: "50",
+    _slot_: 'operation',
+    width: '50'
   }
 ]
 
-
-export { routerList, columns,doneColumns,readUnRead }
+export { routerList, columns, doneColumns, readUnRead }

src/views/purchaseIn/purchaseOrder/columns.js

@@ -23,7 +23,7 @@ const columns = [
   // {
   //   prop: "bkcode",
   //   label: "备库单编号",
-  //   width: "155px",
+  //   width: "155px",a
   // },
 
   // {
@@ -65,12 +65,6 @@ const columns = [
     width: '110px'
   },
 
-  {
-    prop: 'has_account',
-    label: '供应商端情况',
-    _slot_: 'has_account',
-    width: '100px'
-  },
   {
     prop: 'spuCode',
     label: '商品成本编号',
@@ -157,29 +151,10 @@ const columns = [
   // },
   {
     prop: 'has_account',
-    label: '供应商端开启状态',
+    label: '供应商端',
     _slot_: 'has_account',
     width: '120px'
   },
-  {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    width: '120px'
-  },
-  {
-    prop: 'order_id',
-    label: '商品类型',
-    _slot_: 'order_id',
-    width: '110px'
-  },
-  {
-    prop: 'order_source',
-    label: '订单来源',
-    _slot_: 'order_source',
-    width: '110px'
-  },
-
   {
     prop: 'lasttime',
     label: '预计最晚入库时间',

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/components/mark-modal.vue

@@ -0,0 +1,60 @@
+<template>
+  <el-dialog :visible.sync="innerVisible" title="退货工单标记" center>
+    <vue-editor v-model="content" />
+    <el-button class="fr" type="primary" size="mini" style="margin:10px 0px" :loading="loading" @click="() => onMark()">保存</el-button>
+    <div style="clear:both" />
+  </el-dialog>
+</template>
+
+<script>
+import { VueEditor } from 'vue2-editor'
+import asyncRequest from '@/apis/service/sellOut/beforeReturnGoodWorkOrder'
+export default {
+  components: { VueEditor },
+  props: ['sitem', 'visible'],
+  data: () => ({
+    content: '',
+    loading: false
+  }),
+  computed: {
+    innerVisible: {
+      get() {
+        return this.visible
+      },
+      set(newValue) {
+        this.$emit('update:visible', newValue)
+      }
+    }
+  },
+  watch: {
+    visible: {
+      handler() {
+        if (!this.visible) return null
+        this.$nextTick(() => {
+          console.log(this.sitem.record)
+          this.content = this.sitem.record
+        })
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    async onMark() {
+      this.loading = true
+      const { code, message } = await asyncRequest.setAfterChildRecord({ record: this.content, id: this.sitem.id })
+      this.loading = false
+
+      switch (code) {
+        case 0:
+          this.content = ''
+          this.innerVisible = false
+          this.$emit('reload')
+          break
+        default:
+          this.$message.warning(message)
+          break
+      }
+    }
+  }
+}
+</script>

src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="sellReturnDetail pagePadding">
+    <div style="display:flex;justify-content:flex-end;align-items:center">
+        <el-button type="primary" plain size="mini" @click="() => visible = true">退货工单标记</el-button>
+    </div>
+
     <div style="width: 100%" v-if="powers.some((i) => i == '007')">
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
@@ -80,10 +84,6 @@
             <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('2') && String(sitem.status) === '12' && !isSupertube">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
-
-            <el-collapse-item title="退货工单标记" name="2">
-              <work-order-mark :sitem="sitem" @reload="initData" />
-            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
       </el-tabs>
@@ -91,6 +91,8 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
+
+    <mark-modal :visible.sync="visible" :sitem="sitem" @reload="() => initData()" />
   </div>
 </template>
 <script>
@@ -100,13 +102,13 @@ import asyncRequest from "@/apis/service/sellOut/beforeReturnGoodWorkOrder";
 import { showColumns } from "./components/ShowDataTableColumns";
 import { xs_order_type_options } from "@/assets/js/statusList";
 import WaitStockman from "./components/wait-stockman.vue";
-import WorkOrderMark from "./components/work-order-mark.vue"
+import MarkModal from "./components/mark-modal.vue";
 import { mapGetters } from "vuex";
 
 export default {
   name: "deliveryWorkOrderDetail",
   mixins: [mixinPage, resToken],
-  components: { WaitStockman, WorkOrderMark },
+  components: { WaitStockman, MarkModal },
   computed: {
     ...mapGetters(['isSupertube']),
     powers() {
@@ -126,6 +128,7 @@ export default {
     return {
       activeTabs: "1",
       showColumns: showColumns,
+      visible: false,
       statusOptions: [
         { value: "1", label: "待收货" },
         { value: "2", label: "已收货" }

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -2,7 +2,7 @@ export default [
   { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'returnCode',
-    label: '售后申请单号',
+    label: '售后退货单号',
     width: '160'
   },
   {

src/views/sellOut/returnGoodWorkOrder/components/mark-modal.vue

@@ -0,0 +1,58 @@
+<template>
+  <el-dialog :visible.sync="innerVisible" title="退货工单标记" center>
+    <vue-editor v-model="content" />
+    <el-button class="fr" type="primary" size="mini" style="margin:10px 0px" :loading="loading" @click="() => onMark()">保存</el-button>
+    <div style="clear:both" />
+  </el-dialog>
+</template>
+
+<script>
+import { VueEditor } from 'vue2-editor'
+import asyncRequest from '@/apis/service/sellOut/returnGoodWorkOrder'
+export default {
+  components: { VueEditor },
+  props: ['sitem', 'visible'],
+  data: () => ({
+    content: '',
+    loading: false
+  }),
+  computed: {
+    innerVisible: {
+      get() {
+        return this.visible
+      },
+      set(newValue) {
+        this.$emit('update:visible', newValue)
+      }
+    }
+  },
+  watch: {
+    visible: {
+      handler() {
+        if (!this.visible) return null
+        this.$nextTick(() => {
+          this.content = this.sitem.record
+        })
+      }
+    }
+  },
+  methods: {
+    async onMark() {
+      this.loading = true
+      const { code, message } = await asyncRequest.setAfterChildRecord({ record: this.content, id: this.sitem.id })
+      this.loading = false
+
+      switch (code) {
+        case 0:
+          this.content = ''
+          this.innerVisible = false
+          this.$emit('reload')
+          break
+        default:
+          this.$message.warning(message)
+          break
+      }
+    }
+  }
+}
+</script>

src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="sellReturnDetail pagePadding">
+    <div style="display:flex;justify-content:flex-end;align-items:center">
+        <el-button type="primary" plain size="mini" @click="visible = true">退货工单标记</el-button>
+    </div>
+
     <div style="width: 100%" v-if="powers.some((i) => i == '007')">
+
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
@@ -76,10 +81,6 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
-
-            <el-collapse-item title="退货工单标记" name="1">
-              <work-order-mark :sitem="sitem" @reload="initData()" />
-            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
       </el-tabs>
@@ -87,6 +88,8 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
+
+    <mark-modal :visible.sync="visible" :sitem="sitem" @reload="() => initData()" />
   </div>
 </template>
 <script>
@@ -95,13 +98,13 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/returnGoodWorkOrder";
 import { showColumns } from "./components/ShowDataTableColumns";
 import { xs_order_type_options } from "@/assets/js/statusList";
-import WorkOrderMark from "./components/work-order-mark.vue"
+import MarkModal from "./components/mark-modal.vue";
 import { mapGetters } from "vuex";
 
 export default {
   name: "deliveryWorkOrderDetail",
   mixins: [mixinPage, resToken],
-  components: { WorkOrderMark },
+  components: { MarkModal },
   computed: {
     ...mapGetters(['isSupertube']),
     powers() {
@@ -115,6 +118,7 @@ export default {
     return {
       activeTabs: "1",
       showColumns: showColumns,
+      visible:false,
       statusOptions: [
         { value: "1", label: "待收货" },
         { value: "2", label: "已收货" }

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -29,7 +29,7 @@
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="24">
               <el-col :span="4" style="margin-right:10px" >
-                <el-input v-model="parmValue.returnCode"  placeholder="售后申请单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
+                <el-input v-model="parmValue.returnCode"  placeholder="售后退货单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
 
               <el-col :span="4">

src/views/sellOut/returnOrder/ShowDataTableColumns.js

@@ -1,72 +1,69 @@
 export default [
 
   {
-    prop: "thNo",
-    label: "售后退货单编号",
+    prop: 'thNo',
+    label: '售后退货单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "售后退货单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '售后退货单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "returnCode",
-    label: "售后申请单编号",
+    prop: 'returnCode',
+    label: '售后退货单编号',
     span: 6
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 6
   },
   {
-    prop: "outCode",
-    label: "发货单编号",
+    prop: 'outCode',
+    label: '发货单编号',
     span: 6
   },
 
-
-
   {
-    prop: "orderCode",
-    label: "订单编号",
+    prop: 'orderCode',
+    label: '订单编号',
     span: 6
   },
-  
+
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "contactor",
-    label: "退回联系人",
+    prop: 'contactor',
+    label: '退回联系人',
     span: 6
   },
   {
-    prop: "mobile",
-    label: "退回联系电话",
+    prop: 'mobile',
+    label: '退回联系电话',
     span: 6
   },
   {
-    prop: "return_msg",
-    label: "退回原因",
+    prop: 'return_msg',
+    label: '退回原因',
     span: 12
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "addr",
-    label: "退回联系地址",
+    prop: 'addr',
+    label: '退回联系地址',
     // span: 18
-    span:24
-  },
+    span: 24
+  }
 
- 
 ]
 

src/views/sellOut/returnOrder/columns.js

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

src/views/sellOut/returnOrder/index.vue

@@ -185,7 +185,7 @@
                     placeholder="关键字类型"
                   >
                     <el-option label="售后退货单编号" value="returnNo" />
-                    <el-option label="售后申请单编号" value="serviceNo" />
+                    <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

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

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

@@ -2,8 +2,8 @@
   <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
     <el-form-item label="审核状态" prop="status">
       <el-select v-model="formData.status" style="width:100%">
-        <el-option label="修改供应商审批结果" value="10" />
-        <el-option label="认同供应商审批结果" value="11" />
+        <el-option label="不同意供应商审批结果,修改供应商审批结果" value="10" />
+        <el-option label="同意供应商审批结果,由业务公司承担" value="11" />
       </el-select>
     </el-form-item>
 

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

@@ -42,11 +42,12 @@
                 <search-stock
                   :is-detail="false"
                   :size="'mini'"
+                  :disabled="isStock"
                   :value="list[scope.$index].return_wsm_code"
                   :placeholder="'仓库名称'"
                   :is-relation="true"
                   :wsmtype="'5'"
-                  :company-no="currentCompany"
+                  :company-no="isStock ? list[scope.$index].wsm_code : currentCompany"
                   :disbaled="!currentCompany"
                   :names="''"
                   @searchChange="onStockChange($event, scope.$index)"
@@ -86,19 +87,23 @@ export default {
           required: true,
           message: '请选择退货仓库',
           trigger: 'change'
-        }],
-        return_num: [{
-          required: false
         }]
       })
+    },
+    isStock() {
+      const { order_type } = this.sitem
+      return order_type === '2'
     }
   },
   async mounted() {
     this.$nextTick(async() => {
       const { data, code, message } = await asyncRequest.sendList({ outCode: this.sitem.outCode })
+      const { order_type } = this.sitem
+      const isStock = order_type === '2'
+
       switch (code) {
         case 0:
-          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
+          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: isStock ? [item.wsm_code] : '' }))
           break
         default:
           this.$message.warning(message)

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

@@ -74,8 +74,8 @@ export default {
         contactor: ''
       },
       statusOptions: [
-        { value: '4', label: '确认修改' },
-        { value: '2', label: '不同意修改' }
+        { value: '4', label: '确认修改,供应商同意退货' },
+        { value: '2', label: '不同意修改,希望业务公司承担' }
       ]
     }
   },

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 !== ''"
@@ -62,7 +62,7 @@
                     :type="sitem.status == '0' ? 'warning' : ''"
                     v-text="
                       (
-                        (sitem.is_receive + ''=== '0' ? status2Options : status1Options).find(
+                      statusOptions.find(
                           (item) => String(item.id) === String( sitem.status)
                         ) || {}
                       ).label || '--'
@@ -172,7 +172,7 @@
               <wait-return :sitem="sitem" @changeStatus="handleExpress" />
             </el-collapse-item>
 
-            <el-collapse-item name="7" title="业务公司修改待供应商确认"  v-if="isHasPermission({status:'10', process:'10'})">
+            <el-collapse-item name="7" title="业务公司修改，待供应商确认"  v-if="isHasPermission({status:'10', process:'10'})">
               <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
             </el-collapse-item>
 
@@ -286,34 +286,19 @@ export default {
         { id: "1", name: "库存品" },
       ],
       // 收到货状态
-      status1Options: [
+      statusOptions: [
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },//  id: "2", label: "供应商驳回,待供应商负责人审核" },
-      //{ id: "2", label: "待设置仓库" },//节点废除
-        { id: "4", label: "待客户退货" },//已收到货才有
-        { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
-        //{ id: "7", label: "采购已驳回" },//节点废除
-        { id: "8", label: "申请已取消" },
         { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
-        { id: "11", label: "待设置工单" },//已收到货才有
-        { id: "12", label: "待库管收货" },//已收到货才有
-      ],
-      // 未收到货状态
-      status2Options: [
-        { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },//  id: "2", label: "供应商驳回,待供应商负责人审核" },
-      //{ id: "2", label: "待设置仓库" },//节点废除
-        { id: "4", label: "待客户退货" },//已收到货才有
+        { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
+        { id: "10", label: "业务公司修改，待供应商确认" },
+        { id: "11", label: "待设置工单" }, //已收到货才有
+        //{ id: "2", label: "待设置仓库" },//节点废除
+        { id: "4", label: "待客户退货" }, //已收到货才有
+        { id: "12", label: "待库管收货" }, //已收到货才有
         { id: "5", label: "售后已完成" },
-        { id: "6", label: "业务已驳回" },
         //{ id: "7", label: "采购已驳回" },//节点废除
         { id: "8", label: "申请已取消" },
-        { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
-        { id: "11", label: "待设置工单" },//已收到货才有
-        { id: "12", label: "待库管收货" },//已收到货才有
       ],
       orderCode: "",
       return_code: "",

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>
@@ -257,10 +257,7 @@
             :type="''"
             v-text="
               (
-                (scope.row.is_receive + '' === '0'
-                  ? status2Options
-                  : status1Options
-                ).find((item) => item.id == scope.row.status) || {}
+              statusOptions.find((item) => item.id == scope.row.status) || {}
               ).label || '--'
             "
           ></el-tag>
@@ -357,34 +354,19 @@ export default {
       ],
       sitem: null,
       // 收到货状态
-      status1Options: [
+      statusOptions: [
         { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
-        //{ id: "2", label: "待设置仓库" },//节点废除
-        { id: "4", label: "待客户退货" }, //已收到货才有
-        { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
-        //{ id: "7", label: "采购已驳回" },//节点废除
-        { id: "8", label: "申请已取消" },
         { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
-        { id: "11", label: "待设置工单" }, //已收到货才有
-        { id: "12", label: "待库管收货" }, //已收到货才有
-      ],
-      // 未收到货状态
-      status2Options: [
-        { id: "1", label: "待业务审核" },
         { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
+        { id: "10", label: "业务公司修改，待供应商确认" },
+        { id: "11", label: "待设置工单" }, //已收到货才有
         //{ id: "2", label: "待设置仓库" },//节点废除
         { id: "4", label: "待客户退货" }, //已收到货才有
+        { id: "12", label: "待库管收货" }, //已收到货才有
         { id: "5", label: "售后已完成" },
-        { id: "6", label: "业务已驳回" },
         //{ id: "7", label: "采购已驳回" },//节点废除
         { id: "8", label: "申请已取消" },
-        { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
-        { id: "11", label: "待设置工单" }, //已收到货才有
-        { id: "12", label: "待库管收货" }, //已收到货才有
       ],
       loading: false,
       showModel: false,
@@ -436,7 +418,7 @@ export default {
         //{ id: "7", label: "采购已驳回" },//节点废除
         { id: "8", label: "申请已取消" },
         { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
+        { id: "10", label: "业务公司修改，待供应商确认" },
         { id: "11", label: "待设置工单" }, //已收到货才有
         { id: "12", label: "待库管收货" }, //已收到货才有
       ],
@@ -469,7 +451,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);
@@ -494,7 +476,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

@@ -265,7 +265,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"
@@ -12,7 +12,7 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
     @close="showModelThis = false"
   >
-  <el-card style="margin-top: -20px" v-loading="loading">
+    <el-card v-loading="loading" style="margin-top: -20px">
       <add-edit-form
         v-if="showModel"
         :id="id"
@@ -26,59 +26,59 @@
   </el-dialog>
 </template>
 <script>
-import addEditForm from "./addEditForm.vue";
+import addEditForm from './addEditForm.vue'
 export default {
-  name: "handover",
-  props: ["showModel", "id", "isDetail", "sitem"],
+  name: 'Handover',
   components: {
-    addEditForm,
+    addEditForm
   },
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
   data() {
     return {
       sitem: null,
-      title: "",
-      showModelThis: this.showModel,
-    };
+      title: '',
+      showModelThis: this.showModel
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
-    
+
     async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "新建售后申请";
-        this.rulesThis = this.rules;
+      this.loading = true
+      if (this.id === 'add') {
+        this.title = '新建售后退货'
+        this.rulesThis = this.rules
       } else {
         if (this.isDetail) {
-          this.rulesThis = {};
+          this.rulesThis = {}
         } else {
-          this.rulesThis = this.rules;
+          this.rulesThis = this.rules
         }
       }
-      this.loading = false;
+      this.loading = false
     },
     handClick(e) {
-      this.showModelThis = e;
+      this.showModelThis = e
     },
     refresh(e) {
-      console.log(e);
-      this.showModelThis = e;
-      this.$emit("refresh", true);
-    },
-  },
-};
+      console.log(e)
+      this.showModelThis = e
+      this.$emit('refresh', true)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

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"
@@ -12,7 +12,7 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
     @close="showModelThis = false"
   >
-    <el-card style="margin-top: -20px" v-loading="loading">
+    <el-card v-loading="loading" style="margin-top: -20px">
       <add-edit-form
         v-if="showModel"
         :id="id"
@@ -26,60 +26,60 @@
   </el-dialog>
 </template>
 <script>
-import addEditForm from "./addEdit_sellForm.vue";
+import addEditForm from './addEdit_sellForm.vue'
 export default {
-  name: "handover",
-  props: ["showModel", "id", "isDetail", "sitem"],
+  name: 'Handover',
   components: {
-    addEditForm,
+    addEditForm
   },
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
   data() {
     return {
       sitem: null,
-      title: "",
-      showModelThis: this.showModel,
-    };
+      title: '',
+      showModelThis: this.showModel
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
-    
+
     async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "新建售后申请";
-        this.rulesThis = this.rules;
+      this.loading = true
+      if (this.id === 'add') {
+        this.title = '新建售后退货'
+        this.rulesThis = this.rules
       } else {
         if (this.isDetail) {
-          this.rulesThis = {};
+          this.rulesThis = {}
         } else {
-          this.rulesThis = this.rules;
+          this.rulesThis = this.rules
         }
       }
-      this.loading = false;
+      this.loading = false
     },
     handClick(e) {
-      console.log(e);
-      this.showModelThis = e;
+      console.log(e)
+      this.showModelThis = e
     },
     refresh(e) {
-      console.log(e);
-      this.showModelThis = e.close;
-      this.$emit("refresh", { status: 5 });
-    },
-  },
-};
+      console.log(e)
+      this.showModelThis = e.close
+      this.$emit('refresh', { status: 5 })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

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"
@@ -145,7 +145,7 @@
             </el-collapse-item> -->
 
             <el-collapse-item
-              title="售后申请单结果"
+              title="售后退货单结果"
               name="4"
               v-if="
                 returnCode && returnCode_type && sitem && sitem.order_return && resitem
@@ -715,7 +715,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/detail.vue

@@ -172,7 +172,7 @@
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseExam" />
             </el-collapse-item>
 
-            <el-collapse-item title="业务公司修改待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'})">
+            <el-collapse-item title="业务公司修改，待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'})">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"

src/views/sellOut/zixunOrder/ShowDataTableColumns.js

@@ -1,16 +1,16 @@
 export default [
   {
-    prop: "returnCode",
-    label: "售后申请单号",
+    prop: 'returnCode',
+    label: '售后退货单号'
   },
   {
-    prop: "status",
-    label: "售后申请单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '售后退货单状态',
+    _slot_: 'status'
   },
   {
-    prop: "outCode",
-    label: "发货单编号"
+    prop: 'outCode',
+    label: '发货单编号'
   },
 
   // {
@@ -20,37 +20,36 @@ export default [
   // },
 
   {
-    prop: "orderCode",
-    label: "销售订单编号",
+    prop: 'orderCode',
+    label: '销售订单编号'
   },
   {
-    prop: "apply_name",
-    label: "申请人"
+    prop: 'apply_name',
+    label: '申请人'
   },
   {
-    prop: "class_cat",
-    label: "商品分类",
+    prop: 'class_cat',
+    label: '商品分类'
   },
 
   {
-    prop: "good_code",
-    label: "商品编码",
+    prop: 'good_code',
+    label: '商品编码'
   },
 
   {
-    prop: "good_name",
-    label: "商品名称",
+    prop: 'good_name',
+    label: '商品名称'
   },
 
- 
   {
-    prop: "total_num",
-    label: "总发货数量",
+    prop: 'total_num',
+    label: '总发货数量'
   },
 
   {
-    prop: "sale_price",
-    label: "销售单价",
+    prop: 'sale_price',
+    label: '销售单价'
   },
   // {
   //   prop: "origin_price",
@@ -62,19 +61,18 @@ export default [
   //   label: "商品单价",
   // },
   {
-    prop: "total_price",
-    label: "发货单总价",
+    prop: 'total_price',
+    label: '发货单总价'
   },
 
   {
-    prop: "updatetime",
-    label: "更新时间",
+    prop: 'updatetime',
+    label: '更新时间'
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-  },
-
+    prop: 'addtime',
+    label: '创建时间'
+  }
 
 ]
 

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

@@ -1,4 +1,4 @@
-//筛选数据
+// 筛选数据
 const schTahead = [
   // {
   //  这个不做筛选、列表渲染需要这个字段
@@ -19,40 +19,40 @@ const schTahead = [
   //   minWidth:200,
   // },
   {
-    prop: "standBookNo",
-    label: "台账记录",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'standBookNo',
+    label: '台账记录',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "projectNo",
-    label: "项目",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'projectNo',
+    label: '项目',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "infoNo",
-    label: "竞价单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'infoNo',
+    label: '竞价单',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "bargainNo",
-    label: "议价单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'bargainNo',
+    label: '议价单',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "bk_code",
-    label: "备货单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'bk_code',
+    label: '备货单',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "orderCode",
-    label: "销售订单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'orderCode',
+    label: '销售订单',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   // {
   //   prop: "outCode",
@@ -62,7 +62,7 @@ const schTahead = [
   // },
   // {
   //   prop: "returnCode",
-  //   label: "售后申请单",
+  //   label: "售后退货单",
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
@@ -79,10 +79,10 @@ const schTahead = [
   //   minWidth:155,
   // },
   {
-    prop: "cgdNo",
-    label: "采购单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'cgdNo',
+    label: '采购单',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
 
   // {
@@ -98,16 +98,16 @@ const schTahead = [
   //   minWidth:155,
   // },
   {
-    prop: "spuCode",
-    label: "成本商品",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'spuCode',
+    label: '成本商品',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "skuCode",
-    label: "上线商品",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'skuCode',
+    label: '上线商品',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   // {
   //   prop: "order_type",
@@ -115,66 +115,66 @@ const schTahead = [
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
-  
+
   {
-    prop: "supplierNo",
-    label: "供应商",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'supplierNo',
+    label: '供应商',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "companyNo",
-    label: "业务公司",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'companyNo',
+    label: '业务公司',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "customer_code",
-    label: "企业客户",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+    prop: 'customer_code',
+    label: '企业客户',
+    t1: '方便统一修改、留存',
+    minWidth: 155
+  }
 
 ]
 
-//列表
+// 列表
 const columns = [
-  
+
   {
-    prop: "standBookNo",
-    label: "台账编码",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'standBookNo',
+    label: '台账编码',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "projectNo",
-    label: "项目编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'projectNo',
+    label: '项目编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "infoNo",
-    label: "竞价单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'infoNo',
+    label: '竞价单编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "bargainNo",
-    label: "议价单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'bargainNo',
+    label: '议价单编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "bk_code",
-    label: "备货单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'bk_code',
+    label: '备货单编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "orderCode",
-    label: "销售订单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'orderCode',
+    label: '销售订单编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   // {
   //   prop: "outCode",
@@ -184,7 +184,7 @@ const columns = [
   // },
   // {
   //   prop: "returnCode",
-  //   label: "售后申请单编号",
+  //   label: "售后退货单编号",
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
@@ -194,7 +194,7 @@ const columns = [
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
-  
+
   // {
   //   prop: "returnGoodCode",
   //   label: "退货单编号",
@@ -208,10 +208,10 @@ const columns = [
   //   minWidth:155,
   // },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'cgdNo',
+    label: '采购单编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
 
   // {
@@ -233,16 +233,16 @@ const columns = [
   //   minWidth:155,
   // },
   {
-    prop: "spuCode",
-    label: "成本商品编码",
-    t1:"方便统一修改、留存",
-    minWidth:165,
+    prop: 'spuCode',
+    label: '成本商品编码',
+    t1: '方便统一修改、留存',
+    minWidth: 165
   },
   {
-    prop: "skuCode",
-    label: "上线商品编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'skuCode',
+    label: '上线商品编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   // {
   //   prop: "order_type",
@@ -250,31 +250,31 @@ const columns = [
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
-  
+
   {
-    prop: "supplierNo",
-    label: "供应商编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'supplierNo',
+    label: '供应商编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "companyNo",
-    label: "业务公司编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'companyNo',
+    label: '业务公司编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   {
-    prop: "customer_code",
-    label: "企业客户编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'customer_code',
+    label: '企业客户编号',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
 
   {
-    prop: "addtime",
-    label: "创建时间",
-    t1:"方便统一修改、留存",
-    minWidth:155,
+    prop: 'addtime',
+    label: '创建时间',
+    t1: '方便统一修改、留存',
+    minWidth: 155
   },
   // {
   //   prop: "updatetime",
@@ -283,112 +283,110 @@ const columns = [
   //   minWidth:155,
   // },
   {
-    prop:"",
-    label: "操作",
-    _slot_: "operation",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    _slot_: 'operation',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
+    width: '50px'
 
   }
 ]
 
-//采购单号——详情
-const cgd_detail2 =  [
+// 采购单号——详情
+const cgd_detail2 = [
   {
-    prop: "cgdNo",
-    label: "采购单编号",
+    prop: 'cgdNo',
+    label: '采购单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "采购单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '采购单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "order_type",
-    label: "采购单来源",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '采购单来源',
+    _slot_: 'order_type',
     span: 6
   },
   {
-    prop: "lasttime",
-    label: "要求入库时间",
+    prop: 'lasttime',
+    label: '要求入库时间',
     span: 6
   },
- 
+
   {
-    prop: "supplier_name",
-    label: "销售方公司",
-    _slot_: "supplier_name",
+    prop: 'supplier_name',
+    label: '销售方公司',
+    _slot_: 'supplier_name'
   },
   {
-    prop: "company",
-    label: "购买方公司",
-    _slot_: "company",
+    prop: 'company',
+    label: '购买方公司',
+    _slot_: 'company'
   },
 
   {
-    prop: "wsm",
-    label: "仓库信息",
-    _slot_: "wsm",
+    prop: 'wsm',
+    label: '仓库信息',
+    _slot_: 'wsm'
   },
- 
- 
- 
+
   {
-    prop: "total_fee",
-    label: "采购总成本",
+    prop: 'total_fee',
+    label: '采购总成本',
     span: 6
   },
   {
-    prop: "good_price",
-    label: "采购单价",
+    prop: 'good_price',
+    label: '采购单价',
     span: 6
   },
   {
-    prop: "good_num",
-    label: "采购总数量",
+    prop: 'good_num',
+    label: '采购总数量',
     span: 6
   },
   {
-    prop: "send_num",
-    label: "已发货数量",
+    prop: 'send_num',
+    label: '已发货数量',
     span: 6
   },
   {
-    prop: "wsend_num",
-    label: "未发货数量",
+    prop: 'wsend_num',
+    label: '未发货数量',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "gold_price",
-    label: "当前实时金价",
-    _slot_: "gold_price",
+    prop: 'gold_price',
+    label: '当前实时金价',
+    _slot_: 'gold_price',
     span: 12
   },
   {
-    prop: "customer",
-    label: "订单客户名称",
-    _slot_: "customer",
+    prop: 'customer',
+    label: '订单客户名称',
+    _slot_: 'customer',
     span: 12
   },
   {
-    prop: "addr_info",
-    label: "收货信息",
-    _slot_: "addr_info",
+    prop: 'addr_info',
+    label: '收货信息',
+    _slot_: 'addr_info',
     span: 24
-  },
+  }
 ]
 
 export {
   schTahead,
   columns,
-  cgd_detail2,
+  cgd_detail2
 }

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

@@ -1,84 +1,81 @@
 const columns = [
 
   {
-    prop: "thNo",
-    label: "售后退货单编号",
+    prop: 'thNo',
+    label: '售后退货单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "售后退货单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '售后退货单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "returnCode",
-    label: "售后申请单编号",
+    prop: 'returnCode',
+    label: '售后退货单编号',
     span: 6
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 6
   },
   {
-    prop: "outCode",
-    label: "发货单编号",
+    prop: 'outCode',
+    label: '发货单编号',
     span: 6
   },
 
-
-
   {
-    prop: "orderCode",
-    label: "订单编号",
+    prop: 'orderCode',
+    label: '订单编号',
     span: 6
   },
-  
+
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "contactor",
-    label: "退回联系人",
+    prop: 'contactor',
+    label: '退回联系人',
     span: 6
   },
   {
-    prop: "mobile",
-    label: "退回联系电话",
+    prop: 'mobile',
+    label: '退回联系电话',
     span: 6
   },
   {
-    prop: "return_msg",
-    label: "退回原因",
+    prop: 'return_msg',
+    label: '退回原因',
     span: 12
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "addr",
-    label: "退回联系地址",
+    prop: 'addr',
+    label: '退回联系地址',
     span: 18
     // span:24
-  },
+  }
 
- 
 ]
 
 const listColumens = [
   {
-    prop: "thNo",
-    label: "售后退货单编号",
-    minWidth: "160px"
+    prop: 'thNo',
+    label: '售后退货单编号',
+    minWidth: '160px'
   },
   // {
   //   prop: "returnCode",
-  //   label: "售后申请单编号",
+  //   label: "售后退货单编号",
   //   minWidth: "160"
 
   // },
@@ -87,29 +84,27 @@ const listColumens = [
   //   label: "发货单编号",
   //   minWidth: "160"
   // },
- 
+
   {
-    prop: "orderCode",
-    label: "销售订单编号",
-    minWidth: "160"
+    prop: 'orderCode',
+    label: '销售订单编号',
+    minWidth: '160'
   },
   {
-    prop: "good_code",
-    label: "商品属性编号",
-    minWidth: "150"
+    prop: 'good_code',
+    label: '商品属性编号',
+    minWidth: '150'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    minWidth: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    minWidth: '150'
   },
 
- 
- 
   {
-    prop: "customer_code",
-    label: "客户编号",
-    minWidth: "140"
+    prop: 'customer_code',
+    label: '客户编号',
+    minWidth: '140'
 
   },
   // {
@@ -118,14 +113,14 @@ const listColumens = [
   //   minWidth: "140"
 
   // },
-  
+
   {
-    prop: "return_num",
-    label: "退货数量",
+    prop: 'return_num',
+    label: '退货数量'
   },
   {
-    prop: "normal_num",
-    label: "正常数量",
+    prop: 'normal_num',
+    label: '正常数量'
   },
   // {
   //   prop: "received_num",
@@ -145,49 +140,48 @@ const listColumens = [
   // },
   // {地址code}
   {
-    prop: "post_fee",
-    label: "邮费",
+    prop: 'post_fee',
+    label: '邮费'
   },
 
   {
-    prop: "post_company",
-    label: "物流公司",
+    prop: 'post_company',
+    label: '物流公司'
   },
   {
-    prop: "post_code",
-    label: "快递单号",
-    minWidth: "120"
+    prop: 'post_code',
+    label: '快递单号',
+    minWidth: '120'
   },
- 
- 
+
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    minWidth: "90px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    minWidth: '90px'
   },
   {
-    prop: "addtime",
-    label: "申请时间",
+    prop: 'addtime',
+    label: '申请时间',
     sortable: true,
     minWidth: 150
   },
   {
-    prop: "",
+    prop: '',
     minWidth: 50,
-    label: "操作",
-    fixed: "right",
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-  },
+    _slot_: 'operation'
+  }
 
 ]
 const statusOptions = [
-  { value: "0", label: "取消" },
-        { value: "1", label: "退货商品验收" },
-        { value: "2", label: "退货验收审核" },
-        { value: "3", label: "退货业务审核" },
-        { value: "4", label: "退货已完成" },
-];
+  { value: '0', label: '取消' },
+  { value: '1', label: '退货商品验收' },
+  { value: '2', label: '退货验收审核' },
+  { value: '3', label: '退货业务审核' },
+  { value: '4', label: '退货已完成' }
+]
 
-export { columns, statusOptions,listColumens }
+export { columns, statusOptions, listColumens }

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

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

src/views/standingBook/detail.vue

@@ -83,7 +83,7 @@
             </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>
@@ -213,7 +213,7 @@ export default {
         // { tar: "#detail9", title: "销售：备货申请单" },
         // { tar: "#detail10", title: "销售：销售订单" },
         // { tar: "#detail11", title: "销售：发货单" },
-        // { tar: "#detail12", title: "销售：售后申请单" },
+        // { tar: "#detail12", title: "销售：售后退货单" },
         // { tar: "#detail13", title: "销售：售后退货单" },
         // { tar: "#detail14", title: "销售：退货单" },
         // { tar: "#detail15", title: "销售：工差单" },
@@ -323,7 +323,7 @@ export default {
         : (flag = false);
       //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
       (orderCode ?? "") != ""
-        ? arr.push({ tar: "#detail12", title: "销售售后申请单" })
+        ? arr.push({ tar: "#detail12", title: "销售售后退货单" })
         : (flag = false);
       //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
       (orderCode ?? "") != ""

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/components/mark-modal.vue

@@ -0,0 +1,65 @@
+<template>
+  <el-dialog :visible.sync="innerVisible" title="退货工单标记" center>
+    <vue-editor v-model="content" />
+    <el-button class="fr" type="primary" size="mini" style="margin:10px 0px" :loading="loading" @click="() => onMark()">保存</el-button>
+    <div style="clear:both" />
+  </el-dialog>
+</template>
+
+<script>
+import { VueEditor } from 'vue2-editor'
+import asyncRequest from '@/apis/service/sellOut/beforeReturnGoodWorkOrder'
+export default {
+  components: { VueEditor },
+  props: ['sitem', 'visible'],
+  data: () => ({
+    content: '',
+    loading: false
+  }),
+  computed: {
+    innerVisible: {
+      get() {
+        return this.visible
+      },
+      set(newValue) {
+        this.$emit('update:visible', newValue)
+      }
+    }
+  },
+  watch: {
+    visible: {
+      handler() {
+        if (!this.visible) return null
+        this.$nextTick(() => {
+          console.log(this.sitem.record)
+          this.content = this.sitem.record
+        })
+      },
+      immediate: true
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.content = this.sitem.record
+    })
+  },
+  methods: {
+    async onMark() {
+      this.loading = true
+      const { code, message } = await asyncRequest.setAfterChildRecord({ record: this.content, id: this.sitem.id })
+      this.loading = false
+
+      switch (code) {
+        case 0:
+          this.content = ''
+          this.innerVisible = false
+          this.$emit('reload')
+          break
+        default:
+          this.$message.warning(message)
+          break
+      }
+    }
+  }
+}
+</script>

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/components/wait-stockman.vue

@@ -165,7 +165,6 @@ export default {
       });
     },
     handleCompany(e) {
-      console.log(e);
       this.ruleForm.good_receive_type = e && e.code ? [e.label] : [];
       this.$refs.ruleForm.validateField("good_receive_type");
     },

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/detail.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="sellReturnDetail pagePadding">
+    <div style="display:flex;justify-content:flex-end;align-items:center">
+        <el-button type="primary" plain size="mini" @click="() => visible = true">退货工单标记</el-button>
+    </div>
+
     <div style="width: 100%" v-if="powers.some((i) => i == '007')">
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
@@ -91,6 +95,8 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
+
+    <mark-modal :visible.sync="visible" :sitem="sitem" @reload="() => initData()" />
   </div>
 </template>
 <script>
@@ -103,10 +109,11 @@ import WaitStockman from "./components/wait-stockman.vue";
 import WorkOrderMark from "./components/work-order-mark.vue"
 import { mapGetters } from "vuex";
 
+import MarkModal from "./components/mark-modal.vue";
 export default {
   name: "deliveryWorkOrderDetail",
   mixins: [mixinPage, resToken],
-  components: { WaitStockman, WorkOrderMark },
+  components: { WaitStockman, WorkOrderMark , MarkModal},
   computed: {
     ...mapGetters(['isSupertube']),
     powers() {
@@ -124,6 +131,7 @@ export default {
   },
   data() {
     return {
+      visible: fsalse,
       activeTabs: "1",
       showColumns: showColumns,
       statusOptions: [

src/views/supplierSellOut/supplierFiling/detail.vue

@@ -50,13 +50,13 @@
 </template>
 
 <script>
-import WaitTransferred from "./cpns/wait-transferred.vue";
-import ShipmentRequest from "./cpns/shipment-request.vue";
-import baseDetail from "./cpns/baseDetail.vue";
-import BaseForm from "./cpns/baseForm.vue";
+import WaitTransferred from './cpns/wait-transferred.vue'
+import ShipmentRequest from './cpns/shipment-request.vue'
+import baseDetail from './cpns/baseDetail.vue'
+import BaseForm from './cpns/baseForm.vue'
 // import ExamForms from './cpns/exam-form.vue'
-import asyncRequest from "@/apis/service/sellOut/filing";
-import { mapGetters } from "vuex";
+import asyncRequest from '@/apis/service/sellOut/filing'
+import { mapGetters } from 'vuex'
 
 export default {
   components: {
@@ -64,63 +64,63 @@ export default {
     // ExamForms,
     baseDetail,
     WaitTransferred,
-    ShipmentRequest,
+    ShipmentRequest
   },
   data() {
     return {
       loading: false,
-      activeTabs: "1",
-      collapses: ["1", "2", "3", "4"],
-      status: "",
+      activeTabs: '1',
+      collapses: ['1', '2', '3', '4'],
+      status: '',
       sitem: {},
-      orderCode: "",
-      num: "0",
-    };
+      orderCode: '',
+      num: '0'
+    }
   },
   computed: {
-    ...mapGetters(["isSupertube"]),
+    ...mapGetters(['isSupertube']),
     title() {
-      return this.id && this.id !== "add" ? "报备单详情" : "新建报备单";
+      return this.id && this.id !== 'add' ? '报备单详情' : '新建报备单'
     },
     type() {
-      return this.id && this.id !== "add" ? "view" : "add";
+      return this.id && this.id !== 'add' ? 'view' : 'add'
     },
     id() {
-      return this.$route.query.id;
+      return this.$route.query.id
     },
     getNewTime() {
-      this.newTime = new Date().valueOf();
-    },
+      this.newTime = new Date().valueOf()
+    }
   },
   methods: {
     async examFormSubmit({ companyCode, ...rest } = {}) {
-      const { id } = this.$route.query;
-      this.loading = true;
+      const { id } = this.$route.query
+      this.loading = true
       await asyncRequest.status({
         ...rest,
         id,
-        companyCode: Array.isArray(companyCode) ? companyCode[0] : companyCode,
-      });
+        companyCode: Array.isArray(companyCode) ? companyCode[0] : companyCode
+      })
 
-      await this.$refs.baseForm.initData();
-      this.loading = false;
+      await this.$refs.baseForm.initData()
+      this.loading = false
     },
     handleChangeStatus(status) {
-      this.status = status;
+      this.status = status
     },
     handleChangeOrderCode(orderCode) {
-      this.orderCode = orderCode;
+      this.orderCode = orderCode
     },
     async handleRefresh() {
-      this.loading = true;
-      await this.$refs.baseForm.initData();
-      this.loading = false;
+      this.loading = true
+      await this.$refs.baseForm.initData()
+      this.loading = false
     },
     handleChangeNum(num) {
-      this.num = num;
-    },
-  },
-};
+      this.num = num
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/supplierSellOut/supplierReturnOrder/ShowDataTableColumns.js

@@ -1,72 +1,69 @@
 export default [
 
   {
-    prop: "thNo",
-    label: "售后退货单编号",
+    prop: 'thNo',
+    label: '售后退货单编号',
     span: 6
   },
   {
-    prop: "status",
-    label: "售后退货单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '售后退货单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "returnCode",
-    label: "售后申请单编号",
+    prop: 'returnCode',
+    label: '售后退货单编号',
     span: 6
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 6
   },
   {
-    prop: "outCode",
-    label: "发货单编号",
+    prop: 'outCode',
+    label: '发货单编号',
     span: 6
   },
 
-
-
   {
-    prop: "orderCode",
-    label: "订单编号",
+    prop: 'orderCode',
+    label: '订单编号',
     span: 6
   },
-  
+
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "contactor",
-    label: "退回联系人",
+    prop: 'contactor',
+    label: '退回联系人',
     span: 6
   },
   {
-    prop: "mobile",
-    label: "退回联系电话",
+    prop: 'mobile',
+    label: '退回联系电话',
     span: 6
   },
   {
-    prop: "return_msg",
-    label: "退回原因",
+    prop: 'return_msg',
+    label: '退回原因',
     span: 12
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "addr",
-    label: "退回联系地址",
+    prop: 'addr',
+    label: '退回联系地址',
     // span: 18
-    span:24
-  },
+    span: 24
+  }
 
- 
 ]
 

src/views/supplierSellOut/supplierReturnOrder/columns.js

@@ -6,7 +6,7 @@ export default [
   },
   // {
   //   prop: "returnCode",
-  //   label: "售后申请单编号",
+  //   label: "售后退货单编号",
   //   width: "160"
 
   // },
@@ -48,14 +48,14 @@ export default [
     width: '150'
   },
   {
-    prop: "companyNo",
-    label: "业务公司编号",
-    width: "160",
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
   },
   {
-    prop: "companyName",
-    label: "业务公司名称",
-    "min-width": "135",
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
   },
   // {
   //   prop: "customer_name",

src/views/supplierSellOut/supplierReturnOrder/index.vue

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

src/views/supplierSellOut/supplierReturnWorkOrder/components/mark-modal.vue

@@ -0,0 +1,60 @@
+<template>
+  <el-dialog :visible.sync="innerVisible" title="退货工单标记" center>
+    <vue-editor v-model="content" />
+    <el-button class="fr" type="primary" size="mini" style="margin:10px 0px" :loading="loading" @click="() => onMark()">保存</el-button>
+    <div style="clear:both" />
+  </el-dialog>
+</template>
+
+<script>
+import { VueEditor } from 'vue2-editor'
+import asyncRequest from '@/apis/service/sellOut/returnGoodWorkOrder'
+export default {
+  components: { VueEditor },
+  props: ['sitem', 'visible'],
+  data: () => ({
+    content: '',
+    loading: false
+  }),
+  computed: {
+    innerVisible: {
+      get() {
+        return this.visible
+      },
+      set(newValue) {
+        this.$emit('update:visible', newValue)
+      }
+    }
+  },
+  watch: {
+    visible: {
+      handler() {
+        if (!this.visible) return null
+        this.$nextTick(() => {
+          console.log(this.sitem.record)
+          this.content = this.sitem.record
+        })
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    async onMark() {
+      this.loading = true
+      const { code, message } = await asyncRequest.setAfterChildRecord({ record: this.content, id: this.sitem.id })
+      this.loading = false
+
+      switch (code) {
+        case 0:
+          this.content = ''
+          this.innerVisible = false
+          this.$emit('reload')
+          break
+        default:
+          this.$message.warning(message)
+          break
+      }
+    }
+  }
+}
+</script>

src/views/supplierSellOut/supplierReturnWorkOrder/detail.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="sellReturnDetail pagePadding">
+    <div style="display:flex;justify-content:flex-end;align-items:center">
+        <el-button type="primary" plain size="mini" @click="() => visible = true">退货工单标记</el-button>
+    </div>
+
     <div style="width: 100%" v-if="powers.some((i) => i == '007')">
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
@@ -21,6 +25,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="record">
+                  <div v-html="sitem.record"></div>
+                </template>
+
                 <template slot="order_type">
                   <el-tag
                     :size="'mini'"
@@ -73,9 +81,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="退货工单标记" name="1">
-              <work-order-mark :sitem="sitem" @reload="initData()" />
-            </el-collapse-item>
+            <mark-modal :visible.sync="visible" :sitem="sitem" @reload="() => initData()" />
           </el-collapse>
         </el-tab-pane>
       </el-tabs>
@@ -92,12 +98,13 @@ import asyncRequest from "@/apis/service/sellOut/returnGoodWorkOrder";
 import { showColumns } from "./components/ShowDataTableColumns";
 import { xs_order_type_options } from "@/assets/js/statusList";
 import WorkOrderMark from "./components/work-order-mark.vue"
+import MarkModal from "./components/mark-modal.vue";
 import { mapGetters } from "vuex";
 
 export default {
   name: "deliveryWorkOrderDetail",
   mixins: [mixinPage, resToken],
-  components: { WorkOrderMark },
+  components: { WorkOrderMark , MarkModal},
   computed: {
     ...mapGetters(['isSupertube']),
     powers() {
@@ -110,6 +117,7 @@ export default {
   data() {
     return {
       activeTabs: "1",
+      visible: false,
       showColumns: showColumns,
       statusOptions: [
         { value: "1", label: "待库管发货" },

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -30,7 +30,7 @@
               <el-col :span="24">
 
               <el-col :span="4" style="margin-right:10px" >
-                <el-input v-model="parmValue.returnCode"  placeholder="售后申请单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
+                <el-input v-model="parmValue.returnCode"  placeholder="售后退货单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
 
               <el-col :span="4">

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -1,8 +1,8 @@
 const columns = [
   {
-    prop: "returnCode",
-    label: "售后申请单",
-    width: "160",
+    prop: 'returnCode',
+    label: '售后退货单',
+    width: '160'
   },
 
   // {
@@ -11,34 +11,34 @@ const columns = [
   //   width:"160"
   // },
   {
-    prop: "outCode",
-    label: "发货单编号",
-    width: "160",
+    prop: 'outCode',
+    label: '发货单编号',
+    width: '160'
   },
   {
-    prop: "orderCode",
-    label: "订单编号",
-    width: "160",
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '160'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: "total_num",
-    label: "出库总数",
+    prop: 'total_num',
+    label: '出库总数'
   },
   {
-    prop: "good_code",
-    label: "商品编码",
-    width: "140",
+    prop: 'good_code',
+    label: '商品编码',
+    width: '140'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    width: "150",
+    prop: 'good_name',
+    label: '商品名称',
+    width: '150'
   },
   // {
   //     prop:"error_num",
@@ -57,14 +57,14 @@ const columns = [
   // },
 
   {
-    prop: "companyNo",
-    label: "业务公司编号",
-    width: "160",
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
   },
   {
-    prop: "companyName",
-    label: "业务公司名称",
-    "min-width": "135",
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
   },
 
   // {
@@ -82,123 +82,123 @@ const columns = [
   //   _slot_: "post_own",
   // },
   {
-    prop: "supplierNo",
-    label: "供应商编号",
-    width: "160",
+    prop: 'supplierNo',
+    label: '供应商编号',
+    width: '160'
   },
   {
-    prop: "supplierName",
-    label: "供应商名称",
-    width: "160",
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '160'
   },
   {
-    prop: "customer_name",
-    label: "客户名称",
-    width: "200",
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '200'
   },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人'
   },
   {
-    prop: "addtime",
-    label: "添加时间",
-    width: 150,
+    prop: 'addtime',
+    label: '添加时间',
+    width: 150
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: 50,
-  },
-];
+    _slot_: 'operation',
+    width: 50
+  }
+]
 const sellshowColumns = [
   {
-    prop: "returnCode",
-    label: "售后申请单号",
-    span: 6,
+    prop: 'returnCode',
+    label: '售后退货单号',
+    span: 6
   },
   {
-    prop: "status",
-    label: "售后申请单状态",
-    _slot_: "status",
-    span: 6,
+    prop: 'status',
+    label: '售后退货单状态',
+    _slot_: 'status',
+    span: 6
   },
   {
-    prop: "outCode",
-    label: "发货单编号",
-    span: 6,
+    prop: 'outCode',
+    label: '发货单编号',
+    span: 6
   },
 
   {
-    prop: "order_type",
-    label: "订单类别",
-    _slot_: "order_type",
-    span: 6,
+    prop: 'order_type',
+    label: '订单类别',
+    _slot_: 'order_type',
+    span: 6
   },
 
   {
-    prop: "is_receive",
-    label: "期望结果",
-    _slot_: "is_receive",
-    span: 6,
+    prop: 'is_receive',
+    label: '期望结果',
+    _slot_: 'is_receive',
+    span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    span: 6,
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
   },
   {
-    prop: "total_num",
-    label: "发货总数量",
-    span: 4,
+    prop: 'total_num',
+    label: '发货总数量',
+    span: 4
   },
   {
-    prop: "error_num",
-    label: "异常数量",
-    span: 4,
+    prop: 'error_num',
+    label: '异常数量',
+    span: 4
   },
 
   {
-    prop: "apply_name",
-    label: "申请人",
-    span: 4,
+    prop: 'apply_name',
+    label: '申请人',
+    span: 4
   },
 
   {
-    prop: "error_msg",
-    label: "异常原因",
-    span: 6,
+    prop: 'error_msg',
+    label: '异常原因',
+    span: 6
   },
   {
-    prop: "except_code",
-    label: "期望",
-    _slot_: "except_code",
-    span: 6,
+    prop: 'except_code',
+    label: '期望',
+    _slot_: 'except_code',
+    span: 6
   },
   {
-    prop: "loop_total",
-    label: "循环次数",
-    span: 4,
+    prop: 'loop_total',
+    label: '循环次数',
+    span: 4
   },
   {
-    prop: "error_img",
-    label: "异常图片",
-    _slot_: "error_img",
-    span: 8,
+    prop: 'error_img',
+    label: '异常图片',
+    _slot_: 'error_img',
+    span: 8
   },
   {
-    prop: "error_remark",
-    label: "备注",
-    span: 24,
-  },
+    prop: 'error_remark',
+    label: '备注',
+    span: 24
+  }
   // {
   //   prop: "sale_price",
   //   label: "销售单价",
@@ -221,5 +221,5 @@ const sellshowColumns = [
   //   prop: "updatetime",
   //   label: "更新时间",
   // },
-];
-export { columns, sellshowColumns };
+]
+export { columns, sellshowColumns }

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

@@ -2,8 +2,8 @@
   <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
     <el-form-item label="审核状态" prop="status">
       <el-select v-model="formData.status" style="width:100%">
-        <el-option label="修改供应商审批结果" value="10" />
-        <el-option label="认同供应商审批结果" value="11" />
+        <el-option label="不同意供应商审批结果,修改供应商审批结果" value="10" />
+        <el-option label="同意供应商审批结果,由业务公司承担" value="11" />
       </el-select>
     </el-form-item>
 

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

@@ -74,8 +74,8 @@ export default {
         contactor: ''
       },
       statusOptions: [
-        { value: '4', label: '确认修改' },
-        { value: '2', label: '不同意修改' }
+        { value: '4', label: '确认修改,供应商同意退货' },
+        { value: '2', label: '不同意修改,希望业务公司承担' }
       ]
     }
   },

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 !== ''"
@@ -17,7 +17,7 @@
                     :type="sitem.status == '0' ? 'warning' : ''"
                     v-text="
                       (
-                        (sitem.is_receive + ''=== '0' ? status2Options : status1Options).find(
+                      statusOptions.find(
                           (item) => String(item.id) === String( sitem.status)
                         ) || {}
                       ).label || '--'
@@ -230,34 +230,19 @@ export default {
       newTime: "",
       loading: false,
       // 收到货状态
-      status1Options: [
-       { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },//  id: "2", label: "供应商驳回,待供应商负责人审核" },
-      //{ id: "2", label: "待设置仓库" },//节点废除
-        { id: "4", label: "待客户退货" },//已收到货才有
-        { id: "5", label: "售后已完成" },
+      statusOptions: [
+        { id: "1", label: "待业务审核" },
         { id: "6", label: "业务已驳回" },
-        //{ id: "7", label: "采购已驳回" },//节点废除
-        { id: "8", label: "申请已取消" },
         { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
-        { id: "11", label: "待设置工单" },//已收到货才有
-        { id: "12", label: "待库管收货" },//已收到货才有
-      ],
-      // 未收到货状态
-      status2Options: [
-        { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },//  id: "2", label: "供应商驳回,待供应商负责人审核" },
+        { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
+        { id: "10", label: "业务公司修改，待供应商确认" },
+        { id: "11", label: "待设置工单" }, //已收到货才有
         //{ id: "2", label: "待设置仓库" },//节点废除
-        { id: "4", label: "待客户退货" },//已收到货才有
+        { id: "4", label: "待客户退货" }, //已收到货才有
+        { id: "12", label: "待库管收货" }, //已收到货才有
         { id: "5", label: "售后已完成" },
-        { id: "6", label: "业务已驳回" },
         //{ id: "7", label: "采购已驳回" },//节点废除
-        { id: "8", label: "申请已取消" },
-        { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
-        { id: "11", label: "待设置工单" },//已收到货才有
-        { id: "12", label: "待库管收货" },//已收到货才有
+        { id: "8", label: "申请已取消" }
       ],
       orderCode: "",
       return_code: "",

src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -135,7 +135,7 @@
                     placeholder="关键字类型"
                   >
                     <el-option
-                      label="售后申请编号"
+                      label="售后退货编号"
                       value="serviceNum"
                     ></el-option>
                     <el-option
@@ -177,7 +177,7 @@
             :size="tablebtnSize"
             :type="''"
             v-text="
-              ((scope.row.is_receive + '' ==='0'?status2Options:status1Options).find((item) => item.id == scope.row.status) || {})
+              (statusOptions.find((item) => item.id == scope.row.status) || {})
                 .label || '--'
             "
           ></el-tag>
@@ -273,34 +273,19 @@ export default {
       ],
       sitem: null,
       // 收到货状态
-      status1Options: [
-      { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },//  id: "2", label: "供应商驳回,待供应商负责人审核" },
-      //{ id: "2", label: "待设置仓库" },//节点废除
-        { id: "4", label: "待客户退货" },//已收到货才有
-        { id: "5", label: "售后已完成" },
+      statusOptions: [
+        { id: "1", label: "待业务审核" },
         { id: "6", label: "业务已驳回" },
-        //{ id: "7", label: "采购已驳回" },//节点废除
-        { id: "8", label: "申请已取消" },
         { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
-        { id: "11", label: "待设置工单" },//已收到货才有
-        { id: "12", label: "待库管收货" },//已收到货才有
-      ],
-       // 未收到货状态
-      status2Options: [
-      { id: "1", label: "待业务审核" },
-        { id: "2", label: "供应商驳回,待采购审核" },//  id: "2", label: "供应商驳回,待供应商负责人审核" },
-      //{ id: "2", label: "待设置仓库" },//节点废除
-        { id: "4", label: "待客户退货" },//已收到货才有
+        { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
+        { id: "10", label: "业务公司修改，待供应商确认" },
+        { id: "11", label: "待设置工单" }, //已收到货才有
+        //{ id: "2", label: "待设置仓库" },//节点废除
+        { id: "4", label: "待客户退货" }, //已收到货才有
+        { id: "12", label: "待库管收货" }, //已收到货才有
         { id: "5", label: "售后已完成" },
-        { id: "6", label: "业务已驳回" },
         //{ id: "7", label: "采购已驳回" },//节点废除
-        { id: "8", label: "申请已取消" },
-        { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
-        { id: "11", label: "待设置工单" },//已收到货才有
-        { id: "12", label: "待库管收货" },//已收到货才有
+        { id: "8", label: "申请已取消" }
       ],
       loading: false,
       showModel: false,
@@ -350,7 +335,7 @@ export default {
         //{ id: "7", label: "采购已驳回" },//节点废除
         { id: "8", label: "申请已取消" },
         { id: "9", label: "供应商审核" },
-        { id: "10", label: "业务公司修改待供应商确认" },
+        { id: "10", label: "业务公司修改，待供应商确认" },
         { id: "11", label: "待设置工单" },//已收到货才有
         { id: "12", label: "待库管收货" },//已收到货才有
       ],
@@ -382,7 +367,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)
@@ -407,7 +392,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

@@ -116,14 +116,14 @@ const columns = [
     width: '140'
   },
   {
-    prop: "companyNo",
-    label: "业务公司编号",
-    width: "160",
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
   },
   {
-    prop: "companyName",
-    label: "业务公司名称",
-    "min-width": "135",
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
   },
   {
     prop: 'addtime',
@@ -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"
@@ -12,7 +12,7 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
     @close="showModelThis = false"
   >
-  <el-card style="margin-top: -20px" v-loading="loading">
+    <el-card v-loading="loading" style="margin-top: -20px">
       <add-edit-form
         v-if="showModel"
         :id="id"
@@ -26,59 +26,59 @@
   </el-dialog>
 </template>
 <script>
-import addEditForm from "./addEditForm.vue";
+import addEditForm from './addEditForm.vue'
 export default {
-  name: "handover",
-  props: ["showModel", "id", "isDetail", "sitem"],
+  name: 'Handover',
   components: {
-    addEditForm,
+    addEditForm
   },
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
   data() {
     return {
       sitem: null,
-      title: "",
-      showModelThis: this.showModel,
-    };
+      title: '',
+      showModelThis: this.showModel
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
-    
+
     async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "新建售后申请";
-        this.rulesThis = this.rules;
+      this.loading = true
+      if (this.id === 'add') {
+        this.title = '新建售后退货'
+        this.rulesThis = this.rules
       } else {
         if (this.isDetail) {
-          this.rulesThis = {};
+          this.rulesThis = {}
         } else {
-          this.rulesThis = this.rules;
+          this.rulesThis = this.rules
         }
       }
-      this.loading = false;
+      this.loading = false
     },
     handClick(e) {
-      this.showModelThis = e;
+      this.showModelThis = e
     },
     refresh(e) {
-      console.log(e);
-      this.showModelThis = e;
-      this.$emit("refresh", true);
-    },
-  },
-};
+      console.log(e)
+      this.showModelThis = e
+      this.$emit('refresh', true)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新建售后申请"
+    title="新建售后退货"
     :center="true"
     align="left"
     top="14vh"
@@ -15,8 +15,7 @@
     <!-- <p>orderCode{{ sitem }}</p> -->
     <!-- <p>outCode{{ outCode }}</p> -->
 
-
-    <el-card style="margin-top: -20px" v-loading="loading">
+    <el-card v-loading="loading" style="margin-top: -20px">
       <add-edit-form-a
         v-if="showModel"
         :id="id"
@@ -30,60 +29,60 @@
   </el-dialog>
 </template>
 <script>
-import addEditFormA from "./addEditFormA";
+import addEditFormA from './addEditFormA'
 export default {
-  name: "handover",
-  props: ["showModel", "id", "isDetail", "sitem"],
+  name: 'Handover',
   components: {
-    addEditFormA,
+    addEditFormA
   },
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
   data() {
     return {
       sitem: null,
-      title: "",
-      showModelThis: this.showModel,
-    };
+      title: '',
+      showModelThis: this.showModel
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
-    
+
     async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "新建售后申请";
-        this.rulesThis = this.rules;
+      this.loading = true
+      if (this.id === 'add') {
+        this.title = '新建售后退货'
+        this.rulesThis = this.rules
       } else {
         if (this.isDetail) {
-          this.rulesThis = {};
+          this.rulesThis = {}
         } else {
-          this.rulesThis = this.rules;
+          this.rulesThis = this.rules
         }
       }
-      this.loading = false;
+      this.loading = false
     },
     handClick(e) {
-      console.log(e);
-      this.showModelThis = e;
+      console.log(e)
+      this.showModelThis = e
     },
     refresh(e) {
-      console.log(e);
-      this.showModelThis = e;
-      this.$emit("refresh", true);
-    },
-  },
-};
+      console.log(e)
+      this.showModelThis = e
+      this.$emit('refresh', true)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="新建售后申请"
+    title="新建售后退货"
     :center="true"
     align="left"
     top="14vh"
@@ -12,7 +12,7 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
     @close="showModelThis = false"
   >
-    <el-card style="margin-top: -20px" v-loading="loading">
+    <el-card v-loading="loading" style="margin-top: -20px">
       <add-edit-form
         v-if="showModel"
         :id="id"
@@ -26,60 +26,60 @@
   </el-dialog>
 </template>
 <script>
-import addEditForm from "./addEdit_sellForm.vue";
+import addEditForm from './addEdit_sellForm.vue'
 export default {
-  name: "handover",
-  props: ["showModel", "id", "isDetail", "sitem"],
+  name: 'Handover',
   components: {
-    addEditForm,
+    addEditForm
   },
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
   data() {
     return {
       sitem: null,
-      title: "",
-      showModelThis: this.showModel,
-    };
+      title: '',
+      showModelThis: this.showModel
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
-    
+
     async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "新建售后申请";
-        this.rulesThis = this.rules;
+      this.loading = true
+      if (this.id === 'add') {
+        this.title = '新建售后退货'
+        this.rulesThis = this.rules
       } else {
         if (this.isDetail) {
-          this.rulesThis = {};
+          this.rulesThis = {}
         } else {
-          this.rulesThis = this.rules;
+          this.rulesThis = this.rules
         }
       }
-      this.loading = false;
+      this.loading = false
     },
     handClick(e) {
-      console.log(e);
-      this.showModelThis = e;
+      console.log(e)
+      this.showModelThis = e
     },
     refresh(e) {
-      console.log(e);
-      this.showModelThis = e.close;
-      this.$emit("refresh", { status: 5 });
-    },
-  },
-};
+      console.log(e)
+      this.showModelThis = e.close
+      this.$emit('refresh', { status: 5 })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

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"
@@ -144,7 +144,7 @@
             </el-collapse-item> -->
 
             <el-collapse-item
-              title="售后申请单结果"
+              title="售后退货单结果"
               name="4"
               v-if="
                 returnCode && returnCode_type && sitem && sitem.order_return && resitem
@@ -646,7 +646,7 @@ export default {
         this.returnCode_type + '' === "2" ||
         this.returnCode_type + '' === "3"
       ) {
-        this.$message.warning("当前售后申请单未完成审批！");
+        this.$message.warning("当前售后退货单未完成审批！");
         return;
       }
       this.showModel = true;