|
|
@@ -24,22 +24,22 @@
|
|
|
<span v-else>{{ scope.$index + 1 }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="contractNo" label="货名"> </el-table-column>
|
|
|
- <el-table-column prop="goodsName" label="毛重（吨）"></el-table-column>
|
|
|
- <el-table-column prop="weight" label="皮重（吨）"> </el-table-column>
|
|
|
- <el-table-column prop="unitContractPrice" label="净重（吨）"></el-table-column>
|
|
|
- <el-table-column prop="packingMethod" label="品级"> </el-table-column>
|
|
|
- <el-table-column prop="buyer" label="出入库日期"> </el-table-column>
|
|
|
+ <el-table-column prop="goodsName" label="货名"> </el-table-column>
|
|
|
+ <el-table-column prop="tare" label="毛重（吨）"></el-table-column>
|
|
|
+ <el-table-column prop="grossWeight" label="皮重（吨）"> </el-table-column>
|
|
|
+ <el-table-column prop="netWeight" label="净重（吨）"></el-table-column>
|
|
|
+ <el-table-column prop="grade" label="品级"> </el-table-column>
|
|
|
+ <el-table-column prop="inOutDate" label="出入库日期"> </el-table-column>
|
|
|
<el-table-column prop="buyer" label="类型"> </el-table-column>
|
|
|
- <el-table-column prop="buyer" label="合同编号"> </el-table-column>
|
|
|
- <el-table-column prop="buyer" label="车牌号"> </el-table-column>
|
|
|
- <el-table-column prop="buyer" label="经办人"> </el-table-column>
|
|
|
- <el-table-column prop="buyer" label="内勤"> </el-table-column>
|
|
|
- <el-table-column prop="buyer" label="保存时间"> </el-table-column>
|
|
|
+ <el-table-column prop="contractNo" label="合同编号"> </el-table-column>
|
|
|
+ <el-table-column prop="carNo" label="车牌号"> </el-table-column>
|
|
|
+ <el-table-column prop="agent" label="经办人"> </el-table-column>
|
|
|
+ <el-table-column prop=" backOffice" label="内勤"> </el-table-column>
|
|
|
+ <el-table-column prop="updateDate" label="保存时间"> </el-table-column>
|
|
|
<el-table-column prop="address" label="操作" width="200">
|
|
|
<ws-button
|
|
|
type="primary"
|
|
|
- @click="edits()"
|
|
|
+ @click="edits(scope.row)"
|
|
|
v-hasPermission="
|
|
|
`${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
|
|
|
"
|
|
|
@@ -47,7 +47,7 @@
|
|
|
>
|
|
|
<ws-button
|
|
|
type="primary"
|
|
|
- @click="deletes()"
|
|
|
+ @click="handleDelete(scope.row)"
|
|
|
v-hasPermission="
|
|
|
`${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
|
|
|
"
|
|
|
@@ -71,11 +71,13 @@
|
|
|
</template>
|
|
|
<script>
|
|
|
import {
|
|
|
+ complete,
|
|
|
getList,
|
|
|
export1,
|
|
|
editstatus,
|
|
|
billoperatehis,
|
|
|
-} from '@/model/contarct/index'
|
|
|
+ deletewarehouse,
|
|
|
+} from '@/model/warehouse/index'
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
import WsUpload from '@/components/WsUpload'
|
|
|
@@ -115,6 +117,11 @@ export default {
|
|
|
contractType: 2,
|
|
|
startDate: null,
|
|
|
endDate: null,
|
|
|
+ deletewarehouse:[],
|
|
|
+ pageSize:10,
|
|
|
+ currentPage:'1',
|
|
|
+
|
|
|
+
|
|
|
// 提交类型
|
|
|
submitType: true,
|
|
|
selectpackingMethod: {},
|
|
|
@@ -129,7 +136,8 @@ export default {
|
|
|
contractList: [],
|
|
|
deptBudgetList: {},
|
|
|
historyList: [],
|
|
|
-
|
|
|
+ deletewarehouse:[],
|
|
|
+ // inOutDate:null,
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|
|
|
@@ -142,17 +150,27 @@ export default {
|
|
|
//cg.viewBudget
|
|
|
//cg.viewSpareMoney
|
|
|
// this.getVesselData();
|
|
|
- this.getList()
|
|
|
+
|
|
|
+ //接参
|
|
|
+ this.getList(this.$route.query.baseId,this.$route.query.positionId)
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
+
|
|
|
+ //编辑
|
|
|
+ edits(row){
|
|
|
+ this.$router.push({
|
|
|
+ name:'warehouseManagementPerfectput',
|
|
|
+ query: { baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage },
|
|
|
+ })
|
|
|
+ },
|
|
|
//返回按钮
|
|
|
returnWarehouse() {
|
|
|
this.$router.push({ path: 'warehouseManagementList' })
|
|
|
},
|
|
|
//删除
|
|
|
deletes(){
|
|
|
-
|
|
|
+ this.$router.push({path:'warehouseManagementDelete'})
|
|
|
},
|
|
|
//编辑
|
|
|
edits(){
|
|
|
@@ -193,63 +211,60 @@ export default {
|
|
|
console.log(`当前页: ${val}`)
|
|
|
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,
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
+ //收
|
|
|
+ getList(id,id1){
|
|
|
+ complete({
|
|
|
+ // compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
+ baseId:id,
|
|
|
+ positionId:id1,
|
|
|
+ pageSize:this.pageSize,
|
|
|
+ currentPage:this.currentPage,
|
|
|
+ // inOutDate:this.inOutDate
|
|
|
+ })
|
|
|
+ .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.getList = response
|
|
|
})
|
|
|
},
|
|
|
- selecttaskType(e) {
|
|
|
- for (var i = 0; i < this.taskTypeList.length; i++) {
|
|
|
- if (this.taskTypeList[i].value == e) {
|
|
|
- this.searchType = this.taskTypeList[i].type
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- fujian(row) {
|
|
|
- if (
|
|
|
- row.receiveAttachmentPath === null ||
|
|
|
- row.receiveAttachmentPath === ''
|
|
|
- ) {
|
|
|
- EventBus.$emit(
|
|
|
- 'warning',
|
|
|
- this.$t('system.noticeCircular.NoInformation')
|
|
|
- )
|
|
|
- } else {
|
|
|
- this.accessoryTFs = true
|
|
|
- }
|
|
|
- this.appendixIdss = row.receiveAttachmentPath
|
|
|
- },
|
|
|
+ // complete(){
|
|
|
+ // complete({
|
|
|
+
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+
|
|
|
handleExamine(row) {
|
|
|
this.$router.push({
|
|
|
name: 'salesContractExamine',
|
|
|
query: { id: row.id },
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
+ //删除
|
|
|
+ handleDelete(row) {
|
|
|
+ // console.log(row)
|
|
|
+ this.$confirm(`删除后不可恢复，确认删除？`, {
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ type: 'warning',
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ deletewarehouse({ baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.$notify.success({
|
|
|
+ title: '成功',
|
|
|
+ message: '删除成功',
|
|
|
+ })
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+
|
|
|
+ })
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ return false
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
// 关闭 dialog时 处理文件url 初始化upload组件
|
|
|
handleCloe() {
|
|
|
this.dialogViewSpareMoney = false
|
|
|
@@ -299,8 +314,8 @@ export default {
|
|
|
total() {},
|
|
|
clearfiltQuery() {},
|
|
|
selectCrtDuty() {},
|
|
|
- },
|
|
|
-}
|
|
|
+ }
|
|
|
+
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
.center {
|
gjy