yyw提交

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

@@ -40,6 +40,7 @@
             </div>
           </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>

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-form-item label="成本变动">
-                    <el-input v-model="form.ratio" placeholder="成本变动" style="width: 400px;"></el-input>
+                    <el-input v-model="form.ratio" placeholder="成本变动"></el-input>
-                </el-form-item>
+                </el-form-item> -->
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="dialogFormVisible = false">取 消</el-button>