From 30664d1a51fd70dd8058b9aa2b4009ea2ed8e2a4 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Fri, 19 Jan 2024 17:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E4=B8=8B=E6=8B=89=E6=A1=86?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/J-Picker/jPicker.vue | 22 ++++++++++++++++------
src/pages/equipment/Repair/repairing.vue | 18 ++++++++++++++++--
src/pages/equipment/Repairbx/index.vue | 7 ++++++-
src/pages/shouye/me.vue | 2 +-
4 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/components/J-Picker/jPicker.vue b/src/components/J-Picker/jPicker.vue
index b183913..ebc524a 100644
--- a/src/components/J-Picker/jPicker.vue
+++ b/src/components/J-Picker/jPicker.vue
@@ -67,6 +67,7 @@ export default {
// unSelStyle:'',
//'background-color:rgba(0, 74, 255, 0.44);',//'background-color:rgba(220, 250, 9, 0.44);',rgba(250, 9, 9, 0.44)
selStyle: 'height:50px;',
+ keyWord: '',
};
},
props: ['options', 'moren', 'showKey', 'valKey', 'val', 'position', 'disabled', 'bgColor', 'sureColor', 'focus'],
@@ -129,12 +130,20 @@ export default {
sureSelect() {
this.pickerVisable = false;
if (this.listData.length == 0) {
- uni.showToast({
- //title: '未选中',
- icon: 'none',
- title: this.$t('message.unselected') as string,
- });
+ // uni.showToast({
+ // //title: '未选中',
+ // icon: 'none',
+ // title: this.$t('message.unselected') as string,
+ // });
+ let obj = {
+ pickerVal: this.keyWord,
+ pickerName: {
+ label: this.keyWord,
+ value: this.keyWord,
+ },
+ };
this.$emit('sure', {});
+ this.$emit('bindinput', obj);
} else {
let obj = {
pickerVal: this.nSel,
@@ -161,8 +170,9 @@ export default {
this.nSel = e.detail.value[0];
},
filterOp(e) {
- //console.log(e.detail.value);
+ // console.log(e.detail.value);
let keyWord = e.detail.value;
+ this.keyWord = e.detail.value;
if (keyWord != '') {
keyWord = keyWord.toLowerCase();
let oldArr = this.options;
diff --git a/src/pages/equipment/Repair/repairing.vue b/src/pages/equipment/Repair/repairing.vue
index bbaa1ea..fc14c9d 100644
--- a/src/pages/equipment/Repair/repairing.vue
+++ b/src/pages/equipment/Repair/repairing.vue
@@ -154,10 +154,10 @@
-->
-
+
-
+
@@ -305,6 +305,7 @@ export default class ChangePalletNew extends BasePage {
isvalue = false;
workReason: any = {};
repairMeasures: any = {};
+ workReasonceshi: 'aaaaa';
async onReady() {
//await this.model.getpalletLocation();
//this.remove = this.model.WlList[0];
@@ -321,6 +322,7 @@ export default class ChangePalletNew extends BasePage {
this.Sparepartlist = this.model.rowdata;
console.log(1, this.model.rowdata, this.Sparepartlist);
}
+ console.log(session);
}
// 输入框焦点
blur(item, value, index, index1) {
@@ -442,10 +444,22 @@ export default class ChangePalletNew extends BasePage {
this.workReason = e.pickerName;
// await this.model.getpalletDestination(params);
}
+ async selectbindinput(e: any) {
+ model.locList2.push(e.pickerName);
+ this.workReason = e.pickerName;
+ console.log(this.workReason.value, e, model.locList2);
+ // await this.model.getpalletDestination(params);
+ }
async selectProductlocCode2(e: any) {
this.repairMeasures = e.pickerName;
// await this.model.getpalletDestination(params);
}
+ async selectbindinput2(e: any) {
+ model.locList.push(e.pickerName);
+ this.repairMeasures = e.pickerName;
+ console.log(this.workReason.value, e, model.locList2);
+ // await this.model.getpalletDestination(params);
+ }
scrollLeft() {
return 222 * (this.imgList.length + 1);
}
diff --git a/src/pages/equipment/Repairbx/index.vue b/src/pages/equipment/Repairbx/index.vue
index ae39a07..f745427 100644
--- a/src/pages/equipment/Repairbx/index.vue
+++ b/src/pages/equipment/Repairbx/index.vue
@@ -42,7 +42,7 @@
-->
-
+
@@ -218,6 +218,11 @@ export default class ChangePalletNew extends BasePage {
this.orderDesc = e.pickerName;
// await this.model.getpalletDestination(params);
}
+ async selectbindinput(e: any) {
+ model.locList.push(e.pickerName);
+ this.orderDesc = e.pickerName;
+ // await this.model.getpalletDestination(params);
+ }
timeConfirm(e) {
this.orderBreakdownTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.month;
this.formdata.orderBreakdownTime = this.orderBreakdownTime;
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 20a4ae0..336fe93 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
model = model;
src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
today = dayjs().format('YYYY-MM-DD dddd');
- version = '0.0.36';
+ version = '0.0.37';
checkversion: any = {};
sessiondata: any = '';
onLoad() {