查询
@@ -47,21 +70,29 @@
@selection-change="selectionLineChangeHandle">
+
+
+ 办理
+ 查看
+
+
-
-
+
+
-
+
+
+
+
+
+
+
-
@@ -76,6 +107,90 @@
+
+
+
+
+
+
+ 送货方式
+
+
+
+
+
+
+
+
+
+
+
+ 快递单号
+
+
+
+ 快递公司
+
+
+
+ 备注
+
+
+
+
+
+
+ 取货人
+
+
+
+ 取货日期
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+ 送货人
+
+
+
+ 送达日期
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+ 确 定
+
+
+
+
@@ -85,15 +200,18 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './allocationAdd.vue'
+ import divInfo from './allocationInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
- divAdd
+ divAdd,
+ divInfo
},
data() {
return {
+ dialogVisible: false,
btndisabled: false,
viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false,
@@ -107,12 +225,20 @@
btnKey: 'toAdd',
btnLabel: '新增'
},
+
+ {
+ type: 'danger',
+ size: 'small',
+ icon: 'el-icon-delete',
+ btnKey: 'doDel',
+ btnLabel: '删除'
+ },
{
type: 'primary',
size: 'small',
icon: 'edit',
- btnKey: 'toEdit',
- btnLabel: '编辑'
+ btnKey: 'toSupplement',
+ btnLabel: '补充物流信息'
},
{
type: 'info',
@@ -127,12 +253,47 @@
size: 10,
total: 0,
params: {
- "createDateStart": "",
- "createDateEnd": "",
+ "outOrgName": "",
+ "deptName": "",
+ "createByName": "",
+ "billNo": "",
+ "createStartTime": "",
+ "createEndTime": "",
+ "finishStartTime": "",
+ "finishEndTime": "",
+ "outPlatName": "",
+ "inOrgName": "",
+ "inPlatName": "",
+ "confirmName": ""
}
},
sids: [],
- selectionList:[]
+ selectionList: [],
+ deliveryKeyList: [{
+ name: '快递',
+ sid: 1
+ },
+ {
+ name: '对方自取',
+ sid: 2
+ },
+ {
+ name: '我方送货',
+ sid: 3
+ }
+ ],
+ formobj: {
+ "sids": [],
+ "remarks": "",
+ "deliveryKey": "",
+ "deliveryName": "",
+ "expressBillNo": "",
+ "expressCompany": "",
+ "pickUpName": "",
+ "pickUpDate": "",
+ "deliveryPerson": "",
+ "deliveryDate": ""
+ }
}
},
mounted() {
@@ -156,9 +317,12 @@
case 'toAdd':
this.toAdd()
break
- case 'toEdit':
- this.toEdit()
- break
+ case 'doDel':
+ this.doDel()
+ break
+ case 'toSupplement':
+ this.toSupplement()
+ break
case 'doClose':
this.doClose()
break
@@ -207,8 +371,18 @@
size: 10,
total: 0,
params: {
- "createDateStart": "",
- "createDateEnd": "",
+ "outOrgName": "",
+ "deptName": "",
+ "createByName": "",
+ "billNo": "",
+ "createStartTime": "",
+ "createEndTime": "",
+ "finishStartTime": "",
+ "finishEndTime": "",
+ "outPlatName": "",
+ "inOrgName": "",
+ "inPlatName": "",
+ "confirmName": ""
}
}
this.loadList()
@@ -217,123 +391,166 @@
this.viewState = 2
this.$refs['divadd'].showAdd()
},
+ doDel() {
+
+ if (this.sids.length > 0) {
+ const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ const loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ req.deleteBySids(this.sids).then((resp) => {
+ loading.close()
+ if (resp.success) {
+ this.$message({
+ type: 'success',
+ message: resp.msg,
+ showClose: true
+ })
+ this.loadList()
+ } else {
+ loading.close()
+ // 根据resp.code进行异常情况处理
+ }
+ }).catch(e => {
+ loading.close()
+ })
+ }).catch(() => {})
+ } else {
+ this.$message({
+ type: "warning",
+ showClose: true,
+ message: '请至少选择一条记录进行删除操作'
+ })
+ }
+ },
+
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
-
+ const aa = []
+ val.forEach(element => {
+ aa.push(element.sid)
+ })
+ this.sids = aa
+ },
+ toRelevancy(row) {
+ this.viewState = 3
+ this.$refs['divadd'].showEdit(row.sid)
+ },
+ toDetails(row) {
+ this.viewState = 4
+ this.$refs['divinfo'].showAdd(row.sid)
},
- toEdit(){
- if(this.selectionList.length!=1){
- this.$message({
- type: 'warning',
- message: "请选择一条数据。",
- showClose: true
- })
- return
- }
- if(this.selectionList[0].state=='2'){
+ toSupplement() {
+ if (this.sids.length > 0) {
+ this.dialogVisible = true
+
+ console.log("toSupplement", this.sids);
+
+ } else {
this.$message({
- type: 'warning',
- message: "此记录已完成,不可重复编辑。",
- showClose: true
+ type: "warning",
+ showClose: true,
+ message: '请至少选择一条记录进行操作'
})
- return
}
+ },
+ saveData() {
+ this.formobj.sids = this.sids
- this.viewState = 3
- this.$refs['divadd'].showEdit(this.selectionList[0])
- },
+ req.saveLogisticsInfo(this.formobj).then((resp) => {
+ loading.close()
+ if (resp.success) {
+ this.dialogVisible = false
+ this.$message({
+ type: 'success',
+ message: resp.msg,
+ showClose: true
+ })
+ this.loadList()
+ } else {
+ // 根据resp.code进行异常情况处理
+ }
+ }).catch(e => {})
- toBuild() {
- const loading = this.$loading({
- lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- })
+ },
+ handleClose() {
+ this.dialogVisible = false
+ },
+ selectDeliveryKey(val) {
+ console.log("selectDeliveryKey", val);
+ const choose = this.deliveryKeyList.filter((item) => item.sid == val)
+ console.log('>>>>>>>>>selectDeliveryKey', choose)
+ this.formobj.deliveryName = choose[0].warehouseName
+ this.formobj.deliveryKey = choose[0].sid
- req.exportExcel(this.queryParams.params).then((resp) => {
- loading.close()
- const blob = new Blob([resp], {
- type: 'application/vnd.ms-excel'
- })
- const fileName = '出入库明细_' + this.queryParams.params.createDateStart + '.xls'
- const elink = document.createElement('a')
- elink.download = fileName
- elink.style.display = 'nonde'
- elink.href = URL.createObjectURL(blob)
- document.body.appendChild(elink)
- elink.click()
- URL.revokeObjectURL(elink.href)
- document.body.removeChild(elink)
- }).catch(() => {
- loading.close()
- })
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
- toRelevancy(row) {
- this.viewState = 3
- this.$refs['divadd'].showEdit(row)
- },
- toRelevancyInfo(row) {
- const tip = '请确认是否删除所选品牌?'
- this.$confirm(tip, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- const loading = this.$loading({
- lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- })
- req.deleteGoods(row.sid).then((resp) => {
- loading.close()
- if (resp.success) {
- this.$message({
- type: 'success',
- message: resp.msg,
- showClose: true
- })
- this.loadList()
- } else {
- // 根据resp.code进行异常情况处理
- }
- }).catch(e => {
- loading.close()
- })
- }).catch(() => {})
- },
resetState() {
this.viewState = 1
},
- enableChange(sid, state) {
- console.log('sid', sid)
- console.log('state', state)
- req.updateIsEnable(sid, state).then((resp) => {
- if (resp.success) {
- this.$message({
- type: 'success',
- message: '状态已更新',
- showClose: true
- })
- } else { // 根据resp.code进行异常情况处理
- }
- }).catch(e => {
- console.log(e)
- })
- }
+
}
}
diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
index f34ceca349..4edb69c9e8 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
@@ -47,13 +47,13 @@