This commit is contained in:
闫晓茹 2022-11-16 11:37:08 +08:00
parent e80fb60fab
commit 3b2064b9fb
5 changed files with 138 additions and 57 deletions

View File

@ -490,7 +490,7 @@ import {
goodsInfoList,
goodsCategory,
editGoodsWhetherShelf,
stationList
stationList,
} from "@/api/system/OperateGoodsInfo";
import editor from "@/components/Editor";
import stationAcatar from "../stationAvatar/index.vue";
@ -800,7 +800,6 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
@ -808,8 +807,7 @@ export default {
goodsName: null,
goodsCategoryName: null,
goodsPurpose: null,
}
};
this.handleQuery();
},
@ -842,11 +840,11 @@ export default {
handleUpdate(row) {
this.reset();
const id = row.goodsInfoId || this.ids;
this.StationName = row.nurseStationName;
if(this.StationName == null){
this.StationName = "请选择所属护理站";
}
console.log(this.StationName)
this.StationName = row.nurseStationName;
if (this.StationName == null) {
this.StationName = "请选择所属护理站";
}
console.log(this.StationName);
getGoodsInfo(id).then((response) => {
this.form = response.data[0];
this.imgone = this.form.goodsPictureUrl;
@ -870,8 +868,17 @@ export default {
if (this.form.goodsInfoId != null) {
this.form.id = this.form.goodsInfoId;
updateGoodsInfo(this.form).then((response) => {
var obj = { pictureUrlList: [] };
if (this.imgone != this.form.goodsPictureUrl) {
obj.pictureUrlList.push(this.form.goodsPictureUrl);
}
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {
console.log(res);
});
}
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
@ -898,11 +905,18 @@ export default {
})
.then(() => {
delGoodsInfo(row.goodsInfoId).then((res) => {
var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.goodsPictureUrl);
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {
console.log(res);
});
}
this.$message.success("删除成功");
this.getList();
});
})
.catch(() => { });
.catch(() => {});
},
imgUrl(imgUrl) {
console.log(imgUrl);
@ -937,7 +951,7 @@ export default {
stationList(this.getListByUserquery).then((res) => {
this.nurseStationlist = res.rows;
this.total2 = res.total;
console.log(res)
console.log(res);
// if (res.rows[0].isAdmin == "1") {
// this.nurseStationlist = res.rows;
// this.total2 = res.total;

View File

@ -212,7 +212,7 @@ import {
listGoodsCategory,
getGoodsCategory,
delGoodsCategory,
updatePicture ,
updatePicture,
addGoodsCategory,
updateGoodsCategory,
} from "@/api/system/goodsCategory";
@ -223,7 +223,7 @@ export default {
components: { stationAcatar },
data() {
return {
imgone:"",
imgone: "",
baseurl: "",
//
loading: true,
@ -293,7 +293,7 @@ export default {
cancel() {
console.log(this.form);
var obj = { pictureUrlList: [] };
if(this.imgone !=this.form.goodsCategoryPicture ){
if (this.imgone != this.form.goodsCategoryPicture) {
obj.pictureUrlList.push(this.form.goodsCategoryPicture);
}
if (obj.pictureUrlList.length > 0) {
@ -362,6 +362,15 @@ export default {
if (valid) {
if (this.form.id != null) {
updateGoodsCategory(this.form).then((response) => {
var obj = { pictureUrlList: [] };
if (this.imgone != this.form.goodsCategoryPicture) {
obj.pictureUrlList.push(this.form.goodsCategoryPicture);
}
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {
console.log(res);
});
}
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@ -385,6 +394,13 @@ export default {
return delGoodsCategory(ids);
})
.then(() => {
var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.goodsCategoryPicture);
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {
console.log(res);
});
}
this.getList();
this.$modal.msgSuccess("删除成功");
})

View File

@ -42,7 +42,10 @@
</el-form-item>
<el-form-item label="商品用途" prop="goodsPurpose">
<el-select v-model="queryParams.goodsPurpose" placeholder="请选择商品用途">
<el-select
v-model="queryParams.goodsPurpose"
placeholder="请选择商品用途"
>
<el-option
v-for="item in goods"
:key="item.value"
@ -572,8 +575,8 @@ export default {
},
//
form: {
nurseStationName:"",
nurseStationId:"",
nurseStationName: "",
nurseStationId: "",
},
//
rules: {
@ -687,7 +690,7 @@ export default {
cancel() {
console.log(this.form);
var obj = { pictureUrlList: [] };
if (this.imgone!= this.form.goodsPictureUrl) {
if (this.imgone != this.form.goodsPictureUrl) {
obj.pictureUrlList.push(this.form.goodsPictureUrl);
}
if (obj.pictureUrlList.length > 0) {
@ -726,8 +729,8 @@ export default {
// this.getListByUserquery.pageNum = 1;
this.getList2();
},
getList2(){
getListByUser(this.getListByUserquery).then((res) => {
getList2() {
getListByUser(this.getListByUserquery).then((res) => {
this.total2 = res.total;
this.nurseStationlist = res.rows;
});
@ -785,20 +788,19 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
if (this.nurseStationlist[0].isAdmin == '1') {
if (this.nurseStationlist[0].isAdmin == "1") {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
pageSize: 10
}
pageSize: 10,
};
} else {
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10
this.queryParams.goodsName = null
this.queryParams.goodsCategoryName = null
this.queryParams.goodsPurpose = null
this.queryParams.whetherShelf = null
this.queryParams.pageSize = 10;
this.queryParams.goodsName = null;
this.queryParams.goodsCategoryName = null;
this.queryParams.goodsPurpose = null;
this.queryParams.whetherShelf = null;
}
this.handleQuery();
},
@ -811,9 +813,9 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.form.nurseStationName=this.nurseStationlist[0].nurseStationName
this.form.nurseStationId =this.nurseStationlist[0].id;
this.reset();
this.form.nurseStationName = this.nurseStationlist[0].nurseStationName;
this.form.nurseStationId = this.nurseStationlist[0].id;
this.title = "商品基本信息";
this.StationName = "请选择所属护理站";
this.goodDetailsLists = [
@ -829,13 +831,13 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
console.log(row)
console.log(row);
// this.reset();
const id = row.goodsInfoId || this.ids;
getGoodsInfo(id).then((response) => {
console.log(response)
console.log(response);
this.form = response.data[0];
this.form.nurseStationName = row.nurseStationName
this.form.nurseStationName = row.nurseStationName;
this.imgone = this.form.goodsPictureUrl;
if (response.data[0].goodAttributeDetailsLists) {
this.goodDetailsLists = response.data[0].goodAttributeDetailsLists;
@ -847,7 +849,7 @@ export default {
/** 提交按钮 */
submitForm() {
console.log(this.form);
console.log(this.form);
console.log(this.goodDetailsLists);
this.form.goodAttributeDetailsLists = [];
this.form.goodDetailsLists = this.goodDetailsLists;
@ -857,6 +859,15 @@ export default {
if (this.form.goodsInfoId != null) {
this.form.id = this.form.goodsInfoId;
updateGoodsInfo(this.form).then((response) => {
var obj = { pictureUrlList: [] };
if (this.imgone != this.form.goodsPictureUrl) {
obj.pictureUrlList.push(this.form.goodsPictureUrl);
}
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {
console.log(res);
});
}
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@ -868,7 +879,7 @@ export default {
this.$modal.msgSuccess("新增成功");
// this.StationName = "";
this.open = false;
this.open = false;
this.getList();
});
}
@ -884,13 +895,19 @@ export default {
type: "warning",
})
.then(() => {
var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.goodsPictureUrl);
updatePicture(obj).then((res) => {
console.log(res);
});
delGoodsInfo(row.goodsInfoId).then((res) => {
this.$message.success("删除成功");
this.getList();
// console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
});
})
.catch(() => { });
.catch(() => {});
},
// handleDelete(row) {
// const ids = row.id || this.ids;
@ -942,13 +959,13 @@ export default {
//
info() {
goodsCategory().then((res) => {
console.log(res)
console.log(res);
console.log(this.form);
this.goodsCategorylist = res.rows;
});
getListByUser(this.getListByUserquery).then((res) => {
console.log(res)
console.log(res);
if (res.rows[0].isAdmin == "1") {
this.nurseStationlist = res.rows;
// console.log(this.queryParams)

View File

@ -685,15 +685,14 @@ export default {
},
created() {
this.getList();
this.getaddress();
this.info();
},
methods: {
imgUrl(imgUrl) {
console.log(imgUrl);
this.form.stationPictureUrl = imgUrl;
},
imgUrl2(imgUrl) {
console.log(imgUrl);
this.form.stationIntroducePcitureUrl = imgUrl;
},
delnurseStationLabelList(index, item) {
@ -771,14 +770,17 @@ export default {
});
},
/** 查询护理站信息列表 */
getList() {
this.liststationinfo();
getaddress() {
getFirstLevelInfo().then((res) => {
this.provincelist = res.data;
});
getInfoList().then((res) => {
this.nurseStationTypelist = res.data;
});
},
getList() {
this.liststationinfo();
// getInfoList().then((res) => {
// this.nurseStationTypelist = res.data;
// });
this.loading = true;
},
//
@ -817,7 +819,7 @@ export default {
stationIntroducePcitureUrl: null,
sort: null,
nurseStationLabelList: [],
streetCode:null,
streetCode: null,
};
this.resetForm("form");
},
@ -898,7 +900,7 @@ export default {
this.looknurseStationLabel = response.data.nurseStationLabel;
this.open = true;
this.loading = false;
console.log(this.form)
console.log(this.form);
});
},
/** 提交按钮 */
@ -912,6 +914,16 @@ export default {
this.form.nurseStationType = this.nurseStationType2.join(",");
if (this.form.id != null) {
updateStation(this.form).then((response) => {
var obj = { pictureUrlList: [] };
if (this.imgone != this.form.stationIntroducePcitureUrl) {
obj.pictureUrlList.push(this.imgone);
}
if (this.imgtwo != this.form.stationPictureUrl) {
obj.pictureUrlList.push(this.imgtwo);
}
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {});
}
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@ -939,6 +951,12 @@ export default {
return delStation(ids);
})
.then(() => {
var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.stationIntroducePcitureUrl);
obj.pictureUrlList.push(row.stationPictureUrl);
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {});
}
this.getList();
this.$modal.msgSuccess("删除成功");
})

View File

@ -860,8 +860,8 @@ export default {
this.$refs.upload.clearFiles();
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
response.msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
@ -951,7 +951,6 @@ export default {
},
/** 耗材列表 */
listStationConsumable() {
listStationConsumable(this.StationConsumablequeryParams).then(
(response) => {
this.stationConsumableList = response.rows;
@ -1112,12 +1111,13 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.StationConsumablequeryParams.nurseStationId = null
this.StationConsumablequeryParams.nurseStationId = null;
const id = row.id || this.ids;
getNurseItem(id).then((response) => {
console.log(response);
this.form = response.data;
this.StationConsumablequeryParams.nurseStationId = response.data.nurseStationItem.nurseStationId
this.StationConsumablequeryParams.nurseStationId =
response.data.nurseStationItem.nurseStationId;
this.imgone = this.form.nurseStationItem.itemPictureUrl;
if (this.form.nurseStationItemPrices == []) {
var obj = {
@ -1162,6 +1162,17 @@ export default {
if (valid) {
if (this.form.nurseStationItem.id != null) {
updateNurseItem(this.form).then((response) => {
var obj = { pictureUrlList: [] };
if (this.imgone != this.form.nurseStationItem.itemPictureUrl) {
obj.pictureUrlList.push(
this.form.nurseStationItem.itemPictureUrl
);
}
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {
console.log(res);
});
}
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@ -1169,7 +1180,7 @@ export default {
} else {
addNurseItem(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.$forceUpdate()
this.$forceUpdate();
this.open = false;
this.getList();
});
@ -1186,10 +1197,15 @@ export default {
return delNurseItem(ids);
})
.then(() => {
var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.nurseStationItem.itemPictureUrl);
updatePicture(obj).then((res) => {
console.log(res);
});
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => { });
.catch(() => {});
},
/** 导入按钮操作 */
handleExport() {