首頁 探索 說明
註冊 登入
seimin
/
itsm-wx-handle
關註 1
讚好 0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

单选下拉组件替换

maotao 10 月之前
父節點
c994ea555a
當前提交
53bcdadba0
共有 7 個文件被更改，包括 130 次插入 和 47 次删除
分割檢視 顯示文件統計
  1. 28 10
      pages/assign/assign.vue
  2. 23 10
      pages/buildIncident/buildIncident.vue
  3. 40 14
      pages/changeUser/changeUser.vue
  4. 28 10
      pages/handler/handler.vue
  5. 8 0
      static/scss/common.scss
  6. 2 2
      uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
  7. 1 1
      uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue

+ 28 - 10
pages/assign/assign.vue
查看文件 

@@ -5,7 +5,8 @@
5 5 
         {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
6 6 
       </view>
7 7 
     </view>
8 
-    <scroll-view scroll-y class="body page_padding">
8 
+    <!-- <scroll-view scroll-y class="body page_padding"> -->
9 
+		<view class="body page_padding view-body">
9 10 
       <!-- 故障处理 -->
10 11 
       <template v-if="dataInfo.tabActiveValue === 'direct'">
11 12 
         <view class="form_item column" v-if="dataInfo.category.hasSimple != 1">
 
@@ -21,12 +22,20 @@
21 22 
         </view>
22 23 
         <view class="form_item">
23 24 
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理方式：</view>
24 
-          <uni-data-select class="value" v-model="dataInfo.handleCategory" :localdata="dataInfo.handleCategoryList" :clear="false" placeholder="请选择处理方式" :class="{formRed: isSubmit && !dataInfo.handleCategory}"></uni-data-select>
25 
-        </view>
25 
+          <!-- <uni-data-select class="value" v-model="dataInfo.handleCategory" :localdata="dataInfo.handleCategoryList" :clear="false" placeholder="请选择处理方式" :class="{formRed: isSubmit && !dataInfo.handleCategory}"></uni-data-select> -->
26 
+					<uni-data-picker class="value" placeholder="请选择处理方式"
27 
+						:localdata="dataInfo.handleCategoryList" v-model="dataInfo.handleCategory"
28 
+						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handleCategory}">
29 
+					</uni-data-picker>
30 
+				</view>
26 31 
         <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
27 32 
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理结果：</view>
28 
-          <uni-data-select class="value" v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList" :clear="false" placeholder="请选择处理结果" :class="{formRed: isSubmit && !dataInfo.closecode}"></uni-data-select>
29 
-        </view>
33 
+          <!-- <uni-data-select class="value" v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList" :clear="false" placeholder="请选择处理结果" :class="{formRed: isSubmit && !dataInfo.closecode}"></uni-data-select> -->
34 
+					<uni-data-picker class="value" placeholder="请选择处理结果"
35 
+						:localdata="dataInfo.closecodeList" v-model="dataInfo.closecode"
36 
+						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.closecode}">
37 
+					</uni-data-picker>
38 
+				</view>
30 39 
         <view class="form_item">
31 40 
           <view class="title"><text class="required newicon newicon-bitian transparent"></text>协同人员：</view>
32 41 
           <text class="synergeticNames ellipsis">{{dataInfo.synergetic.map(v => v.name).join('，')}}</text>
 
@@ -52,16 +61,24 @@
52 61 
       <template v-if="dataInfo.tabActiveValue === 'assign'">
53 62 
         <view class="form_item">
54 63 
           <view class="title select"><text class="required newicon newicon-bitian"></text>工作组：</view>
55 
-          <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
56 
-        </view>
64 
+          <!-- <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select> -->
65 
+					<uni-data-picker class="value" placeholder="请选择工作组"
66 
+						:localdata="dataInfo.groupList" v-model="dataInfo.groupId"
67 
+						:clear-icon="false" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}">
68 
+					</uni-data-picker>
69 
+				</view>
57 70 
         <view class="form_item">
58 71 
           <view class="title radio"><text class="required newicon newicon-bitian"></text>是否转派到人：</view>
59 72 
           <uni-data-checkbox class="value" v-model="dataInfo.isAssignUser" :localdata="dataInfo.isAssignUserList" @change="changeIsAssignUser" />
60 73 
         </view>
61 74 
         <view class="form_item" v-if="dataInfo.isAssignUser === 1">
62 75 
           <view class="title select"><text class="required newicon newicon-bitian"></text>转派对象：</view>
63 
-          <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择转派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
64 
-        </view>
76 
+          <!-- <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择转派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select> -->
77 
+					<uni-data-picker class="value" placeholder="请选择转派对象"
78 
+						:localdata="dataInfo.userList" v-model="dataInfo.userId"
79 
+						:clear-icon="false" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}">
80 
+					</uni-data-picker>
81 
+				</view>
65 82 
         <!-- <view class="form_item_column">
66 83 
           <view class="form_item">
67 84 
             <view class="title"><text class="required newicon newicon-bitian transparent"></text>处理图片：</view>
 
@@ -77,7 +94,8 @@
77 94 
           </view>
78 95 
         </view> -->
79 96 
       </template>
80 
-    </scroll-view>
97 
+		</view>
98 
+    <!-- </scroll-view> -->
81 99 
     <view class="foot_common_btns">
82 100 
       <button @click="goBack" type="default" class="cancelButton btn">返回</button>
83 101 
       <button @click="submit" type="default" class="primaryButton btn">提交</button>

+ 23 - 10
pages/buildIncident/buildIncident.vue
查看文件 

@@ -1,10 +1,15 @@
1 1 
 <template>
2 2 
   <view class="buildIncident">
3 
-    <scroll-view scroll-y class="body">
3 
+		<!-- 原来的scroll-view -->
4 
+    <view class="body view-body">
4 5 
       <view class="form_item">
5 6 
         <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
6 
-        <uni-data-select class="value" v-model="incidentData.branch" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" :class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch"></uni-data-select>
7 
-      </view>
7 
+        <!-- <uni-data-select class="value" v-model="incidentData.branch" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" :class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch"></uni-data-select> -->
8 
+				<uni-data-picker class="value" placeholder="请选择院区"
9 
+					:localdata="dataInfo.branchList" v-model="incidentData.branch" :clear-icon="false"
10 
+					:class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch">
11 
+				</uni-data-picker>
12 
+			</view>
8 13 
       <view class="form_item">
9 14 
         <view class="title"><text class="required newicon newicon-bitian"></text>报修科室：</view>
10 15 
         <view class="value category" @click="selectDepartment">
 
@@ -47,12 +52,20 @@
47 52 
       </view>
48 53 
       <view class="form_item">
49 54 
         <view class="title select"><text class="required newicon newicon-bitian"></text>故障来源：</view>
50 
-        <uni-data-select readonly class="value" v-model="incidentData.source" :localdata="dataInfo.sourceList" placeholder="请选择故障来源" :class="{formRed: isSubmit && !incidentData.source}"></uni-data-select>
51 
-      </view>
55 
+        <!-- <uni-data-select readonly class="value" v-model="incidentData.source" :localdata="dataInfo.sourceList" placeholder="请选择故障来源" :class="{formRed: isSubmit && !incidentData.source}"></uni-data-select> -->
56 
+				<uni-data-picker class="value" placeholder="请选择故障来源"
57 
+					:localdata="dataInfo.sourceList" v-model="incidentData.source"
58 
+					:clear-icon="false" :class="{formRed: isSubmit && !incidentData.source}">
59 
+				</uni-data-picker>
60 
+			</view>
52 61 
       <view class="form_item">
53 62 
         <view class="title select"><text class="required newicon newicon-bitian"></text>优先级：</view>
54 
-        <uni-data-select placement="top" readonly class="value" v-model="incidentData.priority" :localdata="dataInfo.priorityList" placeholder="请选择优先级" :class="{formRed: isSubmit && !incidentData.priority}"></uni-data-select>
55 
-      </view>
63 
+        <!-- <uni-data-select placement="top" readonly class="value" v-model="incidentData.priority" :localdata="dataInfo.priorityList" placeholder="请选择优先级" :class="{formRed: isSubmit && !incidentData.priority}"></uni-data-select> -->
64 
+				<uni-data-picker placement="top" class="value" placeholder="请选择优先级"
65 
+					:localdata="dataInfo.priorityList" v-model="incidentData.priority"
66 
+					:clear-icon="false" :class="{formRed: isSubmit && !incidentData.priority}">
67 
+				</uni-data-picker>
68 
+			</view>
56 69 
       <view class="form_item column">
57 70 
         <view class="title select"><text class="required newicon newicon-bitian"></text>故障描述：</view>
58 71 
         <uni-easyinput class="value" type="textarea" v-model="incidentData.description" placeholder="请输入故障描述" :class="{formRed: isSubmit && !incidentData.description.trim()}" />
 
@@ -72,7 +85,7 @@
72 85 
         </view>
73 86 
       </view>
74 87
75 
-    </scroll-view>
88 
+    </view>
76 89 
     <view class="foot_common_btns">
77 90 
       <button @click="goBack" type="default" class="cancelButton btn">返回</button>
78 91 
       <button @click="submit" type="default" class="primaryButton btn">下一步</button>
 
@@ -101,7 +114,7 @@
101 114
102 115 
   // 主题颜色
103 116 
   const primaryColor = ref(defaultColor)
104 
-
117 
+
105 118 
   // 工单对象
106 119 
   const incidentData = reactive({
107 120 
     "deleteFlag": 0,
 
@@ -287,7 +300,7 @@
287 300 
     incidentData.place = undefined;
288 301 
     incidentData.houseNumber = undefined;
289 302 
   }
290 
-
303 
+
291 304 
   // 处理提交事件
292 305 
   function handlerOrder(){
293 306 
     let postData = {

+ 40 - 14
pages/changeUser/changeUser.vue
查看文件 

@@ -5,45 +5,70 @@
5 5 
         {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
6 6 
       </view>
7 7 
     </view>
8 
-    <scroll-view scroll-y class="body">
8 
+    <!-- <scroll-view scroll-y class="body"> -->
9 
+		<view class="body view-body">
9 10 
       <!-- 转派 -->
10 11 
       <template v-if="dataInfo.tabActiveValue === 'redeploy'">
11 12 
         <view class="form_item">
12 13 
           <view class="title select"><text class="required newicon newicon-bitian"></text>工作组：</view>
13 
-          <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
14 
-        </view>
14 
+          <!-- <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select> -->
15 
+					<uni-data-picker class="value" placeholder="请选择工作组"
16 
+						:localdata="dataInfo.groupList" v-model="dataInfo.groupId"
17 
+						:clear-icon="false" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}">
18 
+					</uni-data-picker>
19 
+				</view>
15 20 
         <view class="form_item">
16 21 
           <view class="title radio"><text class="required newicon newicon-bitian"></text>是否转派到人：</view>
17 22 
           <uni-data-checkbox class="value" v-model="dataInfo.isAssignUser" :localdata="dataInfo.isAssignUserList" @change="changeIsAssignUser" />
18 23 
         </view>
19 24 
         <view class="form_item" v-if="dataInfo.isAssignUser === 1">
20 25 
           <view class="title select"><text class="required newicon newicon-bitian"></text>转派对象：</view>
21 
-          <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择转派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
22 
-        </view>
26 
+          <!-- <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择转派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select> -->
27 
+					<uni-data-picker class="value" placeholder="请选择转派对象"
28 
+						:localdata="dataInfo.userList" v-model="dataInfo.userId"
29 
+						:clear-icon="false" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}">
30 
+					</uni-data-picker>
31 
+				</view>
23 32 
       </template>
24 33
25 34 
       <!-- 指派 -->
26 35 
       <template v-if="dataInfo.tabActiveValue === 'assign'">
27 36 
         <view class="form_item">
28 37 
           <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
29 
-          <uni-data-select class="value" v-model="dataInfo.branchId" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" @change="changeBranch" :class="{formRed: isSubmit && !dataInfo.branchId}"></uni-data-select>
30 
-        </view>
38 
+          <!-- <uni-data-select class="value" v-model="dataInfo.branchId" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" @change="changeBranch" :class="{formRed: isSubmit && !dataInfo.branchId}"></uni-data-select> -->
39 
+					<uni-data-picker class="value" placeholder="请选择院区"
40 
+						:localdata="dataInfo.branchList" v-model="dataInfo.branchId"
41 
+						:clear-icon="false" @change="changeBranch" :class="{formRed: isSubmit && !dataInfo.branchId}">
42 
+					</uni-data-picker>
43 
+				</view>
31 44 
         <view class="form_item">
32 45 
           <view class="title select"><text class="required newicon newicon-bitian"></text>责任科室：</view>
33 
-          <uni-data-select class="value" v-model="dataInfo.dutyId" :localdata="dataInfo.dutyList" :clear="false" placeholder="请选择责任科室" @change="changeDuty" :class="{formRed: isSubmit && !dataInfo.dutyId}"></uni-data-select>
34 
-        </view>
46 
+          <!-- <uni-data-select class="value" v-model="dataInfo.dutyId" :localdata="dataInfo.dutyList" :clear="false" placeholder="请选择责任科室" @change="changeDuty" :class="{formRed: isSubmit && !dataInfo.dutyId}"></uni-data-select> -->
47 
+					<uni-data-picker class="value" placeholder="请选择责任科室"
48 
+						:localdata="dataInfo.dutyList" v-model="dataInfo.dutyId"
49 
+						:clear-icon="false" @change="changeDuty" :class="{formRed: isSubmit && !dataInfo.dutyId}">
50 
+					</uni-data-picker>
51 
+				</view>
35 52 
         <view class="form_item">
36 53 
           <view class="title select"><text class="required newicon newicon-bitian"></text>工作组：</view>
37 
-          <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
38 
-        </view>
54 
+          <!-- <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择工作组" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select> -->
55 
+					<uni-data-picker class="value" placeholder="请选择工作组"
56 
+						v-model="dataInfo.groupId" :localdata="dataInfo.groupList"
57 
+						:clear-icon="false" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}">
58 
+					</uni-data-picker>
59 
+				</view>
39 60 
         <view class="form_item">
40 61 
           <view class="title radio"><text class="required newicon newicon-bitian"></text>是否指派到人：</view>
41 62 
           <uni-data-checkbox class="value" v-model="dataInfo.isAssignUser" :localdata="dataInfo.isAssignUserList" @change="changeIsAssignUser" />
42 63 
         </view>
43 64 
         <view class="form_item" v-if="dataInfo.isAssignUser === 1">
44 65 
           <view class="title select"><text class="required newicon newicon-bitian"></text>指派对象：</view>
45 
-          <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择指派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select>
46 
-        </view>
66 
+          <!-- <uni-data-select class="value" v-model="dataInfo.userId" :localdata="dataInfo.userList" :clear="false" placeholder="请选择指派对象" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}"></uni-data-select> -->
67 
+					<uni-data-picker class="value" placeholder="请选择指派对象"
68 
+						v-model="dataInfo.userId" :localdata="dataInfo.userList"
69 
+						:clear-icon="false" :class="{formRed: isSubmit && dataInfo.groupId && dataInfo.isAssignUser == 1 && !dataInfo.userId}">
70 
+					</uni-data-picker>
71 
+				</view>
47 72 
       </template>
48 73
49 74 
       <!-- 退回 -->
 
@@ -54,7 +79,8 @@
54 79 
           <view class="tips">注：退回后，由调度台重新指派。</view>
55 80 
         </view>
56 81 
       </template>
57 
-    </scroll-view>
82 
+		</view>
83 
+    <!-- </scroll-view> -->
58 84 
     <view class="foot_common_btns">
59 85 
       <button @click="goBack" type="default" class="cancelButton btn">返回</button>
60 86 
       <button @click="submit" type="default" class="primaryButton btn">提交</button>

+ 28 - 10
pages/handler/handler.vue
查看文件 

@@ -5,7 +5,8 @@
5 5 
         {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
6 6 
       </view>
7 7 
     </view>
8 
-    <scroll-view scroll-y class="body" :class="{ page_padding: !(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder), bg: (dataInfo.tabActiveValue === 'doing' && isInSummaryOrder) }">
8 
+		<view class="body view-body" :class="{ page_padding: !(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder), bg: (dataInfo.tabActiveValue === 'doing' && isInSummaryOrder) }">
9 
+    <!-- <scroll-view scroll-y class="body" :class="{ page_padding: !(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder), bg: (dataInfo.tabActiveValue === 'doing' && isInSummaryOrder) }"> -->
9 10 
       <!-- 汇总单 -->
10 11 
       <template v-if="dataInfo.tabActiveValue === 'doing' && isInSummaryOrder">
11 12 
         <!-- 耗材 -->
 
@@ -87,12 +88,20 @@
87 88 
         </view>
88 89 
         <view class="form_item">
89 90 
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理方式：</view>
90 
-          <uni-data-select class="value" v-model="dataInfo.handleCategory" :localdata="dataInfo.handleCategoryList" :clear="false" placeholder="请选择处理方式" :class="{formRed: isSubmit && !dataInfo.handleCategory}"></uni-data-select>
91 
-        </view>
91 
+          <!-- <uni-data-select class="value" v-model="dataInfo.handleCategory" :localdata="dataInfo.handleCategoryList" :clear="false" placeholder="请选择处理方式" :class="{formRed: isSubmit && !dataInfo.handleCategory}"></uni-data-select> -->
92 
+					<uni-data-picker class="value" placeholder="请选择处理方式"
93 
+						v-model="dataInfo.handleCategory" :localdata="dataInfo.handleCategoryList"
94 
+						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handleCategory}">
95 
+					</uni-data-picker>
96 
+				</view>
92 97 
         <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
93 98 
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理结果：</view>
94 
-          <uni-data-select class="value" v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList" :clear="false" placeholder="请选择处理结果" :class="{formRed: isSubmit && !dataInfo.closecode}"></uni-data-select>
95 
-        </view>
99 
+          <!-- <uni-data-select class="value" v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList" :clear="false" placeholder="请选择处理结果" :class="{formRed: isSubmit && !dataInfo.closecode}"></uni-data-select> -->
100 
+					<uni-data-picker class="value" placeholder="请选择处理结果"
101 
+						v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList"
102 
+						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.closecode}">
103 
+					</uni-data-picker>
104 
+				</view>
96 105 
         <view class="form_item">
97 106 
           <view class="title"><text class="required newicon newicon-bitian transparent"></text>协同人员：</view>
98 107 
           <text class="synergeticNames ellipsis">{{dataInfo.synergetic.map(v => v.name).join('，')}}</text>
 
@@ -118,18 +127,27 @@
118 127 
       <template v-if="dataInfo.tabActiveValue === 'overtime'">
119 128 
         <view class="form_item">
120 129 
           <view class="title select"><text class="required newicon newicon-bitian"></text>延期原因：</view>
121 
-          <uni-data-select class="value" v-model="dataInfo.repairTypeId" :localdata="dataInfo.repairTypeList" :clear="false" placeholder="请选择延期原因" :class="{formRed: isSubmit && !dataInfo.repairTypeId}"></uni-data-select>
122 
-        </view>
130 
+          <!-- <uni-data-select class="value" v-model="dataInfo.repairTypeId" :localdata="dataInfo.repairTypeList" :clear="false" placeholder="请选择延期原因" :class="{formRed: isSubmit && !dataInfo.repairTypeId}"></uni-data-select> -->
131 
+					<uni-data-picker class="value" placeholder="请选择延期原因"
132 
+						v-model="dataInfo.repairTypeId" :localdata="dataInfo.repairTypeList"
133 
+						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.repairTypeId}">
134 
+					</uni-data-picker>
135 
+				</view>
123 136 
         <view class="form_item column">
124 137 
           <view class="title"><text class="required newicon newicon-bitian"></text>延期说明：</view>
125 138 
           <uni-easyinput class="value" type="textarea" v-model="dataInfo.deferralRemark" placeholder="请输入延期说明" :class="{formRed: isSubmit && !dataInfo.deferralRemark.trim()}" />
126 139 
         </view>
127 140 
         <view class="form_item">
128 141 
           <view class="title select"><text class="required newicon newicon-bitian"></text>延期天数：</view>
129 
-          <uni-data-select class="value" v-model="dataInfo.deferralDayId" :localdata="dataInfo.deferralDayList" :clear="false" placeholder="请选择延期天数" :class="{formRed: isSubmit && !dataInfo.deferralDayId}"></uni-data-select>
130 
-        </view>
142 
+          <!-- <uni-data-select class="value" v-model="dataInfo.deferralDayId" :localdata="dataInfo.deferralDayList" :clear="false" placeholder="请选择延期天数" :class="{formRed: isSubmit && !dataInfo.deferralDayId}"></uni-data-select> -->
143 
+					<uni-data-picker class="value" placeholder="请选择延期天数"
144 
+						v-model="dataInfo.deferralDayId" :localdata="dataInfo.deferralDayList"
145 
+						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.deferralDayId}">
146 
+					</uni-data-picker>
147 
+				</view>
131 148 
       </template>
132 
-    </scroll-view>
149 
+    <!-- </scroll-view> -->
150 
+		</view>
133 151 
     <view class="foot_common_btns">
134 152 
       <button @click="goBackOrToList" type="default" class="cancelButton btn">{{dataInfo.isSummaryNext ? '上一步' : '返回'}}</button>
135 153 
       <button @click="submit" type="default" class="primaryButton btn">{{dataInfo.tabActiveValue === 'doing' && isInSummaryOrder ? '下一步' : '提交'}}</button>

+ 8 - 0
static/scss/common.scss
查看文件 

@@ -205,3 +205,11 @@ uni-toast,
205 205 
 .mt0{
206 206 
   margin-top: 0!important;
207 207 
 }
208 
+
209 
+.no-scroll{
210 
+	overflow-y: hidden;
211 
+}
212 
+
213 
+.view-body{
214 
+	overflow-y: scroll;
215 
+}

+ 2 - 2
uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
查看文件 

@@ -1,5 +1,5 @@
1 1 
 <template>
2 
-  <view class="uni-data-tree">
2 
+  <view class="uni-data-tree" @touchmove.stop.prevent>
3 3 
     <view class="uni-data-tree-input" @click="handleInput">
4 4 
       <slot :options="options" :data="inputSelected" :error="errorMessage">
5 5 
         <view class="input-value" :class="{'input-value-border': border}">
 
@@ -320,7 +320,7 @@
320 320 
   }
321 321
322 322 
   .selected-area {
323 
-    flex: 1;
323 
+    /* flex: 1; */
324 324 
     overflow: hidden;
325 325 
     /* #ifndef APP-NVUE */
326 326 
     display: flex;

+ 1 - 1
uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
查看文件 

@@ -1,5 +1,5 @@
1 1 
 <template>
2 
-  <view class="uni-data-pickerview">
2 
+  <view class="uni-data-pickerview" @touchmove.stop.prevent>
3 3 
     <scroll-view v-if="!isCloudDataList" class="selected-area" scroll-x="true">
4 4 
       <view class="selected-list">
5 5 
           <view