feat: 商品价格列表增加导入功能，调整innerdetails表格列显示逻辑，优化退货单详情获取和开发环境代理配置

src/BIZComponents/innerdetails.vue

@@ -123,7 +123,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
-              v-if="clientEnvironmentId == 4"
+          
               label="级别"
               prop="level"
               align="center"
@@ -161,18 +161,26 @@
               :show-overflow-tooltip="true"
             >
             </el-table-column>
-            <!-- <el-table-column
-              label="最小包装单元"
-              align="center"
+                <el-table-column
+              label="客户代号"
+              prop="clientCode"
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
+            <el-table-column
+              label="供应商"
+              prop="supplierName"
+              :show-overflow-tooltip="true"
               width="120"
-              prop="minPackingQuantity"
             >
-              <template slot-scope="{ row, $index }">
-                {{ row.minPackingQuantity }} {{ row.measureUnit }} /{{
-                  row.packingUnit
-                }}
-              </template>
-            </el-table-column> -->
+            </el-table-column>
+            <el-table-column
+              label="供应商代号"
+              prop="supplierCode"
+              :show-overflow-tooltip="true"
+              width="120"
+            >
+            </el-table-column>
 
             <el-table-column label="数量" prop="packingQuantity" align="center">
               <template slot-scope="{ row, $index }">
@@ -332,12 +340,26 @@
               :show-overflow-tooltip="true"
             >
             </el-table-column>
-            <el-table-column
+                     <el-table-column
               label="客户代号"
               prop="clientCode"
               :show-overflow-tooltip="true"
             >
             </el-table-column>
+            <el-table-column
+              label="供应商"
+              prop="supplierName"
+              :show-overflow-tooltip="true"
+              width="120"
+            >
+            </el-table-column>
+            <el-table-column
+              label="供应商代号"
+              prop="supplierCode"
+              :show-overflow-tooltip="true"
+              width="120"
+            >
+            </el-table-column>
             <el-table-column
               label="刻码"
               prop="engrave"

src/views/commodityManagement/commodityPriceList/index.vue

@@ -57,6 +57,13 @@
               >
                 批量删除
               </el-button>
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-upload2"
+                @click="uploadFile"
+                >导入</el-button
+              >
             </template>
 
             <!-- 展开列 -->
@@ -202,6 +209,14 @@
         </template>
       </ele-split-layout>
     </el-card>
+    <importDialog
+      ref="importDialogRef"
+      @success="reload"
+      :fileUrl="'/eom/goods/downLoadTemplate'"
+      :isWeb="false"
+      fileName="商品导入模板"
+      apiUrl="/eom/goods/importBatch"
+    />
     <process-submit-dialog
       :isNotNeedProcess="false"
       :processSubmitDialogFlag.sync="processSubmitDialogFlag"
@@ -230,6 +245,7 @@
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
   import { reviewStatus } from '@/enum/dict';
   import { mapGetters } from 'vuex';
+  import importDialog from '@/components/upload/import-dialog.vue';
 
   export default {
     mixins: [tabMixins, dictMixins],
@@ -239,7 +255,7 @@
       AddDialog,
       EditPriceDialog,
       HistoricalpriceDialog,
-      processSubmitDialog
+      processSubmitDialog,importDialog
     },
     data() {
       return {
@@ -472,7 +488,9 @@
           this.$refs.processSubmitDialogRef.init(params);
         });
       },
-
+      uploadFile() {
+        this.$refs.importDialogRef.open();
+      },
       //上架下架操作
       editGoodsStatus(row) {
         const data = {

src/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue

@@ -536,7 +536,6 @@
       //获取退货单详情
       async getReturnSaleOrderrecordDetail(id) {
         const data = await getReturnSaleOrderrecordDetail(id);
-        this.detailList;
         this.form.detailList = data.productList.map((item) => {
           item['reason'] = item.returnReason;
           item['weight'] = item.receiveTotalWeight;

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://192.168.1.251:18086',//开发
+        target: 'http://192.168.1.25:18086',//开发
         // target: 'http://192.168.1.251:18186',//测试
         // target: 'http://192.168.1.23:18086',//罗
         // target: 'http://192.168.1.144:18086',//付