xiaodai2022 há 2 anos atrás
pai
commit
bc0e2d8c95
26 ficheiros alterados com 112 adições e 1814 exclusões
  1. 0 0
      dist/static/js/0.js
  2. 0 0
      dist/static/js/app.js
  3. 0 35
      src/apis/service/sellOut/zxAfterSaleOrder/detail.js
  4. 0 25
      src/apis/service/sellOut/zxAfterSaleOrder/index.js
  5. 2 2
      src/components/globalComponents/process-time-line/main.vue
  6. 6 1
      src/views/goodStore/goodsCost/detail.vue
  7. 9 3
      src/views/goodStore/goodsOnline/detail.vue
  8. 28 1
      src/views/process/columns.js
  9. 38 30
      src/views/process/oing/index.vue
  10. 6 2
      src/views/purchaseIn/purchaseDiffOrder/addEditModel.vue
  11. 1 0
      src/views/purchaseIn/purchaseOrder/components/tolerance.vue
  12. 8 1
      src/views/sellOut/bargainList/detail.vue
  13. 6 1
      src/views/sellOut/project/detail.vue
  14. 0 0
      src/views/sellOut/returnOrder/售后退货单
  15. 1 1
      src/views/sellOut/salesOrder/detail.vue
  16. 7 2
      src/views/sellOut/zixunOrder/detail.vue
  17. 0 74
      src/views/sellOut/zxAfterSaleOrder/ShowDataTableColumns.js
  18. 0 2
      src/views/sellOut/zxAfterSaleOrder/addEdit.vue
  19. 0 149
      src/views/sellOut/zxAfterSaleOrder/columns.js
  20. 0 182
      src/views/sellOut/zxAfterSaleOrder/components/addEdit.vue
  21. 0 42
      src/views/sellOut/zxAfterSaleOrder/components/columns.js
  22. 0 380
      src/views/sellOut/zxAfterSaleOrder/components/return-record.vue
  23. 0 292
      src/views/sellOut/zxAfterSaleOrder/components/returnCheck.vue
  24. 0 235
      src/views/sellOut/zxAfterSaleOrder/detail.vue
  25. 0 354
      src/views/sellOut/zxAfterSaleOrder/index.vue
  26. 0 0
      src/views/sellOut/zxAfterSaleOrder/咨询-售后退货单

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/0.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.js


+ 0 - 35
src/apis/service/sellOut/zxAfterSaleOrder/detail.js

@@ -1,35 +0,0 @@
-// 物业管理员
-import http from "@/apis/axios";
-const api = "admin/";
-export default {
-  // 添加
-  add: (data, params) => http(api + "salecreate", data, "post", params),
-  // 删除
-  delete: (data, params) => http(api + "saledelect", data, "post", params),
-  // 详情
-  detail: (data, params) => http(api + "saleinfo", data, "post", params),
-  // 更新
-  update: (data, params) => http(api + "saleedit", data, "post", params),
-  // 修改状态
-  status: (data, params) => http(api + "salestatus", data, "post", params),
-  // 获取仓库商品列表
-  getGoodStock: (data, params) => http(api + "checkflist", data, "post", params),
-  // 采购反馈物流费用
-  salefee: (data, params) => http(api + "salefee", data, "post", params),
-  // 新建发货申请单
-  saleout: (data, params) => http(api + "saleout", data, "post", params),
-
-
-
-
-  // 新建入库单详情
-  orderininfo: (data, params) => http(api + "orderininfo", data, "post", params),
-  // 异常原因列表
-  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
-  // 入库单验货
-  orderincheck: (data, params) => http(api + "orderincheck", data, "post", params),
-  // 入库单退货换货
-  orderinreturn: (data, params) => http(api + "orderinreturn", data, "post", params),
-  // 发货单状态修改
-  orderinstatus: (data, params) => http(api + "orderinstatus", data, "post", params),
-};

+ 0 - 25
src/apis/service/sellOut/zxAfterSaleOrder/index.js

@@ -1,25 +0,0 @@
-// 物业管理员
-import http from "@/apis/axios";
-const api = "admin/";
-export default {
-  // 添加
-  add: (data, params) => http(api + "add", data, "post", params),
-  // 删除
-  delete: (data, params) => http(api + "delete", data, "post", params),
-  // 分页查询
-  list: (data, params) => http(api + "orderbacklist", data, "post", params),
-  // 详情
-  detail: (data, params) => http(api + "orderbackinfo", data, "post", params),
-  // 更新
-  update: (data, params) => http(api + "update", data, "post", params),
-  // 修改状态
-  status: (data, params) => http(api + "orderbackexam", data, "post", params),
-  // 验货审核
-  check: (data, params) => http(api + "orderbce", data, "post", params),
-  // 退货验货
-  returnCheck: (data, params) => http(api + "orderbackcheck", data, "post", params),
-  // 获取异常原因
-  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
-
-};
-   

+ 2 - 2
src/components/globalComponents/process-time-line/main.vue

@@ -30,9 +30,9 @@
           <p class="name">
           <p class="name">
            操作人: {{ item.action_name?item.action_name:'未知'}}
            操作人: {{ item.action_name?item.action_name:'未知'}}
           </p>
           </p>
-          <p class="item">
+          <!-- <p class="item">
             {{ item.action_name?item.action_name:'未知'}}
             {{ item.action_name?item.action_name:'未知'}}
-          </p>
+          </p> -->
           <p class="time">
           <p class="time">
             {{ item.addtime }}
             {{ item.addtime }}
           </p>
           </p>

+ 6 - 1
src/views/goodStore/goodsCost/detail.vue

@@ -48,7 +48,12 @@
           </el-collapse>
           </el-collapse>
         </el-tab-pane>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
-          111
+            <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'ZXD'"
+            :orderCode="queryId"
+          />
         </el-tab-pane>
         </el-tab-pane>
       </el-tabs>
       </el-tabs>
     </div>
     </div>

+ 9 - 3
src/views/goodStore/goodsOnline/detail.vue

@@ -156,12 +156,12 @@
                 <template slot="supplierName">
                 <template slot="supplierName">
                   <span>{{ sitem.supplierName }}</span>
                   <span>{{ sitem.supplierName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                   <el-popover placement="top" width="300" trigger="hover">
-                     <ul>
+                    <ul>
                       <li>
                       <li>
                         <span>供应商编号:</span
                         <span>供应商编号:</span
                         ><span>{{ sitem.supplierNo }}</span>
                         ><span>{{ sitem.supplierNo }}</span>
                       </li>
                       </li>
-                     </ul>
+                    </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                   </el-popover>
                 </template>
                 </template>
@@ -320,7 +320,13 @@
             </el-collapse-item>
             </el-collapse-item>
           </el-collapse>
           </el-collapse>
         </el-tab-pane>
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="2"> 111 </el-tab-pane>
+        <el-tab-pane label="审批记录" name="2">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'ZXD'"
+            :orderCode="queryId"
+        /></el-tab-pane>
       </el-tabs>
       </el-tabs>
     </div>
     </div>
     <div v-else>
     <div v-else>

+ 28 - 1
src/views/process/columns.js

@@ -10,12 +10,14 @@ const routerList = [
     type: "DBD",
     type: "DBD",
     toRouter: "/stock/allotDetail",
     toRouter: "/stock/allotDetail",
     to: "id",
     to: "id",
+    isok: true
   },
   },
   {
   {
     name: "盘点流程",
     name: "盘点流程",
     type: "PDD",
     type: "PDD",
     toRouter: "/stock/checkDetail",
     toRouter: "/stock/checkDetail",
     to: "id",
     to: "id",
+    isok: true
   },
   },
 
 
 
 
@@ -26,12 +28,22 @@ const routerList = [
     type: "CGD",
     type: "CGD",
     toRouter: "/purchaseIn/purchaseOrderDetail",
     toRouter: "/purchaseIn/purchaseOrderDetail",
     to: "code",
     to: "code",
+    isok: true
   },
   },
   {
   {
     name: "入库单流程",
     name: "入库单流程",
     type: "RKD",
     type: "RKD",
     toRouter: "/purchaseIn/wsmInOrderDetail",
     toRouter: "/purchaseIn/wsmInOrderDetail",
     to: "code",
     to: "code",
+    isok: true
+  },
+
+  {
+    name: "入库单退货流程",
+    type: "RKTHD-X",
+    toRouter: "/purchaseIn/wsmInOrderDetail",
+    to: "code",
+    isok: false
   },
   },
   {
   {
     name: "采购单退货流程",
     name: "采购单退货流程",
@@ -51,6 +63,7 @@ const routerList = [
     type: "BHD",
     type: "BHD",
     toRouter: "/sellOut/stockApplyDetail",
     toRouter: "/sellOut/stockApplyDetail",
     to: "id",
     to: "id",
+    isok: true
   },
   },
   {
   {
     name: "销售订单流程",
     name: "销售订单流程",
@@ -73,8 +86,9 @@ const routerList = [
   {
   {
     name: "咨询单流程",
     name: "咨询单流程",
     type: "ZXD",
     type: "ZXD",
-    toRouter: "sellOut/zixunOrderDetail",
+    toRouter: "/sellOut/zixunOrderDetail",
     to: "code",
     to: "code",
+    isok: false
   },
   },
   {
   {
     name: "议价单流程",
     name: "议价单流程",
@@ -87,6 +101,7 @@ const routerList = [
     type: "SHD",
     type: "SHD",
     toRouter: "/sellOut/sellAfterApplyDetail",
     toRouter: "/sellOut/sellAfterApplyDetail",
     to: "code",
     to: "code",
+    isok: true
   },
   },
 
 
   {
   {
@@ -94,12 +109,14 @@ const routerList = [
     type: "CKTHD",
     type: "CKTHD",
     toRouter: "/sellOut/returnOrderDetail",
     toRouter: "/sellOut/returnOrderDetail",
     to: "code",
     to: "code",
+    isok: true
   },
   },
   {
   {
     name: "销售退货流程",
     name: "销售退货流程",
     type: "QRTHD",
     type: "QRTHD",
     toRouter: "/sellOut/sellReturnDetail",
     toRouter: "/sellOut/sellReturnDetail",
     to: "code",
     to: "code",
+    isok: true
   },
   },
   // //咨询订单
   // //咨询订单
   // {
   // {
@@ -149,7 +166,17 @@ const columns = [
     prop: "process_name",
     prop: "process_name",
     label: "流程名称",
     label: "流程名称",
     // sortable: true,
     // sortable: true,
+
+  },
+  {
+    prop: "status_name",
+    label: "流程名称",
+    // sortable: true,
+
   },
   },
+
+
+
   {
   {
     prop: "apply_name",
     prop: "apply_name",
     label: "申请人",
     label: "申请人",

+ 38 - 30
src/views/process/oing/index.vue

@@ -71,10 +71,7 @@
           content="详情"
           content="详情"
           placement="top"
           placement="top"
         >
         >
-          <i
-            class="el-icon-view tb-icon"
-            @click="getRouter(scope.row.toRouter, scope.row.queryId)"
-          ></i>
+          <i class="el-icon-view tb-icon" @click="getRouter(scope.row)"></i>
         </el-tooltip>
         </el-tooltip>
       </template>
       </template>
     </ex-table>
     </ex-table>
@@ -108,13 +105,13 @@ export default {
     return {
     return {
       process_router_list: JSON.parse(JSON.stringify(routerList)),
       process_router_list: JSON.parse(JSON.stringify(routerList)),
       loading: true,
       loading: true,
- 
+
       modelId: 0,
       modelId: 0,
       parmValue: {
       parmValue: {
         page: 1, // 页码
         page: 1, // 页码
         size: 15, // 每页显示条数
         size: 15, // 每页显示条数
       },
       },
-     
+
       // 表格 - 数据
       // 表格 - 数据
       tableData: [],
       tableData: [],
       // 表格 - 参数
       // 表格 - 参数
@@ -130,19 +127,29 @@ export default {
         total: 0,
         total: 0,
       },
       },
       // 表格 - 列参数
       // 表格 - 列参数
-      columns: columns 
+      columns: columns,
     };
     };
   },
   },
   mounted() {
   mounted() {
-    // this.searchProList();
+    this.searchProList();
     this.searchList();
     this.searchList();
   },
   },
   methods: {
   methods: {
-    getRouter(toRouter, queryId) {
-      if (toRouter && queryId) {
-        this.routeGoto(toRouter, { id: queryId , type: "view"});
-      }else{
-         this.$message.warning("暂未找到相关流程!");
+    getRouter(row) {
+      const { order_type, order_id, order_code } = row;
+      let index = this.process_router_list.findIndex(
+        (y) => y.type === order_type
+      );
+      if (index !== -1) {
+        const { toRouter, to } = this.process_router_list[index];
+        let model = {
+          type: "view",
+          id: to === "code" ? order_code : order_id,
+        };
+
+        this.routeGoto(toRouter, model);
+      } else {
+        this.$message.warning("暂未找到相关流程!");
       }
       }
     },
     },
 
 
@@ -157,7 +164,7 @@ export default {
         page: 1, // 页码
         page: 1, // 页码
         size: 15, // 每页显示条数
         size: 15, // 每页显示条数
       };
       };
-      // this.searchProList();
+      this.searchProList();
       this.searchList();
       this.searchList();
     },
     },
 
 
@@ -167,22 +174,23 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.tableData = res.data.list;
-        this.tableData.forEach((v, i) => {
-          let index = this.process_router_list.findIndex(
-            (y) => y.type === v.order_type
-          );
-          if (index !== -1) {
-            const { name, toRouter, to } = this.process_router_list[index];
-            this.tableData[i].process_name = name;
-            this.tableData[i].toRouter = toRouter;
-            this.tableData[i].queryId =
-              to == "code" ? v.order_code : v.order_id;
-          } else {
-            this.tableData[i].process_name = "";
-            this.tableData[i].toRouter = "";
-            this.tableData[i].queryId = "";
-          }
-        });
+        // this.tableData.forEach((v, i) => {
+        //   let index = this.process_router_list.findIndex(
+        //     (y) => y.type === v.order_type
+        //   );
+        //   if (index !== -1) {
+        //     const { name, toRouter, to } = this.process_router_list[index];
+        //     this.tableData[i].process_name = name;
+        //     this.tableData[i].toRouter = toRouter;
+        //     this.tableData[i].typetoRouter = toRouter;
+        //     this.tableData[i].queryId =
+        //       to == "code" ? v.order_code : v.order_id;
+        //   } else {
+        //     this.tableData[i].process_name = "";
+        //     this.tableData[i].toRouter = "";
+        //     this.tableData[i].queryId = "";
+        //   }
+        // });
         this.pageInfo.total = Number(res.data.count);
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
         await this.logout();

+ 6 - 2
src/views/purchaseIn/purchaseDiffOrder/addEditModel.vue

@@ -167,10 +167,14 @@ export default {
         if (this.$refs.ruleForm) {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.$refs.ruleForm.clearValidate();
-          const { cgdNo, weight } = this.sitem;
+          const { cgdNo, weight, good_num } = this.sitem;
+          // console.log(good_num)
+          const t_weight = weight * 1;
+          const t_good_num = good_num * 1;
+          // console.log(t_good_num, t_weight);
           this.ruleForm = {
           this.ruleForm = {
             cgdNo: cgdNo || "",
             cgdNo: cgdNo || "",
-            weight: weight || "",
+            weight: t_good_num * t_weight || "0",
             num: "0",
             num: "0",
           };
           };
         }
         }

+ 1 - 0
src/views/purchaseIn/purchaseOrder/components/tolerance.vue

@@ -73,6 +73,7 @@ export default {
           this.isshow = true;
           this.isshow = true;
           this.showItem = {
           this.showItem = {
             cgdNo: this.cgdNo,
             cgdNo: this.cgdNo,
+            good_num: this.sitem.good_num,
             weight: noble_weight,
             weight: noble_weight,
           };
           };
         }
         }

+ 8 - 1
src/views/sellOut/bargainList/detail.vue

@@ -174,7 +174,14 @@
             </el-collapse-item>
             </el-collapse-item>
           </el-collapse>
           </el-collapse>
         </el-tab-pane>
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="3"> 111 </el-tab-pane>
+        <el-tab-pane label="审批记录" name="3">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'ZXD'"
+            :orderCode="queryId"
+          />
+        </el-tab-pane>
       </el-tabs>
       </el-tabs>
     </div>
     </div>
     <div v-else>
     <div v-else>

+ 6 - 1
src/views/sellOut/project/detail.vue

@@ -88,7 +88,12 @@
         </el-tab-pane>
         </el-tab-pane>
 
 
         <el-tab-pane label="审批记录" name="4" v-if="queryType !== 'add'">
         <el-tab-pane label="审批记录" name="4" v-if="queryType !== 'add'">
-          111
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'ZXD'"
+            :orderCode="queryId"
+          />
         </el-tab-pane>
         </el-tab-pane>
       </el-tabs>
       </el-tabs>
     </div>
     </div>

+ 0 - 0
src/views/sellOut/returnOrder/销售售后退货单 → src/views/sellOut/returnOrder/售后退货单


+ 1 - 1
src/views/sellOut/salesOrder/detail.vue

@@ -133,7 +133,7 @@
           <process-time-line
           <process-time-line
             v-if="newTime !== ''"
             v-if="newTime !== ''"
             :newTime="newTime"
             :newTime="newTime"
-            :type="'XSQRD'"
+            :type="'QRD'"
             :orderCode="queryId"
             :orderCode="queryId"
           />
           />
         </el-tab-pane>
         </el-tab-pane>

+ 7 - 2
src/views/sellOut/zixunOrder/detail.vue

@@ -87,7 +87,12 @@
           />
           />
         </el-tab-pane>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="3" v-if="queryType == 'view'">
         <el-tab-pane label="审批记录" name="3" v-if="queryType == 'view'">
-          111
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'ZXD'"
+            :orderCode="queryId"
+          />
         </el-tab-pane>
         </el-tab-pane>
       </el-tabs>
       </el-tabs>
     </div>
     </div>
@@ -113,7 +118,7 @@ export default {
     editForm,
     editForm,
     feedbackList,
     feedbackList,
   },
   },
-  
+
   computed: {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
     powers() {

+ 0 - 74
src/views/sellOut/zxAfterSaleOrder/ShowDataTableColumns.js

@@ -1,74 +0,0 @@
-export default  [
-
-    {
-      prop: "thNo",
-      label: "销售售后退货单编号",
-    },
-    {
-      prop: "status",
-      label: "售后退货单状态",
-      _slot_: "status",
-    },
-    {
-      prop: "returnCode",
-      label: "销售售后申请单编号",
-    },
-    {
-      prop: "cgder",
-      label: "申请人",
-    },
-    {
-      prop: "outCode",
-      label: "发货申请单编号",
-    },
-    {
-      prop: "return_msg",
-      label: "退回原因",
-    },
-    
-   
-    {
-      prop: "orderCode",
-      label: "销售订单编号",
-    },
-    {
-      prop: "class_cat",
-      label: "商品分类",
-    },
-   
-    // {
-    //   prop: "good_code",
-    //   label: "商品编号",
-    // },
-    {
-      prop: "good_code",
-      label: "商品属性编号",
-    },
-    {
-      prop: "good_name",
-      label: "商品名称",
-    },
-    {
-      prop: "contactor",
-      label: "退回收货联系人",
-    },
-    {
-      prop: "mobile",
-      label: "退回收货联系人电话",
-    },
-    {
-      prop: "addr",
-      label: "退回收货地址",
-      // span:24
-    },
-    {
-      prop: "updatetime",
-      label: "更新时间",
-    },
-    
-    {
-      prop: "addtime",
-      label: "创建时间",
-    },
-  ]
-  

+ 0 - 2
src/views/sellOut/zxAfterSaleOrder/addEdit.vue

@@ -1,2 +0,0 @@
-
-   

+ 0 - 149
src/views/sellOut/zxAfterSaleOrder/columns.js

@@ -1,149 +0,0 @@
-// export default [
-//   {
-//     prop: "thNo",
-//     label: "售后退货单编号",
-//     width: "160"
-//   },
-
-//   {
-//     prop: "status",
-//     label: "状态",
-//     _slot_: "status",
-//     width: "120px",
-//   },
-
-//   {
-//     prop: "customer_code",
-//     label: "客户编号",
-//     width: "125"
-//   },
-//   {
-//     prop: "return_num",
-//     label: "退货数量",
-//   },
-//   {
-//     prop: "normal_num",
-//     label: "正常数量",
-//   },
-//   {
-//     prop: "received_num",
-//     label: "收货数量",
-//   },
-
-
-
- 
-//   {
-//     prop: "",
-//     label: "操作",
-//     fixed: "right",
-//     width: 50,
-//     _noset_: true,
-//     _slot_: "operation",
-//   },
-
-// ]
-
-export default [
-  {
-    prop: "orderCode",
-    label: "订单编号",
-    width:"160"
-  },
-  {
-    prop: "thNo",
-    label: "退货单编号",
-    width:"160"
-  },
-  // {确认单编号}
-  // {order_type类型}
- 
-
-  {
-    prop: "outCode",
-    label: "发货申请单编号",
-    width:"160"
-
-  },
-  {
-    prop: "returnCode",
-    label: "售后单编号",
-    width:"160"
-
-  },
-  {
-    prop: "customer_code",   
-    label: "客户编号",
-    width:"140"
-
-  },
-  {
-    prop: "return_num",
-    label: "退货数量",
-  },
-  {
-      prop:"normal_num",
-      label:"正常数量",
-  },
-  {
-      prop:"received_num",
-      label:"收货数量",
-  },
-  // {
-  //   prop: "contactor",
-  //   label: "收货人",
-  // },
-  // {
-  //   prop: "mobile",
-  //   label: "联系电话",
-  // },
-  // {
-  //   prop: "addr",
-  //   label: "收货人地址",
-  // },
-  // {地址code}
-  {
-    prop: "post_fee",
-    label: "邮费",
-  },
-  {
-    prop: "post_code",
-    label: "快递单号",
-    width:"160"
-  },
-   {
-    prop: "post_company",
-    label: "物流公司",
-  },
-
-  {
-      prop:"good_code",
-      label:"商品属性编号",
-      width:"150"
-  },
-  {
-      prop:"good_name",
-      label:"商品名称",
-      width:"150"
-  },
-  {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "130px",
-  },
-  {
-    prop: "addtime",
-    label: "申请时间",
-    sortable: true,
-    width:142
-  },
-  {
-    prop: "",
-    label: "操作",
-    fixed: "right",
-    _noset_: true,
-    _slot_: "operation",
-  },
-
-]

+ 0 - 182
src/views/sellOut/zxAfterSaleOrder/components/addEdit.vue

@@ -1,182 +0,0 @@
-<template>
-  <el-form
-    :model="ruleForm"
-    ref="ruleForm"
-    label-width="110px"
-    class="demo-ruleForm"
-  >
-    <el-row>
-           <el-col :span="12">
-        <el-form-item label="商品分类" prop="numbers">
-          <el-input
-            disabled
-            v-model="ruleForm.numbers"
-            placeholder="商品分类"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-           <el-col :span="12">
-        <el-form-item label="商品名称" prop="numbers">
-          <el-input
-            disabled
-            v-model="ruleForm.numbers"
-            placeholder="商品名称"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-           <el-col :span="12">
-        <el-form-item label="购买方公司" prop="numbers">
-          <el-input
-            disabled
-            v-model="ruleForm.numbers"
-            placeholder="购买方公司"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="12" prop="numbers">
-          <el-input
-            disabled
-            v-model="ruleForm.numbers"
-            placeholder="请输入异常数量"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="异常原因" prop="reason">
-          <el-select
-            style="width: 100%"
-            disabled
-            v-model="ruleForm.reason"
-            placeholder="请选择异常原因"
-          >
-            <el-option
-              v-for="item in reason_options"
-              :key="item.id"
-              :label="item.result"
-              :value="item.result_code"
-              :disabled="item.status == 0"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="异常备注" prop="remark">
-          <el-input
-            type="textarea"
-            disabled
-            placeholder="请输入异常原因备注"
-            v-model="ruleForm.remark"
-            maxlength="250"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-   <script>
-import asyncRequest from "@/apis/service/sellOut/zxAfterSaleOrder";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "returnOrder",
-  props: ["showModel", "id", "isDetail", "sitem"],
-  mixins: [resToken],
-  data() {
-
-    return {
-      loading: false,
-      title: "添加异常情况",
-      showModelThis: this.showModel,
-      ruleForm: {
-        numbers: "", //异常数量
-        reason: "", //异常原因
-        remark: "", //异常备注
-        name: "",
-        status: "1",
-      },
-      reason_options: [],
-     
-    };
-  },
-  watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-      if (val) {
-        console.log("int:" + val);
-        this.initForm();
-      }
-    },
-    showModelThis(val) {
-      console.log(val);
-      if (!val) {
-        console.log("out:" + val);
-        this.$emit("cancel");
-      }
-    },
-  },
-
-  methods: {
-    
-    async initForm() {
-      await this.getReason();
-      this.loading = true;
-      await this.resetForm();
-      this.loading = false;
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-
-          this.ruleForm = {
-            numbers: "", //异常数量
-            reason: "", //异常原因
-            remark: "", //异常备注
-            name: "",
-          };
-        }
-      });
-    },
-
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          // this.loading = true;
-          this.showModelThis = false;
-          console.log(this.ruleForm);
-          this.$emit("refresh", this.ruleForm);
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    // 异常原因
-    async getReason() {
-      let model = {
-        type: "5",
-        page: 1,
-        size: 100,
-      };
-      const res = await asyncRequest.resultlist(model);
-      this.loading = false;
-      if (res && res.code === 0) {
-        console.log(res.data);
-        this.reason_options = res.data.list;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-</style>
-   

+ 0 - 42
src/views/sellOut/zxAfterSaleOrder/components/columns.js

@@ -1,42 +0,0 @@
-
-export default {
-  tableFormThis: {
-    check_remark: [
-      {
-        required: false,
-        message: "",
-        trigger: "blur",
-      },
-    ],
-    check_value: [
-      {
-        required: true,
-        message: "",
-        trigger: "change",
-      },
-    ],
-  },
-  columns: [
-    // 表格 - 列参数
-    {
-      prop: "anomalous_numbers",
-      label: "异常数量",
-      show: true,
-      type:"text"
-    },
-    {
-      prop: "anomalous_reason",
-      label: "异常原因",
-      show: true,
-      type:"select"
-    },
-    {
-      prop: "anomalous_remark",
-      label: "异常备注",
-      show: true,
-      type:"text"
-    },
-    
-  ]
-
-}

+ 0 - 380
src/views/sellOut/zxAfterSaleOrder/components/return-record.vue

@@ -1,380 +0,0 @@
-<template>
-  <el-form
-    ref="ruleForm"
-    :loading="loading"
-    :model="ruleForm"
-    status-icon
-    :rules="rulesThis"
-    label-width="120px"
-    style="width: 100%"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="12">
-        <el-form-item label="退货总数量" prop="return_num">
-          <el-input
-            disabled
-            v-model="ruleForm.return_num"
-            placeholder="退货总数量"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="可销售数量" prop="normal">
-          <el-input
-            :disabled="
-              !(status === '0' && powers.some((item) => item == '047'))
-            "
-            v-model="ruleForm.normal"
-            placeholder="可销售数量"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="其他备注" prop="remark">
-          <el-input
-            :disabled="
-              !(status === '0' && powers.some((item) => item == '047'))
-            "
-            type="textarea"
-            maxlength="250"
-            show-word-limit
-            placeholder="请填写备注"
-            v-model="ruleForm.remark"
-          >
-          </el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="异常情况记录" :size="'mini'">
-          <el-form
-            :model="ruleForm"
-            :rules="tableFormThis"
-            ref="ruleForm"
-            :size="'mini'"
-            class="demo-tableForm product_go"
-          >
-            <el-table
-              :data="ruleForm.product_go"
-              border
-              :size="'mini'"
-              row-key="key"
-            >
-              <el-table-column label="异常数量" prop="error_num" />
-              <el-table-column label="异常原因" prop="error_code_name" />
-              <el-table-column label="异常备注" prop="error_remark" />
-              <el-table-column
-                fixed="right"
-                label="操作"
-                width="80"
-                v-if="status === '0' && powers.some((item) => item == '047')"
-              >
-                <template slot="header" slot-scope="scope">
-                  <!-- v-if="status == '1' || status == '0'" -->
-                  <span>操作</span>
-                  <el-tooltip
-                    class="fr"
-                    style="margin: 3px 0 0 0"
-                    effect="dark"
-                    content="添加"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-circle-plus-outline tb-icon"
-                      style="color: #63cbe7"
-                      @click="openModal(-1)"
-                    ></i>
-                  </el-tooltip>
-                </template>
-                <!-- v-if="status == '1' || status == '0'" -->
-                <template slot-scope="scope">
-                  <el-tooltip
-                    effect="dark"
-                    content="编辑"
-                    v-if="!scope.row.edit"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-edit tb-icon"
-                      @click="openModal(scope.$index)"
-                    ></i>
-                  </el-tooltip>
-
-                  <el-tooltip
-                    v-if="scope.row.edit"
-                    effect="dark"
-                    content="重置"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-delete tb-icon"
-                      @click="deleteRow(scope.$index, ruleForm.product_go)"
-                    ></i>
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form>
-        </el-form-item>
-      </el-col>
-      <el-col
-        :span="24"
-        style="text-align: right; margin: -5px 0 20px 0"
-        v-if="status === '0' && powers.some((item) => item == '047')"
-      >
-        <el-button type="primary" class="fr" :size="'mini'" @click="submitForm"
-          >保 存
-        </el-button>
-      </el-col>
-    </el-row>
-    <abnormal-condition-modal
-      :index="index"
-      :sitem="s_item"
-      :show-model="showModel"
-      @refresh="handleValue"
-      @cancel="showModel = false"
-    />
-  </el-form>
-</template>
-<script>
-import asyncRequest from "@/apis/service/sellOut/zxAfterSaleOrder";
-import resToken from "@/mixins/resToken";
-import { isnumber } from "@/utils/validate";
-import abnormalConditionModal from "@/components/abnormal-condition-modal";
-export default {
-  name: "zxAfterSaleOrderDetail",
-  props: ["id", "showModelThis", "newTime", "sitem"],
-  mixins: [resToken],
-  components: { abnormalConditionModal },
-  data() {
-    const validatenumbers = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("数量不能为空!"));
-      } else {
-        if (!isnumber(value)) {
-          callback(new Error("数量格式不正确!"));
-        } else {
-          callback();
-        }
-      }
-    };
-    return {
-      arr: [],
-      s_item: null,
-      sitemGetNumber: "", //详情总收货量
-      isShow: false, //用于情况1
-      returnNO: "", //退货编号
-      ruleForm: {
-        return_num: "", //收货总数量
-        normal: "", //可销售数量
-        remark: "", //其他备注
-        product_go: [], //表格参数
-      },
-
-      btn_code: "",
-      index: "",
-      options: [],
-      edit: false, //默认不能提交
-      totalNumber: 0, //全局保存数量
-      loading: false,
-      status: "", //存储详情接口返的状态
-      showModel: null,
-
-      rulesThis: this.rules,
-      // 验证规则
-      rules: {
-        return_num: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validatenumbers,
-          },
-        ],
-        normal: [
-          {
-            required: true,
-            trigger: "blur",
-            validator: validatenumbers,
-          },
-        ],
-        remark: [
-          {
-            required: true,
-            trigger: "blur",
-            message: "请填写备注信息",
-          },
-        ],
-      },
-    };
-  },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zxAfterSaleOrderDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-
-  // mounted() {
-  //   this.initForm();
-  // },
-  watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-  },
-  methods: {
-    async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.getresultlist();
-      await this.resetForm();
-      this.loading = false;
-    },
-
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.status = "";
-          this.arr = [];
-          let { child, status, normal_num, remark, return_num } = this.sitem;
-          this.status = status;
-          if (child) {
-            this.arr =
-              child && child.length > 0
-                ? JSON.parse(JSON.stringify(child))
-                : [];
-            this.arr.forEach((v) => {
-              v.is_del = "0";
-              v.error_code_name = v.error_msg;
-            });
-          }
-          this.ruleForm = {
-            return_num: return_num || "",
-            normal: normal_num || "", //可销售数量
-            remark: remark, //其他备注
-            product_go: this.arr, //表格参数this.arr
-          };
-        }
-      });
-    },
-
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          let list = JSON.parse(JSON.stringify(this.arr));
-          let { return_num, normal, product_go, remark } = model;
-          let errorT = 0;
-          if (product_go && product_go.length > 0) {
-            product_go.forEach((v) => {
-              errorT += parseInt(v.error_num);
-            });
-          }
-
-          if (parseInt(normal) + errorT !== parseInt(return_num)) {
-            this.$message.warning("可销售数量+异常总数量不等于退货总数量!");
-            this.loading = false;
-            return;
-          }
-          product_go.forEach((x) => {
-            let index = list.findIndex((y) => x.id === y.id);
-            if (index !== -1) {
-              list.splice(index, 1);
-            }
-          });
-          list.forEach((v) => {
-            v.is_del = "1";
-          });
-          let item = {
-            thNo: this.sitem.thNo,
-            normal,
-            remark,
-            errorlist: [].concat(product_go).concat(list),
-          };
-
-          const res = await asyncRequest.returnCheck(item);
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: res.message,
-              message: "",
-            });
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        }
-      });
-    },
-    // 获取异常原因下拉列表
-    async getresultlist() {
-      const res = await asyncRequest.resultlist({
-        page: 1,
-        size: 100,
-        type: "1",
-        // status: "3",
-      });
-      if (res && res.code === 0 && res.data) {
-        const { list } = res.data;
-        this.options = list;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-
-    // 删除行操作
-    deleteRow(index, rows) {
-      if (this.id !== "add" && rows[index].id) {
-        this.delList.push(rows[index]);
-      }
-      rows.splice(index, 1);
-      this.$refs.ruleForm.validateField("product_go");
-    },
-    openModal(index) {
-      this.s_item =
-        index === -1
-          ? {}
-          : JSON.parse(JSON.stringify(this.ruleForm.product_go[index]));
-      this.index = index;
-      this.showModel = true;
-    },
-    // 获取弹窗的值
-    handleValue(e) {
-      const { index, item } = e;
-      if (index === -1) {
-        this.ruleForm.product_go.push(JSON.parse(JSON.stringify(item)));
-      } else {
-        const { error_num, error_code, error_remark, error_code_name, id } =
-          JSON.parse(JSON.stringify(item));
-        this.ruleForm.product_go[index].id = id;
-        this.ruleForm.product_go[index].error_num = error_num;
-        this.ruleForm.product_go[index].error_code = error_code;
-        this.ruleForm.product_go[index].error_remark = error_remark;
-        this.ruleForm.product_go[index].error_code_name = error_code_name;
-      }
-      this.$refs.ruleForm.validateField("product_go");
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 0 - 292
src/views/sellOut/zxAfterSaleOrder/components/returnCheck.vue

@@ -1,292 +0,0 @@
-<template>
-  <el-row class="addForm">
-    <el-col :span="24">
-      <el-form
-        :model="tableForm"
-        :rules="tableFormThis"
-        ref="tableForm"
-        :size="'mini'"
-        class="demo-tableForm product_go"
-      >
-        <el-table
-          :data="tableForm.product_go"
-          border
-          :size="'mini'"
-          row-key="key"
-        >
-          <el-table-column label="异常数量" prop="anomalous_numbers" />
-          <el-table-column label="异常原因" prop="anomalous_reason" />
-          <el-table-column label="异常备注" prop="anomalous_remark" />
-          <el-table-column label="审核情况" prop="check_value">
-            <template slot-scope="scope">
-              <el-form-item
-                :style="!scope.row.edit ? 'margin:0' : ''"
-                :size="'mini'"
-                :prop="'product_go.' + scope.$index + '.check_value'"
-                :rules="tableFormThis.check_value"
-              >
-                <el-select
-                  :disabled="!scope.row.edit"
-                  style="width: 100%"
-                  v-model="scope.row.check_value"
-                  placeholder="审核情况"
-                >
-                  <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column label="审核备注" prop="check_remark">
-            <template slot-scope="scope">
-              <el-form-item
-                :style="!scope.row.edit ? 'margin:0' : ''"
-                :size="'mini'"
-                :prop="'product_go.' + scope.$index + '.check_remark'"
-                :rules="tableFormThis.check_remark"
-              >
-                <el-input
-                  :disabled="!scope.row.edit"
-                  v-model="scope.row.check_remark"
-                ></el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            fixed="right"
-            label="操作"
-            width="80"
-            v-if="status === '2' && powers.some((item) => item == '042')"
-          >
-            <template slot-scope="scope">
-              <el-tooltip
-                effect="dark"
-                content="编辑"
-                v-if="!scope.row.edit"
-                placement="top"
-              >
-                <i
-                  class="el-icon-edit tb-icon"
-                  @click="editRow(scope.$index)"
-                ></i>
-              </el-tooltip>
-
-              <el-tooltip
-                effect="dark"
-                content="保存"
-                v-if="scope.row.edit"
-                placement="top"
-              >
-                <i
-                  class="el-icon-circle-check tb-icon"
-                  @click="checkRow(scope.$index)"
-                ></i>
-              </el-tooltip>
-
-              <el-tooltip effect="dark" content="重置" placement="top">
-                <i
-                  class="el-icon-refresh-left tb-icon"
-                  @click="resetRow(scope.$index)"
-                ></i>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-col
-          :span="24"
-          style="text-align: right; padding: 30px 0 10px 0"
-          v-if="status === '2' && powers.some((item) => item == '042')"
-        >
-          <el-button type="primary" :size="'mini'" @click="submitForm"
-            >保 存
-          </el-button>
-        </el-col>
-      </el-form>
-    </el-col>
-  </el-row>
-</template>
-   <script>
-import asyncRequest from "@/apis/service/sellOut/zxAfterSaleOrder";
-import resToken from "@/mixins/resToken";
-import config from "./columns"; //表格列参数
-export default {
-  name: "zxAfterSaleOrderDetail",
-  props: ["id", "newTime", "sitem"],
-
-  mixins: [resToken],
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zxAfterSaleOrderDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      thNo: "",
-      options: [
-        // {
-        //   value: "0",
-        //   label: "待审核",
-        // },
-        {
-          value: "1",
-          label: "同意",
-        },
-        {
-          value: "2",
-          label: "拒绝",
-        },
-      ],
-      status: "",
-      loading: false,
-      tableForm: {
-        product_go: [],
-      },
-      tableFormThis: config.tableFormThis,
-      voList: [],
-    };
-  },
-  watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-  },
-
-  mounted() {
-    this.initForm();
-  },
-  methods: {
-    async initForm() {
-      this.loading = true;
-      this.columns = [];
-      await this.resetForm();
-      this.loading = false;
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.tableForm) {
-          this.voList = [];
-          this.tableForm.product_go = [];
-          this.$refs.tableForm.resetFields();
-          this.$refs.tableForm.clearValidate();
-          let { child, thNo, status } = this.sitem;
-          this.status = status;
-          this.thNo = thNo;
-
-          child.map((ele) => {
-            let obj = {
-              id: ele.id,
-              anomalous_numbers: ele.error_num,
-              anomalous_reason: ele.error_code,
-              anomalous_reason_code: ele.error_code, //异常原因code
-              anomalous_remark: ele.error_remark,
-              check_value: ele.status === "0" ? "1" : ele.status,
-              check_remark: ele.exam_remark,
-              is_del: "0",
-            };
-            this.voList.push(obj);
-          });
-          let list = JSON.parse(JSON.stringify(this.voList));
-          list.forEach((v) => {
-            v.edit = false;
-            this.tableForm.product_go.push(v);
-          });
-        }
-      });
-    },
-
-    async submitForm() {
-      let index = -1;
-      this.tableForm.product_go.forEach((v, i) => {
-        if (v.edit && index === -1) {
-          index = i;
-        }
-      });
-      if (index !== -1) {
-        this.$message.warning("当前已有商品正在编辑!");
-        return;
-      }
-      let arr = [];
-      let model = JSON.parse(JSON.stringify(this.tableForm));
-      model.product_go.map((ele) => {
-        let obj = {
-          id: ele.id,
-          remark: ele.anomalous_remark,
-          status: ele.check_value,
-        };
-        arr.push(obj);
-      });
-      let _model = {
-        thNo: this.thNo,
-        errorlist: arr,
-        status: "3", //1待验货2待验货审核3待业务审核4完成 this.status + 1
-      };
-      const res = await asyncRequest.check(_model);
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: res.message,
-          message: "",
-        });
-        this.$emit("refresh");
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-    //异常原因筛选
-    //保存某一行
-    checkRow(rowIndex) {
-      const { check_value, check_remark } = this.tableForm.product_go[rowIndex];
-      if (check_value !== "1" && check_value !== "2") {
-        this.$message.warning("审核情况不能为空!");
-        return;
-      }
-      if (check_value === "2" && check_remark === "") {
-        this.$message.warning("审核备注不能为空!");
-        return;
-      }
-      if (check_value === "1") {
-        this.tableForm.product_go[rowIndex].edit = false;
-      }
-      if (check_value === "2" && check_remark !== "") {
-        this.tableForm.product_go[rowIndex].edit = false;
-      }
-    },
-    //编辑某一行
-    editRow(rowIndex) {
-      let index = this.tableForm.product_go.findIndex((v) => v.edit);
-      if (index !== -1) {
-        this.$message.warning("请完成其他行的编辑!");
-        return;
-      } else {
-        this.tableForm.product_go[rowIndex].edit = true;
-      }
-    },
-    resetRow(rowIndex) {
-      this.tableForm.product_go[rowIndex].check_remark = "";
-      this.tableForm.product_go[rowIndex].check_value = "1";
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
-
-   

+ 0 - 235
src/views/sellOut/zxAfterSaleOrder/detail.vue

@@ -1,235 +0,0 @@
-<template>
-  <div class="zxAfterSaleOrderDetail pagePadding">
-    <div
-      style="width: 100%"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
-      <!-- <p>{{ status }}---{{ powers }}</p> -->
-      <div class="detail-page-title">
-        <span>咨询售后退后单编号:</span
-        ><span v-if="sitem">{{ orderCode }}</span>
-      </div>
-      <!-- <status-bar
-        v-if="newTime !== ''"
-        :newTime="newTime"
-        :options="statusOptions"
-        :status="status"
-      /> -->
-      <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">
-              <show-data-table
-                :newTime="newTime"
-                v-if="newTime !== ''"
-                :sitem="sitem"
-                :columns="ShowDataTableColumns"
-              >
-                <template slot="status">
-                  <el-tag
-                    :size="'mini'"
-                    :type="sitem.status == '0' ? 'warning' : ''"
-                    v-text="
-                      (
-                        statusOptions.find(
-                          (item) => item.value == sitem.status
-                        ) || {}
-                      ).label || '--'
-                    "
-                  ></el-tag>
-                </template>
-                <template slot="order_type">
-                  <el-tag :size="'mini'" :type="''">{{
-                    sitem.status === "1"
-                      ? "发货申请单"
-                      : sitem.status === "2"
-                      ? "咨询发货申请单"
-                      : "--"
-                  }}</el-tag>
-                </template>
-                <template slot="except_code">
-                  <el-tag :size="'mini'" :type="''">{{
-                    sitem.except_code === "1"
-                      ? "退货"
-                      : sitem.except_code === "2"
-                      ? "换货"
-                      : sitem.except_code === "2"
-                      ? "改变售价"
-                      : "--"
-                  }}</el-tag>
-                </template>
-              </show-data-table>
-            </el-collapse-item>
-            <el-collapse-item title="退货验收记录" name="0">
-              <return-record
-                v-if="newTime !== ''"
-                :sitem="sitem"
-                @refresh="initData"
-                :newTime="newTime"
-              />
-            </el-collapse-item>
-
-            <el-collapse-item title="退货验收审核" name="1">
-              <return-check
-                v-if="newTime !== ''"
-                :newTime="newTime"
-                :sitem="sitem"
-                @refresh="initData"
-              />
-            </el-collapse-item>
-            <el-collapse-item
-              title="业务审核"
-              name="2"
-              v-if="powers.some((item) => item == '042')"
-            >
-              <exam-form
-                v-if="newTime !== ''"
-                :statusList="statusList"
-                :newTime="newTime"
-                :disabled="false"
-                :isMust="true"
-                @searchChange="exam_form_change"
-              />
-            </el-collapse-item>
-          </el-collapse>
-        </el-tab-pane>
-        <el-tab-pane label="审批记录" name="2">
-          <process-time-line
-            v-if="newTime !== ''"
-            :newTime="newTime"
-            :type="'ZXCKTHD'"
-            :orderCode="qid"
-          />
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <div v-else>
-      <no-auth></no-auth>
-    </div>
-  </div>
-</template>
-   <script>
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-import asyncRequest from "@/apis/service/sellOut/zxAfterSaleOrder";
-import ReturnRecord from "./components/return-record";
-import ReturnCheck from "./components/returnCheck";
-// import addEdit from "./components/addEdit";
-import ShowDataTableColumns from "./ShowDataTableColumns";
-export default {
-  name: "zxAfterSaleOrderDetail",
-  mixins: [mixinPage, resToken],
-  components: {
-    ReturnRecord,
-    ReturnCheck,
-    // addEdit,
-  },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zxAfterSaleOrderDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      activeTabs: "1",
-      ShowDataTableColumns: ShowDataTableColumns,
-      statusOptions: [
-        { value: "0", label: "待申请" },
-        { value: "1", label: "待验收" },
-        { value: "2", label: "待验收审核" },
-        { value: "3", label: "待业务审核" },
-        { value: "4", label: "完成退货" },
-      ],
-      orderCode: "",
-      activeNames: ["-1", "0", "1", "2", "10"],
-      sitem: null,
-      status: "", //存储详情接口状态
-      statusList: [
-        {
-          value: "0",
-          label: "退货验收记录",
-        },
-        {
-          value: "2",
-          label: "退货验收审核",
-        },
-      ],
-      newTime: "",
-      loading: false,
-      qid: "",
-    };
-  },
-  mounted() {
-    this.qid = this.$route.query.id;
-    this.initData();
-  },
-  methods: {
-    getNewTime() {
-      this.newTime = new Date().valueOf();
-    },
-    // 点击业务审核的保存按钮
-    async exam_form_change(e) {
-      if (!this.loading) {
-        let type = e.state === "1" ? "4" : e.rebut;
-        await this.setstatus(type, "提交业务审核", e.remark);
-      }
-    },
-    async setstatus(type, detail, remark) {
-      await this.$confirm(`确定要${detail}?`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          let _model = {
-            thNo: this.qid,
-            status: type,
-            remark: remark,
-          };
-          let res = await asyncRequest.status(_model);
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "修改成功!",
-              message: "",
-            });
-            await this.initData();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-    async initData() {
-      let model = {
-        thNo: this.qid,
-      };
-      const res = await asyncRequest.detail(model);
-      if (res && res.code === 0 && res.data) {
-        this.status = res.data.status;
-        this.sitem = res.data;
-        this.orderCode = res.data.orderCode;
-        this.getNewTime();
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-      // }
-    },
-  },
-};
-</script>
-   
-   

+ 0 - 354
src/views/sellOut/zxAfterSaleOrder/index.vue

@@ -1,354 +0,0 @@
-<template>
-  <div class="zxAfterSaleOrder pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="columns"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @screen-submit="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-      >
-        <template #table-header="{}">
-          <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
-              <el-col :span="4" style="width: 410px">
-                <search-customer
-                  :size="searchSize"
-                  :value="parmValue.customer_code"
-                  :placeholder="'购买方公司'"
-                  :disabled="false"
-                  :isDetail="false"
-                  @searchChange="customer_code_change"
-                />
-              </el-col>
-
-              <!-- 快递公司 -->
-              <el-col :span="4" style="width: 370px; padding: 0 0 0 10px">
-                <search-express
-                  :size="searchSize"
-                  :value="parmValue.post_compay"
-                  :placeholder="'物流公司'"
-                  :names="''"
-                  :is-detail="false"
-                  @searchChange="handleCompany"
-                />
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-            </el-row>
-            <el-row style="padding: 10px 0 0 0">
-              <el-col :span="4" style="width: 150px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.status"
-                  filterable
-                  clearable
-                  placeholder="售后退货状态"
-                  style="width: 100%"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in statusList"
-                    :key="'status' + item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-col>
-              <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
-                <period-date-picker
-                  :type="1"
-                  :width="'135px'"
-                  :size="searchSize"
-                  :start="parmValue.start"
-                  :end="parmValue.end"
-                  @timeReturned="handleTime"
-                />
-              </el-col>
-              <el-col :span="18" style="width: 440px; padding: 0 0 0 10px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  placeholder="关键字"
-                  v-model="s_input"
-                  class="input-with-select"
-                >
-                  <el-select
-                    style="width: 137px"
-                    v-model="select"
-                    slot="prepend"
-                    placeholder="请选择"
-                  >
-                    <el-option label="售后退货单编号" value="1" />
-                    <el-option label="售后单编号" value="2" />
-                    <el-option label="发货申请单编号" value="3" />
-                    <el-option label="咨询订单编号" value="4" />
-                    <el-option label="快递单号" value="5" />
-                  </el-select>
-                  <el-button
-                    slot="append"
-                    icon="el-icon-search"
-                    @click="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                  ></el-button>
-                </el-input>
-              </el-col>
-              <el-col :span="6" style="width: 66px" class="fr">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
-            </el-row>
-          </div>
-        </template>
-        <template #status="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (statusList.find((item) => item.value == scope.row.status) || {})
-                .label || '--'
-            "
-          ></el-tag>
-        </template>
-        <template #operation="{ scope }">
-          <el-tooltip
-            v-if="powers.some((item) => item == '007')"
-            effect="dark"
-            content="详情"
-            placement="top"
-          >
-            <i
-              class="el-icon-view tb-icon"
-              @click="
-                routeGoto('zxAfterSaleOrderDetail', { id: scope.row.thNo })
-              "
-            ></i>
-          </el-tooltip>
-        </template>
-      </ex-table>
-      <add-edit
-        :id="modelId"
-        :sitem="sitem"
-        :show-model="showModel"
-        :is-detail="isDetail"
-        @refresh="searchList"
-        @cancel="showModel = false"
-      />
-    </div>
-    <div v-else>
-      <no-auth></no-auth>
-    </div>
-  </div>
-</template>
-   <script>
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-import columns from "./columns";
-import asyncRequest from "@/apis/service/sellOut/zxAfterSaleOrder";
-import addEdit from "./addEdit";
-import { mapGetters } from "vuex";
-
-export default {
-  name: "zxAfterSaleOrder",
-  mixins: [mixinPage, resToken],
-  components: {
-    addEdit,
-  },
-  computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zxAfterSaleOrder"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      s_input: "",
-      select: "1",
-      statusList: [
-        { value: "0", label: "待申请" },
-        { value: "1", label: "待验收" },
-        { value: "2", label: "待验收审核" },
-        { value: "3", label: "待业务审核" },
-        { value: "4", label: "完成退货" },
-      ],
-      sitem: null,
-      loading: true,
-      showModel: false,
-      isDetail: false,
-      modelId: 0,
-      parmValue: {
-        order_type: "2",
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-        thNo: "", //退货编号
-        status: "", //状态节点
-        post_code: "", //物流单号
-        post_compay: [], //物流公司
-        customer_code: [], //退货客户编号
-        order_code: "", //咨询订单编号
-        out_code: "", //销售出库编号
-        return_code: "", //售后申请编号
-        start: "", //
-        end: "", //
-      },
-      tableData: [],
-      passwordModel: false,
-      passwordModelId: 0,
-      isPasswordDetail: false,
-      // 表格 - 数据
-      tableData: [],
-      // 表格 - 参数
-      table: {
-        stripe: true,
-        border: true,
-        _defaultHeader_: ["setcol"],
-      },
-      // 表格 - 分页
-      pageInfo: {
-        size: 15,
-        curr: 1,
-        total: 0,
-      },
-      // 表格 - 列参数
-      columns: columns,
-    };
-  },
-  mounted() {
-    this.searchList();
-  },
-
-  methods: {
-    restSearch() {
-      this.select = "1";
-      this.s_input = "";
-      this.parmValue = {
-        order_type: "2",
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-        thNo: "", //退货编号
-        status: "", //状态节点
-        post_code: "", //物流单号
-        post_compay: [], //物流公司
-        customer_code: [], //退货客户编号
-        order_code: "", //咨询订单编号
-        out_code: "", //销售出库编号
-        return_code: "", //售后申请编号
-        start: "", //
-        end: "", //
-      };
-      // 表格 - 分页
-      this.pageInfo = {
-        size: 15,
-        curr: 1,
-        total: 0,
-      };
-      this.searchList();
-    },
-    async customer_code_change(e) {
-      if (e && e.id) {
-        this.parmValue.customer_code = [e.code];
-      } else {
-        this.parmValue.customer_code = [];
-      }
-      this.parmValue.page = 1;
-      this.pageInfo.curr = 1;
-      await this.searchList();
-    },
-
-    async searchList() {
-      this.loading = true;
-      let model = JSON.parse(JSON.stringify(this.parmValue));
-      console.log(model);
-      model.post_compay = model.post_compay.toString(); //	快递公司
-      model.customer_code = model.customer_code.toString();
-      model.thNo = this.select === "1" ? this.s_input : "";
-      model.return_code = this.select === "2" ? this.s_input : "";
-      model.out_code = this.select === "3" ? this.s_input : "";
-      model.order_code = this.select === "4" ? this.s_input : "";
-      model.post_code = this.select === "5" ? this.s_input : "";
-
-      const res = await asyncRequest.list(model);
-      if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
-      }
-      this.loading = false;
-    },
-
-    //物流公司查询
-    async handleCompany(e) {
-      this.parmValue.post_compay = e && e.code ? [e.label] : [];
-      this.parmValue.page = 1;
-      this.pageInfo.curr = 1;
-      await this.searchList();
-    },
-    // 时间
-    async handleTime(e) {
-      if (e.startTime !== "") {
-        this.parmValue.start = e.startTime;
-      } else {
-        this.parmValue.start = "";
-      }
-      if (e.endTime !== "") {
-        this.parmValue.end = e.endTime;
-      } else {
-        this.parmValue.end = "";
-      }
-    },
-  },
-};
-</script>
-   <style lang="scss" scoped>
-.sellReturn {
-}
-</style>
-   

+ 0 - 0
src/views/sellOut/zxAfterSaleOrder/咨询-售后退货单


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff