|
@@ -25,7 +25,7 @@
|
|
|
<span @click="pushToDaySugarList">{{ $t('device.todaysSugarList') }}>></span>
|
|
|
</div>
|
|
|
<div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span class="txt3">{{
|
|
|
- $t('device.submitToMakeSugar') }}</span></div>
|
|
|
+ $t('device.submitToMakeSugar') }}</span></div>
|
|
|
<van-button v-if="doSugartData" style="padding: 1em;" round type="primary" class="block5 flex-col"
|
|
|
:disabled="doSugartType" @click="checkData()">{{ $t('device.viewResults') }}</van-button>
|
|
|
</div>
|
|
@@ -47,7 +47,7 @@
|
|
|
<span @click="pushToDaySugarList">{{ $t('device.todaysMakeList') }}>></span>
|
|
|
</div>
|
|
|
<div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span class="txt3">{{
|
|
|
- $t('device.submitToMakeSugar') }}</span></div>
|
|
|
+ $t('device.submitToMakeSugar') }}</span></div>
|
|
|
<van-button v-if="doSugartData" round type="primary" class="volumeChangeButton" :disabled="doSugartType"
|
|
|
@click="checkData()">{{ $t('device.viewResults') }}</van-button>
|
|
|
</div>
|
|
@@ -64,12 +64,12 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</van-cascader>
|
|
|
- </van-popup>
|
|
|
+ </van-popup> -->
|
|
|
<div class="textRow o-pr-20">
|
|
|
<span @click="pushToDaySugarList">{{ $t('device.todaysMakeList') }}>></span>
|
|
|
</div>
|
|
|
<div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span class="txt3">{{
|
|
|
- $t('device.submitToMakeSugar') }}</span></div>
|
|
|
+ $t('device.submitToMakeSugar') }}</span></div>
|
|
|
<van-button v-if="doSugartData" round type="primary" class="volumeChangeButton" :disabled="doSugartType"
|
|
|
@click="checkData()">{{ $t('device.viewResults') }}</van-button>
|
|
|
</div>
|
|
@@ -98,9 +98,9 @@ export default {
|
|
|
const cascaderValue = ref('');
|
|
|
const options = ref([]);
|
|
|
const onFinish = ({ selectedOptions }) => {
|
|
|
+ console.log('onFinish', selectedOptions);
|
|
|
show.value = false;
|
|
|
fieldValue.value = selectedOptions[0].value
|
|
|
- console.log('onFinish', selectedOptions[0].value);
|
|
|
}
|
|
|
const doSugartData = ref(null);
|
|
|
const doSugartType = ref(true);
|
|
@@ -127,7 +127,7 @@ export default {
|
|
|
const getProduct = async () => {
|
|
|
const { data } = await selectProducts({ equipmentId: deviceId });
|
|
|
if (data.code) {
|
|
|
- if(machineType != '2') {
|
|
|
+ if (machineType != '2') {
|
|
|
options.value = data.data.map(item => {
|
|
|
return {
|
|
|
text: item.productName,
|
|
@@ -156,7 +156,11 @@ export default {
|
|
|
children: []
|
|
|
}
|
|
|
)
|
|
|
- } else if (item.no.includes('J')) {
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ data.data.forEach(item => {
|
|
|
+ if (item.no.includes('J')) {
|
|
|
options.value[0].children.push(
|
|
|
{
|
|
|
text: item.productName,
|
|
@@ -165,7 +169,11 @@ export default {
|
|
|
children: [],
|
|
|
}
|
|
|
)
|
|
|
- } else if (item.no.includes('C')) {
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ data.data.forEach(item => {
|
|
|
+ if (item.no.includes('C')) {
|
|
|
options.value[0].children.forEach(item1 => {
|
|
|
item1.children.push(
|
|
|
{
|
|
@@ -179,7 +187,7 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
} else { showFailToast(data.message); }
|
|
|
- console.log(options.value);
|
|
|
+ // console.log(options.value);
|
|
|
}
|
|
|
const submitDoSugar = async () => {
|
|
|
doSugartData.value = null;
|