查询
@@ -54,14 +27,19 @@
-
-
+
-
+
+
+
+
+
+
+
-
+
@@ -72,7 +50,7 @@
-
+
处理
上报
@@ -288,6 +266,18 @@
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
+ },
+ formatDate(cellValue) {
+ let treatmentTime=cellValue.treatmentTime
+ if (treatmentTime == null || treatmentTime == "") return "";
+ var date = new Date(treatmentTime)
+ var year = date.getFullYear()
+ var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+ var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+ var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+ var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+ var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+ return year + '-' + month + '-' + day
}
}
}
diff --git a/warehousing-system/project_web/src/components/initial_value/storehouse.vue b/warehousing-system/project_web/src/components/initial_value/storehouse.vue
index a32e4602..6b205cdd 100644
--- a/warehousing-system/project_web/src/components/initial_value/storehouse.vue
+++ b/warehousing-system/project_web/src/components/initial_value/storehouse.vue
@@ -23,26 +23,32 @@
-
+
+
+
+
+
+
+
+ {{ scope.row.provinceName }}
+ -{{ scope.row.cityName }}-
+ {{ scope.row.countyName }}
+
-
-
-
-
-
+
+ 查看详情
*附件：
-
+
点击上传
@@ -360,6 +364,188 @@
确 定
+
+
+
+
+
+
+
+
+ 客户名称
+
+
+
+
+ {{temp.custerName}}
+
+
+
+
+ 仓库名称
+
+
+
+
+ {{temp.name}}
+
+
+
+
+
+
+ 仓库简称
+
+
+
+
+ {{temp.simpleName}}
+
+
+
+
+ 仓库编码
+
+
+
+
+ {{temp.code}}
+
+
+
+
+
+
+ 联系人
+
+
+
+
+ {{temp.linkerName}}
+
+
+
+
+ 联系电话
+
+
+
+
+ {{temp.linkerPhone}}
+
+
+
+
+
+
+ 省-市-县
+
+
+
+
+ {{temp.provinceName}} - {{temp.cityName}} - {{temp.countyName}}
+
+
+
+
+ 区域名称
+
+
+
+
+ {{temp.regionName}}
+
+
+
+
+
+
+ 详细地址
+
+
+
+
+ {{temp.address}}
+
+
+
+
+
+
+
+
+ 房源
+
+
+
+
+ {{temp.housingResource}}
+
+
+
+
+ 库房面积
+
+
+
+
+ {{temp.acreage}}
+
+
+
+
+
+
+
+ 库房高度
+
+
+
+
+ {{temp.storeyHeight}}
+
+
+
+
+ 月租金
+
+
+
+
+ {{temp.monthlyPrice}}
+
+
+
+
+
+
+
+ 库房性质名称
+
+
+
+
+ {{temp.attributeNames}}
+
+
+
+
+ 仓库信息表
+
+
+
+
+ 下载仓库信息表
+ 没有信息表文件
+
+
+
+
+
+
@@ -369,8 +555,8 @@ export default {
return {
queryInfo: {
total: 0,
- size: 1,
- current: 10,
+ size: 10,
+ current: 1,
params: {},
},
total: 0,
@@ -384,6 +570,7 @@ export default {
countyList: [],
updateAction: "http://jianguan.yyundong.com/warehouseapi/v1/shstorehouse/upload",
storehouseDialogVisible: false,
+ addPurchaseDialogVisible: false,
// myHeaders: { Access-Control-Allow-Origin},
title: "新增仓库",
storehouseForm: {
@@ -423,11 +610,19 @@ export default {
},
CITY: [],
XIAN: [],
+ temp: {},
mapApiKey: "map",
shouhuoArrive: {},
+ fullscreenloading: null,
};
},
methods: {
+ // 序号
+ indexMethod(index) {
+ var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size
+ var pageindex = index + 1 + pagestart
+ return pageindex
+ },
handleSizeChange(val) {
this.queryInfo.size = val;
this.getStorehouseList();
@@ -436,15 +631,36 @@ export default {
this.queryInfo.current = val;
this.getStorehouseList();
},
+ clearList(){
+ this.form={
+ name: "",
+ custerName: "",
+ provinceName: "",
+ cityName: "",
+ simpleName: "",
+ code: "",
+ countyName: "",
+ address: "",
+ acreage: "",
+ storeyHeight: "",
+ monthlyPrice: "",
+ attributeNames: "",
+ attributeCodes: "",
+ housingResource: "",
+ linkerName: "",
+ linkerPhone: "",
+ picUrl: "",
+ }
+ },
async getStorehouseList() {
const { data: result } = await this.$http.post(
"/v1/shstorehouse/listPage",
{ params: this.queryInfo }
);
- if (result.code !== 200) return this.$message.error("获取列表失败");
+ if (result.code == 200)
this.total = result.data.total;
- this.storehouseList = result.data.rows;
+ this.storehouseList = result.data.records;
},
addStorehouseDialog() {
this.title = "新增仓库";
@@ -468,10 +684,7 @@ export default {
this.form.code = choose[0].addr;
},
updataStorehousedialog(storehouse) {
- this.storehouseForm.name = storehouse.name;
- this.storehouseForm.simpleName = storehouse.simpleName;
- this.storehouseForm.addr = storehouse.addr;
- this.storehouseForm.remarks = storehouse.remarks;
+ this.form=storehouse
this.title = "修改仓库";
this.storehouseDialogVisible = true;
},
@@ -480,17 +693,18 @@ export default {
"/v1/shstorehouse/save",
this.form
);
- if (result.code !== 200) return this.$message.error("添加仓库失败");
+ if (result.code == 200)
this.$message.success("成功添加仓库");
this.getStorehouseList();
this.storehouseDialogVisible = false;
+ this.clearList()
},
async updataStorehouse() {
- const { data: result } = await this.$http.put(
- "/storehouse/updataStorehouse",
- this.storehouseForm
+ const { data: result } = await this.$http.post(
+ "/v1/shstorehouse/save",
+ this.form
);
- if (result.status !== 200) return this.$message.error("修改仓库失败");
+ if (result.code == 200)
this.$message.success("更新成功");
this.getStorehouseList();
this.storehouseDialogVisible = false;
@@ -502,6 +716,8 @@ export default {
}
},
async deleteStorehouse(storehouse) {
+ const sids = []
+ sids.push(storehouse.sid)
const result = await this.$confirm(
"此操作将永久删除" + storehouse.name + ", 是否继续?",
"提示",
@@ -512,10 +728,10 @@ export default {
}
).catch((error) => error);
if (result !== "confirm") return this.$message.info("用户取消操作");
- const { data: resultDB } = await this.$http.delete(
- `/storehouse/delete/${storehouse.name}`
+ const { data: resultDB } = await this.$http.post(
+ '/v1/shstorehouse/delBySids',sids
);
- if (resultDB.status !== 200) return this.$message.error("删除出库失败");
+ if (resultDB.code == 200)
this.getStorehouseList();
this.$message.success("仓库删除成功");
},
@@ -609,25 +825,47 @@ export default {
}
},
handleSuccess(resp, file, fileList) {
- this.fileList = [];
- if (resp.success) {
- this.$message({
+ console.log('222', resp)
+ const rdata = resp.data
+ const _this = this
+ _this.form.picUrl=rdata
+ if (this.fullscreenloading) this.fullscreenloading.close()
+ this.fullscreenloading = null
+ _this.$message({
showClose: true,
type: "success",
message: "导入成功",
});
- } else {
- this.$message({
- showClose: true,
- type: "error",
- message: resp.msg,
- });
- }
},
- handleProgress(event, file, fileList) {},
+ handleProgress(event, file, fileList) {
+ const _this = this
+ this.fullscreenloading = this.$loading({
+ lock: true,
+ text: '文件正在上传',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ console.log('111', event.percent)
+ if (event.percent >= 100) {
+ _this.fullscreenloading.text = '上传完成，正在导入数据库'
+ }
+ },
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`);
},
+ async LookStorehousedialog(purchase){
+ this.addPurchaseDialogVisible=true
+ const _this = this
+ const { data: result } = await this.$http.get(`/v1/shstorehouse/fetchDetailsBySid/${purchase.sid}`)
+ if (result.code==200) {
+ _this.temp=result.data
+ }
+ },
+ toDownload() {
+ if (this.temp.picUrl) {
+ window.open(this.temp.picUrl, '_blank')
+ }
+ },
},
mounted() {
this.getStorehouseList();
@@ -638,7 +876,19 @@ export default {
};
-
diff --git a/warehousing-system/project_web/src/plugins/element.js b/warehousing-system/project_web/src/plugins/element.js
index f6f82ec2..a8595811 100644
--- a/warehousing-system/project_web/src/plugins/element.js
+++ b/warehousing-system/project_web/src/plugins/element.js
@@ -43,7 +43,8 @@ import {
Footer,
Collapse,
CollapseItem,
- DatePicker
+ DatePicker,
+ Loading
} from 'element-ui'
Vue.use(Button)
@@ -88,6 +89,7 @@ Vue.use(Footer)
Vue.use(Collapse)
Vue.use(CollapseItem)
Vue.use(DatePicker)
+Vue.use(Loading)
// 将弹框组件挂载到Vue对象中 用户可以使用this关键字调用
Vue.prototype.$message = Message
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
index 006877d5..94802c56 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
@@ -87,5 +87,6 @@ export default {
method: 'post',
data: params
})
- }
+ },
+
}