DIGITAL_MEDICAL
/
yanyuan
2
0
Fork 0
Code Pull Requests 2 Releases Activity
Browse Source

fix: 药物使用记录修改

develop
song 4 years ago
parent
00d96c42cf
commit
d8eb4220bf
3 changed files with 65 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 6
      src/config/yyInfo.js
  3. 101
      src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue

1
CHANGELOG.md
View File

@ -201,6 +201,7 @@
- | 缓存基本信息 | [d160dad](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/d160dad)
- | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/7d3b906)
- | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/19228d6)
- | 解决error | [00d96c4](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/00d96c4)
- | 解决error | [b1975e5](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/b1975e5)
- | 解决error | [2acacaa](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/2acacaa)
- | 解决error | [1d67797](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/1d67797)

6
src/config/yyInfo.js
View File

@ -425,12 +425,6 @@ export const medicineInfo = [
type: 3,
value: null,
},
{
name: '总分',
label: 'totalScore',
type: 3,
value: null,
},
],
},
{

101
src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue
View File

@ -21,7 +21,8 @@
</view>
<!-- 日期：年月日 -->
<view v-if="colItem.type === 2">
<view v-if="colItem.chooseTime">
<!-- <view v-if="colItem.chooseTime"> -->
<view v-if="isShow">
<view @click="changeShow(index, itemIndex)">
<text :class="colItem.value ? '' : 'text-gray-350'">{{ colItem.value || '请选择' }} </text>
<u-icon name="arrow-right" class="ml-2" color="#909399"></u-icon>
@ -37,14 +38,17 @@
<view class="text-gray-350 pr-3" v-else>无需填写</view>
</view>
<!-- 数字输入框 -->
<view v-if="colItem.type === 3" class="pr-3">
<u-input
v-model="colItem.value"
type="number"
:clearable="false"
input-align="right"
@blur="change(colItem.value, index, itemIndex, colItem.type)"
/>
<view v-if="colItem.type === 3">
<view v-if="isShow" class="pr-3">
<u-input
v-model="colItem.value"
type="number"
:clearable="false"
input-align="right"
@blur="change(colItem.value, index, itemIndex, colItem.type)"
/>
</view>
<view class="text-gray-350 pr-3" v-else>无需填写</view>
</view>
<!-- 数字输入框+单选 -->
<view v-if="colItem.type === 4" class="flex flex-nowrap items-center">
@ -117,6 +121,7 @@ export default {
minute: true,
second: true,
},
isShow: false,
};
},
@ -148,7 +153,8 @@ export default {
case 1: {
// 单选
item.value = e;
this.medicineInfo[0].date[1].chooseTime = e === 1 ? true : false;
// this.medicineInfo[0].date[1].chooseTime = e === 1 ? true : false;
this.isShow = e === 1 ? true : false;
if (!this.show) {
this.updateMedicine(item);
} else {
@ -224,43 +230,60 @@ export default {
const info = this.medicineInfo[i];
for (let j = 0; j < info.date.length; j++) {
const item = info.date[j];
if (item.type === 2) {
if (item.chooseTime && !item.value) {
this.$t.ui.showToast(`请选择测评时间`);
isComplete = false;
switch (item.type) {
case 2: {
if (this.isShow && !item.value) {
this.$t.ui.showToast(`请选择测评时间`);
isComplete = false;
}
break;
}
} else if (item.type === 4) {
if (!item.value && !item.checked) {
this.$t.ui.showToast(`请填写${item.name}`);
isComplete = false;
case 3: {
if (this.isShow && !item.value) {
this.$t.ui.showToast(`请填写${item.name}`);
isComplete = false;
}
break;
}
} else {
if (!item.value) {
this.$t.ui.showToast(`请填写${item.name}`);
isComplete = false;
case 4: {
if (!item.value && !item.checked) {
this.$t.ui.showToast(`请填写${item.name}`);
isComplete = false;
}
break;
}
default: {
if (!item.value) {
this.$t.ui.showToast(`请填写${item.name}`);
isComplete = false;
}
break;
}
}
// if (item.type === 2) {
// if (item.chooseTime && !item.value) {
// this.$t.ui.showToast(`请选择测评时间`);
// isComplete = false;
// break;
// }
// } else if (item.type === 4) {
// if (!item.value && !item.checked) {
// this.$t.ui.showToast(`请填写${item.name}`);
// isComplete = false;
// break;
// }
// } else {
// if (!item.value) {
// this.$t.ui.showToast(`请填写${item.name}`);
// isComplete = false;
// break;
// }
// }
}
if (!isComplete) {
break;
}
}
// if (!isComplete) {
// return;
// }
// if (!this.otherName.value) {
// this.$t.ui.showToast(`请填写${this.otherName.name}`);
// isComplete = false;
// return;
// }
// if (!this.otherMedicine.value) {
// this.$t.ui.showToast(`请填写${this.otherMedicine.name}`);
// isComplete = false;
// return;
// }
if (isComplete) return true;
},
@ -274,7 +297,7 @@ export default {
for (let j = 0; j < info.date.length; j++) {
const item = info.date[j];
if (item.type === 2) {
item.chooseTime = false;
this.isShow = false;
}
if (item.type === 4) {
item.checked = false;
@ -298,7 +321,6 @@ export default {
case 2: {
if (date[item.label]) {
item.value = date[item.label];
item.chooseTime = true;
}
break;
}
@ -307,6 +329,11 @@ export default {
break;
}
default: {
if (date.isTest === '0') {
this.isShow = false;
} else {
this.isShow = true;
}
if (date[item.label] !== '未服用') {
item.value = date[item.label];
item.checked = false;

Write Preview
Loading…
Cancel
Save