diff --git a/src/views/system/OperateGoodsInfo/indexjs.js b/src/views/system/OperateGoodsInfo/indexjs.js index b596c5c..ff87499 100644 --- a/src/views/system/OperateGoodsInfo/indexjs.js +++ b/src/views/system/OperateGoodsInfo/indexjs.js @@ -54,29 +54,15 @@ export default { nursetotal: 0, nurseStationId: null, goods: [{ - value: "BUSINESS", - label: "买卖", - }, - // { - // value: "LEASE", - // label: "租赁", - // }, + value: "BUSINESS", + label: "买卖", + }, + // { + // value: "LEASE", + // label: "租赁", + // }, ], options: [{ - value: 0, - label: "否", - }, - { - value: 1, - label: "是", - }, - ], - // goodAttributeDetailsLists:[], - goodDetailsLists: [], - idd: 9999999, - ids: [], - integraloption: [ - { value: 0, label: "否", }, @@ -85,7 +71,19 @@ export default { label: "是", }, ], - value: "", + // goodAttributeDetailsLists:[], + goodDetailsLists: [], + idd: 9999999, + ids: [], + integraloption: [{ + value: 0, + label: "否", + }, + { + value: 1, + label: "是", + }, + ], // 查询参数 shangjia: { id: null, @@ -260,10 +258,10 @@ export default { obj.pictureUrlList.push(this.form.goodsPictureUrl); } if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => { }); + updatePicture(obj).then((res) => {}); } if (this.imgsurl.pictureUrlList.length > 0) { - updatePicture(this.imgsurl).then((res) => { }); + updatePicture(this.imgsurl).then((res) => {}); } this.imgsurl = { pictureUrlList: [] }; this.open = false; @@ -279,8 +277,8 @@ export default { goodsPrice: "", goodsStock: "", attributeDetailsSort: null, - },], - },]; + }, ], + }, ]; ++this.isResouceShow }, //页面所属护理站 @@ -350,7 +348,7 @@ export default { integralExchangeFlag: null, integralExchangeSill: null, idd: 9999999, - },]; + }, ]; this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -394,7 +392,7 @@ export default { integralExchangeSill: null, sort: null, idd: 9999999, - },]; + }, ]; this.open = true; }, /** 修改按钮操作 */ @@ -456,7 +454,7 @@ export default { } this.imgsurl = { pictureUrlList: [] }; if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => { }); + updatePicture(obj).then((res) => {}); } this.$modal.msgSuccess("修改成功"); ++this.isResouceShow @@ -465,9 +463,9 @@ export default { }); } else { this.form.goodDetailsLists.forEach(e => { - e.goodsPrice = Number(e.goodsPrice) - }) - // this.nurseStationId=this.form.nurseStationId + e.goodsPrice = Number(e.goodsPrice) + }) + // this.nurseStationId=this.form.nurseStationId addGoodsInfo(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); this.StationName = "请选择所属护理站"; @@ -482,22 +480,22 @@ export default { /** 删除按钮操作 */ handleDelete(row) { this.$confirm("是否确认删除订单信息的数据项?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) .then(() => { delGoodsInfo(row.goodsInfoId).then((res) => { var obj = { pictureUrlList: [] }; obj.pictureUrlList.push(row.goodsPictureUrl); if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => { }); + updatePicture(obj).then((res) => {}); } this.$message.success("删除成功"); this.getList(); }); }) - .catch(() => { }); + .catch(() => {}); }, imgUrl(imgUrl) { this.form.goodsPictureUrl = imgUrl; @@ -507,7 +505,7 @@ export default { }, attributePitureitem(item) { let items = JSON.parse(item); - if (items.idd && !items.id) { + if (items.idd && !items.attributeDetailsId) { this.goodDetailsLists.forEach((e) => { if (e.idd == items.idd) { e.attributePitureUrl = items.attributePitureUrl; @@ -542,4 +540,4 @@ export default { }); }, }, -}; \ No newline at end of file +}; diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index 89f4093..002a6d6 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -350,7 +350,6 @@ 重置 - @@ -376,7 +375,6 @@ align="center" :show-overflow-tooltip="true" > - @@ -414,7 +412,6 @@ 重置 - diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue index 8355cc3..14788ea 100644 --- a/src/views/system/person/index.vue +++ b/src/views/system/person/index.vue @@ -9,15 +9,13 @@ label-width="70px" > - {{ + + {{ queryParams.nurseStationName - }} + }} + - + - 搜索 - 重置 + 搜索 + 重置 @@ -55,8 +45,7 @@ size="mini" @click="handleAdd" v-hasPermi="['system:person:add']" - >新增 + >新增 修改 + >修改 删除 + >删除 导入 + >导入 - + - + - + 修改 + >修改 删除 + >删除 @@ -163,296 +135,7 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - - - - - - {{ item.nurseStationName }} - {{ item.nurseStationName }} - - - - {{ item.departmentName }} - {{ item.departmentName }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - - - - - - - - + - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -520,22 +187,10 @@ > - - - - - - - - + + + + - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - 搜索 - 重置 + 搜索 + 重置 - + - - - - - - - - - - - + + + + + - + - - + + {{ nurseStationName }} + style="width: 300px; text-align: left; height: 36px; color: #c0c4cc" + >{{ nurseStationName }} {{ nurseStationName }} + >{{ nurseStationName }} - + {{ departmentName }} + style="width: 300px; text-align: left; height: 36px; color: #c0c4cc" + >{{ departmentName }} {{ departmentName }} + >{{ departmentName }} @@ -816,47 +316,72 @@ v-model="form.nursePersonType" clearable placeholder="请选择" - style="width: 363px" + style="width: 300px" > - + > - + - + > - + + + + + + + + + + + + + + + + + + + + + 新增 + 删除 + + + + - + - 将文件拖到此处,或点击上传 + + 将文件拖到此处,或 + 点击上传 + 仅允许导入xls、xlsx格式文件。 下载模板 + >下载模板