|
|
@@ -11,13 +11,11 @@
|
|
|
<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
|
|
|
@click="pickerShow('gcmc',0)">
|
|
|
<span style="color: darkgray;">请选择工程名称</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')"
|
|
|
- class="to-right-icon"></image>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
|
|
|
<span style="color: black;">{{projectName.name}}</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')"
|
|
|
- class="to-right-icon"></image>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -114,7 +112,8 @@
|
|
|
<view class="background">
|
|
|
<view>
|
|
|
<view class="uni-list">
|
|
|
- <view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
|
|
|
+ <view
|
|
|
+ style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
|
|
|
{{objValue.value}}
|
|
|
|
|
|
<span
|
|
|
@@ -128,8 +127,7 @@
|
|
|
</view>
|
|
|
<view @click="openDatetimePicker()">
|
|
|
<span style="color: black;">{{time}}</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')"
|
|
|
- class="to-right-icon"></image>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -145,13 +143,11 @@
|
|
|
<view v-if="isNew==false">
|
|
|
<view v-if="this.isEmpty(this.materialValue.id)" @click="pickerShow('cz')">
|
|
|
<span style="color: darkgray;">请选择材质</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')"
|
|
|
- class="to-right-icon"></image>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
|
|
|
<span style="color: black;">{{materialValue.name}}</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')"
|
|
|
- class="to-right-icon"></image>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-else-if="isNew==true">
|
|
|
@@ -170,13 +166,11 @@
|
|
|
<view v-if="isNew==false">
|
|
|
<view v-if="this.isEmpty(this.specificationValue.id)" @click="pickerShow('gg')">
|
|
|
<span style="color: darkgray;">请选择规格</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')"
|
|
|
- class="to-right-icon"></image>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
<view v-else class="uni-list-cell-db" @click="pickerShow('gg')">
|
|
|
<span style="color: black;">{{specificationValue.name}}</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')"
|
|
|
- class="to-right-icon"></image>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-else-if="isNew==true">
|
|
|
@@ -186,13 +180,15 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="uni-list">
|
|
|
- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
-
|
|
|
- <text>数 量</text>
|
|
|
- <input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
|
|
|
- maxlength="11" style="margin-left: 10px;text-align: right;"></input>
|
|
|
- </view>
|
|
|
+
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <text>米 数</text>
|
|
|
+ <!-- style="margin-left: 10px;text-align: right;" -->
|
|
|
+ <input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
|
|
|
+ style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
+ <text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
|
|
|
+ <input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
+ style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -289,6 +285,8 @@
|
|
|
specificationValue: {}, //规格
|
|
|
materialValue: {}, //材质
|
|
|
inputNumberValue: '',
|
|
|
+ inputIntegerNumberValue: '',
|
|
|
+ inputDecimalNumberValue: '',
|
|
|
projectName: '', //工程名称
|
|
|
gcdzValue: '', //工程地址
|
|
|
jsdwValue: '', //建设单位
|
|
|
@@ -583,13 +581,11 @@
|
|
|
title: '下载成功'
|
|
|
})
|
|
|
},
|
|
|
- fail: error => {
|
|
|
- }
|
|
|
+ fail: error => {}
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- fail: error => {
|
|
|
- }
|
|
|
+ fail: error => {}
|
|
|
|
|
|
})
|
|
|
|
|
|
@@ -726,8 +722,8 @@
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
- if (this.isEmpty(this.inputNumberValue)) {
|
|
|
- this.$modal.msg("请输入数量")
|
|
|
+ if (this.isEmpty(this.inputIntegerNumberValue)) {
|
|
|
+ this.$modal.msg("请输入米数")
|
|
|
return
|
|
|
}
|
|
|
if (this.imgArr.length <= 0) {
|
|
|
@@ -738,6 +734,13 @@
|
|
|
this.$modal.msg('照片或视频未上传完毕，无法提交！')
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ if (this.isEmpty(this.inputDecimalNumberValue)) {
|
|
|
+ this.inputNumberValue = this.inputIntegerNumberValue;
|
|
|
+ } else {
|
|
|
+ this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
|
|
|
+ }
|
|
|
if (this.isNew) {
|
|
|
//新增
|
|
|
this.zEngineeringMaterialBo.push({
|
|
|
@@ -800,21 +803,22 @@
|
|
|
justify-content: space-between;
|
|
|
padding: 10px;
|
|
|
position: relative;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
-.uni-list {
|
|
|
- border: 1xp solid #eee;
|
|
|
- }
|
|
|
- .to-right-icon {
|
|
|
- width: 15px;
|
|
|
- height: 15px;
|
|
|
- position: absolute;
|
|
|
- top: 50%;
|
|
|
- transform: translateY(-50%);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
+ .uni-list {
|
|
|
+ border: 1xp solid #eee;
|
|
|
+ }
|
|
|
+
|
|
|
+ .to-right-icon {
|
|
|
+ width: 15px;
|
|
|
+ height: 15px;
|
|
|
+ position: absolute;
|
|
|
+ top: 50%;
|
|
|
+ transform: translateY(-50%);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
.text {
|
|
|
font-size: 16px;
|
|
|
color: #333;
|
|
|
@@ -828,23 +832,23 @@
|
|
|
border-radius: 20rpx;
|
|
|
margin: 20rpx;
|
|
|
/*从padding开始往外面裁剪背景*/
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
- .btn {
|
|
|
- width: 715rpx;
|
|
|
- height: 69rpx;
|
|
|
- background: #79A4F0;
|
|
|
- border-radius: 6rpx;
|
|
|
- font-size: 25rpx;
|
|
|
- font-family: Microsoft YaHei;
|
|
|
- font-weight: 400;
|
|
|
- color: #FFFFFF;
|
|
|
- line-height: 69rpx;
|
|
|
- margin-top: 40rpx;
|
|
|
- margin-bottom: 100rpx;
|
|
|
- }
|
|
|
+ .btn {
|
|
|
+ width: 715rpx;
|
|
|
+ height: 69rpx;
|
|
|
+ background: #79A4F0;
|
|
|
+ border-radius: 6rpx;
|
|
|
+ font-size: 25rpx;
|
|
|
+ font-family: Microsoft YaHei;
|
|
|
+ font-weight: 400;
|
|
|
+ color: #FFFFFF;
|
|
|
+ line-height: 69rpx;
|
|
|
+ margin-top: 40rpx;
|
|
|
+ margin-bottom: 100rpx;
|
|
|
+ }
|
|
|
|
|
|
.number {
|
|
|
display: flex;
|
|
|
@@ -856,7 +860,7 @@
|
|
|
padding: 10px;
|
|
|
/* 设置padding以提高视觉效果 */
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.tj-btn {
|
|
|
height: 69rpx;
|
|
|
background: #3184f0;
|
|
|
@@ -866,9 +870,9 @@
|
|
|
color: #FFFFFF;
|
|
|
line-height: 69rpx;
|
|
|
margin: 40rpx 70rpx;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.sc-btn {
|
|
|
height: 69rpx;
|
|
|
background: #f0686b;
|
|
|
@@ -878,9 +882,9 @@
|
|
|
color: #FFFFFF;
|
|
|
line-height: 69rpx;
|
|
|
margin: 40rpx;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.num-style {
|
|
|
background: #e8f4f9;
|
|
|
margin: 20rpx;
|
|
|
@@ -969,5 +973,4 @@
|
|
|
font-size: 28rpx;
|
|
|
color: #808080;
|
|
|
}
|
|
|
-
|
|
|
</style>
|
