Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate

public/dist/css/223.6ee025b2.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-999e92dc]{margin-top:20px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-3f2df4e1]{margin-top:20px}

public/dist/css/283.09e88187.css

@@ -1 +0,0 @@
-.el-upload--picture-card[data-v-c8dedff2]{width:50px;height:50px}.avatar-uploader .el-upload[data-v-c8dedff2]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-c8dedff2]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-c8dedff2]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-c8dedff2]{width:148px;height:148px;display:block}.shop-sku-img[data-v-c8dedff2]{display:flex}.shop-sku-img .shop[data-v-c8dedff2]{margin-right:20px;margin-bottom:20px}.shop-sku-img .shop .shop-name[data-v-c8dedff2]{text-align:center}

public/dist/css/37.26763660.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-26e9f73c]{margin-top:20px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-7d9228d6]{margin-top:20px}

public/dist/css/47.cb6d192b.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-0bad7cd5]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap;.row[data-v-0bad7cd5]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}}.opaBox[data-v-0bad7cd5]{margin-bottom:15px}.btn[data-v-0bad7cd5]{float:right}[data-v-0bad7cd5] .cell{display:flex;align-items:center}.commodityimg[data-v-0bad7cd5]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-0bad7cd5]{width:100%;height:100%}[data-v-0bad7cd5] .btn11{padding:0;width:14px;height:14px}[data-v-0bad7cd5] .btn11 img{width:100%;height:100%}.page[data-v-0bad7cd5]{margin-top:20px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-3b8fe34f]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap;.row[data-v-3b8fe34f]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}}.opaBox[data-v-3b8fe34f]{margin-bottom:15px}.btn[data-v-3b8fe34f]{float:right}[data-v-3b8fe34f] .cell{display:flex;align-items:center}.commodityimg[data-v-3b8fe34f]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-3b8fe34f]{width:100%;height:100%}[data-v-3b8fe34f] .btn11{padding:0;width:14px;height:14px}[data-v-3b8fe34f] .btn11 img{width:100%;height:100%}.page[data-v-3b8fe34f]{margin-top:20px}

public/dist/css/613.a4b31826.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}a[data-v-bec75ba2]{text-decoration:none;color:#fff}.opaBox[data-v-bec75ba2]{margin-bottom:15px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}a[data-v-9f160e6c]{text-decoration:none;color:#fff}.opaBox[data-v-9f160e6c]{margin-bottom:15px}

public/dist/css/649.0b0f7aca.css

@@ -0,0 +1 @@
+.skuBox[data-v-36631d1e]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-36631d1e]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.el-upload--picture-card[data-v-36631d1e]{width:50px;height:50px}.el-form-item[data-v-36631d1e]{margin-left:40px}.avatar-uploader .el-upload[data-v-36631d1e]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-36631d1e]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-36631d1e]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-36631d1e]{width:148px;height:148px;display:block}

public/dist/css/658.3dfc0977.css

@@ -1 +0,0 @@
-.skuBox[data-v-49fca211]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-49fca211]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.el-upload--picture-card[data-v-49fca211]{width:50px;height:50px}.el-form-item[data-v-49fca211]{margin-left:40px}.avatar-uploader .el-upload[data-v-49fca211]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-49fca211]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-49fca211]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-49fca211]{width:148px;height:148px;display:block}

public/dist/css/806.6c9d1a3b.css

@@ -0,0 +1 @@
+.el-upload--picture-card[data-v-ff99f10e]{width:50px;height:50px}.avatar-uploader .el-upload[data-v-ff99f10e]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-ff99f10e]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-ff99f10e]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-ff99f10e]{width:148px;height:148px;display:block}.shop-sku-img[data-v-ff99f10e]{display:flex}.shop-sku-img .shop[data-v-ff99f10e]{margin-right:20px;margin-bottom:20px}.shop-sku-img .shop .shop-name[data-v-ff99f10e]{text-align:center}

public/dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.2fce065b.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.6cc6b1ea.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

resources/frontend/src/router/list.js

@@ -32,7 +32,7 @@ const list = [
             },
             {
                 path: "GOODS_TYPE",
-                name: "商品种类",
+                name: "品类管理",
                 component: () => import("../views/goodsType/goodsType.vue"),
             },
             {
@@ -142,7 +142,7 @@ const list = [
             },
             {
                 path: "PURCHASE_RECORD",
-                name: "采购记录",
+                name: "入库采购",
                 component: () => import("../views/supplyChain/procureLog.vue")
             },
             {

resources/frontend/src/views/goods/addgoods/addgoods.vue

@@ -72,8 +72,8 @@
             <el-input v-model="item.sale_stock" placeholder="可售库存">
             </el-input>
           </el-form-item>
-          <el-form-item label="规格编码：">
-            <el-input v-model="item.sku_code" placeholder="不输入自动生成"></el-input>
+          <el-form-item label="最终编码：">
+            <el-input v-model="item.external_sku_id" placeholder="不输入自动生成"></el-input>
           </el-form-item>
           <el-button type="danger" @click="handleDelete(i)" icon="el-icon-delete">删除</el-button>
         </div>
@@ -222,7 +222,7 @@
       handleAdd() {
         let sku = {
           title: "",
-          sku_code: "",
+          external_sku_id: "",
           status: "0",
           num: "0",
           cost: "0",

resources/frontend/src/views/goods/combination.vue

@@ -41,6 +41,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="num" label="组合数量"></el-table-column>
+        <el-table-column label="实际库存">
+          <template slot-scope="scope">
+            <span v-if="!scope.row.children">{{ scope.row.stock }}</span>
+          </template>
+        </el-table-column>
         <!-- <el-table-column prop="reference_price" label="售价"></el-table-column> -->
         <!-- <el-table-column sortable label="今日7点以后订单">
             <template slot-scope="scope">
@@ -60,8 +65,8 @@
             </template>
         </el-table-column> -->
         <!-- <el-table-column sortable prop="total_orders_num" label="累计订单"></el-table-column> -->
-        <el-table-column sortable prop="stock" label="库存"></el-table-column>
-        <el-table-column prop="status" label="状态"> </el-table-column>
+        <el-table-column sortable prop="sale_stock" label="可售库存"></el-table-column>
+        <el-table-column prop="status" label="状态"></el-table-column>
         <el-table-column label="操作" width="130">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row.id)">编辑</el-button>

resources/frontend/src/views/goods/editgoods.vue

@@ -49,8 +49,8 @@
                     <el-form-item label="规格名称：">
                         <el-input placeholder="规格名称" v-model="goodsData.title"></el-input>
                     </el-form-item>
-                    <el-form-item label="规格编码：">
-                        <el-input v-model="goodsData.sku_code" placeholder="规格编码" disabled></el-input>
+                    <el-form-item label="最终编码：">
+                        <el-input v-model="goodsData.external_sku_id" placeholder="规格编码" disabled></el-input>
                     </el-form-item>
                     <el-form-item label="商品状态：">
                         <el-select v-model="goodsData.status">
@@ -124,7 +124,7 @@ export default {
                 num: "",
                 cost: "",
                 sale_stock: '',
-                sku_code: "",
+                external_sku_id: "",
                 thumb_url: [],
                 goods: {
                     img_url: "",
@@ -238,7 +238,7 @@ export default {
             };
             let sku = {
                 title: this.goodsData.title,
-                sku_code: this.goodsData.sku_code,
+                external_sku_id: this.goodsData.external_sku_id,
                 status: this.goodsData.status,
                 num: this.goodsData.num,
                 cost: this.goodsData.cost,

resources/frontend/src/views/logs/logs.vue

@@ -39,7 +39,7 @@
                 </el-form-item>
                 <el-form-item label="时间:">
                     <el-date-picker v-model="value1" type="datetimerange" range-separator="-" start-placeholder="起"
-                        end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss">
+                        end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss" style="width: 340px;">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
@@ -187,6 +187,10 @@ export default {
                     value: "pdd.ktt.increment.order.query",
                     label: "快团团增量下载订单",
                 },
+                {
+                    value: "sale_stock",
+                    label: "在售库存",
+                }
             ], //类别
             mouduleOptions: [
                 {
@@ -281,6 +285,18 @@ export default {
                     value: "goods",
                     label: "商品",
                 },
+                {
+                    value: "sku_stock_purchase",
+                    label: "入库采购",
+                },
+                {
+                    value: "sku_stock_loss",
+                    label: "报损记录",
+                },
+                {
+                    value: "sku_stock_inventory",
+                    label: "盘点记录",
+                },
             ],//目标类型
             userOptions: [], //查询用户列表
             form: {

resources/frontend/src/views/plat/goodsList.vue

@@ -22,12 +22,12 @@
                 <el-form-item>
                     <el-button type="primary" @click="handleChoose()">筛选</el-button>
                     <el-button plain @click="handleReChoose()">重置筛选</el-button>
-                    <el-upload ref="myUpload" action="/api/today/price" :multiple="false" name="today_price"
+                    <!-- <el-upload ref="myUpload" action="/api/today/price" :multiple="false" name="today_price"
                         :show-file-list="false" :on-success="uploadSuccess" :before-upload="beforeUpload"
                         :on-error="uploadError" style="display:inline-block;margin: 0 10px 0 10px;">
                         <el-button type="primary" plain>今日商品价格导入</el-button>
                     </el-upload>
-                        <el-button type="danger" plain @click="handleExport()">价格差异导出</el-button>
+                    <el-button type="danger" plain @click="handleExport()">价格差异导出</el-button> -->
                 </el-form-item>
             </el-form>
         </el-card>

resources/frontend/src/views/plat/orderList.vue

@@ -51,13 +51,13 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="打印状态:">
+                <!-- <el-form-item label="打印状态:">
                     <el-select v-model="form.print_status" placeholder="打印状态">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="0" label="未打印"></el-option>
                         <el-option value="1" label="已打印"></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
 
                 <el-form-item label="订单商品:">
                     <el-select v-model="form.external_sku_ids" multiple filterable remote reserve-keyword placeholder="订单商品"
@@ -83,7 +83,7 @@
                     <el-button type="primary" @click="handleChoose">筛选</el-button>
                     <el-button plain @click="handleReChoose">重置筛选</el-button>
                 </el-form-item>
-                <el-button type="primary" @click="print">打印</el-button>
+                <!-- <el-button type="primary" @click="print">打印</el-button> -->
                 <el-button v-if="form.goods_sku_num === 2" type="primary">配货单导出</el-button>
             </el-form>
         </el-card>

resources/frontend/src/views/store/store.vue

@@ -12,12 +12,12 @@
                 <el-table-column prop="plat_id" label="所属平台"></el-table-column>
                 <el-table-column prop="owner_id" label="商家店铺id"></el-table-column>
                 <el-table-column prop="refresh_token_expires_at" label="授权过期时间点"></el-table-column>
-                <el-table-column label="成本变动">
+                <!-- <el-table-column label="成本变动">
                     <template slot-scope="scope">
                         <el-input v-model="scope.row.ratio" placeholder="成本变动" @change="handleCellChange(scope.row)">
                         </el-input>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="操作" width="280">
                     <template slot-scope="scope">
                         <el-button type="danger" v-if="scope.row.status === '未授权'" size="mini"><a :href="scope.row.authUrl"
@@ -52,20 +52,20 @@
         </el-card>
 
         <!-- 新增店铺 -->
-        <el-dialog title="新增店铺" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="20%">
+        <el-dialog title="新增店铺" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="500px">
             <el-form ref="form" :rules="rules" :model="form" lable-width="80px">
                 <el-form-item label="店铺名称">
-                    <el-input v-model="form.name" placeholder="输入店铺名称" style="width: 400px;"></el-input>
+                    <el-input v-model="form.name" placeholder="输入店铺名称" style="width: 300px;"></el-input>
                 </el-form-item>
                 <el-form-item label="店铺平台">
-                    <el-select v-model="form.plat_id" placeholder="输入店铺平台" style="width: 400px;">
+                    <el-select v-model="form.plat_id" placeholder="输入店铺平台">
                         <el-option v-for="(item, index) in storeId" :key="index" :label="item" :value="index">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="成本变动">
-                    <el-input v-model="form.ratio" placeholder="成本变动" style="width: 400px;"></el-input>
-                </el-form-item>
+                <!-- <el-form-item label="成本变动">
+                    <el-input v-model="form.ratio" placeholder="成本变动"></el-input>
+                </el-form-item> -->
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="dialogFormVisible = false">取 消</el-button>