Merge branch 'feature/ljm/20250710-优化'

src/views/consignmentManagement/consignmentInventory.vue

@@ -48,7 +48,7 @@
                 <el-dropdown-item command="1">修改安全库存</el-dropdown-item>
                 <el-dropdown-item command="2">修改交期</el-dropdown-item>
                 <el-dropdown-item command="3">上架有效期</el-dropdown-item>
-                <el-dropdown-item command="4">修改销售价格</el-dropdown-item>
+                <el-dropdown-item command="4">修改成本价格</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -94,8 +94,8 @@
           <el-table-column prop="stock" label="可用库存数量" width="100" align="center" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column prop="in_transit_stock" label="在途库存" width="100" align="center" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column prop="consignment_safe_stock" label="安全库存" width="100" align="center" :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column prop="cn_ladder_price" label="含税销售价（￥）" width="120" align="center" :show-overflow-tooltip="true">
-            <template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length>0">
+          <el-table-column prop="cn_ladder_price" label="含税成本价（￥）" width="120" align="center" :show-overflow-tooltip="true">
+            <template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length > 0">
               <el-popover effect="light" trigger="hover" placement="bottom">
                 <p class="row" v-for="item in scope.row.cn_ladder_price">
                   <span>{{ item.purchases }}+</span>
@@ -105,8 +105,8 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column prop="hk_ladder_price" label="美金销售价（$）" width="120" align="center" :show-overflow-tooltip="true">
-            <template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length>0">
+          <el-table-column prop="hk_ladder_price" label="美金成本价（$）" width="120" align="center" :show-overflow-tooltip="true">
+            <template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length > 0">
               <el-popover effect="light" trigger="hover" placement="bottom">
                 <p class="row" v-for="item in scope.row.hk_ladder_price">
                   <span>{{ item.purchases }}+</span>
@@ -162,8 +162,8 @@
           <el-table-column prop="source_val" label="来源" width="150" align="center" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column prop="goods_status" label="状态" width="100" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span v-if="scope.row.goods_status==1" class="f-green">上架</span>
-              <span v-else-if="scope.row.goods_status==3">下架</span>
+              <span v-if="scope.row.goods_status == 1" class="f-green">上架</span>
+              <span v-else-if="scope.row.goods_status == 3">下架</span>
             </template>
           </el-table-column>
           <el-table-column prop="cp_time" label="上架有效期" width="150" align="center" :show-overflow-tooltip="true"></el-table-column>
@@ -233,8 +233,8 @@
           <el-table-column prop="brand_name" label="品牌" min-width="20%" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column prop="goods_status" label="状态" width="80" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span v-if="scope.row.goods_status==1" class="f-green">上架</span>
-              <span v-else-if="scope.row.goods_status==3">下架</span>
+              <span v-if="scope.row.goods_status == 1" class="f-green">上架</span>
+              <span v-else-if="scope.row.goods_status == 3">下架</span>
             </template>
           </el-table-column>
           <el-table-column prop="cp_time_temp" label="上架有效期" width="160" :show-overflow-tooltip="true"></el-table-column>
@@ -250,8 +250,8 @@
         <el-button type="primary" @click="submitCp">确 定</el-button>
       </span>
     </el-dialog>
-    <!--修改销售价格-->
-    <el-dialog title="修改销售价格" :close-on-click-modal="false" :visible.sync="dialogVisible4" width="900px">
+    <!--修改成本价格-->
+    <el-dialog title="修改成本价格" :close-on-click-modal="false" :visible.sync="dialogVisible4" width="900px">
       <div class="kc-mask">
         <el-table :data="priceData" border max-height="600" style="margin-bottom: 10px">
           <el-table-column label="商品信息" width="100%">
@@ -269,12 +269,12 @@
                 <el-input v-model="skuOriginalStepPriceData[scope.$index].purchases" @input="handleInput(scope.$index)" placeholder="起订量" onkeyup="if(event.keyCode !=37 &amp;&amp; event.keyCode != 39){if (!/^[\d]+$/ig.test(this.value)){this.value='';}}"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="price_cn" label="含税销售价（RMB）" min-width="20%" :show-overflow-tooltip="true">
+            <el-table-column prop="price_cn" label="含税成本价（RMB）" min-width="20%" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <el-input v-model="skuOriginalStepPriceData[scope.$index].price_cn" placeholder="￥"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="price_us" label="美金销售价（USD）" min-width="20%" :show-overflow-tooltip="true">
+            <el-table-column prop="price_us" label="美金成本价（USD）" min-width="20%" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <el-input v-model="skuOriginalStepPriceData[scope.$index].price_us" placeholder="$"></el-input>
               </template>
@@ -301,7 +301,7 @@
         <el-table-column prop="create_time" label="时间" min-width="150" align="center"></el-table-column>
         <el-table-column prop="message" label="操作说明" min-width="150" align="center">
           <template slot-scope="scope">
-            <span>修改了价格，点击查看 <a style="color: #409EFF" href="javascript:;" @click="handleDetailClick(scope.row.message.pre_data,scope.row.message.current_data)">修改详情</a></span>
+            <span>修改了价格，点击查看 <a style="color: #409EFF" href="javascript:;" @click="handleDetailClick(scope.row.message.pre_data, scope.row.message.current_data)">修改详情</a></span>
           </template>
         </el-table-column>
         <el-table-column prop="operator" label="操作人" min-width="150" align="center"></el-table-column>
@@ -338,7 +338,7 @@
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip" slot="tip">
-          <el-link type="primary" href="/批量修改.csv" :underline="false">下载模板</el-link>
+          <el-link type="primary" :href="jsHref" :underline="false">下载模板</el-link>
         </div>
       </el-upload>
       <span slot="footer" class="dialog-footer">
@@ -366,23 +366,24 @@
         <el-button type="primary" @click="addConsignmentRecallFromStock">确 定</el-button>
       </span>
     </el-dialog>
-    <Menu/>
+    <Menu />
   </div>
 </template>
 <script>
-import Vue from 'vue';
-import Menu from "@/components/menu.vue";
-import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip, Upload} from 'element-ui'
-import Util from "@/tool";
-import {NODE_ENVS} from "@/ajax";
+  import Vue from 'vue';
+  import Menu from "@/components/menu.vue";
+  import { Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip, Upload } from 'element-ui'
+  import Util from "@/tool";
+  import { NODE_ENVS } from "@/ajax";
 
-Vue.prototype.$message = Message
-Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Tag).use(Link)
-Vue.use(DatePicker).use(Upload).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover)
-export default {
+  Vue.prototype.$message = Message
+  Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Tag).use(Link)
+  Vue.use(DatePicker).use(Upload).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover)
+  export default {
     name: "consignmentInventory",
     data() {
       return {
+        jsHref: location.hostname === 'xinlian.ichunt.com' ? 'https://cloud.ichunt.com/template/批量修改寄售商品模板.csv' : 'http://cloud.liexindev.net/template/批量修改寄售商品模板.csv',
         total: 0,
         limit: 10,
         page: 1,
@@ -1121,8 +1122,8 @@ export default {
     components: {
       Menu
     }
-};
+  };
 </script>
 <style scoped>
-@import "../../assets/css/store/list.min.css";
+  @import "../../assets/css/store/list.min.css";
 </style>
\ No newline at end of file