|
|
@@ -18,36 +18,47 @@
|
|
|
<div class="connert">
|
|
|
<el-table
|
|
|
class="wenzi"
|
|
|
- :data="contractList.records"
|
|
|
+ :data="warehouseList"
|
|
|
style="width: 100%; margin-top: 20px"
|
|
|
height="780"
|
|
|
>
|
|
|
- <el-table-column type="index" label="序号">
|
|
|
+ <el-table-column type="index" label="序号" >
|
|
|
<template scope="scope">
|
|
|
<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
|
|
|
<span v-else>{{ scope.$index + 1 }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="contractNo" label="仓库名称" >
|
|
|
+ <el-table-column prop="warehouseName" label="仓库名称" >
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="goodsName" label="仓库所在地" >
|
|
|
+ <el-table-column prop="warehouseLocation" label="仓库所在地" >
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="weight" label="应余库存（吨）"> </el-table-column>
|
|
|
- <el-table-column prop="unitContractPrice" label="负责人">
|
|
|
+ <el-table-column prop="nowStorage" label="应余库存（吨）"> </el-table-column>
|
|
|
+ <el-table-column prop="personCharge;" label="负责人">
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
<el-table-column prop="address" label="操作" width="200">
|
|
|
- <!-- <template slot-scope="scope"> -->
|
|
|
+ <template slot-scope="scope" >
|
|
|
<ws-button
|
|
|
type="primary"
|
|
|
- @click="handleAdd()"
|
|
|
+ @click="handleHide(scope.row)"
|
|
|
v-hasPermission="
|
|
|
+
|
|
|
`${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
|
|
|
"
|
|
|
+ v-if="scope.row.showFlag==0"
|
|
|
+ >显示</ws-button
|
|
|
+ >
|
|
|
+ <ws-button
|
|
|
+ type="primary"
|
|
|
+ @click="handleHide(scope.row)"
|
|
|
+ v-hasPermission="
|
|
|
+
|
|
|
+ `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
|
|
|
+ "
|
|
|
+ v-if="scope.row.showFlag==1"
|
|
|
>隐藏</ws-button
|
|
|
>
|
|
|
-
|
|
|
<ws-button
|
|
|
type="primary"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
@@ -56,7 +67,7 @@
|
|
|
"
|
|
|
>删除</ws-button
|
|
|
>
|
|
|
- <!-- </template> -->
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
@@ -66,7 +77,10 @@
|
|
|
<script>
|
|
|
|
|
|
import{
|
|
|
- deletewarehouse
|
|
|
+ getList,
|
|
|
+ delectlist,
|
|
|
+ deletewarehouse,
|
|
|
+ hide,
|
|
|
} from '@/model/warehouse/index'
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
@@ -88,7 +102,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
-
|
|
|
+ isshow:false,
|
|
|
//弹出框
|
|
|
dialogViewSpareMoney: false,
|
|
|
dialogApproveFormVisible: false,
|
|
|
@@ -108,7 +122,9 @@ export default {
|
|
|
contractType: 2,
|
|
|
startDate: null,
|
|
|
endDate: null,
|
|
|
-
|
|
|
+ warehouseList:[],
|
|
|
+ scope:[],
|
|
|
+ show:'隐藏',
|
|
|
// 提交类型
|
|
|
submitType: true,
|
|
|
size: 10,
|
|
|
@@ -121,264 +137,96 @@ export default {
|
|
|
contractList: [],
|
|
|
deptBudgetList: {},
|
|
|
historyList: [],
|
|
|
-
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|
|
|
},
|
|
|
},
|
|
|
accessoryTFs: false,
|
|
|
- taskTypeList: [
|
|
|
- { value: '未完成', type: 1 },
|
|
|
- { value: '已完成', type: 2 },
|
|
|
- { value: '全部合同', type: '' },
|
|
|
- ],
|
|
|
- pickerOptions: {
|
|
|
- shortcuts: [
|
|
|
- {
|
|
|
- text: '本周',
|
|
|
- onClick(picker) {
|
|
|
- const end = new Date()
|
|
|
- const start = new Date()
|
|
|
- var thisDay = start.getDay()
|
|
|
- var thisDate = start.getDate()
|
|
|
- if (thisDay != 0) {
|
|
|
- start.setDate(thisDate - thisDay)
|
|
|
- }
|
|
|
- picker.$emit('pick', [start, end])
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- text: '本月',
|
|
|
- onClick(picker) {
|
|
|
- const end = new Date()
|
|
|
- const start = new Date()
|
|
|
- start.setDate(1)
|
|
|
- picker.$emit('pick', [start, end])
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- text: '本季度',
|
|
|
- onClick(picker) {
|
|
|
- var oDate = new Date()
|
|
|
-
|
|
|
- var thisYear = oDate.getFullYear()
|
|
|
- var thisMonth = oDate.getMonth() + 1
|
|
|
-
|
|
|
- var n = Math.ceil(thisMonth / 3) // 季度
|
|
|
-
|
|
|
- var Month = n * 3 - 1
|
|
|
-
|
|
|
- var start = new Date(thisYear, Month - 2, 1)
|
|
|
- var end = new Date()
|
|
|
-
|
|
|
- picker.$emit('pick', [start, end])
|
|
|
- },
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- value1: '',
|
|
|
- value2: '',
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
|
- //cg.viewBudget
|
|
|
- //cg.viewSpareMoney
|
|
|
- // this.getVesselData();
|
|
|
- // this.deletewarehouse()
|
|
|
- // this.getList()
|
|
|
-
|
|
|
+ this.getList()
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
- handleDelete(){
|
|
|
- this.$router.push({ path : 'warehouseManagementDelete'})
|
|
|
- },
|
|
|
returnWarehouse(){
|
|
|
this.$router.push({ path: 'warehouseManagementList' })
|
|
|
},
|
|
|
- dateFormat(fmt, date) {
|
|
|
- let ret
|
|
|
- const opt = {
|
|
|
- 'Y+': date.getFullYear().toString(), // 年
|
|
|
- 'm+': (date.getMonth() + 1).toString(), // 月
|
|
|
- 'd+': date.getDate().toString(), // 日
|
|
|
- 'H+': date.getHours().toString(), // 时
|
|
|
- // "M+": date.getMinutes().toString(), // 分
|
|
|
- // "S+": date.getSeconds().toString() // 秒
|
|
|
- // 有其他格式化字符需求可以继续添加，必须转化成字符串
|
|
|
- }
|
|
|
- for (let k in opt) {
|
|
|
- ret = new RegExp('(' + k + ')').exec(fmt)
|
|
|
- if (ret) {
|
|
|
- fmt = fmt.replace(
|
|
|
- ret[1],
|
|
|
- ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
|
|
|
- )
|
|
|
- }
|
|
|
- }
|
|
|
- return fmt
|
|
|
- },
|
|
|
|
|
|
- getList() {
|
|
|
- getList({
|
|
|
+ //列表
|
|
|
+ getList() {
|
|
|
+ delectlist({
|
|
|
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()
|
|
|
.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.warehouseList = response
|
|
|
})
|
|
|
},
|
|
|
- // 上传附件
|
|
|
- uploadSuccess(data, files, url) {
|
|
|
- console.log(data, files, url)
|
|
|
-
|
|
|
- // this.deptBudgetList.
|
|
|
- // this.formData.append('files', files)
|
|
|
- // this.feedbackObj.uploadNameAttachment = data.appendixName
|
|
|
- // this.feedbackObj.pathUploadAttachment = data.appendixPath
|
|
|
- // // this.newAppendixs = files
|
|
|
- // this.onChangeFlag = true
|
|
|
+ handleExamine(row) {
|
|
|
+ this.$router.push({
|
|
|
+ name: 'salesContractExamine',
|
|
|
+ query: { id: row.id },
|
|
|
+ })
|
|
|
},
|
|
|
- editClick(row) {
|
|
|
- var status = ''
|
|
|
- if (row.status == '待执行' || row.status == '已完成') {
|
|
|
- status = '执行中'
|
|
|
- } else if (row.status == '执行中') {
|
|
|
- status = '已完成'
|
|
|
- }
|
|
|
- //cancelButtonClass: "btn-custom-cancel"
|
|
|
- this.$confirm(`是否将状态改为${status}`, {
|
|
|
- confirmButtonText: '确定',
|
|
|
+ // 关闭 dialog时 处理文件url 初始化upload组件
|
|
|
+ handleCloe() {
|
|
|
+ this.dialogViewSpareMoney = false
|
|
|
+ },
|
|
|
+ //隐藏
|
|
|
+ handleHide(row) {
|
|
|
+ console.log(row.showFlag)
|
|
|
+ if(row.showFlag==1){
|
|
|
+ this.$confirm(`隐藏后将对其他用户不可见，是否确认隐藏`, {
|
|
|
cancelButtonText: '取消',
|
|
|
+ confirmButtonText: '确定',
|
|
|
type: 'warning',
|
|
|
})
|
|
|
.then(() => {
|
|
|
- editstatus({ id: row.id })
|
|
|
+ hide({ id: row.id})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.$notify.success({
|
|
|
title: '成功',
|
|
|
- message: '状态修改成功',
|
|
|
+ message: '隐藏成功',
|
|
|
})
|
|
|
this.getList()
|
|
|
})
|
|
|
.catch((response) => {
|
|
|
- // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
+ // console.log(3333)
|
|
|
+ // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
})
|
|
|
})
|
|
|
.catch(() => {
|
|
|
return false
|
|
|
})
|
|
|
- },
|
|
|
- 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
|
|
|
+ }else{
|
|
|
+ hide({ id: row.id})
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.$notify.success({
|
|
|
+ title: '成功',
|
|
|
+ message: '显示成功',
|
|
|
+ })
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+ // console.log(3333)
|
|
|
+ // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
+ })
|
|
|
}
|
|
|
- this.appendixIdss = row.receiveAttachmentPath
|
|
|
- },
|
|
|
- handleExamine(row) {
|
|
|
- this.$router.push({
|
|
|
- name: 'salesContractExamine',
|
|
|
- query: { id: row.id },
|
|
|
- })
|
|
|
- },
|
|
|
-
|
|
|
- // 关闭 dialog时 处理文件url 初始化upload组件
|
|
|
- handleCloe() {
|
|
|
- this.dialogViewSpareMoney = false
|
|
|
- },
|
|
|
- history(row) {
|
|
|
- console.log(row)
|
|
|
- billoperatehis({ id: row.id })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.historyList = response
|
|
|
- })
|
|
|
- },
|
|
|
- find() {
|
|
|
- this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
|
|
|
- this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
|
|
|
- this.currentPage = 1
|
|
|
- this.getList()
|
|
|
- },
|
|
|
- async exportlist() {
|
|
|
- const { data } = await export1(
|
|
|
- {
|
|
|
- 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,
|
|
|
- },
|
|
|
- {},
|
|
|
- { responseType: 'blob' }
|
|
|
- ).toPromise()
|
|
|
- downloadFile({
|
|
|
- res: data,
|
|
|
- fileName: `${
|
|
|
- this.date.year + (this.date.month ? `-${this.date.month}` : '')
|
|
|
- }_采购合同`,
|
|
|
- type: 'xls',
|
|
|
- })
|
|
|
+ }
|
|
|
},
|
|
|
- // deletecontract(){},
|
|
|
- //删除
|
|
|
- approve() {},
|
|
|
- listQuery() {},
|
|
|
- total() {},
|
|
|
- clearfiltQuery() {},
|
|
|
- selectCrtDuty() {},
|
|
|
- },
|
|
|
- handleDelete(row) {
|
|
|
- var handleDelete = ' '
|
|
|
- if (row.handleDelete =='') {
|
|
|
- }
|
|
|
+ handleDelete(row) {
|
|
|
+ // console.log(row)
|
|
|
this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
|
|
|
cancelButtonText: '取消',
|
|
|
confirmButtonText: '确定',
|
|
|
type: 'warning',
|
|
|
})
|
|
|
.then(() => {
|
|
|
- deletewarehouse({ id: row.id })
|
|
|
+ deletewarehouse({ id: row.id})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.$notify.success({
|
|
|
@@ -388,14 +236,24 @@ export default {
|
|
|
this.getList()
|
|
|
})
|
|
|
.catch((response) => {
|
|
|
-
|
|
|
+ // console.log(3333)
|
|
|
+ // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
})
|
|
|
})
|
|
|
.catch(() => {
|
|
|
return false
|
|
|
})
|
|
|
},
|
|
|
-}
|
|
|
+ // deletecontract(){},
|
|
|
+ //删除
|
|
|
+ approve() {},
|
|
|
+ listQuery() {},
|
|
|
+ total() {},
|
|
|
+ clearfiltQuery() {},
|
|
|
+ selectCrtDuty() {},
|
|
|
+ delectlist(){},
|
|
|
+ deletewarehouse(){},
|
|
|
+ }
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
.connert {
|
|
|
@@ -406,5 +264,4 @@ export default {
|
|
|
width: 62px;
|
|
|
text-align: right;
|
|
|
}
|
|
|
-
|
|
|
</style>
|
gjy