dingdan

src/apis/service/process/done/index.js

@@ -7,7 +7,7 @@ export default {
   // 删除
   delete: (data, params) => http(api + 'sharedel', data, 'post', params),
   // 分页查询
-  list: (data, params) => http(api + 'sharelist', data, 'post', params),
+  list: (data, params) => http(api + 'processolist', data, 'post', params),
   // 详情
   detail: (data, params) => http(api + 'shareinfo', data, 'post', params),
   // 更新

src/apis/service/process/oing/index.js

@@ -7,7 +7,9 @@ export default {
   // 删除
   delete: (data, params) => http(api + 'delete', data, 'post', params),
   // 分页查询
-  list: (data, params) => http(api + 'processlist', data, 'post', params),
+  list: (data, params) => http(api + 'processowaitlist', data, 'post', params),
+    // 流程列表
+  processList: (data, params) => http(api + 'processlist', data, 'post', params),
   // 详情
   detail: (data, params) => http(api + 'groupinfo', data, 'post', params),
   // 更新

src/views/process/done/index.vue

@@ -1,9 +1,6 @@
-
-
-
-
 <template>
   <div class="done pagePadding">
+    {{ powers }}
     <ex-table
       v-loading="false"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
@@ -27,10 +24,7 @@
         <div style="width: 100%; height: 30px">
           <el-row>
             <el-col :span="24">
-              <el-col
-                :span="3"
-                style="width: 66px; float: right"
-              >
+              <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   type="primary"
                   :size="searchSize"
@@ -78,7 +72,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="openModal(scope.row.id, true)"
+            @click="getRouter(scope.row.order_type, scope.row.order_code)"
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -133,7 +127,7 @@
 </template>
 <script>
 import addEdit from "./addEdit";
-// import asyncRequest from "@/apis/service/process/done";
+import asyncRequest from "@/apis/service/process/done";
 // import asyncRequest from "@/mock/service/process/done"; //引入mock数据
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
@@ -192,52 +186,117 @@ export default {
       },
       // 表格 - 列参数
       columns: [
+        // {
+        //   prop: "order_code",
+        //   label: "订单编号",
+        // },
         {
-          prop: "id",
-          label: "待办编号",
+          prop: "order_type",
+          label: "流程类型",
         },
         {
-          prop: "title",
-          label: "流程名称",
+          prop: "order_code",
+          label: "订单编号",
         },
 
         {
-          prop: "orderNo",
-          label: "单据号",
+          prop: "order_process",
+          label: "流程节点",
         },
         {
-          prop: "type",
-          label: "当前节点",
+          prop: "apply_name",
+          label: "申请人",
         },
         {
-          prop: "timestamp",
-          label: "停留时间",
+          prop: "action_name",
+          label: "操作人",
           // sortable: true,
           // _slot_: "status",
         },
         {
-          prop: "author",
-          label: "发起人",
-          // sortable: true,
-        },
-        {
-          prop: "reviewer",
-          label: "发起人部门",
-          // fixed: "right",
-          // _noset_: true,
-          // _slot_: "operation",
-        },
-        {
-          prop: "addTime",
-          label: "申请时间",
+          prop: "",
+          label: "操作",
+          fixed: "right",
+          _noset_: true,
+          _slot_: "operation",
+          width: "50",
         },
       ],
     };
   },
   mounted() {
-    // this.searchList();
+    this.searchList();
   },
   methods: {
+    async getRouter(type, code, id) {
+      console.log(type, code, id);
+      let list = [
+        {
+          type: "CGD", //采购单
+          rname: "purchaseOrderDetail",
+          to: "id",
+        },
+        {
+          type: "RKD", //入库单
+          rname: "",
+          to: "id",
+        },
+        {
+          type: "FKD", //反馈单流程
+          rname: "storeManageFlow",
+          to: "id",
+        },
+        {
+          type: "BHD", //备货流程
+          rname: "storeManageFlow",
+          to: "id",
+        },
+        {
+          type: "PDD", //盘点流程
+          rname: "checkDetail",
+          to: "id",
+        },
+        {
+          type: "DBD", //调拨流程
+          rname: "allotDetail",
+          to: "id",
+        },
+        // {
+        //   type: "RKTHD",//入库单退货流程
+        //   rname: "storeManageFlow",
+        //   to: "id",
+        // },
+        // {
+        //   type: "CGDTHD",//采购单单流程
+        //   rname: "storeManageFlow",
+        //   to: "id",
+        // },
+        {
+          type: "XSQRD", //销售确认单流程
+          rname: "salesOrderDetail",
+          to: "id",
+        },
+        // {
+        //   type: "CKD",//出库单流程
+        //   rname: "storeManageFlow",
+        //   to: "id",
+        // },
+        {
+          type: "SHD", //售后流程
+          rname: "serviceDetail",
+          to: "code",
+        },
+      ];
+      let item = list.find((v) => {
+        return v.type == type;
+      });
+      console.log(item, "item");
+      if (item && item.type) {
+        console.log(this.routeGoto);
+        // this.routeGoto(item.rname, { id: item.to === "id" ? id : code });
+        await this.routeGoto("serviceDetail", { id: "RXSwjeo211119103144" });
+      }
+    },
     restSearch() {
       // 表格 - 分页
       this.pageInfo = {
@@ -300,8 +359,6 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
-        console.log(this.tableData);
-
         // this.tableData.map((e) => {
         //   e.userdoneList = e.userlist.join(",");
         //   return e;

src/views/process/oing/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="oing pagePadding">
+    {{ powers }}
     <ex-table
       v-loading="loading"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
@@ -25,10 +26,7 @@
         <div style="width: 100%; height: 30px">
           <el-row :gutter="10">
             <el-col :span="24">
-              <el-col
-                :span="3"
-                style="width: 66px; float: right"
-              >
+              <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   type="primary"
                   :size="searchSize"
@@ -56,7 +54,7 @@
           </el-row>
         </div>
       </template>
-      <template #status="{ scope }">
+      <!-- <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
           :type="scope.row.status == '0' ? 'warning' : ''"
@@ -65,7 +63,7 @@
               .label || '--'
           "
         ></el-tag>
-      </template>
+      </template> -->
 
       <template #operation="{ scope }">
         <el-tooltip
@@ -76,7 +74,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="openModal(scope.row.id, true)"
+            @click="getRouter(scope.row.order_type, scope.row.order_code)"
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -171,10 +169,12 @@ export default {
         size: 15, // 每页显示条数
       },
       // 状态
-      statusOptions: [
-        { id: 0, label: "禁用" },
-        { id: 1, label: "启用" },
-      ],
+      // statusOptions: [
+      //   { id: 3, label: "完成" },
+      //   { id: 2, label: "流程中" },
+      //   { id: 1, label: "未操作" },
+      //   { id: 0, label: "未操作" },
+      // ],
       // 角色等级
       authOptions: [
         { id: "1", label: "管理员" },
@@ -197,51 +197,120 @@ export default {
       // 表格 - 列参数
       columns: [
         {
-          prop: "id",
-          label: "待办编号",
+          prop: "order_code",
+          label: "订单编号",
         },
         {
-          prop: "title",
-          label: "流程名称",
+          prop: "order_type",
+          label: "订单类型",
         },
 
         {
-          prop: "orderNo",
-          label: "单据号",
+          prop: "apply_name",
+          label: "申请人",
         },
         {
-          prop: "type",
-          label: "当前节点",
-        },
-        {
-          prop: "timestamp",
-          label: "停留时间",
-          // sortable: true,
-          // _slot_: "status",
-        },
-        {
-          prop: "author",
-          label: "发起人",
+          prop: "action_process",
+          label: "订单流程",
           // sortable: true,
         },
+        // {
+        //   prop: "order_status",
+        //   label: "状态",
+        //   fixed: "right",
+        //   // _noset_: true,
+        //   _slot_: "status",
+        // },
         {
-          prop: "reviewer",
-          label: "发起人部门",
-          // fixed: "right",
-          // _noset_: true,
-          // _slot_: "operation",
+          prop: "addtime",
+          label: "申请时间",
         },
         {
-          prop: "addTime",
-          label: "申请时间",
+          prop: "",
+          label: "操作",
+          fixed: "right",
+          _noset_: true,
+          _slot_: "operation",
+          width: "50",
         },
       ],
     };
   },
   mounted() {
+    this.searchProList();
     this.searchList();
   },
   methods: {
+    getRouter(type, code, id) {
+      console.log(type, code, id);
+      let list = [
+        {
+          type: "CGD", //采购单
+          rname: "purchaseOrderDetail",
+          to: "id",
+        },
+        {
+          type: "RKD", //入库单
+          rname: "",
+          to: "id",
+        },
+        {
+          type: "FKD", //反馈单流程
+          rname: "storeManageFlow",
+          to: "id",
+        },
+        {
+          type: "BHD", //备货流程
+          rname: "storeManageFlow",
+          to: "id",
+        },
+        {
+          type: "PDD", //盘点流程
+          rname: "checkDetail",
+          to: "id",
+        },
+        {
+          type: "DBD", //调拨流程
+          rname: "allotDetail",
+          to: "id",
+        },
+        // {
+        //   type: "RKTHD",//入库单退货流程
+        //   rname: "storeManageFlow",
+        //   to: "id",
+        // },
+        // {
+        //   type: "CGDTHD",//采购单单流程
+        //   rname: "storeManageFlow",
+        //   to: "id",
+        // },
+        {
+          type: "XSQRD", //销售确认单流程
+          rname: "salesOrderDetail",
+          to: "id",
+        },
+        // {
+        //   type: "CKD",//出库单流程
+        //   rname: "storeManageFlow",
+        //   to: "id",
+        // },
+        {
+          type: "SHD", //售后流程
+          rname: "serviceDetail",
+          to: "code",
+        },
+      ];
+      let item = list.find((v) => {
+        return v.type == type;
+      });
+      console.log(item, "item");
+      if (item && item.type) {
+        console.log("1212");
+        console.log(this.routeGoto);
+        this.routeGoto(item.rname, { id: item.to === "id" ? id : code });
+      }
+    },
+
     restSearch() {
       // 表格 - 分页
       this.pageInfo = {
@@ -253,6 +322,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
+      this.searchProList();
       this.searchList();
     },
     // 新建/编辑/详情
@@ -304,6 +374,25 @@ export default {
       // const res = await asyncRequest.list(this.parmValue);
       const res = await asyncRequest.list(this.parmValue);
       // console.log(...res.data.list);
+      if (res && res.code === 0 && res.data) {
+        console.log(res.data);
+        this.tableData = res.data.list;
+        // console.log(this.tableData);
+        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 searchProList() {
+      this.loading = true;
+      // const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.processList(this.parmValue);
+      // console.log(...res.data.list);
       if (res && res.code === 0 && res.data) {
         console.log(res.data);
         // this.tableData = res.data.list;

src/views/sellOut/goodsService/index.vue

@@ -54,49 +54,18 @@
                     </el-option>
                   </el-select>
                 </el-col>
-                <!-- 期望意愿 -->
-                <el-col :span="4" style="width: 130px; padding-left: 10px">
-                  <el-select
+                <!-- 客户公司 -->
+                <el-col :span="4" style="width: 320px; padding: 0px 0 0 10px">
+                  <search-customer
+                    :value="customerCode"
                     :size="searchSize"
-                    v-model="expectValue"
-                    clearable
-                    placeholder="期望意愿"
-                    @change="expectChange"
-                  >
-                    <el-option
-                      v-for="item in expectOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
+                    :placeholder="'客户公司名称'"
+                    @searchChange="customerChange"
+                  />
                 </el-col>
+
                 <!-- 申请人 -->
-                <el-col :span="4" style="width: 120px; padding: 0 0 0 10px">
-                  <el-input
-                    :size="searchSize"
-                    v-model="parmValue.apply_name"
-                    placeholder="申请人"
-                  ></el-input>
-                </el-col>
-                <!-- <el-col :span="4" style="width: 140px; padding-left: 10px">
-                  <el-select
-                    :size="searchSize"
-                    v-model="resultValue"
-                    clearable
-                    placeholder="处理结果"
-                    @change="resultChange"
-                  >
-                    <el-option
-                      v-for="item in resultOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-col> -->
+
                 <!-- <el-col :span="3" style="width: 66px; float: right">
                   <el-button
                     :size="searchSize"
@@ -121,63 +90,72 @@
               </el-col>
             </el-row>
             <el-row style="padding-top: 10px">
-              <!-- 客户公司 -->
-              <el-col :span="4" style="width: 420px; padding: 0px 0 0 0px">
-                <search-customer
-                  :value="customerCode"
-                  :size="searchSize"
-                  :placeholder="'客户公司名称'"
-                  @searchChange="customerChange"
-                />
-              </el-col>
-              <!-- 商品名称 -->
-              <el-col :span="4" style="width: 280px; padding: 0 0 0 10px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  v-model="parmValue.goodsName"
-                  :maxlength="40"
-                  placeholder="商品名称"
-                />
-              </el-col>
-            </el-row>
-            <el-row style="padding: 10px 0 0 0">
-              <!-- 商品编码 -->
-              <el-col :span="4" style="width: 180px; padding: 0 0 0 0px">
-                <el-input
-                  clearable
+              <!-- 期望意愿 -->
+              <el-col :span="4" style="width: 130px">
+                <el-select
                   :size="searchSize"
-                  v-model="parmValue.goodsNumber"
-                  placeholder="商品编号"
-                />
-              </el-col>
-              <!-- 确认单号 -->
-              <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
-                <el-input
+                  v-model="expectValue"
                   clearable
-                  :size="searchSize"
-                  v-model="parmValue.sellNumbers"
-                  placeholder="销售确认单号"
-                />
+                  placeholder="期望意愿"
+                  @change="expectChange"
+                >
+                  <el-option
+                    v-for="item in expectOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </el-col>
-              <!-- 出库单号 -->
-              <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
+              <el-col :span="4" style="width: 620px; padding: 0 0 0 10px">
                 <el-input
                   clearable
                   :size="searchSize"
-                  v-model="parmValue.sellGoStock"
-                  placeholder="销售出库单号"
-                />
+                  placeholder="请输入内容"
+                  v-model="s_input"
+                  class="input-with-select"
+                >
+                  <el-select
+                    style="width: 150px"
+                    v-model="select"
+                    slot="prepend"
+                    placeholder="请选择"
+                  >
+                    <el-option label="申请人" value="applyer"></el-option>
+
+                    <el-option label="商品名称" value="goodsName"></el-option>
+                    <el-option label="商品编号" value="goodsNum"></el-option>
+                    <el-option
+                      label="售后申请编号"
+                      value="serviceNum"
+                    ></el-option>
+
+                    <el-option
+                      label="销售确认单编号"
+                      value="sellOrderNum"
+                    ></el-option>
+                    <el-option
+                      label="销售出库单编号"
+                      value="sellOutNum"
+                    ></el-option>
+                  </el-select>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="handleValue"
+                  ></el-button>
+                </el-input>
               </el-col>
 
-              <el-col :span="4" style="width: 54px">
+              <!-- <el-col :span="4" style="width: 54px">
                 <el-button
                   :size="searchSize"
                   type="primary"
                   class="fr"
                   icon="el-icon-search"
                   @click="searchList"
-              /></el-col>
+              /></el-col> -->
               <el-col :span="4" style="width: 66px">
                 <el-button
                   type="warning"
@@ -299,6 +277,8 @@ export default {
   },
   data() {
     return {
+      select: "",
+      s_input: "",
       customerCode: [], //客户公司code
       except_codeOptions: [
         { id: "1", label: "退货" },
@@ -332,7 +312,6 @@ export default {
         apply_name: "", //申请人名称
         sellNumbers: "", //销售单号
         sellGoStock: "", //销售出库单号，
-        expressNumber: "", //物流编号
         goodsNumber: "", //商品编号
         goodsName: "", //商品名称
         service_value: "", //售后申请单处理状态
@@ -446,7 +425,6 @@ export default {
         apply_name: "", //申请人名称
         sellNumbers: "", //销售单号
         sellGoStock: "", //销售出库单号，
-        expressNumber: "", //物流编号
         goodsNumber: "", //商品编号
         goodsName: "", //商品名称
         service_value: "", //售后申请单处理状态
@@ -506,7 +484,7 @@ export default {
       let _model = {
         page: 1,
         size: 15,
-        goods_name: model.goodsName,
+        good_name: model.goodsName,
         returnCode: model.returnCode,
         outCode: model.sellGoStock,
         status: model.service_value, //售后申请单处理状态
@@ -609,6 +587,39 @@ export default {
       this.parmValue.page = 1;
       await this.searchList();
     },
+    async handleValue() {
+      console.log(this.select);
+      console.log(this.s_input);
+      switch (this.select) {
+        case "goodsName":
+          this.parmValue.goodsName = this.s_input;
+          await this.searchList();
+          break;
+        case "goodsNum":
+          this.parmValue.goodsNumber = this.s_input;
+          await this.searchList();
+
+          break;
+        case "sellOrderNum":
+          this.parmValue.sellNumbers = this.s_input;
+          await this.searchList();
+
+          break;
+        case "applyer":
+          this.parmValue.apply_name = this.s_input;
+          await this.searchList();
+          break;
+        case "serviceNum":
+          this.parmValue.returnCode = this.s_input;
+          await this.searchList();
+          break;
+        default:
+          this.parmValue.sellGoStock = this.s_input;
+          await this.searchList();
+
+          break;
+      }
+    },
   },
 };
 </script>

src/views/sellOut/returnOrder/columns.js

@@ -25,10 +25,12 @@ export default [
           width:"160"
 
         },
-        // {
-        //   prop: "return_wsm",   
-        //   label: "收货仓库",
-        // },
+        {
+          prop: "customer_code",   
+          label: "客户编号",
+          width:"140"
+
+        },
         {
           prop: "return_num",
           label: "退货数量",

src/views/sellOut/returnOrder/index.vue

@@ -28,93 +28,8 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="24">
-                <!-- 销售订单编号 -->
-                <el-col :span="4" style="width: 220px; padding: 0 0 0 0px">
-                  <el-input
-                    clearable
-                    :size="searchSize"
-                    v-model="parmValue.sellOrderNumber"
-                    :maxlength="40"
-                    placeholder="订单编号"
-                    @blur="searchList"
-                  />
-                </el-col>
-                <!-- 退货编号 -->
-                <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
-                  <el-input
-                    clearable
-                    :size="searchSize"
-                    v-model="parmValue.returnNumber"
-                    :maxlength="40"
-                    placeholder="退货单编号"
-                    @blur="searchList"
-                  />
-                </el-col>
-                <!-- 销售出库编号 -->
-                <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
-                  <el-input
-                    clearable
-                    :size="searchSize"
-                    v-model="parmValue.sellOutNumber"
-                    :maxlength="40"
-                    placeholder="出库单编号"
-                    @blur="searchList"
-                  />
-                </el-col>
-
-                <el-col
-                  :span="3"
-                  style="width: 66px; float: right"
-                  v-if="powers.some((item) => item == '003')"
-                >
-                  <el-button
-                    @click="openModal('add', false, {})"
-                    :size="searchSize"
-                    type="success"
-                    style="float: right; margin-left: 5px"
-                  >
-                    添加
-                  </el-button>
-                </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-col>
-            </el-row>
-            <el-row style="padding: 10px 0 0 0">
-              <!-- 售后申请编号 -->
-              <el-col :span="4" style="width: 200px; padding: 0 0 0 0px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  v-model="parmValue.serviceNumber"
-                  :maxlength="40"
-                  placeholder="售后单编号"
-                  @blur="searchList"
-                />
-              </el-col>
-              <!-- 退回客户编号 -->
-              <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  v-model="parmValue.clientNumber"
-                  :maxlength="40"
-                  placeholder="客户编号"
-                  @blur="searchList"
-                />
-              </el-col>
               <!-- 时间区间 -->
-              <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
+              <el-col :span="6" style="width: 303px; padding: 0 0 0 0px">
                 <period-date-picker
                   :type="1"
                   :width="'135px'"
@@ -124,9 +39,6 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-            </el-row>
-
-            <el-row style="padding: 10px 0 0 0">
               <!-- 快递公司 -->
               <el-col :span="4" style="width: 180px; padding: 0 0 0 0px">
                 <search-express
@@ -138,17 +50,6 @@
                   @searchChange="handleCompany"
                 />
               </el-col>
-              <!-- 快递单号 -->
-              <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  v-model="parmValue.postNumber"
-                  :maxlength="40"
-                  placeholder="快递单号"
-                  @blur="searchList"
-                />
-              </el-col>
 
               <!-- 节点查询 -->
               <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
@@ -173,15 +74,77 @@
                   />
                 </el-select>
               </el-col>
-              <el-col :span="4" style="width: 54px">
+
+              <el-col
+                :span="3"
+                style="width: 66px; float: right"
+                v-if="powers.some((item) => item == '003')"
+              >
+                <el-button
+                  @click="openModal('add', false, {})"
+                  :size="searchSize"
+                  type="success"
+                  style="float: right; margin-left: 5px"
+                >
+                  添加
+                </el-button>
+              </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="18">
+                <el-input
+                  clearable
+                  :size="searchSize"
+                  placeholder="请输入内容"
+                  v-model="s_input"
+                  class="input-with-select"
+                >
+                  <el-select
+                    style="width: 150px"
+                    v-model="select"
+                    slot="prepend"
+                    placeholder="请选择"
+                  >
+                    <el-option label="快递单号" value="expressNo"></el-option>
+
+                    <el-option label="客户编号" value="customerNo"></el-option>
+                    <el-option label="售后单编号" value="serviceNo"></el-option>
+                    <el-option
+                      label="出库单编号"
+                      value="outOrderNo"
+                    ></el-option>
+
+                    <el-option label="退货单编号" value="returnNo"></el-option>
+                    <el-option label="订单编号" value="orderNo"></el-option>
+                  </el-select>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="handleValue"
+                  ></el-button>
+                </el-input>
+              </el-col>
+              <!-- <el-col :span="4" style="width: 54px">
                 <el-button
                   :size="searchSize"
                   type="primary"
                   class="fr"
                   icon="el-icon-search"
                   @click="searchList"
-              /></el-col>
-              <el-col :span="4" style="width: 66px">
+              /></el-col> -->
+              <el-col :span="6" style="width: 66px">
                 <el-button
                   type="warning"
                   class="fr"
@@ -313,6 +276,8 @@ export default {
   },
   data() {
     return {
+      s_input: "",
+      select: "",
       statusList: [
         { value: "0", label: "待申请" },
         { value: "1", label: "待验收" },
@@ -389,8 +354,7 @@ export default {
         status: "", //状态节点
 
         // --
-        page: 1, // 页码
-        size: 15, // 每页显示条数
+
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -521,6 +485,40 @@ export default {
       }
       // await this.handleClick(this.sselect);
     },
+    async handleValue() {
+      console.log(this.select);
+      console.log(this.s_input);
+      switch (this.select) {
+        case "expressNo":
+          this.parmValue.postNumber = this.s_input;
+          await this.searchList();
+          break;
+        case "customerNo":
+          this.parmValue.clientNumber = this.s_input;
+          await this.searchList();
+
+          break;
+        case "serviceNo":
+          this.parmValue.serviceNumber = this.s_input;
+          await this.searchList();
+
+          break;
+        case "outOrderNo":
+          this.parmValue.sellOutNumber = this.s_input;
+          await this.searchList();
+          break;
+        case "returnNo":
+          this.parmValue.returnNumber = this.s_input;
+          await this.searchList();
+          break;
+        default:
+          //订单编号
+          this.parmValue.sellOrderNumber = this.s_input;
+          await this.searchList();
+
+          break;
+      }
+    },
   },
 };
 </script>

src/views/sellOut/salesOrder/detail.vue

@@ -92,9 +92,10 @@
           />
         </el-collapse-item>
         <el-collapse-item title="销售出库单" name="3">
+          {{ status }}
           <order-out-table
             :newTime="newTime"
-            v-if="newTime !== '' && status == 3"
+            v-if="newTime !== '' && status == 4"
             :sitem="sitem"
             :id="queryId"
             @refresh="initData()"

src/views/sellOut/sellReturnList/index.vue

@@ -4,7 +4,7 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <!-- loading -->
-      powers:{{ powers }}
+      powers:{{ powers }}1
       <ex-table
         v-loading="false"
         :table="table"
@@ -29,40 +29,54 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="24">
-                <!-- 采购单编号 -->
-                <el-col :span="4" style="width: 220px; padding: 0 0 0 0px">
-                  <el-input
-                    clearable
-                    :size="searchSize"
-                    v-model="parmValue.CG_numbers"
-                    :maxlength="40"
-                    placeholder="采购单编号"
-                    @blur="searchList"
-                  />
-                </el-col>
-                <!-- 退货单编号 -->
-                <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
-                  <el-input
-                    clearable
+                <!-- 时间区间 -->
+                <el-col :span="6" style="width: 303px; padding: 0 0 0 0px">
+                  <period-date-picker
+                    :type="1"
+                    :width="'135px'"
                     :size="searchSize"
-                    v-model="parmValue.returnNumber"
-                    :maxlength="40"
-                    placeholder="退货单编号"
-                    @blur="searchList"
+                    :start="parmValue.start"
+                    :end="parmValue.end"
+                    @timeReturned="handleTime"
                   />
                 </el-col>
-                <!-- 退货仓库编号 -->
-                <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
+                <el-col :span="6" style="width: 500px; padding: 0 0 0 0px">
                   <el-input
-                    clearable
+                    placeholder="关键字"
+                    v-model="s_input"
                     :size="searchSize"
-                    v-model="parmValue.returnStoreNum"
-                    :maxlength="40"
-                    placeholder="退货仓库编号"
-                    @blur="searchList"
-                  />
+                    class="input-with-select"
+                  >
+                    <el-select
+                      v-model="select"
+                      style="width: 125px"
+                      slot="prepend"
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        label="退货单编号"
+                        value="returnNo"
+                      ></el-option>
+                      <el-option label="采购单编号" value="orderNo"></el-option>
+                      <el-option
+                        label="退货仓库编号"
+                        value="returnStoreNo"
+                      ></el-option>
+                      <el-option
+                        label="退货公司编号"
+                        value="returnCompanyNo"
+                      ></el-option>
+                      <!-- <el-option label="产品名称" value="5"></el-option> -->
+                      <el-option label="申请人" value="applyer"></el-option>
+                      <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
+                    </el-select>
+                    <el-button
+                      slot="append"
+                      icon="el-icon-search"
+                      @click="handleValue"
+                    ></el-button>
+                  </el-input>
                 </el-col>
-
                 <el-col
                   :span="3"
                   style="width: 66px; float: right"
@@ -90,41 +104,7 @@
                 </el-col>
               </el-col>
             </el-row>
-            <el-row style="padding: 10px 0 0 0">
-              <!-- 退货仓库公司编号 -->
-              <el-col :span="4" style="width: 200px; padding: 0 0 0 0px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  v-model="parmValue.returnCompanyNum"
-                  :maxlength="40"
-                  placeholder="退货公司编号"
-                  @blur="searchList"
-                />
-              </el-col>
-              <!-- 申请人 -->
-              <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  v-model="parmValue.applyer"
-                  :maxlength="40"
-                  placeholder="申请人"
-                  @blur="searchList"
-                />
-              </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-row>
+            <el-row style="padding: 10px 0 0 0"> </el-row>
           </div>
         </template>
         <template #status="{ scope }">
@@ -246,6 +226,8 @@ export default {
   },
   data() {
     return {
+      select: "",
+      s_input: "",
       statusList: [
         { value: "0", label: "待验收" },
         { value: "1", label: "待验收审核" },
@@ -367,7 +349,7 @@ export default {
         thNo: model.returnNumber, //退货编号
         status: model.status, //节点状态
         post_code: model.postNumber, //快递编码
-        post_compay: model.postCompany.toString(), //	快递公司
+        post_compay: model.postCompany, //	快递公司
         customer_code: model.clientNumber, //客户code
         order_code: model.sellOrderNumber, //	确认单code
         out_code: model.sellOutNumber, //	出库code
@@ -430,6 +412,36 @@ export default {
       console.log(this.parmValue.postCompany);
       await this.searchList();
     },
+    async handleValue() {
+      console.log(this.select);
+      console.log(this.s_input);
+      switch (this.select) {
+        case "returnNo":
+          this.parmValue.returnNumber = this.s_input;
+          await this.searchList();
+          break;
+        case "returnStoreNo":
+          this.parmValue.returnStoreNum = this.s_input;
+          await this.searchList();
+
+          break;
+        case "returnCompanyNo":
+          this.parmValue.returnCompanyNum = this.s_input;
+          await this.searchList();
+
+          break;
+        case "applyer":
+          this.parmValue.applyer = this.s_input;
+          await this.searchList();
+          break;
+        default:
+          //采购单编号
+          this.parmValue.CG_numbers = this.s_input;
+          await this.searchList();
+
+          break;
+      }
+    },
   },
 };
 </script>