snow 2 anni fa
parent
commit
c6a11ef875
2 ha cambiato i file con 73 aggiunte e 94 eliminazioni
  1. 0 0
      dist/static/js/0.js
  2. 73 94
      src/views/sellOut/sellOutOrder/detail.vue

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 73 - 94
src/views/sellOut/sellOutOrder/detail.vue

@@ -149,7 +149,7 @@
               />
             </el-collapse-item> -->
 
-          <el-collapse-item
+            <el-collapse-item
               title="售后退货单结果"
               name="4"
               v-if="
@@ -168,19 +168,40 @@
                 "
                 :columns="rshowColumns"
               >
-                 <template slot="company">
-                   <span>{{ resitem.companyName }}</span>
-                   <el-popover placement="top" width="300" trigger="hover">
-                     <ul>
-                       <li>
-                         <span>业务企业编号:</span><span>{{ resitem.companyNo }}</span>
-                       </li>
-                     </ul>
-                     <i slot="reference" class="el-icon-warning-outline fr" />
-                   </el-popover>
-                 </template>
+                <template slot="addr">
+                  <span>
+                    {{ sitem.contactor }}---{{ sitem.mobile }}---{{ sitem.addr_cn }}{{ sitem.addr }}
+                  </span>
+                </template>
+              <template slot="company">
+                <span>{{ sitem.companyName }}</span>
+                <el-popover placement="top" width="300" trigger="hover">
+                  <ul>
+                    <li>
+                      <span>业务企业编号:</span><span>{{ resitem.companyNo }}</span>
+                    </li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline fr" />
+                </el-popover>
+              </template>
 
-                 <template slot="supplier">
+              <template slot="customer">
+                <span>{{ resitem.customer_name }}</span>
+                <el-popover placement="top" width="300" trigger="hover">
+                  <ul>
+                    <li>
+                      <span>客户公司编号:</span><span>{{ resitem.customer_code }}</span>
+                    </li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline fr" />
+                </el-popover>
+              </template>
+
+              <template slot="loop_total">
+                <span>供应商负责人共修改供应商审批结果 {{resitem.loop_total}} 次</span>
+              </template>
+
+              <template slot="supplier">
                 <span>{{ resitem.supplierName }}</span>
                 <el-popover placement="top" width="300" trigger="hover">
                   <ul>
@@ -191,26 +212,37 @@
                   <i slot="reference" class="el-icon-warning-outline fr" />
                 </el-popover>
               </template>
-               
-                 <template slot="customer">
-                   <span>{{ resitem.customer_name }}</span>
-                   <el-popover placement="top" width="300" trigger="hover">
-                     <ul>
-                       <li>
-                         <span>客户公司编号:</span><span>{{ resitem.customer_code }}</span>
-                       </li>
-                     </ul>
-                     <i slot="reference" class="el-icon-warning-outline fr" />
-                   </el-popover>
-                 </template>
 
-                 <template slot="order_source">
+              <template slot="returnWsm">
+                <span>{{ resitem.wsm_name }}</span>
+                <el-popover placement="top" width="400" trigger="hover">
+                  <ul>
+                    <li><h3>退货仓库</h3></li>
+                    <li>
+                      <span>编码:</span><span>{{ sitem.wsm_code }}</span>
+                    </li>
+                    <li>
+                      <span>名称:</span><span>{{ sitem.wsm_name }}</span>
+                    </li>
+                    <li>
+                      <span>所在供应商编码:</span><span>{{ sitem.wsm_supplierNo }}</span>
+                    </li>
+                    <li>
+                      <span>所在供应商名称:</span><span>{{ resitem.wsm_supplier }}</span>
+                    </li>
+                  </ul>
+                  <i slot="reference" class="el-icon-warning-outline fr" />
+                </el-popover>
+              </template>
+
+              <template slot="status">
                   <el-tag
                     :size="'mini'"
+                    :type="resitem.status == '0' ? 'warning' : ''"
                     v-text="
                       (
-                        xs_order_source_options.find(
-                          (item) => item.id == resitem.order_source
+                      status1Options.find(
+                          (item) => String(item.id) === String( resitem.status)
                         ) || {}
                       ).label || '--'
                     "
@@ -230,79 +262,27 @@
                   ></el-tag>
                 </template>
 
-                <template slot="status">
+                <template slot="order_type">
                   <el-tag
                     :size="'mini'"
-                    :type="resitem.status == '0' ? 'warning' : ''"
                     v-text="
                       (
-                        (resitem.is_receive === '0'
-                          ? status2Options
-                          : status1Options
-                        ).find((item) => item.id + '' === resitem.status + '') || {}
+                        xs_order_type_options.find(
+                          (item) => item.id == resitem.order_type
+                        ) || {}
                       ).label || '--'
                     "
                   ></el-tag>
-                  <el-tooltip
-                    v-if="
-                      resitem.status + '' === '3' &&
-                      resitem.is_receive + '' === '0' &&
-                      powers.some((i) => i == '026')
-                    "
-                    class="fr"
-                    effect="dark"
-                    content="同意退货"
-                    style="padding: 3px 0 0 0"
-                    placement="top"
-                  >
-                    <i class="el-icon-video-play tb-icon" @click="agree_return"></i>
-                  </el-tooltip>
-
-                  <el-tooltip
-                    class="fr"
-                    effect="dark"
-                    content="取消申请"
-                    style="padding: 3px 0 0 0"
-                    v-if="
-                      (resitem.status + '' === '1' ||
-                        resitem.status + '' === '2' ||
-                        resitem.status + '' === '3' ||
-                        resitem.status + '' === '4') &&
-                      powers.some((i) => i == '027') && !isSupertube
-                    "
-                    placement="top"
-                  >
-                    <i class="el-icon-circle-close tb-icon" @click="close_return"></i>
-                  </el-tooltip>
-                  <el-tooltip
-                    class="fr"
-                    effect="dark"
-                    :content="
-                      resitem.is_receive + '' === '1'
-                        ? '换货'
-                        : resitem.is_receive + '' === '0'
-                        ? '补发'
-                        : '--'
-                    "
-                    style="padding: 3px 0 0 0"
-                    v-if="
-                      resitem.status + '' === '5' &&
-                      resitem.is_reissue + '' === '0' &&
-                      resitem.except_code + '' === '2' &&
-                      powers.some((i) => i == '091')
-                    "
-                    placement="top"
-                  >
-                    <i class="el-icon-shopping-cart-2 tb-icon" @click="reissue"></i>
-                  </el-tooltip>
                 </template>
-                <template slot="order_type">
+
+
+                <template slot="order_source">
                   <el-tag
                     :size="'mini'"
                     v-text="
                       (
-                        xs_order_type_options.find(
-                          (item) => item.id == resitem.order_type
+                        xs_order_source_options.find(
+                          (item) => item.id == resitem.order_source
                         ) || {}
                       ).label || '--'
                     "
@@ -313,7 +293,7 @@
                     resitem.is_receive + '' === "1"
                       ? "销售订单退货,采购订单也退货"
                       : resitem.is_receive + '' === "0"
-                      ? "销售订单退货,采购订单不退货(货物已丢失,且无法找回,由业务公司承担)"
+                      ? "采购订单不退货(货物已丢失,且无法找回,由业务公司承担)"
                       : "--"
                   }}</el-tag>
                 </template>
@@ -322,9 +302,8 @@
                     :size="'mini'"
                     v-text="
                       (
-                        expect_options.find(
-                          (item) => item.value == resitem.except_code
-                        ) || {}
+                        expect_options.find((item) => item.value == resitem.except_code) ||
+                        {}
                       ).label || '--'
                     "
                   ></el-tag>
@@ -335,7 +314,7 @@
                     class="fl hover"
                     style="width: 23px; height: 23px; margin: 0 5px 0 0"
                     v-viewer
-                    v-for="(si, i) in resitem.error_img"
+                    v-for="(si, i) in sitem.error_img"
                     :src="si"
                     :key="si + i"
                   />

Some files were not shown because too many files changed in this diff