|
|
@@ -51,12 +51,13 @@
|
|
|
<!-- 品级 -->
|
|
|
<ws-form-item label="品级" span="1" class="readonly">
|
|
|
<ws-select
|
|
|
+ v-model="deptBudgetList.grade"
|
|
|
placeholder=""
|
|
|
class="typeselect"
|
|
|
@change="selectpackingMethod"
|
|
|
>
|
|
|
<ws-option
|
|
|
- v-for="item in goodnameList"
|
|
|
+ v-for="item in gradeList"
|
|
|
:key="item.constKey"
|
|
|
:label="item.constValue"
|
|
|
:value="item.constValue"
|
|
|
@@ -223,6 +224,13 @@
|
|
|
</div>
|
|
|
|
|
|
<div style="text-align: right; padding: 10px">
|
|
|
+ <el-button
|
|
|
+ class="bg-bottom-up"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ @click="returnWarehouse()"
|
|
|
+ >暂存</el-button
|
|
|
+ >
|
|
|
<el-button
|
|
|
class="bg-bottom-up"
|
|
|
type="primary"
|
|
|
@@ -236,7 +244,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { getList, export1, billoperatehis } from '@/model/contarct/index'
|
|
|
+import { pullDown, addstorageputList } from '@/model/warehouse/index'
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
@@ -310,9 +318,12 @@ export default {
|
|
|
//cg.viewBudget
|
|
|
//cg.viewSpareMoney
|
|
|
// this.getVesselData();
|
|
|
- this.getList()
|
|
|
+ // this.getList()
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
+ mounted(){
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
methods: {
|
|
|
//返回按钮
|
|
|
returnNoComplete() {
|
|
|
@@ -320,7 +331,39 @@ export default {
|
|
|
},
|
|
|
//提交按钮
|
|
|
submit() {
|
|
|
- this.$router.push({ path: 'warehouseManagementList' })
|
|
|
+ this.$refs.deptBudgetList.validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
|
|
|
+ this.deptBudgetList.inOutFlag = 1
|
|
|
+ addstorageputList(this.deptBudgetList)
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.$message.success('添加成功')
|
|
|
+ this.$router.push({ path: 'warehouseManagementList' })
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //暂存按钮
|
|
|
+ returnWarehouse() {
|
|
|
+ this.$refs.deptBudgetList.validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
|
|
|
+ this.deptBudgetList.statusFlag = 1
|
|
|
+ addstorageputList(this.deptBudgetList)
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.$message.success('暂存成功')
|
|
|
+ this.$router.push({ path: 'warehouseManagementNoComplete' })
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
dateFormat(fmt, date) {
|
|
|
let ret
|
|
|
@@ -358,33 +401,25 @@ export default {
|
|
|
this.getList()
|
|
|
},
|
|
|
getList() {
|
|
|
- getList({
|
|
|
- compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
- contractType: this.contractType,
|
|
|
- currentPage: this.currentPage,
|
|
|
- pageSize: this.pageSize,
|
|
|
- searchType: this.searchType,
|
|
|
- searchKeyWord: this.searchKeyWord,
|
|
|
- startDate: this.startDate,
|
|
|
- endDate: this.endDate,
|
|
|
- contrPage: this.contrPage,
|
|
|
- })
|
|
|
+ // 货名
|
|
|
+ pullDown({ constId: 'CON2' })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.goodnameList = response
|
|
|
+ })
|
|
|
+ // 品级
|
|
|
+ pullDown({ constId: 'CON3' })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.gradeList = response
|
|
|
+ })
|
|
|
+ // 类型
|
|
|
+ pullDown({ constId: 'CON5' })
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- for (var i = 0; i < response.records.length; i++) {
|
|
|
- if (response.records[i].addressUrl != null) {
|
|
|
- response.records[i].addressUrlArray = response.records[
|
|
|
- i
|
|
|
- ].addressUrl.split(',')
|
|
|
- } else {
|
|
|
- response.records[i].addressUrlArray = []
|
|
|
- }
|
|
|
- }
|
|
|
- this.deptCircularPage.currentPage = response.current
|
|
|
- this.deptCircularPage.pageSize = response.size
|
|
|
- this.deptBudgetTotal = response.total
|
|
|
- this.contractList = response
|
|
|
+ this.storageType = response
|
|
|
})
|
|
|
+
|
|
|
},
|
|
|
selecttaskType(e) {
|
|
|
for (var i = 0; i < this.taskTypeList.length; i++) {
|
18513069273