1

src/views/goodStore/active/index.vue

@@ -95,7 +95,6 @@
                 :isDetail="false"
                 @searchChange="company_idsearchChange"
               />
-              
             </el-col>
             <el-col :span="4" style="width: 373px; padding: 0 0 0 10px">
               <el-input
@@ -114,6 +113,11 @@
                   v-model="select"
                   slot="prepend"
                   style="width: 130px"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                   placeholder="关键字类型"
                 >
                   <el-option label="活动名称" value="1" />
@@ -286,20 +290,20 @@ export default {
       };
       this.searchList();
     },
-   async platform_codesearchChange(e) {
-        const { id, code, label } = e;
-        this.parmValue.platform_code = id ||"";
-         this.pageInfo.curr = 1;
-        this.parmValue.page = 1;
-        await this.searchList();
+    async platform_codesearchChange(e) {
+      const { id, code, label } = e;
+      this.parmValue.platform_code = id || "";
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      await this.searchList();
     },
 
-   async company_idsearchChange(e) {
-        const { id, code, label } = e;
-        this.parmValue.company_id = code || "";
-         this.pageInfo.curr = 1;
-        this.parmValue.page = 1;
-        await this.searchList();
+    async company_idsearchChange(e) {
+      const { id, code, label } = e;
+      this.parmValue.company_id = code || "";
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      await this.searchList();
     },
     // 新建/编辑/详情
     openModal(row, type) {
@@ -385,7 +389,7 @@ export default {
     },
     // 刷新表格
     async searchList() {
-        if (
+      if (
         (this.parmValue.starttime !== "" && this.parmValue.endtime === "") ||
         (this.parmValue.starttime === "" && this.parmValue.endtime !== "")
       ) {

src/views/goodStore/dealGoodsPool/index.vue

@@ -74,6 +74,11 @@
                 <el-select
                   v-model="select"
                   slot="prepend"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                   style="width: 130px"
                   placeholder="关键词类型"
                 >

src/views/goodStore/goodsCost/index.vue

@@ -136,6 +136,11 @@
                   v-model="select"
                   slot="prepend"
                   style="width: 135px"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                   placeholder="关键字类型"
                 >
                   <el-option label="商品编号" value="1" />

src/views/goodStore/goodsOnline/index.vue

@@ -139,6 +139,11 @@
                   slot="prepend"
                   :size="searchSize"
                   style="width: 140px"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                   placeholder="关键字类型"
                 >
                   <el-option label="商品名称" value="1" />

src/views/goodStore/goodsRepertory/index.vue

@@ -139,6 +139,11 @@
                   slot="prepend"
                   :size="searchSize"
                   style="width: 140px"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                   placeholder="关键字类型"
                 >
                   <el-option label="商品名称" value="1" />

src/views/process/columns.js

@@ -1,10 +1,5 @@
 const routerList = [
-  {
-    name: "离职交接流程",
-    type: "LZJJ",
-    toRouter: "/interest/handoverDetail",
-    to: "id",
-  },
+  //库存管理
   {
     name: "调拨流程",
     type: "DBD",
@@ -20,9 +15,7 @@ const routerList = [
     isok: true
   },
 
-
   //采购
-
   {
     name: "采购单流程",
     type: "CGD",
@@ -30,53 +23,33 @@ const routerList = [
     to: "code",
     isok: true
   },
+
   {
-    name: "入库单流程",
+    name: "采购入库单流程",
     type: "RKD",
     toRouter: "/purchaseIn/wsmInOrderDetail",
     to: "code",
     isok: true
   },
 
-  {
-    name: "入库单退货流程",
-    type: "RKTHD-X",
-    toRouter: "/purchaseIn/wsmInOrderDetail",
-    to: "code",
-    isok: false
-  },
+
+
   {
     name: "采购单退货流程",
     type: "CGTHD",
     toRouter: "/purchaseIn/purchaseReturnDetail",
     to: "code",
   },
+
   {
     name: "采购工差单流程",
     type: "CGGCD",
     toRouter: "/purchaseIn/purchaseDiffOrderDetail",
     to: "id",
   },
-  //销售订单
-  {
-    name: "备库申请流程",
-    type: "BHD",
-    toRouter: "/sellOut/stockApplyDetail",
-    to: "id",
-    isok: true
-  },
-  {
-    name: "销售订单流程",
-    type: "XSQRD",
-    toRouter: "/sellOut/salesOrderDetail",
-    to: "id",
-  },
-  {
-    name: "发货申请单流程",
-    type: "CKD",
-    toRouter: "/sellOut/sellOutOrderDetail",
-    to: "code",
-  },
+
+
+  //销售
   {
     name: "项目流程",
     type: "PRO",
@@ -96,6 +69,28 @@ const routerList = [
     toRouter: "/sellOut/bargainListDetail",
     to: "code",
   },
+  {
+    name: "备库申请流程",
+    type: "BHD",
+    toRouter: "/sellOut/stockApplyDetail",
+    to: "id",
+    isok: true
+  },
+
+
+  {
+    name: "销售订单流程",
+    type: "XSQRD",
+    toRouter: "/sellOut/salesOrderDetail",
+    to: "id",
+  },
+  {
+    name: "发货申请单流程",  //改名字
+    type: "CKD",
+    toRouter: "/sellOut/sellOutOrderDetail",
+    to: "code",
+  },
+  //咨询订单删除
   {
     name: "售后申请单流程",
     type: "SHD",
@@ -103,9 +98,8 @@ const routerList = [
     to: "code",
     isok: true
   },
-
   {
-    name: "售后退货单流程",
+    name: "售后退货单流程",  //原来出库退货流程 改为售后退货单流程
     type: "CKTHD",
     toRouter: "/sellOut/returnOrderDetail",
     to: "code",
@@ -118,42 +112,24 @@ const routerList = [
     to: "code",
     isok: true
   },
-  // //咨询订单
+  {
+    name: "销售工差单流程",//原来咨询工差单流程 ,改为销售工差单流程
+    type: "ZXGCD",
+    toRouter: "/sellOut/zxDiffOrderDetail",
+    to: "id",
+  },
+  //商品管理
   // {
-  //   name: "咨询订单流程",
-  //   type: "ZXQRD",
-  //   toRouter: "/sellOut/zxOrderDetail",
+  //   name: "销售工差单流程",
+  //   type: "ZXGCD",
+  //   toRouter: "/sellOut/zxDiffOrderDetail",
   //   to: "id",
   // },
-  // {
-  //   name: "咨询发货申请单流程",
-  //   type: "ZXCKD",
-  //   toRouter: "/sellOut/zxoutOrderDetail",
-  //   to: "code",
-  // },
-  // {
-  //   name: "咨询售后申请单流程",
-  //   type: "ZXSHD",
-  //   toRouter: "/sellOut/zxAfterSaleDetail",
-  //   to: "code",
-  // },
-
-  // {
-  //   name: "咨询售后退货单流程",
-  //   type: "ZXCKTHD",
-  //   toRouter: "/sellOut/zxAfterSaleOrderDetail",
-  //   to: "code",
-  // },
-  // {
-  //   name: "咨询退货单流程",
-  //   type: "ZXTHD",
-  //   toRouter: "/sellOut/zxReturnDetail",
-  //   to: "code",
-  // },
+  //权限
   {
-    name: "咨询工差单流程",
-    type: "ZXGCD",
-    toRouter: "/sellOut/zxDiffOrderDetail",
+    name: "离职交接流程",
+    type: "LZJJ",
+    toRouter: "/interest/handoverDetail",
     to: "id",
   },
 ];

src/views/process/oing/index.vue

@@ -131,6 +131,7 @@ export default {
     };
   },
   mounted() {
+    console.log(this.process_router_list);
     this.searchProList();
     this.searchList();
   },

src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -84,7 +84,7 @@
               <el-col :span="6" style="width: 400px; padding: 0 0 0 0px">
                 <el-input
                   clearable
-                  placeholder="请选择"
+                  placeholder="关键字"
                   v-model="s_input"
                   maxlength="40"
                   :size="searchSize"
@@ -94,7 +94,12 @@
                     v-model="select"
                     style="width: 125px"
                     slot="prepend"
-                    placeholder="请选择"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                    placeholder="关键字类型"
                   >
                     <el-option label="采购单编号" value="cgdNo"></el-option>
                     <el-option label="申请人" value="apply_name"></el-option>

src/views/purchaseIn/purchaseOrder/index.vue

@@ -114,7 +114,7 @@
               <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
                 <el-input
                   clearable
-                  placeholder="编号"
+                  placeholder="关键字"
                   v-model="input"
                   maxlength="40"
                   :size="searchSize"
@@ -129,7 +129,7 @@
                     v-model="select"
                     style="width: 125px"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                     @change="
                       pageInfo.curr = 1;
                       parmValue.page = 1;

src/views/purchaseIn/purchaseReturn/index.vue

@@ -54,7 +54,7 @@
                   clearable
                   placeholder="关键字"
                   v-model="s_input"
-                   maxlength="40"
+                  maxlength="40"
                   :size="searchSize"
                   class="input-with-select"
                 >
@@ -62,7 +62,12 @@
                     v-model="select"
                     style="width: 125px"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
                   >
                     <el-option
                       label="退货单编号"

src/views/purchaseIn/wsmInOrder/index.vue

@@ -151,7 +151,7 @@
                     v-model="select"
                     style="width: 145px"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                     @change="
                       pageInfo.curr = 1;
                       parmValue.page = 1;

src/views/sellOut/bargainList/index.vue

@@ -75,7 +75,7 @@
                     style="width: 140px"
                     v-model="select"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                   >
                     <el-option label="议价单编号" value="1" />
                     <el-option label="反馈商品编号" value="2" />

src/views/sellOut/returnOrder/components/return-record.vue

@@ -156,6 +156,7 @@
         </el-button>
       </el-col>
     </el-row>
+    11
     <abnormal-condition-modal
       :index="index"
       :sitem="s_item"

src/views/sellOut/returnOrder/index.vue

@@ -106,7 +106,7 @@
                     style="width: 150px"
                     v-model="select"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                   >
                     <el-option label="售后退货单编号" value="returnNo" />
                     <el-option label="售后申请单编号" value="serviceNo" />

src/views/sellOut/salesOrder/index.vue

@@ -138,7 +138,7 @@
                     v-model="select"
                     style="width: 100px"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                     @change="searchList"
                   >
                     <el-option label="订单编号" value="orderCode"></el-option>

src/views/sellOut/sellAfterApply/index.vue

@@ -117,7 +117,7 @@
                     style="width: 150px"
                     v-model="select"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                   >
                     <el-option
                       label="售后申请编号"

src/views/sellOut/sellOutOrder/index.vue

@@ -92,7 +92,7 @@
                     style="width: 140px"
                     v-model="select"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                   >
                     <el-option label="销售订单编号" value="orderCode" />
                     <el-option label="发货申请单编号" value="outCode" />

src/views/sellOut/sellReturn/index.vue

@@ -73,7 +73,7 @@
                       v-model="select"
                       style="width: 150px"
                       slot="prepend"
-                      placeholder="请选择"
+                      placeholder="关键字类型"
                     >
                       <el-option label="销售退货单编号" value="returnCode" />
                       <el-option label="销售订单编号" value="orderCode" />

src/views/sellOut/stockApply/index.vue

@@ -93,7 +93,7 @@
                   <el-select
                     v-model="select"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                     style="width: 130px"
                   >
                     <el-option label="备库申请编号" value="1" />

src/views/sellOut/zixunOrder/index.vue

@@ -105,7 +105,7 @@
                     style="width: 140px"
                     v-model="select"
                     slot="prepend"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                   >
                     <el-option label="咨询单编号" value="1" />
                     <el-option label="商品名称" value="2" />

src/views/serviceParam/Invoicing/index.vue

@@ -106,7 +106,7 @@
                     v-model="select"
                     slot="prepend"
                     style="width: 125px"
-                    placeholder="请选择"
+                    placeholder="关键字类型"
                   >
                     <el-option label="统一社会信用代码" value="invoice_code" />
                     <el-option label="联系方式" value="invoice_mobile" />

src/views/serviceParam/storeSet/index.vue

@@ -51,7 +51,7 @@
                     v-model="select"
                     slot="prepend"
                     style="width: 125px"
-                    placeholder="请选择类型"
+                    placeholder="关键字类型"
                   >
                     <el-option label="仓库编码" value="1"></el-option>
                     <el-option label="负责人姓名" value="2"></el-option>