|
@@ -15,11 +15,11 @@
|
|
<div class="cust_vantBorder">
|
|
<div class="cust_vantBorder">
|
|
<van-field required clearable v-model="deviceDetal.name" name="name"
|
|
<van-field required clearable v-model="deviceDetal.name" name="name"
|
|
:label="`${$t('device.equipmentNameLabel')}`" :placeholder="$t('device.equipmentNamePlaceholder')" :rules="[
|
|
:label="`${$t('device.equipmentNameLabel')}`" :placeholder="$t('device.equipmentNamePlaceholder')" :rules="[
|
|
- {
|
|
|
|
- required: true,
|
|
|
|
- message: $t('device.equipmentNamePlaceholder'),
|
|
|
|
- },
|
|
|
|
- ]" />
|
|
|
|
|
|
+ {
|
|
|
|
+ required: true,
|
|
|
|
+ message: $t('device.equipmentNamePlaceholder'),
|
|
|
|
+ },
|
|
|
|
+ ]" />
|
|
<van-field clearable v-model="deviceDetal.selfName" :label="`${$t('device.equipmentRemarksLabel')}`"
|
|
<van-field clearable v-model="deviceDetal.selfName" :label="`${$t('device.equipmentRemarksLabel')}`"
|
|
:placeholder="$t('device.equipmentRemarksPlaceholder')" />
|
|
:placeholder="$t('device.equipmentRemarksPlaceholder')" />
|
|
<div></div>
|
|
<div></div>
|
|
@@ -91,19 +91,19 @@
|
|
<div class="cust_vantBorder">
|
|
<div class="cust_vantBorder">
|
|
<van-field required clearable v-model="deviceDetal.contactName" name="contactName"
|
|
<van-field required clearable v-model="deviceDetal.contactName" name="contactName"
|
|
:label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[
|
|
:label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[
|
|
- {
|
|
|
|
- required: true,
|
|
|
|
- message: $t('device.nameOfOperatorPlaceholder'),
|
|
|
|
- },
|
|
|
|
- ]" />
|
|
|
|
|
|
+ {
|
|
|
|
+ required: true,
|
|
|
|
+ message: $t('device.nameOfOperatorPlaceholder'),
|
|
|
|
+ },
|
|
|
|
+ ]" />
|
|
<van-field required clearable v-model="deviceDetal.contactPhone" name="contactPhone"
|
|
<van-field required clearable v-model="deviceDetal.contactPhone" name="contactPhone"
|
|
:label="`${$t('device.operatorTelephoneLabel')}`" :placeholder="$t('device.operatorTelephonePlaceholder')"
|
|
:label="`${$t('device.operatorTelephoneLabel')}`" :placeholder="$t('device.operatorTelephonePlaceholder')"
|
|
:rules="[
|
|
:rules="[
|
|
- {
|
|
|
|
- required: true,
|
|
|
|
- message: $t('device.operatorTelephonePlaceholder'),
|
|
|
|
- },
|
|
|
|
- ]" />
|
|
|
|
|
|
+ {
|
|
|
|
+ required: true,
|
|
|
|
+ message: $t('device.operatorTelephonePlaceholder'),
|
|
|
|
+ },
|
|
|
|
+ ]" />
|
|
<!-- <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
|
|
<!-- <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
|
|
:placeholder="$t('device.advertisingRulesPlaceholder')" /> -->
|
|
:placeholder="$t('device.advertisingRulesPlaceholder')" /> -->
|
|
</div>
|
|
</div>
|
|
@@ -156,11 +156,11 @@
|
|
<div class="van-cell__value van-field__value radioBox">
|
|
<div class="van-cell__value van-field__value radioBox">
|
|
<van-radio-group v-model="deviceDetal.channel" direction="horizontal">
|
|
<van-radio-group v-model="deviceDetal.channel" direction="horizontal">
|
|
<van-radio name="1" icon-size="16px">{{
|
|
<van-radio name="1" icon-size="16px">{{
|
|
- $t("device.tweets")
|
|
|
|
- }}</van-radio>
|
|
|
|
|
|
+ $t("device.tweets")
|
|
|
|
+ }}</van-radio>
|
|
<van-radio name="2" icon-size="16px">{{
|
|
<van-radio name="2" icon-size="16px">{{
|
|
- $t("device.mq")
|
|
|
|
- }}</van-radio>
|
|
|
|
|
|
+ $t("device.mq")
|
|
|
|
+ }}</van-radio>
|
|
</van-radio-group>
|
|
</van-radio-group>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -184,7 +184,7 @@
|
|
</van-field> -->
|
|
</van-field> -->
|
|
<van-field v-model="deviceDetal.flowers" is-link readonly
|
|
<van-field v-model="deviceDetal.flowers" is-link readonly
|
|
:label="machineType === '1' ? '口味种类' : $t('device.flowerType')"
|
|
:label="machineType === '1' ? '口味种类' : $t('device.flowerType')"
|
|
- :placeholder="machineType === '1' ? '选择口味种类' : '选择花型种类'" @click="showFlowerPicker = true" />
|
|
|
|
|
|
+ :placeholder="machineType === '1' ? '选择口味种类' : '选择花型种类'" @click="clickFlowerPicker" />
|
|
</template>
|
|
</template>
|
|
<!-- 版本号 -->
|
|
<!-- 版本号 -->
|
|
<van-field readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
|
|
<van-field readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
|
|
@@ -200,7 +200,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="l-flex-center o-mtb-30">
|
|
<div class="l-flex-center o-mtb-30">
|
|
<van-button round type="primary" class="info7" native-type="submit">{{
|
|
<van-button round type="primary" class="info7" native-type="submit">{{
|
|
- $t("device.submitAndPushDeviceUpdates") }}</van-button>
|
|
|
|
|
|
+ $t("device.submitAndPushDeviceUpdates") }}</van-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</van-form>
|
|
</van-form>
|
|
@@ -243,7 +243,7 @@ import {
|
|
Api_getDiscCodeStatus,
|
|
Api_getDiscCodeStatus,
|
|
getGoodsNumber,
|
|
getGoodsNumber,
|
|
} from "@/service/device/index";
|
|
} from "@/service/device/index";
|
|
-import { showFailToast, showSuccessToast, showToast } from "vant";
|
|
|
|
|
|
+import { showFailToast, showSuccessToast, showToast, closeToast } from "vant";
|
|
import { useI18n } from "vue-i18n";
|
|
import { useI18n } from "vue-i18n";
|
|
import dateUtil from "@/utils/dateUtil";
|
|
import dateUtil from "@/utils/dateUtil";
|
|
import { styleUrl } from "../../common/js/utils";
|
|
import { styleUrl } from "../../common/js/utils";
|
|
@@ -470,7 +470,11 @@ export default {
|
|
const onFlowerConfirm = ({ selectedOptions }) => {
|
|
const onFlowerConfirm = ({ selectedOptions }) => {
|
|
showFlowerPicker.value = false;
|
|
showFlowerPicker.value = false;
|
|
deviceDetal.value.flowers = selectedOptions[0].text;
|
|
deviceDetal.value.flowers = selectedOptions[0].text;
|
|
- showToast("提示:\n修改花型后需要重新设置价格")
|
|
|
|
|
|
+ showToast({
|
|
|
|
+ message: "提示:\n修改花型后需要重新设置价格",
|
|
|
|
+ duration: 3000,
|
|
|
|
+ forbidClick: true
|
|
|
|
+ })
|
|
}
|
|
}
|
|
|
|
|
|
// 点击去到编辑标签页
|
|
// 点击去到编辑标签页
|
|
@@ -547,6 +551,33 @@ export default {
|
|
query: { deviceId: route.query.deviceId, adRuleList: JSON.stringify(adRuleList.value) },
|
|
query: { deviceId: route.query.deviceId, adRuleList: JSON.stringify(adRuleList.value) },
|
|
});
|
|
});
|
|
};
|
|
};
|
|
|
|
+ const clickFlowerPicker = () => {
|
|
|
|
+
|
|
|
|
+ const toast = showToast({
|
|
|
|
+ duration: 0,
|
|
|
|
+ forbidClick: true,
|
|
|
|
+ message: '提示:\n请确认PLC版本支持修改的花型,避免出现程序错乱,导致客诉!!!倒计时 5 S',
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+ let second = 5;
|
|
|
|
+ const timer = setInterval(() => {
|
|
|
|
+ second--;
|
|
|
|
+ if (second) {
|
|
|
|
+ toast.message = `提示:\n请确认PLC版本支持修改的花型,避免出现程序错乱,导致客诉!!!倒计时 ${second} S`;
|
|
|
|
+ } else {
|
|
|
|
+ clearInterval(timer);
|
|
|
|
+ closeToast();
|
|
|
|
+ showFlowerPicker.value = true;
|
|
|
|
+ }
|
|
|
|
+ }, 1000);
|
|
|
|
+
|
|
|
|
+ // showToast({
|
|
|
|
+ // message: "提示:\n是否确认过PLC版本支持该花型,避免出现程序错乱,导致客诉!!!",
|
|
|
|
+ // duration: 3000,
|
|
|
|
+ // forbidClick: true
|
|
|
|
+ // })
|
|
|
|
+ // showFlowerPicker.value = true;
|
|
|
|
+ }
|
|
return {
|
|
return {
|
|
deviceDetal,
|
|
deviceDetal,
|
|
updateDeviceFun,
|
|
updateDeviceFun,
|
|
@@ -577,6 +608,7 @@ export default {
|
|
showFlowerPicker,
|
|
showFlowerPicker,
|
|
selectedFlower,
|
|
selectedFlower,
|
|
onFlowerConfirm,
|
|
onFlowerConfirm,
|
|
|
|
+ clickFlowerPicker
|
|
};
|
|
};
|
|
},
|
|
},
|
|
};
|
|
};
|