build

src/components/globalComponents/show-goods-data-table/main.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="showGoodsDataTable" v-loading="loading">
+  <div v-loading="loading" class="showGoodsDataTable">
     <show-data-table
       v-if="
         (type + '' === '1' || type + '' === '2' || type + '' === '5' || type + '' === '6') &&
-        this.sitem &&
-        this.sitem.addtime &&
-        !iscgd
+          this.sitem &&
+          this.sitem.addtime &&
+          !iscgd
       "
       :sitem="sitem"
       :columns="onlineColumns"
@@ -13,13 +13,13 @@
     >
       <template slot="good_name">
         <img
+          v-if="sitem.good_thumb_img"
           v-viewer
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
           class="fl"
-          v-if="sitem.good_thumb_img"
           :src="sitem.good_thumb_img"
           alt=""
-        />
+        >
         <span>{{ sitem.good_name }}</span>
         <span v-for="(si, i) in sitem.speclist" :key="si.spec_id + i">
           <span v-if="i !== 0">-</span>
@@ -34,40 +34,39 @@
             <li
               v-if="
                 newTime !== '' &&
-                private_field &&
-                private_field.length > 0 &&
-                private_field.some((item) => item == '1')
+                  ((private_field &&
+                    private_field.length > 0 &&
+                    private_field.some((item) => item == '1')) || isSupertube)
               "
             >
               <span>商品成本编号：</span><span>{{ sitem.spuCode }}</span>
             </li>
             <li>
-              <span>平台商品编码：</span
-              ><span>{{ sitem.platform_code_en }}</span>
+              <span>平台商品编码：</span><span>{{ sitem.platform_code_en }}</span>
             </li>
           </ul>
-          <i class="el-icon-warning-outline fr" slot="reference"></i>
+          <i slot="reference" class="el-icon-warning-outline fr" />
         </el-popover>
       </template>
       <template slot="good_img">
         <img
+          v-for="(si, i) in sitem.good_img"
+          :key="si + i"
+          v-viewer
           class="fl"
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
-          v-viewer
-          v-for="(si, i) in sitem.good_img"
           :src="si"
-          :key="si + i"
-        />
+        >
       </template>
       <template slot="good_info_img">
         <img
+          v-for="(si, i) in sitem.good_info_img"
+          :key="si + i"
+          v-viewer
           class="fl"
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
-          v-viewer
-          v-for="(si, i) in sitem.good_info_img"
           :src="si"
-          :key="si + i"
-        />
+        >
       </template>
       <template slot="company">
         <span>{{ sitem.company }}</span>
@@ -77,7 +76,7 @@
               <span>业务企业编号：</span><span>{{ sitem.companyNo }}</span>
             </li>
           </ul>
-          <i class="el-icon-warning-outline fr" slot="reference"></i>
+          <i slot="reference" class="el-icon-warning-outline fr" />
         </el-popover>
       </template>
 
@@ -100,7 +99,7 @@
           :size="'mini'"
           v-text="
             (options4.find((item) => item.id == sitem.is_stock) || {}).name ||
-            '--'
+              '--'
           "
         />
       </template>
@@ -109,31 +108,32 @@
           :size="'mini'"
           v-text="
             (options1.find((item) => item.id == sitem.good_type) || {}).name ||
-            '--'
+              '--'
           "
         />
-        <span v-if="sitem.good_type + '' === '1'" style="padding: 0 0 0 5px"
-          >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
-        >
+        <span
+          v-if="sitem.good_type + '' === '1'"
+          style="padding: 0 0 0 5px"
+        >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span>
       </template>
       <template slot="noble">
-        <span v-if="sitem.noble_metal"
-          >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
-            sitem.noble_name
-          }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
-            sitem.is_gold_price + '' === "0" ? "不" : ""
-          }}启用实时金价-{{ sitem.is_diff + '' === "1" ? "有" : "无" }}工差-{{
-            sitem.config
-          }}-{{ sitem.other_config }}</span
-        >
+        <span
+          v-if="sitem.noble_metal"
+        >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
+          sitem.noble_name
+        }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
+          sitem.is_gold_price + '' === "0" ? "不" : ""
+        }}启用实时金价-{{ sitem.is_diff + '' === "1" ? "有" : "无" }}工差-{{
+          sitem.config
+        }}-{{ sitem.other_config }}</span>
       </template>
     </show-data-table>
     <show-data-table
       v-else-if="
         (type + '' === '1' || type + '' === '2' || type + '' === '5' || type + '' === '6') &&
-        this.sitem &&
-        this.sitem.addtime &&
-        iscgd
+          this.sitem &&
+          this.sitem.addtime &&
+          iscgd
       "
       :sitem="sitem"
       :columns="costColumns"
@@ -141,13 +141,13 @@
     >
       <template slot="good_name">
         <img
+          v-if="sitem.good_thumb_img"
           v-viewer
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
           class="fl"
-          v-if="sitem.good_thumb_img"
           :src="sitem.good_thumb_img"
           alt=""
-        />
+        >
         <span>{{ sitem.good_name }}</span>
         <span v-for="(si, i) in sitem.speclist" :key="si.spec_id + i">
           <span v-if="i !== 0">-</span>
@@ -160,28 +160,28 @@
               <span>商品成本编号：</span><span>{{ sitem.spuCode }}</span>
             </li>
           </ul>
-          <i class="el-icon-warning-outline fr" slot="reference"></i>
+          <i slot="reference" class="el-icon-warning-outline fr" />
         </el-popover>
       </template>
       <template slot="good_img">
         <img
+          v-for="(si, i) in sitem.good_img"
+          :key="si + i"
+          v-viewer
           class="fl"
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
-          v-viewer
-          v-for="(si, i) in sitem.good_img"
           :src="si"
-          :key="si + i"
-        />
+        >
       </template>
       <template slot="good_info_img">
         <img
+          v-for="(si, i) in sitem.good_info_img"
+          :key="si + i"
+          v-viewer
           class="fl"
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
-          v-viewer
-          v-for="(si, i) in sitem.good_info_img"
           :src="si"
-          :key="si + i"
-        />
+        >
       </template>
       <template slot="company">
         <span>{{ sitem.company }}</span>
@@ -191,7 +191,7 @@
               <span>业务企业编号：</span><span>{{ sitem.companyNo }}</span>
             </li>
           </ul>
-          <i class="el-icon-warning-outline fr" slot="reference"></i>
+          <i slot="reference" class="el-icon-warning-outline fr" />
         </el-popover>
       </template>
       <template slot="supplierName">
@@ -202,7 +202,7 @@
               <span>供应商编号：</span><span>{{ sitem.supplierNo }}</span>
             </li>
           </ul>
-          <i class="el-icon-warning-outline fr" slot="reference"></i>
+          <i slot="reference" class="el-icon-warning-outline fr" />
         </el-popover>
       </template>
       <template slot="exclusive">
@@ -224,7 +224,7 @@
           :size="'mini'"
           v-text="
             (options4.find((item) => item.id == sitem.is_stock) || {}).name ||
-            '--'
+              '--'
           "
         />
       </template>
@@ -233,7 +233,7 @@
           :size="'mini'"
           v-text="
             (options3.find((item) => item.id == sitem.is_auth) || {}).name ||
-            '--'
+              '--'
           "
         />
       </template>
@@ -243,31 +243,32 @@
           :size="'mini'"
           v-text="
             (options1.find((item) => item.id == sitem.good_type) || {}).name ||
-            '--'
+              '--'
           "
         />
-        <span v-if="sitem.good_type + '' === '1'" style="padding: 0 0 0 5px"
-          >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
-        >
+        <span
+          v-if="sitem.good_type + '' === '1'"
+          style="padding: 0 0 0 5px"
+        >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span>
       </template>
       <template slot="noble">
-        <span v-if="sitem.noble_metal"
-          >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
-            sitem.noble_name
-          }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
-            sitem.is_gold_price + '' === "0" ? "不" : ""
-          }}启用实时金价-{{ sitem.is_diff + '' === "1" ? "有" : "无" }}工差-{{
-            sitem.config
-          }}-{{ sitem.other_config }}</span
-        >
+        <span
+          v-if="sitem.noble_metal"
+        >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
+          sitem.noble_name
+        }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
+          sitem.is_gold_price + '' === "0" ? "不" : ""
+        }}启用实时金价-{{ sitem.is_diff + '' === "1" ? "有" : "无" }}工差-{{
+          sitem.config
+        }}-{{ sitem.other_config }}</span>
       </template>
     </show-data-table>
     <show-data-table
       v-else-if="
         (type === '3' || type === '4') &&
-        this.sitem &&
-        this.sitem.addtime &&
-        !iscgd
+          this.sitem &&
+          this.sitem.addtime &&
+          !iscgd
       "
       :sitem="sitem"
       :columns="reColumns"
@@ -294,7 +295,7 @@
               <span>商品编号：</span><span>{{ sitem.spuCode }}</span>
             </li>
           </ul>
-          <i class="el-icon-warning-outline fr" slot="reference"></i>
+          <i slot="reference" class="el-icon-warning-outline fr" />
         </el-popover>
       </template>
       <template slot="send_way">
@@ -305,12 +306,13 @@
           :size="'mini'"
           v-text="
             (options1.find((item) => item.id == sitem.good_type) || {}).name ||
-            '--'
+              '--'
           "
         />
-        <span v-if="sitem.good_type + '' === '1'" style="padding: 0 0 0 5px"
-          >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
-        >
+        <span
+          v-if="sitem.good_type + '' === '1'"
+          style="padding: 0 0 0 5px"
+        >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span>
       </template>
       <template slot="supply_area">
         <el-tag
@@ -319,47 +321,47 @@
             (options6.find((item) => item.id + '' === sitem.supply_area + '') || {})
               .name || '--'
           "
-        ></el-tag>
+        />
       </template>
       <template slot="pay_way">
         <el-tag
           :size="'mini'"
           v-text="
             (options9.find((item) => item.id + '' == sitem.pay_way + '') || {}).name ||
-            '--'
+              '--'
           "
         />
       </template>
       <template slot="noble">
-        <span v-if="sitem.noble_name"
-          >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
-            sitem.noble_name
-          }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
-            sitem.is_gold_price === "0" ? "不" : ""
-          }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
-            sitem.config
-          }}-{{ sitem.other_config }}</span
-        >
+        <span
+          v-if="sitem.noble_name"
+        >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
+          sitem.noble_name
+        }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
+          sitem.is_gold_price === "0" ? "不" : ""
+        }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
+          sitem.config
+        }}-{{ sitem.other_config }}</span>
         <span v-else>--</span>
       </template>
       <template slot="good_img">
         <img
+          v-for="(si, sii) in sitem.good_img"
+          :key="si + sii"
           v-viewer
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
           class="fl"
-          v-for="(si, sii) in sitem.good_img"
-          :key="si + sii"
           :src="si"
           alt=""
-        />
+        >
       </template>
     </show-data-table>
     <show-data-table
       v-else-if="
         (type === '3' || type === '4') &&
-        this.sitem &&
-        this.sitem.addtime &&
-        iscgd
+          this.sitem &&
+          this.sitem.addtime &&
+          iscgd
       "
       :sitem="sitem"
       :columns="coveColumns"
@@ -378,7 +380,7 @@
               <span>商品编号：</span><span>{{ sitem.spuCode }}</span>
             </li>
           </ul>
-          <i class="el-icon-warning-outline fr" slot="reference"></i>
+          <i slot="reference" class="el-icon-warning-outline fr" />
         </el-popover>
       </template>
 
@@ -391,12 +393,13 @@
           :size="'mini'"
           v-text="
             (options1.find((item) => item.id == sitem.good_type) || {}).name ||
-            '--'
+              '--'
           "
         />
-        <span v-if="sitem.good_type + '' === '1'" style="padding: 0 0 0 5px"
-          >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
-        >
+        <span
+          v-if="sitem.good_type + '' === '1'"
+          style="padding: 0 0 0 5px"
+        >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span>
       </template>
       <template slot="supply_area">
         <el-tag
@@ -405,40 +408,40 @@
             (options6.find((item) => item.id === sitem.supply_area) || {})
               .name || '--'
           "
-        ></el-tag>
+        />
       </template>
-     
+
       <template slot="pay_way">
         <el-tag
           :size="'mini'"
           v-text="
             (options9.find((item) => item.id == sitem.pay_way) || {}).name ||
-            '--'
+              '--'
           "
         />
       </template>
       <template slot="noble">
-        <span v-if="sitem.noble_name"
-          >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
-            sitem.noble_name
-          }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
-            sitem.is_gold_price === "0" ? "不" : ""
-          }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
-            sitem.config
-          }}-{{ sitem.other_config }}</span
-        >
+        <span
+          v-if="sitem.noble_name"
+        >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
+          sitem.noble_name
+        }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
+          sitem.is_gold_price === "0" ? "不" : ""
+        }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
+          sitem.config
+        }}-{{ sitem.other_config }}</span>
         <span v-else>--</span>
       </template>
       <template slot="good_img">
         <img
+          v-for="(si, sii) in sitem.good_img"
+          :key="si + sii"
           v-viewer
           style="width: 23px; height: 23px; margin: 0 5px 0 0"
           class="fl"
-          v-for="(si, sii) in sitem.good_img"
-          :key="si + sii"
           :src="si"
           alt=""
-        />
+        >
       </template>
     </show-data-table>
     <div v-else>商品编号有误</div>
@@ -446,7 +449,8 @@
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/show-goods-data-table";
+import asyncRequest from '@/apis/components/show-goods-data-table'
+import { mapGetters } from 'vuex'
 import {
   onlineColumns,
   reColumns,
@@ -463,38 +467,37 @@ import {
   options9,
   options10,
   options11,
-  options12,
-} from "./ShowDataTableColumns";
+  options12
+} from './ShowDataTableColumns'
 export default {
-  name: "showGoodsDataTable",
+  name: 'ShowGoodsDataTable',
 
   props: {
     newTime: {
       type: String,
-      default: "",
+      default: ''
     },
     type: {
       type: String,
-      default: "",
+      default: ''
     },
     skucode: {
       type: String,
-      default: "",
+      default: ''
     },
     iscgd: {
       type: Boolean,
-      default: false,
+      default: false
     },
     spucode: {
       type: String,
-      default: "",
+      default: ''
     },
     border: {
       type: Boolean,
-      default: false,
-    },
+      default: false
+    }
   },
-  computed: {},
   data() {
     return {
       loading: true,
@@ -514,86 +517,87 @@ export default {
       onlineColumns,
       reColumns,
       costColumns,
-      coveColumns,
-    };
+      coveColumns
+    }
+  },
+  computed: {
+    ...mapGetters(['isSupertube'])
   },
   watch: {
-    newTime: function (val) {
+    newTime: function(val) {
       if (val) {
-        this.initForm();
+        this.initForm()
       }
-    },
+    }
   },
   mounted() {
-    this.initForm();
+    this.initForm()
   },
 
   methods: {
     async initForm() {
       console.log(
         `${this.type}---${this.skucode}---${this.spucode}---${this.iscgd}`
-      );
-      this.columns = [];
-      this.loading = true;
+      )
+      this.columns = []
+      this.loading = true
       if (this.type) {
-        let res = {};
+        let res = {}
         if (
-          this.type + '' === "1" ||
-          this.type + '' === "2" ||
-          this.type + '' === "5" ||
-          this.type + '' === "6"
+          this.type + '' === '1' ||
+          this.type + '' === '2' ||
+          this.type + '' === '5' ||
+          this.type + '' === '6'
         ) {
           if (this.iscgd) {
             res = await asyncRequest.cost_detail({
-              spuCode: this.spucode,
-            });
+              spuCode: this.spucode
+            })
           } else {
             res = await asyncRequest.online_detail({
-              skuCode: this.skucode,
-            });
+              skuCode: this.skucode
+            })
           }
         } else {
           if (this.iscgd) {
             res = await asyncRequest.cove_detail({
-              spuCode: this.spucode,
-            });
+              spuCode: this.spucode
+            })
           } else {
             res = await asyncRequest.re_detail({
-              spuCode: this.spucode,
-            });
+              spuCode: this.spucode
+            })
           }
         }
-        const { code, message, data } = res;
-        this.loading = false;
+        const { code, message, data } = res
+        this.loading = false
         if (code === 0) {
-          this.sitem = JSON.parse(JSON.stringify(data));
-          const { cat_info } = this.sitem;
-          let cat = "";
+          this.sitem = JSON.parse(JSON.stringify(data))
+          const { cat_info } = this.sitem
+          let cat = ''
           if (cat_info && cat_info.length > 0) {
             cat_info.forEach((e, i) => {
-              cat += i === 0 ? e.name : "_" + e.name;
-            });
+              cat += i === 0 ? e.name : '_' + e.name
+            })
           }
-          this.sitem.cat = cat;
-          //线上商品字段转换
+          this.sitem.cat = cat
+          // 线上商品字段转换
           if (this.sitem && this.sitem.good_img) {
-            this.sitem.good_img = this.sitem.good_img.split(",");
+            this.sitem.good_img = this.sitem.good_img.split(',')
           }
           if (this.sitem && this.sitem.good_info_img) {
-            this.sitem.good_info_img = this.sitem.good_info_img.split(",");
+            this.sitem.good_info_img = this.sitem.good_info_img.split(',')
           }
         } else if (code >= 100 && code <= 104) {
-          await this.logout();
+          await this.logout()
         } else {
-          this.$message.warning(message);
+          this.$message.warning(message)
         }
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
-
-
 <style lang="scss" scoped>
 </style>

src/views/goodStore/goodsCost/components/addEdit.vue

@@ -285,7 +285,7 @@ export default {
               let htmlList = '<ul>'
               resList.forEach((v) => {
                 htmlList += `<li>
-                 <img src='${v.good_img}' style='width: 20px; height: 20px'
+                 <img src='${v.good_thumb_img}' style='width: 20px; height: 20px'
                     class='hover'
                        v-viewer/>
                   <span>${v.good_name}__</span>`

src/views/goodStore/goodsOnline/add.vue

@@ -306,7 +306,7 @@ export default {
               let htmlList = "<ul>";
               resList.forEach((v) => {
                 htmlList += `<li>
-                <img src='${v.good_img}' style='width: 20px; height: 20px'
+                <img src='${v.good_thumb_img}' style='width: 20px; height: 20px'
                   class='hover'
                   v-viewer/>
                   <span>${v.good_name}__</span>`;

src/views/netOrderEntry/netOrderEnter/addEdit.vue

@@ -76,8 +76,8 @@
               </el-col>
 
               <el-col :span="8">
-                <el-form-item label="支付渠道" prop="pay_id">
-                  <search-pay
+                <el-form-item label="平台" prop="pay_id">
+                  <!-- <search-pay
                     :value="ruleForm.pay_id"
                     :disabled="id !== '003'"
                     :size="'mini'"
@@ -86,7 +86,7 @@
                     :names="pay_name"
                     :placeholder="'支付渠道'"
                     @searchChange="pay_id_change"
-                  />
+                  /> -->
                 </el-form-item>
               </el-col>
               <el-col :span="12">

src/views/sellOut/returnOrder/index.vue

@@ -118,7 +118,35 @@
                 </el-select>
               </el-col>
 
-              <el-col :span="18" style="width: 500px; padding: 0 0 0 10px">
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px;margin-left:10px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </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>
+
+
+            <el-row>
+              <el-col :span="18" style="width: 500px; margin-top: 10px">
                 <el-input
                   clearable
                   :size="searchSize"
@@ -150,16 +178,6 @@
                   ></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>
@@ -268,6 +286,7 @@ export default {
         { value: "3", label: "待业务审核" },
         { value: "4", label: "完成退货" },
       ],
+      supplierNo:"",
       sitem: null,
       // 状态
       statusOptions: [
@@ -344,6 +363,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 = {
@@ -432,6 +456,7 @@ export default {
       
       const res = await asyncRequest.list({
         ...model,
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
         needRela: true
       });
 

src/views/sellOut/sellAfterApply/columns.js

@@ -144,7 +144,7 @@ const sellshowColumns = [
 
   {
     prop: 'is_receive',
-    label: '售后期望结果',
+    label: '期望结果',
     _slot_: 'is_receive',
     span: 6
   },

src/views/sellOut/sellAfterApply/detail.vue

@@ -41,7 +41,7 @@
                     sitem.is_receive + '' === "1"
                       ? "销售订单退货，采购订单也退货"
                       : sitem.is_receive + '' === "0"
-                      ? "采购订单不退货(货物已丢失，由业务公司承担)"
+                      ? "采购订单不退货(货物已丢失，且无法找回，由业务公司承担)"
                       : "--"
                   }}</el-tag>
                 </template>

src/views/sellOut/sellAfterApply/index.vue

@@ -86,52 +86,7 @@
               </el-col>
             </el-row>
 
-            <el-row style="padding-top: 10px">
-              <el-col :span="4" style="width: 150px;margin-right:10px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.order_type"
-                  filterable
-                  clearable
-                  placeholder="商品来源"
-                  style="width: 100%"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in xs_order_type_options"
-                    :key="'orderstatus' + item.id"
-                    :label="item.label"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-col>
-              <!-- 期望意愿 -->
-              <!-- <el-col :span="4" style="width: 130px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.except_code"
-                  clearable
-                  placeholder="期望意愿"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in expectOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                padding: 0 0 0 10px
-              </el-col> -->
+            <el-row style="margin-top:10px">
               <el-col :span="4" style="width: 620px">
                 <el-input
                   clearable
@@ -172,7 +127,47 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <el-col :span="4" style="width: 66px">
+            </el-row>
+
+            <el-row style="padding-top: 10px">
+              <el-col :span="4" style="width: 150px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_type"
+                  filterable
+                  clearable
+                  placeholder="商品来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_type_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px;margin-left:10px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+
+              <el-col :span="2" style="width: 15px">
                 <el-button
                   type="warning"
                   class="fr"
@@ -182,6 +177,29 @@
                   重置
                 </el-button>
               </el-col>
+              <!-- 期望意愿 -->
+              <!-- <el-col :span="4" style="width: 130px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.except_code"
+                  clearable
+                  placeholder="期望意愿"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in expectOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                padding: 0 0 0 10px
+              </el-col> -->
             </el-row>
           </div>
         </template>
@@ -296,6 +314,7 @@ export default {
   },
   data() {
     return {
+      supplierNo: "",
       xs_order_source_options, 
       xs_order_type_options,
       fileUrl: urlConfig.baseURL,
@@ -403,6 +422,11 @@ export default {
   },
 
   methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
     handleExport(){
       if(this.select_list.length === 0){
         this.$message.warning('请选择一条售后申请单');
@@ -545,6 +569,7 @@ export default {
       
       const res = await asyncRequest.list({
         ...model,
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
         needRela: true
       });
 

src/views/sellOut/sellOutOrder/components/addEditFormA.vue

@@ -12,13 +12,13 @@
   >
     <el-row>
       <el-col :span="24">
-        <el-form-item label-width="110px" label="售后期望结果" prop="is_receive">
+        <el-form-item  label="期望结果" prop="is_receive">
           <el-select
             style="width: 100%"
             :disabled="disabled"
             v-model="ruleForm.is_receive"
             @change="is_receive_change"
-            placeholder="售后期望结果"
+            placeholder="期望结果"
           >
             <el-option
               v-for="item in is_receive_options"
@@ -55,6 +55,45 @@
             @reschange="number_change($event, 'num')"
           />
         </el-form-item>
+
+        <el-form-item label="异常图片" prop="img">
+          <div class="el-form-item-error-img">
+            <ul>
+              <li
+                class="images_li"
+                :style="getMargin_li()"
+                v-for="(item, index) in ruleForm.img"
+                :key="item"
+              >
+                <img :src="item" alt="" style="width: 50px; height: 50px" />
+                <i
+                  class="el-icon-close"
+                  v-if="
+                    id === 'add' || (status + '' === '0' && powers.some((i) => i == '005'))
+                  "
+                  @click="imgClose(index)"
+                ></i>
+              </li>
+            </ul>
+            <div
+              class="btnupload"
+              :style="getMargin()"
+              v-if="ruleForm.img.length < 5 && isShow"
+              style="position: relative"
+              @click="show = true"
+            >
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+              <file-upload
+                class="Upload"
+                :accept="'.jpg,.png,.jpeg'"
+                :multiple="true"
+                :uploadcondition="beforeAvatarUpload"
+                @UploadErrorEvent="UploadErrorEvent"
+                @UploadSuccessEvent="UploadSuccessEvent"
+              />
+            </div>
+          </div>
+        </el-form-item>
       </el-col>
       <el-col :span="9">
         <el-form-item label="异常原因" prop="errorCode">
@@ -105,56 +144,23 @@
             show-word-limit
           />
         </el-form-item>
+
+        <div style="width:100%;display:flex;justify-content:flex-end">
+          <el-button
+             type="primary"
+             @click="submitForm"
+             v-if="id === 'add' || (status + '' === '0' && powers.some((i) => i == '005'))"
+           >保 存</el-button
+          >
+        </div>
       </el-col>
-      <el-col :span="20">
-        <el-form-item label="异常图片" prop="img">
-          <div class="el-form-item-error-img">
-            <ul>
-              <li
-                class="images_li"
-                :style="getMargin_li()"
-                v-for="(item, index) in ruleForm.img"
-                :key="item"
-              >
-                <img :src="item" alt="" style="width: 50px; height: 50px" />
-                <i
-                  class="el-icon-close"
-                  v-if="
-                    id === 'add' || (status + '' === '0' && powers.some((i) => i == '005'))
-                  "
-                  @click="imgClose(index)"
-                ></i>
-              </li>
-            </ul>
-            <div
-              class="btnupload"
-              :style="getMargin()"
-              v-if="ruleForm.img.length < 5 && isShow"
-              style="position: relative"
-              @click="show = true"
-            >
-              <i class="el-icon-plus avatar-uploader-icon"></i>
-              <file-upload
-                class="Upload"
-                :accept="'.jpg,.png,.jpeg'"
-                :multiple="true"
-                :uploadcondition="beforeAvatarUpload"
-                @UploadErrorEvent="UploadErrorEvent"
-                @UploadSuccessEvent="UploadSuccessEvent"
-              />
-            </div>
-          </div>
-        </el-form-item>
+      <!-- <el-col :span="20">
+
       </el-col>
 
       <el-col :span="4" style="text-align: right">
-        <el-button
-          type="primary"
-          @click="submitForm"
-          v-if="id === 'add' || (status + '' === '0' && powers.some((i) => i == '005'))"
-          >保 存</el-button
-        >
-      </el-col>
+
+      </el-col> -->
     </el-row>
   </el-form>
 </template>
@@ -191,7 +197,7 @@ export default {
         },
         {
           value: "0",
-          label: "销售订单退货，采购订单不退货(货物已丢失，由业务公司承担)",
+          label: "销售订单退货，采购订单不退货(货物已丢失，且无法找回，由业务公司承担)",
         },
       ],
       resign_name: "", //离职人

src/views/sellOut/sellOutOrder/detail.vue

@@ -245,7 +245,7 @@
                     resitem.is_receive + '' === "1"
                       ? "销售订单退货，采购订单也退货"
                       : resitem.is_receive + '' === "0"
-                      ? "销售订单退货，采购订单不退货(货物已丢失，由业务公司承担)"
+                      ? "销售订单退货，采购订单不退货(货物已丢失，且无法找回，由业务公司承担)"
                       : "--"
                   }}</el-tag>
                 </template>

src/views/sellOut/sellOutOrder/index.vue

@@ -50,18 +50,6 @@
                 />
               </el-col>
 
-              <!-- <el-col :span="4" style="width: 375px; display: flex; align-items: center">
-                <p style="margin-right: 10px">发货时间:</p>
-                <period-date-picker
-                  :type="1"
-                  :start="parmValue.start_sendtime"
-                  :end="parmValue.end_sendtime"
-                  :width="'134px'"
-                  :size="searchSize"
-                  @timeReturned="handleTime($event, true)"
-                />
-              </el-col> -->
-
               <el-col :span="4" style="width: 230px; padding: 0px 0 0 10px">
                 <search-customer
                   :value="customerCode"
@@ -144,7 +132,52 @@
                   />
                 </el-select>
               </el-col>
-              <el-col :span="4" style="width: 500px; padding: 0 0 0 10px">
+
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px;margin-left:10px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+            
+              <el-col :span="4" style="width: 66px" class="fr">
+                <el-button
+                  type="warning"
+                  class="fr"
+                  :size="searchSize"
+                  @click="restSearch"
+                >
+                  重置
+                </el-button>
+              </el-col>
+
+              <el-col
+                :span="4"
+                style="width: 66px; float: right"
+                v-if="powers.some((i) => i == '090') && !isSupertube"
+              >
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  @click="routeGoto('sendOutOrder', {})"
+                  :size="searchSize"
+                  class="fr"
+                >
+                  批量发货
+                </el-button>
+              </el-col>
+            </el-row>
+
+
+            <el-row>
+              <el-col :span="4" style="width: 500px; margin-top: 10px">
                 <el-input
                   clearable
                   :size="searchSize"
@@ -161,7 +194,7 @@
                   >
                     <el-option label="销售订单编号" value="orderCode" />
                     <el-option label="发货申请单编号" value="outCode" />
-                    <el-option label="供应商名称" value="supplier_name" />
+                    <!-- <el-option label="供应商名称" value="supplier_name" /> -->
                     <el-option label="商品编号" value="good_code" />
                     <el-option label="商品名称" value="good_name" />
                     <el-option label="申请人部门" value="company_name" />
@@ -179,32 +212,6 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <el-col :span="4" style="width: 66px" class="fr">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
-
-              <el-col
-                :span="4"
-                style="width: 66px; float: right"
-                v-if="powers.some((i) => i == '090') && !isSupertube"
-              >
-                <el-button
-                  type="primary"
-                  style="margin-left: 30px"
-                  @click="routeGoto('sendOutOrder', {})"
-                  :size="searchSize"
-                  class="fr"
-                >
-                  批量发货
-                </el-button>
-              </el-col>
             </el-row>
           </div>
         </template>
@@ -347,6 +354,7 @@ export default {
       showModel: false,
       isDetail: false,
       modelId: 0,
+      supplierNo: "",
       parmValue: {
         timerInner: "添加时间",
         order_type: "",
@@ -357,7 +365,6 @@ export default {
         end: "",
         start_sendtime: "",
         end_sendtime: "",
-        supplier_name: "",
         companyNo: "",
         good_code: "",
         good_name: "",
@@ -417,6 +424,11 @@ export default {
   },
 
   methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
     setTimerKey(key){
       this.timerKey = key
       this.searchList();
@@ -599,8 +611,6 @@ export default {
     },
     // 列表搜索
     async searchList() {
-      console.log(this.timerKey)
-
       const {start:startProp,end:endProp} = this.timerMaps[this.timerKey]
 
       if (
@@ -615,6 +625,7 @@ export default {
 
       const res = await asyncRequest.list({
         ...rest,
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
         [startProp]:start,
         [endProp]:end,
         needRela: true

src/views/sellOut/sellReturn/index.vue

@@ -125,7 +125,27 @@
                 />
               </el-col>
 
-              <el-col :span="6" style="width: 400px;">
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+
+                <div style="float: right;">
+                  <el-button type="primary" size="mini" @click="handleExport">退货单导出</el-button>
+               </div>
+            </el-row>
+
+            <el-row>
+              <el-col :span="6" style="width: 400px;margin-top: 10px;">
                   <el-input
                     clearable
                     placeholder="关键字"
@@ -158,10 +178,6 @@
                     ></el-button>
                   </el-input>
                 </el-col>
-
-                <div style="float: right;">
-                  <el-button type="primary" size="mini" @click="handleExport">退货单导出</el-button>
-               </div>
             </el-row>
           </div>
         </template>
@@ -330,6 +346,11 @@ export default {
   },
 
   methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
     customer_code_change(e) {
       if (e && e.code) {
         this.parmValue.customer_code = [e.code];
@@ -501,6 +522,7 @@ export default {
       const res = await asyncRequest.list({
         ...model,
         customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
         needRela: true
       });
 

src/views/standingBook/components/detail12/columns.js

@@ -25,7 +25,7 @@ const columns = [
 
   {
     prop: 'is_receive',
-    label: '售后期望结果',
+    label: '期望结果',
     _slot_: 'is_receive',
     span: 6
   },

src/views/standingBook/components/detail12/main.vue

@@ -35,7 +35,7 @@
             sitem.is_receive + '' === "1"
               ? "销售订单退货，采购订单也退货"
               : sitem.is_receive + '' === "0"
-              ? "销售订单退货，采购订单不退货(货物已丢失，由业务公司承担)"
+              ? "销售订单退货，采购订单不退货(货物已丢失，且无法找回，由业务公司承担)"
               : "--"
           }}</el-tag>
         </template>

src/views/stock/goodsRepertory/columns.js

@@ -160,16 +160,16 @@ const listCol = [
     label: '创建人',
     width: '70px'
   },
-  {
-    prop: 'companyNo',
-    label: '业务公司编号',
-    width: '155px'
-  },
-  {
-    prop: 'company',
-    label: '业务公司名称',
-    width: '150px'
-  },
+  // {
+  //   prop: 'companyNo',
+  //   label: '业务公司编号',
+  //   width: '155px'
+  // },
+  // {
+  //   prop: 'company',
+  //   label: '业务公司名称',
+  //   width: '150px'
+  // },
   // {
   //   prop: "addtime",
   //   label: "创建时间",

src/views/stock/survey/index.vue

@@ -293,7 +293,7 @@ export default {
           prop: "is_stock",
           label: "是否库存品",
           _slot_: "is_stock",
-          width: "70px",
+          width: "85px",
         },
         {
           prop: "action_type_cn",

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -131,7 +131,7 @@ const sellshowColumns = [
 
   {
     prop: 'is_receive',
-    label: '售后期望结果',
+    label: '期望结果',
     _slot_: 'is_receive',
     span: 6
   },

src/views/supplierSellOut/supplierSellOutOrder/detail.vue

@@ -244,7 +244,7 @@
                     resitem.is_receive + '' === "1"
                       ? "销售订单退货，采购订单也退货"
                       : resitem.is_receive + '' === "0"
-                      ? "销售订单退货，采购订单不退货(货物已丢失，由业务公司承担)"
+                      ? "销售订单退货，采购订单不退货(货物已丢失，且无法找回，由业务公司承担)"
                       : "--"
                   }}</el-tag>
                 </template>