java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

fix_bug_pro20231227
caoyizhong 2 years ago
parent
fad84fdf14 e0d0a52402
commit
2cf43a56cb
5 changed files with 3982 additions and 3735 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/config/website.js
  2. 2
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  3. 2840
      src/views/distribution/reservation/reservation.vue
  4. 4797
      src/views/distribution/reservation/reservationAddFrom.vue
  5. 76
      src/views/distribution/reservation/reservationSubmitFrom.vue

2
src/config/website.js
Unescape View File

@ -11,7 +11,7 @@ export default {
tenantMode: true, // 是否开启租户模式
tenantId: '000000', // 管理组租户编号
captchaMode: false, // 是否开启验证码模式
switchMode: true, // 是否开启部门切换模式
switchMode: false, // 是否开启部门切换模式
lockPage: '/lock',
tokenTime: 3000,
tokenHeader: 'Blade-Auth',

2
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
Unescape View File

@ -373,7 +373,7 @@ export default {
head: false,
},
{
prop: 'warehouseId',
prop: 'warehouseCode',
label: '仓库编号',
type: 2,
values: '',

2840
src/views/distribution/reservation/reservation.vue
View File

File diff suppressed because it is too large Load Diff

4797
src/views/distribution/reservation/reservationAddFrom.vue
View File

File diff suppressed because it is too large Load Diff

76
src/views/distribution/reservation/reservationSubmitFrom.vue
Unescape View File

@ -117,15 +117,15 @@
<el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
</el-form-item>
</el-col>
<!-- <el-col :span="10">-->
<!-- <el-form-item label="服务类型:" prop="serveType" label-width="120px">-->
<!-- <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
<!-- <el-checkbox :label="item.dictKey"-->
<!-- :value="item.dictKey">{{item.dictValue}}&emsp;-->
<!-- </el-checkbox>-->
<!-- </el-checkbox-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="10">
<el-form-item label="服务类型:" prop="serveType" label-width="120px">
<el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
<el-checkbox :label="item.dictKey"
:value="item.dictKey">{{item.dictValue}}&emsp;
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="10">
@ -318,19 +318,19 @@
<!-- :before-close="handleClose"-->
<el-form :inline="true" :model="query">
<el-form-item label="商场名称:">
<el-input v-model="query.marketName" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>
</el-form-item>
<el-form-item label="物料名称:">
<el-input v-model="query.descriptionGoods" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>
</el-form-item>
<el-form-item label="商场编码:">
<el-input v-model="query.marketCode" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>
</el-form-item>
<el-form-item label="订单自编号:">
<el-input v-model="query.orderCode" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
</el-form-item>
<el-form-item label="品牌:">
<el-input v-model="query.brand" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item>
@ -500,6 +500,7 @@
import option from '@/option/distribution/distributionStockArticle';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs';
export default {
data() {
@ -1322,6 +1323,53 @@
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
// inputscStockArtic(index, row) {
// console.log(index, row);
// this.query[row.prop] = index;
// this.onLoadOrder(this.page);
// },
// timescStockArtic(index, row) {
// console.log(index, row);
// if (!!index){
// index = dayjs(index).format('YYYY-MM-DD');
// }
// this.query[row.prop] = index
// if (!index){
// delete this.query[row.prop]
// }
// this.onLoadOrder(this.page);
// },
// btnscStockArtic(index, row) {
// console.log(index, row);
// this.onLoad(this.page);
// },
// selectscStockArtic(index, row) {
// console.log(index, row);
// if(row.prop ==='reservationStatusName'){
// this.query['reservationStatus'] = index;
// }else if(row.prop ==='freezeStatusName'){
// this.query['freezeStatus'] = index;
// }else if(row.prop ==='completeSetName'){
// this.query['completeSet'] = index;
// }
// // else if(row.prop ==='groundingStatusName'){
// // this.query['groundingStatus'] = index;
// // }else if(row.prop ==='stockupStatusName'){
// // this.query['stockupStatus'] = index;
// // }else if(row.prop ==='orderStatusName'){
// // this.query['orderStatus'] = index;
// // }else if(row.prop ==='typeServerName'){
// // this.query['typeService'] = index;
// // }
// // else if(row.prop ==='orderReceiveStatusName'){
// // this.query['orderReceiveStatus'] = index;
// // }
//
// else{
// this.query[row.prop] = index;
// }
// this.onLoadOrder(this.page);
// },
onLoadOrder(page, params = {}) {
this.query.typeService = 2;
this.query.genre = '1';

Write Preview
Loading…
Cancel
Save