|
@@ -2,34 +2,34 @@
|
|
<view>
|
|
<view>
|
|
<form @submit="submit">
|
|
<form @submit="submit">
|
|
<form @submit="addMachine">
|
|
<form @submit="addMachine">
|
|
- <view class="title"> 机器</view>
|
|
|
|
|
|
+ <view class="bigTitle">机器</view>
|
|
<view class="body">
|
|
<view class="body">
|
|
<input class="input" style="display:none;" name="coding" :value=coding />
|
|
<input class="input" style="display:none;" name="coding" :value=coding />
|
|
机器编码:<input class="input" v-model="coding" />
|
|
机器编码:<input class="input" v-model="coding" />
|
|
- <button type="primary" @click="saoma('coding')" class="button1">
|
|
|
|
|
|
+ <button type="primary" @click="saoma('coding')" class="button1" size="mini">
|
|
<p class="p">扫码</p>
|
|
<p class="p">扫码</p>
|
|
</button>
|
|
</button>
|
|
- <button type="primary" @click="getMachine(coding)" class="button1">
|
|
|
|
|
|
+ <button type="primary" @click="getMachine(coding)" class="button1" size="mini">
|
|
<p class="p">获取</p>
|
|
<p class="p">获取</p>
|
|
</button>
|
|
</button>
|
|
</view>
|
|
</view>
|
|
<view class="bodyname">
|
|
<view class="bodyname">
|
|
名称:<input class="input" name="name" :value="name" />
|
|
名称:<input class="input" name="name" :value="name" />
|
|
- <button type="primary" form-type="submit" class="button1">
|
|
|
|
|
|
+<!-- <button type="primary" form-type="submit" class="button1">
|
|
<p class="p">确认</p>
|
|
<p class="p">确认</p>
|
|
- </button>
|
|
|
|
|
|
+ </button> -->
|
|
</view>
|
|
</view>
|
|
<view class="body">
|
|
<view class="body">
|
|
机身铭牌:<input class="input" name="nameplate" :value="nameplate" />
|
|
机身铭牌:<input class="input" name="nameplate" :value="nameplate" />
|
|
- <button type="primary" form-type="submit" class="button1">
|
|
|
|
|
|
+<!-- <button type="primary" form-type="submit" class="button1">
|
|
<p class="p">确认</p>
|
|
<p class="p">确认</p>
|
|
- </button>
|
|
|
|
|
|
+ </button> -->
|
|
</view>
|
|
</view>
|
|
<view class="body">
|
|
<view class="body">
|
|
设备编号:<input class="input" name="clientId" :value="clientId" />
|
|
设备编号:<input class="input" name="clientId" :value="clientId" />
|
|
- <button type="primary" form-type="submit" class="button1">
|
|
|
|
|
|
+<!-- <button type="primary" form-type="submit" class="button1">
|
|
<p class="p">确认</p>
|
|
<p class="p">确认</p>
|
|
- </button>
|
|
|
|
|
|
+ </button> -->
|
|
</view>
|
|
</view>
|
|
<view class="body">
|
|
<view class="body">
|
|
<!-- 订单编号:<input class="input" name="orderNo" :value="orderNo" /> -->
|
|
<!-- 订单编号:<input class="input" name="orderNo" :value="orderNo" /> -->
|
|
@@ -38,27 +38,32 @@
|
|
<button type="primary" @click="saoma('orderNo')" class="button1">
|
|
<button type="primary" @click="saoma('orderNo')" class="button1">
|
|
<p class="p">扫码</p>
|
|
<p class="p">扫码</p>
|
|
</button>
|
|
</button>
|
|
- <button type="primary" form-type="submit" class="button1">
|
|
|
|
|
|
+<!-- <button type="primary" form-type="submit" class="button1">
|
|
<p class="p">确认</p>
|
|
<p class="p">确认</p>
|
|
- </button>
|
|
|
|
|
|
+ </button> -->
|
|
<!-- <button type="primary" @click="getMessage(orderNo)" class="button1">
|
|
<!-- <button type="primary" @click="getMessage(orderNo)" class="button1">
|
|
<p class="p">获取</p>
|
|
<p class="p">获取</p>
|
|
</button> -->
|
|
</button> -->
|
|
</view>
|
|
</view>
|
|
<view class="body">
|
|
<view class="body">
|
|
客户编号:<input class="input" name="customerNo" :value="customerNo" />
|
|
客户编号:<input class="input" name="customerNo" :value="customerNo" />
|
|
- <button type="primary" form-type="submit" class="button1">
|
|
|
|
|
|
+<!-- <button type="primary" form-type="submit" class="button1">
|
|
<p class="p">确认</p>
|
|
<p class="p">确认</p>
|
|
- </button>
|
|
|
|
|
|
+ </button> -->
|
|
</view>
|
|
</view>
|
|
<view class="body">
|
|
<view class="body">
|
|
<input class="input" style="display:none;" name="cardReader" :value=cardReader />
|
|
<input class="input" style="display:none;" name="cardReader" :value=cardReader />
|
|
- 刷卡器:<input class="input" v-model="cardReader" />
|
|
|
|
|
|
+ <span style="margin-left: 25upx;">刷卡器:</span><input class="input" v-model="cardReader" />
|
|
<button type="primary" @click="saoma('cardReader')" class="button1">
|
|
<button type="primary" @click="saoma('cardReader')" class="button1">
|
|
<p class="p">扫码</p>
|
|
<p class="p">扫码</p>
|
|
</button>
|
|
</button>
|
|
- <button type="primary" form-type="submit" class="button1">
|
|
|
|
|
|
+<!-- <button type="primary" form-type="submit" class="button1">
|
|
<p class="p">确认</p>
|
|
<p class="p">确认</p>
|
|
|
|
+ </button> -->
|
|
|
|
+ </view>
|
|
|
|
+ <view class="">
|
|
|
|
+ <button type="primary" form-type="submit" class="submitButton">
|
|
|
|
+ 确认
|
|
</button>
|
|
</button>
|
|
</view>
|
|
</view>
|
|
</form>
|
|
</form>
|
|
@@ -657,7 +662,7 @@
|
|
<p class="p1">检查</p>
|
|
<p class="p1">检查</p>
|
|
</button>
|
|
</button>
|
|
</view>
|
|
</view>
|
|
- <view class="">
|
|
|
|
|
|
+ <view class="checkContent">
|
|
{{weiname}} </br>
|
|
{{weiname}} </br>
|
|
{{Modulesname}}
|
|
{{Modulesname}}
|
|
</view>
|
|
</view>
|
|
@@ -773,8 +778,9 @@
|
|
// 允许从相机和相册扫码
|
|
// 允许从相机和相册扫码
|
|
uni.scanCode({
|
|
uni.scanCode({
|
|
success(res) {
|
|
success(res) {
|
|
- // console.log('条码类型:' + res.scanType);
|
|
|
|
- // console.log('条码内容:' + res.result);
|
|
|
|
|
|
+ console.log('res:' + res);
|
|
|
|
+ console.log('条码类型:' + res.scanType);
|
|
|
|
+ console.log('条码内容:' + res.result);
|
|
if (cod == 'coding') {
|
|
if (cod == 'coding') {
|
|
that.coding = res.result;
|
|
that.coding = res.result;
|
|
}
|
|
}
|
|
@@ -841,6 +847,15 @@
|
|
if (cod == 'cardReader') {
|
|
if (cod == 'cardReader') {
|
|
that.cardReader = res.result;
|
|
that.cardReader = res.result;
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ fail(err) {
|
|
|
|
+ console.log('err:' + JSON.stringify(err));
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'none',
|
|
|
|
+ title: '请使用正确的条形码或二维码!',
|
|
|
|
+ duration: 2000
|
|
|
|
+ });
|
|
|
|
+
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -1640,25 +1655,30 @@
|
|
|
|
|
|
.input {
|
|
.input {
|
|
/* padding: 10upx 20upx 10upx 0upx; */
|
|
/* padding: 10upx 20upx 10upx 0upx; */
|
|
- padding-left: 20upx;
|
|
|
|
- padding-top: 10upx;
|
|
|
|
|
|
+ padding-left: 10upx;
|
|
|
|
+ /* padding-top: 10upx; */
|
|
background-color: #FFFFFF;
|
|
background-color: #FFFFFF;
|
|
- width: 400upx;
|
|
|
|
|
|
+ width: 350upx;
|
|
height: 50upx;
|
|
height: 50upx;
|
|
box-shadow: 0upx 0upx 20upx #D3D3D3;
|
|
box-shadow: 0upx 0upx 20upx #D3D3D3;
|
|
border-radius: 5upx;
|
|
border-radius: 5upx;
|
|
}
|
|
}
|
|
|
|
|
|
.button {
|
|
.button {
|
|
- margin: auto;
|
|
|
|
- width: 60%;
|
|
|
|
|
|
+ /* margin: auto; */
|
|
|
|
+ margin: 50upx 100upx ;
|
|
|
|
+ /* width: 60%; */
|
|
height: 100upx;
|
|
height: 100upx;
|
|
}
|
|
}
|
|
|
|
|
|
.button1 {
|
|
.button1 {
|
|
margin: auto;
|
|
margin: auto;
|
|
- width: 75upx;
|
|
|
|
- height: 50upx;
|
|
|
|
|
|
+ width: 90upx;
|
|
|
|
+ height: 55upx;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ .submitButton {
|
|
|
|
+ margin: 20upx 200upx;
|
|
}
|
|
}
|
|
|
|
|
|
.p {
|
|
.p {
|
|
@@ -1710,6 +1730,11 @@
|
|
height: 10upx;
|
|
height: 10upx;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ .bigTitle {
|
|
|
|
+ font-size: 35upx;
|
|
|
|
+ margin-left: 20upx;
|
|
|
|
+ }
|
|
|
|
+
|
|
.title {
|
|
.title {
|
|
font-size: 35upx;
|
|
font-size: 35upx;
|
|
}
|
|
}
|
|
@@ -1723,6 +1748,11 @@
|
|
flex-direction: row;
|
|
flex-direction: row;
|
|
justify-content: flex-start;
|
|
justify-content: flex-start;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ .checkContent {
|
|
|
|
+ margin: 50upx 30upx;
|
|
|
|
+ font-size: 30upx;
|
|
|
|
+ }
|
|
|
|
|
|
.modules {
|
|
.modules {
|
|
width: 95%;
|
|
width: 95%;
|