wtq/jxc4-backstage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'!'

Browse Source
This commit is contained in:
wtq
2026-03-10 14:49:25 +08:00
parent 7d3d78bce2
commit 1b59b491c5
6 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/components/storegoodscheck/store-goods-check.vue
View File

@@ -327,12 +327,19 @@
<el-button
type="success"
size="mini"
@click="dealCheck (2,row)"
@click="dealCheck (2,row,false)"
>批准</el-button>
<el-button
type="warning"
size="mini"
@click="dealCheck (2,row,true)"
style="margin-left: 10px;"
>批准并可售</el-button>
<el-button
type="danger"
size="mini"
@click="dealCheck(-1, row)"
style="margin-left: 10px;"
>拒绝</el-button>
</el-button-group>
</div>
@@ -645,7 +652,7 @@ export default {
this.selects = val;
},
// 处理
dealCheck(handleType, row) {
dealCheck(handleType, row,flag) {
const { storeID, nameID, unitPrice, originPrice } = row;
// -1拒绝 1批准 2预审核
if (handleType === -1) {
@@ -703,16 +710,20 @@ export default {
const { storeID, nameID } = row;
// 修改可售参数 row.type 关注操作
let skuName = await getStoreSku(storeID, nameID, row.type === 2 ? false : true);
let skus = skuName.skus.map(sku => { return {
skuID:sku.id,
isSale:1
} })
let arr = [];
arr.push({
NameID:nameID,
skus
});
let skuName = null
let arr = []
if(flag){
skuName = await getStoreSku(storeID, nameID, row.type === 2 ? false : true);
let skus = skuName.skus.map(sku => { return {
skuID:sku.id,
isSale:1
} })
arr.push({
NameID:nameID,
skus
});
}
// 批准的参数
let payload = JSON.stringify([
@@ -751,29 +762,32 @@ export default {
payload
});
updateStoreSkus(storeID, arr,(res) => {
if (res.code === "0") {
if(flag){
updateStoreSkus(storeID, arr,(res) => {
if (res.code === "0") {
this.$message({
message: "[改价] 成功",
type: "success",
center: true
});
this.getStoreCheckList();
}else{
this.$message({
message: "[改价] 成功",
message: "[改价] 成功,可售失败",
type: "success",
center: true
});
this.getStoreCheckList();
}else{
this.$message({
message: "[改价] 成功,可售失败",
type: "success",
center: true
});
this.getStoreCheckList();
}
})
// this.$message({
// message: "[改价] 成功",
// type: "success",
// center: true
// });
// this.getStoreCheckList();
}
})
}else{
this.$message({
message: "[改价] 成功",
type: "success",
center: true
});
this.getStoreCheckList();
}
});
hideLoad();
} else {
@@ -784,24 +798,34 @@ export default {
isContinueWhenError: false,
payload
});
updateStoreSkus(storeID, arr,(res) => {
if (res.code === "0") {
if(flag){
updateStoreSkus(storeID, arr,(res) => {
if (res.code === "0") {
this.$message({
message: "[改价] 成功",
type: "success",
center: true
});
this.getStoreCheckList();
}else{
this.$message({
message: "[改价] 成功",
message: "[改价] 成功,可售失败",
type: "success",
center: true
});
this.getStoreCheckList();
}else{
this.$message({
message: "[改价] 成功,可售失败",
type: "success",
center: true
});
this.getStoreCheckList();
}
})
}
})
}else{
this.$message({
message: "[改价] 成功",
type: "success",
center: true
});
this.getStoreCheckList();
}
// this.$message({
// message: "[改价] 成功",
// type: "success",

3
src/components/storemanager/create-store.vue
View File

@@ -856,6 +856,7 @@ export default {
changePriceType: 0, // 价格审核 0不审核 1审核 2禁止修改
packageSetting: 0, // 包装费
packageSwitch: 1, // 允许物料购买 0允许 1禁用
deliverySelf:0, // 是否允许自提 默认不允许
freightMarkup: 0, // 三方运单的配送费
cityCode: null, // 510100,
districtCode: null, // 510105,
@@ -1388,6 +1389,7 @@ export default {
this.storeInfo = JSON.parse(res.data.data)
if(this.storeInfo.openTime2) this.isShowOpenTime = true
this.storeInfo.packageSwitch = 1
this.storeInfo.deliverySelf = 0
this.storeInfo.printerVendorID = printerVendorID
this.storeInfo.printerSN = printerSN
this.storeInfo.printerKey = printerKey
@@ -1556,6 +1558,7 @@ export default {
this.storeInfo.packageSetting = Number(this.storeInfo.packageSetting) * 100
this.storeInfo.freightMarkup = Number(this.storeInfo.freightMarkup) * 100
this.storeInfo.packageSwitch = 1
this.storeInfo.deliverySelf = 0
let json = JSON.parse(JSON.stringify(this.storeInfo))
if (json.hasOwnProperty('idExpire') && !json.idExpire) json.idExpire = ''
if (json.hasOwnProperty('licenceExpire') && !json.licenceExpire)

19
src/components/storemanager/dialog/editorVendorStore.vue
View File

@@ -568,6 +568,17 @@
style="width: 100px; height: 100px; margin-left: 50px"
/>
</div>
<!-- 是否自提 -->
<el-form-item label="是否允许自提" v-if="vendorQuery.isBind && addStore.vendorID === 9">
<el-switch
v-model="addStore.deliverySelf"
:active-value="1"
:inactive-value="0"
active-text="允许"
inactive-text="不允许"
>
</el-switch>
</el-form-item>
<!-- 满减 -->
<el-form-item label="减运费策略:" v-if="addStore.vendorID === 9">
满
@@ -1104,6 +1115,7 @@ export default {
// deliveryType: 0, // 门店快递类型
isSync: 0, // 0不同步 1同步,
isService: 0, // 切换服务商
deliverySelf:0, // 是否允许自提 0-不支持,1-支持
isSupplyGoods: 0, //
pricePercentagePack: '', // 调价包
freightDeductionPack: '', // 免运包
@@ -1703,6 +1715,7 @@ export default {
this.addStore.deliveryFeeDeductionFee =
data[index].deliveryFeeDeductionFee / 100
this.addStore.isOrder = data[index].isOrder
this.addStore.deliverySelf = data[index].deliverySelf
} else if (this.vendorQuery.vendorID === 5) {
this.addStore.status = data[index].status
this.addStore.syncRule = data[index].syncRule
@@ -1851,7 +1864,8 @@ export default {
deliveryFeeDeductionFee: Math.round(
this.addStore.deliveryFeeDeductionFee * 100
),
isOrder: this.addStore.isOrder
isOrder: this.addStore.isOrder,
deliverySelf:this.addStore.deliverySelf
})
)
} else if (this.vendorQuery.vendorID === 4) {
@@ -1992,7 +2006,8 @@ export default {
this.addStore.deliveryFeeDeductionFee * 100
),
isOrder: this.addStore.isOrder,
createDeliveryType: this.addStore.createDeliveryType
createDeliveryType: this.addStore.createDeliveryType,
deliverySelf:this.addStore.deliverySelf
})
)
} else {

2
src/components/storemanager/modify-store.vue
View File

@@ -655,7 +655,7 @@
</template>
<script>
import { GetVendorStore, updateStore, deleteStoreVendorMap, addStoreVendorMap, getStoreVendorMaps, updateStoreVendorMap, taoUpdateStatusOrTimeOrPoints, createStore } from '@/apis/store.js'
import { GetVendorStore, updateStore, deleteStoreVendorMap, addStoreVendorMap, updateStoreVendorMap, taoUpdateStatusOrTimeOrPoints, createStore } from '@/apis/store.js'
import { getPlaces, getCoordinateDistrictCode, getPlaces2, updateStoreTemplate } from '@/apis/cms.js'
import $ajax from 'axios'
import api from '@/utils/api'

2
src/pages/indexpage/cmp/chatDeatil/chatDetail.vue
View File

@@ -374,7 +374,7 @@ export default {
}
},
created(){
// return
return
this.getChatUsersList()
// this.platInfo()
},

5
src/pages/indexpage/indexPage3.vue
View File

@@ -505,15 +505,14 @@
</div>
</el-tab-pane>
<el-tab-pane name="storechat">
<!-- <el-tab-pane name="storechat">
<span slot="label">
<el-badge value="new" style=" margin-top: 10px; margin-right: 40px;" :hidden="allUser ? false: true">
<!-- <span></span> -->
<div style="margin-top:-10px">门店聊天</div>
</el-badge>
</span>
<ChatDetail :isGetDetail="isGetDetail" v-model="allUser"></ChatDetail>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
<el-dialog title="收益统计" :visible.sync="staticStatusShow" width="80%">