Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 2 months ago
parent
commit
121de2ac8d
  1. 146
      yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue
  2. 66
      yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue
  3. 52
      yxt-as-ui/src/views/storage/adjustment/index.vue
  4. 46
      yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue
  5. 20
      yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue
  6. 79
      yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentEdit.vue
  7. 14
      yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentYiBan.vue

146
yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue

@ -13,15 +13,9 @@
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -35,25 +29,23 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
type="textarea" :rows="4" clearable /></el-form-item>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
</el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品类别列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="categoryAdd()">添加</el-button>
</div>
<el-table v-loading="listLoading" :data="formobj.smsPricestrategyBillDetailList" border style="width: 100%;">
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" wid align="center" width="200">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="deleteGoodsType(scope.row)">删除</el-button>
<el-button type="primary" size="mini" @click="deleteGoodsType(scope.$index)">删除</el-button>
<el-button type="primary" size="mini" @click="editPriceStrategy(scope.row)">编辑</el-button>
</template>
</el-table-column>
@ -69,14 +61,10 @@
{{ calculation2(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!-- 选择商品类别 -->
<choosecategory v-show="viewState == 2" ref="choosecategory" @backData="backData" @doback="resetState"/>
<!-- 编辑价格策略 -->
@ -94,6 +82,7 @@
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
export default {
components: {
choosecategory,
@ -101,75 +90,59 @@
},
data() {
return {
title: "【新增】",
title: '【新增】',
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {
"sid": "",
"createByName": window.sessionStorage.getItem('name'),
"billNo": "",
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
sid: '',
createByName: window.sessionStorage.getItem('name'),
billNo: '',
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createTime": getCurrentDate(),
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"useOrgSid": "",
"useOrgName": "",
"smsPricestrategyBillDetailList": []
},
remarks: '',
createBySid: window.sessionStorage.getItem('userSid'),
createTime: getCurrentDate(),
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
smsPricestrategyBillDetailList: []
}
}
},
created() {
},
methods: {
calculation(row) {
console.log("calculation》》》》", row)
var info = ''
if (row.strategyType == 1) {
info = '固定比例'
}
if (row.strategyType == 2) {
info = '价格区间'
}
return info
},
calculation2(row) {
var info = ''
if (row.strategyType == 2) {
for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + " " + row
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + ' ' + row
.smsPricestrategyBillGoodstypedetailList[i]
.markupRate + ";"
.markupRate + '%;'
}
} else {
info = row.gdMarkupRate
info = row.gdMarkupRate + '%'
}
return info
},
deleteGoodsType(row) {
const index = this.formobj.smsPricestrategyBillDetailList.findIndex((item) => item === row)
console.log("index》》》》", index)
deleteGoodsType(index) {
this.formobj.smsPricestrategyBillDetailList.splice(index, 1)
},
editPriceStrategy(row) {
@ -179,58 +152,35 @@
},
backData(value) {
this.viewState = 1
console.log('>>>>>>>>>backData', value)
for (var i = 0; i < value.length; i++) {
this.formobj.smsPricestrategyBillDetailList.push(
{
goodsTypeSid: value[i].sid,
goodsTypeCode: value[i].goodsTypeCode,
goodsTypeName: value[i].goodsTypeName,
strategyType: '',
strategyTypeValue: '',
gdMarkupRate: "",
gdMarkupRate: '',
strategyDetail: '',
smsPricestrategyBillGoodstypedetailList: []
}
)
}
},
backData2(value) {
this.viewState = 1
console.log('>>>>>>>>>backData2', value)
var info = ''
if (value.strategyType == 2) {
for (var i = 0; i < value.smsPricestrategyBillGoodstypedetailList.length; i++) {
info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + value
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + " " + value
info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + value
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + ' ' + value
.smsPricestrategyBillGoodstypedetailList[i]
.markupRate + ";"
.markupRate + '%;'
}
}
console.log('>>>>>>>>>backData2', info)
const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value
.goodsTypeSid)
console.log('>>>>>>>>>busTypeSelect', choose)
// choose[0].strategyDetail = value.strategyType == 0 ? value.gdMarkupRate : info
const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value.goodsTypeSid)
choose[0].smsPricestrategyBillGoodstypedetailList = value.smsPricestrategyBillGoodstypedetailList
choose[0].strategyType = value.strategyType
// choose[0].strategyTypeValue = value.strategyType == 0 ? '' : ''
if (value.strategyType == 1) {
choose[0].strategyTypeValue = '固定比例'
choose[0].strategyDetail = value.gdMarkupRate
@ -239,14 +189,10 @@
choose[0].strategyTypeValue = '价格区间'
choose[0].strategyDetail = info
}
console.log('>>>>>>>>>backData2', choose)
},
resetState() {
this.viewState = 1
},
categoryAdd() {
this.viewState = 2
const aa = []
@ -256,9 +202,6 @@
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@ -280,8 +223,6 @@
})
},
submintdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.smsPricestrategyBillDetailList.length == 0) {
this.$message({
showClose: true,
@ -290,8 +231,6 @@
})
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@ -315,17 +254,12 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.submitdisabled = false
this.formobj = {
}
this.formobj = {}
this.$emit('doback')
},
showAdd() {
this.title = '【新增】'
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
@ -333,16 +267,12 @@
})
},
showEdit(row) {
this.title = '【编辑】'
req.init(row.sid)
.then(resp => {
req.init(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
}).catch(e => {
this.formobj = {}
})
}

66
yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue

@ -1,6 +1,5 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>定调价策略申请</div>
@ -11,15 +10,9 @@
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -33,20 +26,16 @@
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div class="title">
<div>商品类别列表</div>
<!-- <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">添加</el-button> -->
</div>
<el-table v-loading="listLoading" :data="formobj.smsPricestrategyBillDetailList" border style="width: 100%;">
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="类别编码" prop="goodsTypeCode" align="center"/>
<el-table-column label="类别名称" prop="goodsTypeName" align="center"/>
@ -60,32 +49,25 @@
{{ calculation2(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/adjustment.js'
export default {
components: {},
data() {
return {
listLoading: false,
submitdisabled: false,
formobj: {
},
formobj: {}
}
},
created() {},
methods: {
calculation(row) {
var info = ''
if (row.strategyType == 1) {
@ -98,49 +80,35 @@
},
calculation2(row) {
var info = ''
if (row.smsPricestrategyBillGoodstypedetailList != null && row.smsPricestrategyBillGoodstypedetailList.length >
0) {
for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + " " + row
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + ' ' + row
.smsPricestrategyBillGoodstypedetailList[i]
.markupRate + ";"
.markupRate + '%;'
}
} else {
info = row.gdMarkupRate
info = row.gdMarkupRate + '%'
}
return info
},
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
handleReturn() {
this.submitdisabled = false
this.formobj = {
}
this.formobj = {}
this.$emit('doback')
},
showAdd() {
},
showInfo(row) {
req.init(row.sid)
.then(resp => {
req.init(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
}).catch(e => {
this.formobj = {}
})
}
@ -152,10 +120,6 @@
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}
@ -172,12 +136,4 @@
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

52
yxt-as-ui/src/views/storage/adjustment/index.vue

@ -10,7 +10,7 @@
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable />
<el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
@ -22,18 +22,14 @@
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -49,14 +45,12 @@
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
@selection-change="handleSelectionChange">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
<el-table-column label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)"
:disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
@ -66,7 +60,6 @@
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="nodeState" label="流程状态" align="center" /> -->
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="useOrgName" label="分公司" align="center" />
<el-table-column prop="deptName" label="申请部门" align="center" />
@ -78,8 +71,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--End查询列表部分-->
</div>
@ -90,23 +82,17 @@
<adjustmentInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
:src="this.centerDialogVisible === true ? url :''"></iframe>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/storage/adjustment.js'
import {
typeValues
} from '@/api/Common/dictcommons'
import {
getStorage
} from '@/utils/auth'
import { typeValues } from '@/api/Common/dictcommons'
import { getStorage } from '@/utils/auth'
import adjustmentAdd from './adjustmentAdd'
import adjustmentInfo from './adjustmentInfo'
@ -114,7 +100,6 @@
name: 'Procurement',
components: {
Pagination,
pageye,
ButtonBar,
adjustmentAdd,
adjustmentInfo
@ -162,7 +147,7 @@
size: 5,
total: 0,
params: {
createOrgName: '',
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
@ -170,6 +155,9 @@
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
}
@ -289,7 +277,7 @@
size: 5,
total: 0,
params: {
createOrgName: '',
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
@ -297,12 +285,15 @@
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
this.getList()
},
toAdd() {
this.viewState = 3
this.viewState = 2
this.$refs['divAdd'].showAdd()
},
toEdit(row) {
@ -347,7 +338,8 @@
}).catch(e => {
loading.close()
})
}).catch(() => {})
}).catch(() => {
})
},
//
resetState() {

46
yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue

@ -31,17 +31,21 @@
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据类型">
<el-input v-model="listQuery.params.billType" placeholder="" clearable />
<el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
<el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="业务类型">
<el-input v-model="listQuery.params.busTypeValue" placeholder="" clearable />
<el-select v-model="listQuery.params.busTypeValue" clearable placeholder="请选择" filterable>
<el-option v-for="item in busType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="发生时间">
<el-date-picker v-model="listQuery.params.createTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.createTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="操作人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
@ -59,8 +63,7 @@
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">商品出入库列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
<div class="">
@ -87,7 +90,7 @@
<el-table-column prop="currentCount" label="出入库后的库存" align="center" width="150" />
<el-table-column prop="cost" label="出入库单价" align="center" width="140" />
<el-table-column prop="amount" label="出入库金额" align="center" width="140" />
<el-table-column prop="tax" label="税率" align="center" width="100" />
<el-table-column prop="tax" label="税率(%)" align="center" width="100" />
<el-table-column prop="guidPrice" label="销售指导价" align="center" width="130" />
<el-table-column prop="createByName" label="操作人" align="center" width="100" />
<el-table-column prop="handlerName" label="经办人" align="center" width="100" />
@ -97,8 +100,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--End查询列表部分-->
</div>
@ -111,6 +113,7 @@
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/storage/inventory'
import { typeValues } from '@/api/Common/dictcommons'
export default {
name: 'InventoryRefer',
@ -143,6 +146,17 @@
tableKey: 0,
list: [],
sids: [], // SIDs
busType_list: [],
billType_list: [
{
dictKey: '0',
dictValue: '出库'
},
{
dictKey: '1',
dictValue: '入库'
}
],
FormLoading: false,
listLoading: false,
//
@ -175,12 +189,20 @@
},
created() {
//
this.init()
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
typeValues({ type: 'wms_busType' }).then((res) => {
if (res.success) {
this.busType_list = res.data
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -275,7 +297,7 @@
const fileName = '出入库记录' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()

20
yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue

@ -82,8 +82,10 @@
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item>
<el-form-item>
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -199,32 +201,26 @@
calculation(row) {
console.log("calculation》》》》", row)
var info = ''
if (row.strategyType == 1) {
info = '固定比例'
}
if (row.strategyType == 2) {
info = '价格区间'
}
return info
},
calculation2(row) {
var info = ''
if (row.strategyType == 2) {
for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + " " + row
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + ' ' + row
.smsPricestrategyBillGoodstypedetailList[i]
.markupRate + ";"
.markupRate + '%;'
}
} else {
info = row.gdMarkupRate
info = row.gdMarkupRate + '%'
}
return info
},
showInfo(sid) {

79
yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentEdit.vue

@ -23,15 +23,16 @@
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable
placeholder="" /></el-form-item>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
type="textarea" :rows="4" clearable /></el-form-item>
<el-form-item>
<el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder=""/>
</el-form-item>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
</el-form-item>
</el-col>
</el-row>
<div class="title">商品类别列表</div>
@ -39,7 +40,7 @@
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" wid align="center" width="200">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="deleteGoodsType(scope.row)">删除</el-button>
<el-button type="primary" size="mini" @click="deleteGoodsType(scope.$index)">删除</el-button>
<el-button type="primary" size="mini" @click="editPriceStrategy(scope.row)">编辑</el-button>
</template>
</el-table-column>
@ -55,27 +56,22 @@
{{ calculation2(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!-- 选择商品类别 -->
<choosecategory v-show="viewState == 2" ref="choosecategory" @backData="backData" @doback="resetState"/>
<!-- 编辑价格策略 -->
<editPriceStrategy v-show="viewState == 3" ref="editPriceStrategy" @backData2="backData2" @doback="resetState"/>
</div>
</template>
<script>
import req from '@/api/storage/adjustment.js'
import {
getCurrentDate
} from '@/utils/index.js'
import choosecategory from './relation/choosecategory'
import editPriceStrategy from './relation/editPriceStrategy'
export default {
components: {
choosecategory,
@ -105,7 +101,7 @@
"useOrgSid": "",
"useOrgName": "",
"smsPricestrategyBillDetailList": []
},
}
}
},
created() {
@ -128,41 +124,30 @@
methods: {
calculation(row) {
console.log("calculation》》》》", row)
var info = ''
if (row.strategyType == 1) {
info = '固定比例'
}
if (row.strategyType == 2) {
info = '价格区间'
}
return info
},
calculation2(row) {
var info = ''
if (row.strategyType == 2) {
for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + " " + row
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + ' ' + row
.smsPricestrategyBillGoodstypedetailList[i]
.markupRate + ";"
.markupRate + '%;'
}
} else {
info = row.gdMarkupRate
info = row.gdMarkupRate + '%'
}
return info
},
deleteGoodsType(row) {
const index = this.formobj.smsPricestrategyBillDetailList.findIndex((item) => item === row)
console.log("index》》》》", index)
deleteGoodsType(index) {
this.formobj.smsPricestrategyBillDetailList.splice(index, 1)
},
editPriceStrategy(row) {
@ -172,12 +157,8 @@
},
backData(value) {
this.viewState = 1
console.log('>>>>>>>>>backData', value)
for (var i = 0; i < value.length; i++) {
this.formobj.smsPricestrategyBillDetailList.push(
{
goodsTypeSid: value[i].sid,
goodsTypeCode: value[i].goodsTypeCode,
@ -187,43 +168,24 @@
gdMarkupRate: "",
strategyDetail: '',
smsPricestrategyBillGoodstypedetailList: []
}
)
}
},
backData2(value) {
this.viewState = 1
console.log('>>>>>>>>>backData2', value)
var info = ''
if (value.strategyType == 2) {
for (var i = 0; i < value.smsPricestrategyBillGoodstypedetailList.length; i++) {
info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + value
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + " " + value
info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + value
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + ' ' + value
.smsPricestrategyBillGoodstypedetailList[i]
.markupRate + ";"
.markupRate + '%;'
}
}
console.log('>>>>>>>>>backData2', info)
const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value
.goodsTypeSid)
console.log('>>>>>>>>>busTypeSelect', choose)
// choose[0].strategyDetail = value.strategyType == 0 ? value.gdMarkupRate : info
const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value.goodsTypeSid)
choose[0].smsPricestrategyBillGoodstypedetailList = value.smsPricestrategyBillGoodstypedetailList
choose[0].strategyType = value.strategyType
// choose[0].strategyTypeValue = value.strategyType == 0 ? '' : ''
if (value.strategyType == 1) {
choose[0].strategyTypeValue = '固定比例'
choose[0].strategyDetail = value.gdMarkupRate
@ -232,14 +194,10 @@
choose[0].strategyTypeValue = '价格区间'
choose[0].strategyDetail = info
}
console.log('>>>>>>>>>backData2', choose)
},
resetState() {
this.viewState = 1
},
categoryAdd() {
this.viewState = 2
const aa = []
@ -248,7 +206,6 @@
indexMethod(index) {
return index + 1
},
showInfo(sid) {
this.viewTitle = '【编辑】定调价策略申请'
this.$nextTick(() => {

14
yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentYiBan.vue

@ -124,32 +124,26 @@
calculation(row) {
console.log("calculation》》》》", row)
var info = ''
if (row.strategyType == 1) {
info = '固定比例'
}
if (row.strategyType == 2) {
info = '价格区间'
}
return info
},
calculation2(row) {
var info = ''
if (row.strategyType == 2) {
for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + " " + row
info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
.smsPricestrategyBillGoodstypedetailList[i].rangeEnd + ' ' + row
.smsPricestrategyBillGoodstypedetailList[i]
.markupRate + ";"
.markupRate + '%;'
}
} else {
info = row.gdMarkupRate
info = row.gdMarkupRate + '%'
}
return info
},
showInfo(sid) {

Loading…
Cancel
Save