build

src/mixins/resToken.js

@@ -7,6 +7,7 @@ export default {
       }
     },
     async routeGoto(path, query) {
+      console.log(111);
       await window.vm.$router.push({
         path: path,
         query: query

src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -206,7 +206,7 @@
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
               (is_stock_options.find((item) => item.id == String(scope.row.is_stock)) || {})
-                .label || '--'
+                .name || '--'
             "
           ></el-tag>
         </template>

src/views/purchaseIn/recovery/index.vue

@@ -112,8 +112,8 @@
                 >
                 </el-input>
               </el-col>
-              <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
-                <el-input
+              <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
+                <!-- <el-input
                   clearable
                   placeholder="供应商负责人部门"
                   v-model="parmValue.company_name"
@@ -125,8 +125,20 @@
                     searchList();
                   "
                 >
-                </el-input>
-              </el-col> -->
+                </el-input> -->
+                <el-select 
+                    v-if="isSupertube"
+                    v-model="parmValue.is_own" 
+                    size="mini" 
+                    @change="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();"
+                  >
+                  <el-option label="只看自己" value="1" />
+                  <el-option label="查看全部" value="0" />
+                </el-select>
+              </el-col>
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   :size="searchSize"
@@ -199,7 +211,7 @@ export default {
     showData,
   },
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find((item) => item.menu_route == "recovery") || {};
@@ -245,6 +257,7 @@ export default {
     };
   },
   mounted() {
+    this.parmValue.is_own = this.isSupertube ? '0' : '1'
     this.searchList();
   },
 
@@ -253,7 +266,7 @@ export default {
       this.parmValue = {
         infoNo: "",
         bidNo: "",
-        is_own: "1",
+        is_own: this.isSupertube ? '0' : "1",
         company_name: "", //部门
         supplierName: "",
         good_name: "",
@@ -273,6 +286,7 @@ export default {
       this.loading = true;
       const res = await asyncRequest.list({
         ...this.parmValue,
+        is_own: this.isSupertube ? this.parmValue.is_own : '1',
         needRela: true
       });
       

src/views/reload/index.vue

@@ -9,8 +9,13 @@ export default {
     const keys = Object.keys(query).filter(key => key)
     let queryString = ''
 
+    // const chunk = (qs, key, index) => {
+    //   const next = `${key}=${query[key]}${index === !keys.length ? '&' : ''}`
+    //   return qs + next
+    // }
+
     const chunk = (qs, key, index) => {
-      const next = `${key}=${query[key]}${index === !keys.length ? '&' : ''}`
+      const next = `${key}=${query[key]}${index === keys.length ? '' : '&'}`
       return qs + next
     }
 

src/views/sellOut/sellAfterApply/columns.js

@@ -160,14 +160,24 @@ const sellshowColumns = [
     label: '发货申请单编号',
     span: 6
   },
-
   {
     prop: 'order_type',
     label: '订单类别',
     _slot_: 'order_type',
     span: 6
   },
-
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    span: 6
+  },
+  {
+    prop: 'is_stock',
+    label: '商品类型',
+    _slot_: 'is_stock',
+    span: 6
+  },
   {
     prop: 'is_receive',
     label: '期望结果',
@@ -179,6 +189,18 @@ const sellshowColumns = [
     label: '创建时间',
     span: 6
   },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    _slot_: 'company',
+    span: 12
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    _slot_: 'supplier',
+    span: 12
+  },
   {
     prop: 'total_num',
     label: '发货总数量',
@@ -216,7 +238,7 @@ const sellshowColumns = [
     prop: 'error_img',
     label: '异常图片',
     _slot_: 'error_img',
-    span: 8
+    span: 20
   },
   {
     prop: 'error_remark',

src/views/sellOut/sellAfterApply/detail.vue

@@ -11,7 +11,31 @@
                 :sitem="sitem"
                 :columns="sellshowColumns"
               >
-                <template slot="status">
+              <template slot="company">
+                <span>{{ sitem.companyName }}</span>
+                <el-popover placement="top" width="300" trigger="hover">
+                  <ul>
+                    <li>
+                      <span>业务企业编号：</span><span>{{ sitem.companyNo }}</span>
+                    </li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline fr" />
+                </el-popover>
+              </template>
+
+              <template slot="supplier">
+                <span>{{ sitem.supplierName }}</span>
+                <el-popover placement="top" width="300" trigger="hover">
+                  <ul>
+                    <li>
+                      <span>供应商编号：</span><span>{{ sitem.supplierName }}</span>
+                    </li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline fr" />
+                </el-popover>
+              </template>
+
+              <template slot="status">
                   <el-tag
                     :size="'mini'"
                     :type="sitem.status == '0' ? 'warning' : ''"
@@ -24,6 +48,20 @@
                     "
                   ></el-tag>
                 </template>
+
+                <template slot="is_stock">
+                  <el-tag
+                    :size="'mini'"
+                    :type="sitem.status == '0' ? 'warning' : ''"
+                    v-text="
+                      ((stockOptions).find(
+                          (item) => String(item.id) === String( sitem.is_stock)
+                        ) || {}
+                      ).name || '--'
+                    "
+                  ></el-tag>
+                </template>
+
                 <template slot="order_type">
                   <el-tag
                     :size="'mini'"
@@ -36,6 +74,18 @@
                     "
                   ></el-tag>
                 </template>
+                <template slot="order_source">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        xs_order_source_options.find(
+                          (item) => item.id == sitem.order_source
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
                 <template slot="is_receive">
                   <el-tag :size="'mini'" :type="''">{{
                     sitem.is_receive + '' === "1"
@@ -155,7 +205,7 @@ import ExpressFeedback from "./components/express_feedback";
 import { sellshowColumns } from "./columns";
 import purchaseExam from "./components/purchase_exam";
 import SupplierExam from "./components/supplier_exam.vue";
-import { xs_order_type_options } from "@/assets/js/statusList";
+import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
 import WaitReturn from "./components/wait-return.vue";
 import SupplierConfrim from "./components/supplier-confirm.vue";
 import ApprovalResults from "./components/approval-results.vue";
@@ -191,6 +241,7 @@ export default {
   data() {
     return {
       xs_order_type_options,
+      xs_order_source_options,
       activeTabs: "1",
       expect_options: [],
       expect_options1: [
@@ -220,6 +271,10 @@ export default {
       sitem: null,
       newTime: "",
       loading: false,
+      stockOptions:[
+        { id: "0", name: "非库存品" },
+        { id: "1", name: "库存品" },
+      ],
       // 收到货状态
       status1Options: [
         { value: "1", label: "待业务审核" },

src/views/sellOut/zixunOrder/detail.vue

@@ -23,6 +23,7 @@
             placement="top"
             v-if="sitem.status + '' === '1' && powers.some((i) => i == '066') && !isSupertube"
           >
+
             <i
               class="el-icon-video-pause hover"
               style="margin: 0 0 0 10px"
@@ -248,11 +249,23 @@ export default {
               id: this.queryId,
               type: "edit",
             };
-            this.routeReGoto("zixunOrderDetail", model);
-            location.reload();
+            // this.routeReGoto("zixunOrderDetail", model);
+            // location.reload();
+
+            const chunk = (qs, key, index) => {
+              const next = `${key}=${model[key]}${index === keys.length ? '' : '&'}`
+              return qs + next
+            }
+
+
+            model.redirect = '/sellOut/zixunOrderDetail'
+            const keys = Object.keys(model)
+            const queryString = keys.reduce(chunk, '?')
+            this.$router.push('/reload' + queryString)
           }
         })
-        .catch(() => {
+        .catch((e) => {
+          console.log(e)
           console.log("取消");
         });
     },

src/views/sellOut/zxDiffOrder/index.vue

@@ -113,31 +113,8 @@
             </el-row>
 
             <el-row style="margin-top: 10px">
-              <el-col :span="4" style="width: 300px">
-                  <el-input
-                    placeholder="订单编号"
-                    v-model="parmValue.orderCode"
-                    :size="searchSize"
-                    :maxlength="40"
-                    @blur="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                  >
-                    <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="4" style="width: 150px;margin-left:10px">
+              <el-col :span="4" style="width: 150px;">
                 <el-select
                   :size="searchSize"
                   v-model="parmValue.order_source"
@@ -183,6 +160,46 @@
                   />
                 </el-select>
               </el-col>
+
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="margin-left: 10px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+             </el-col>
+            </el-row>
+
+            <el-row style="margin-top:10px">
+              <el-col :span="4" style="width: 300px">
+                  <el-input
+                    placeholder="订单编号"
+                    v-model="parmValue.orderCode"
+                    :size="searchSize"
+                    :maxlength="40"
+                    @blur="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  >
+                    <el-button
+                      slot="append"
+                      icon="el-icon-search"
+                      @click="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                    ></el-button>
+                  </el-input>
+              </el-col>
             </el-row>
           </div>
         </template>
@@ -269,6 +286,7 @@ export default {
   },
   data() {
     return {
+      supplierNo:"",
       xs_order_source_options,
       xs_order_type_options,
       select: "1",
@@ -365,6 +383,11 @@ export default {
   },
 
   methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
     getRouter(toRouter, queryId){
       if (toRouter && queryId) {
         let model = {
@@ -492,6 +515,7 @@ export default {
      
       const res = await asyncRequest.list({
         ...this.parmValue,
+        supplierNo:Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
         needRela: true
       });