pjkbof4hw
/
git20250625_dy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pjkbof4hw:master
Branches Tags
pjkbof4hw:master
pjkbof4hw:x_develop
pjkbof4hw:g_develop
pjkbof4hw:l_develop
pjkbof4hw:develop
..
compare: pjkbof4hw:l_develop
Branches Tags
pjkbof4hw:master
pjkbof4hw:x_develop
pjkbof4hw:g_develop
pjkbof4hw:l_develop
pjkbof4hw:develop

No commits in common. 'master' and 'l_develop' have entirely different histories.
master ... l_develop

21 changed files with 2 additions and 24 deletions
Show Stats

1
renren-fast-vue/src/views/modules/product/attr-add-or-update.vue
Unescape View File

@ -26,7 +26,6 @@
inactive-color="#ff4949"
:inactive-value="0"
:active-value="1"
></el-switch>
</el-form-item>
<el-form-item label="可选值" prop="valueSelect">

1
renren-fast-vue/src/views/modules/product/attr-group-relation.vue
Unescape View File

@ -30,7 +30,6 @@
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>

1
renren-fast-vue/src/views/modules/product/attrgroup-add-or-update.vue
Unescape View File

@ -40,7 +40,6 @@
<script>
import CategoryCascader from '../common/category-cascader'
export default {
data() {
return {

1
renren-fast-vue/src/views/modules/product/attrgroup.vue
Unescape View File

@ -37,7 +37,6 @@
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small"
@click="addOrUpdateHandle(scope.row.attrGroupId)">修改</el-button>
<el-button type="text" size="small"
@click="deleteHandle(scope.row.attrGroupId)">删除</el-button>

1
renren-fast-vue/src/views/modules/product/attrupdate.vue
Unescape View File

@ -40,7 +40,6 @@
v-model="dataResp.baseAttrs[gidx][aidx].showDesc"
:true-label="1"
:false-label="0"
>快速展示</el-checkbox>
</el-form-item>
</el-form>

1
renren-fast-vue/src/views/modules/product/brand-add-or-update.vue
Unescape View File

@ -44,7 +44,6 @@
</el-dialog>
</template>
<script>
import SingleUpload from "@/components/upload/singleUpload";
export default {

1
renren-fast-vue/src/views/modules/product/brand.vue
Unescape View File

@ -132,7 +132,6 @@ export default {
CategoryCascader
},
activated() {
this.getDataList();
},
methods: {

1
renren-fast-vue/src/views/modules/product/category.vue
Unescape View File

@ -43,7 +43,6 @@
>
<el-form :model="category">
<el-form-item label="分类名称">
<el-input v-model="category.name" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="图标">

1
renren-fast-vue/src/views/modules/product/manager.vue
Unescape View File

@ -43,7 +43,6 @@
品牌ID：{{scope.row.brandId}}
<br />
</template>
</el-table-column>
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="skuId" header-align="center" align="center" label="skuId"></el-table-column>

2
renren-fast-vue/src/views/modules/product/saleattr.vue
Unescape View File

@ -34,6 +34,4 @@ export default {
destroyed() {}, //生命周期 - 销毁完成
activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
};
</script>

1
renren-fast-vue/src/views/modules/product/spuadd.vue
Unescape View File

@ -43,7 +43,6 @@
placeholder="成长值"
v-model="spu.bounds.growBounds"
:min="0"
controls-position="right"
>
<template slot="prepend">成长值</template>

1
renren-fast-vue/src/views/modules/product/spuinfo.vue
Unescape View File

@ -46,7 +46,6 @@
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
</div>
</template>
<script>

1
renren-fast-vue/src/views/modules/ware/purchase-add-or-update.vue
Unescape View File

@ -13,7 +13,6 @@
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
</span>
</el-dialog>
</template>
<script>

5
renren-fast-vue/src/views/modules/ware/purchase.vue
Unescape View File

@ -93,7 +93,6 @@
</span>
</el-dialog>
</div>
</template>
<script>
@ -125,7 +124,7 @@ export default {
this.getDataList();
},
created() {
},
methods: {
opendrawer(row){
@ -161,7 +160,7 @@ export default {
type: "success",
duration: 1500
});
this.userId = "";
this.getDataList();
} else {

1
renren-fast-vue/src/views/modules/ware/purchasedetail-add-or-update.vue
Unescape View File

@ -10,7 +10,6 @@
ref="dataForm"
@keyup.enter.native="dataFormSubmit()"
label-width="120px"
>
<el-form-item label="采购商品id" prop="skuId">
<el-input v-model="dataForm.skuId" placeholder="采购商品id"></el-input>

1
renren-fast-vue/src/views/modules/ware/purchaseitem.vue
Unescape View File

@ -14,7 +14,6 @@
<el-option label="已完成" :value="3"></el-option>
<el-option label="采购失败" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键字">
<el-input style="width:120px;" v-model="dataForm.key" placeholder="参数名" clearable></el-input>

1
renren-fast-vue/src/views/modules/ware/task.vue
Unescape View File

@ -16,7 +16,6 @@
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"

1
renren-fast-vue/src/views/modules/ware/wareinfo-add-or-update.vue
Unescape View File

@ -23,7 +23,6 @@
<script>
export default {
data () {
return {
visible: false,

1
renren-fast-vue/src/views/modules/ware/wareinfo.vue
Unescape View File

@ -21,7 +21,6 @@
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
prop="id"

1
renren-fast-vue/src/views/modules/ware/wareordertaskdetail-add-or-update.vue
Unescape View File

@ -25,7 +25,6 @@
</template>
<script>
export default {
data () {
return {

1
renren-fast-vue/src/views/modules/ware/waresku-add-or-update.vue
Unescape View File

@ -26,7 +26,6 @@
<el-input v-model="dataForm.skuName" placeholder="sku_name"></el-input>
</el-form-item>
<el-form-item label="锁定库存" prop="stockLocked">
<el-input v-model="dataForm.stockLocked" placeholder="锁定库存"></el-input>
</el-form-item>
</el-form>

Write Preview
Loading…
Cancel
Save