Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app into dengfei

pages/internalManagement/apply/index.vue

@@ -20,7 +20,7 @@
 									v-for="(listItem,listIndex) in defaultList" :key="listIndex"
 									@click="handleDetail(listItem,'add')">
 									<zui-svg-icon style="position: relative;bottom: -14px" :icon="listItem.icon"
-										width="2rem" />
+										width="3rem" />
 									<text class="grid-text">{{listItem.name}}</text>
 								</u-grid-item>
 							</u-grid>
@@ -274,8 +274,8 @@
 	}
 
 	.grid-text {
-		font-size: 14px;
-		color: #909399;
+		font-size: 15px;
+		color: #333;
 		padding: 10rpx 0 20rpx 0rpx;
 		/* #ifndef APP-PLUS */
 		box-sizing: border-box;

pages/pda/components/workCard.vue

@@ -41,12 +41,16 @@
         <view>{{ item.brandNo }}</view>
       </view>
       <view class="item_one perce50 rx-sc">
-        <view>型号：</view>
-        <view>{{ item.model }}</view>
+        <view class="lable">批次号：</view>
+        <view class="gylx">{{ item.batchNo }}</view>
       </view>
     </view>
 
     <view class="item_box rx-sc">
+      <view class="item_one perce50 rx-sc">
+        <view>型号：</view>
+        <view>{{ item.model }}</view>
+      </view>
       <view class="item_one perce50 rx-sc">
         <view class="lable">规格：</view>
         <view class="gylx">{{ item.specification }}</view>
@@ -79,12 +83,7 @@
     </view>
 
     <view class="item_box rx-sc">
-      <view class="item_one perce50 rx-sc">
-        <view class="lable">批次号：</view>
-        <view class="gylx">{{ item.batchNo }}</view>
-      </view>
-
-      <view class="item_one perce50 rx-sc">
+      <view class="item_one rx-sc">
         <view class="lable">工艺路线：</view>
         <view class="gylx">{{ item.produceRoutingName }}</view>
       </view>
@@ -126,6 +125,7 @@ export default {
   },
   methods: {
     handleDetail() {
+      console.log('this.item', this.item)
       this.$emit("handleDetail", this.item);
     },
   },
@@ -171,6 +171,10 @@ export default {
       word-wrap: break-word;
     }
 
+    .item-right {
+      flex: 1;
+    }
+
     .gylx {
       color: $theme-color;
     }