新增生产要求

manifest.json

@@ -10,7 +10,7 @@
             "proxy" : {
                 "/api" : {
                     // "target" : "http://192.168.1.110:18086/",
-                    "target" : "http://192.168.1.251:18086/",
+                    "target" : "http://192.168.1.125:18086/",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

pages/pda/feeding/components/workOrderBom.vue

@@ -70,6 +70,21 @@
             </view>
           </view>
         </view>
+
+        <view class="item" v-if="isReportWork">
+          <view class="lable rx-cc">生产要求</view>
+          <!-- <view class="content" :disabled="isDetails">{{
+            item.productionCodes
+          }}</view> -->
+          <view class="content content_num">
+            <input
+              style="width: 100%"
+              :disabled="isDetails"
+              class="uni-input"
+              v-model="item.productionRequirements"
+            />
+          </view>
+        </view>
       </view>
     </view>
     <!-- {{ clientEnvironmentId }} {{ pType }} -->
@@ -108,6 +123,11 @@ export default {
       default: false,
     },
 
+    isReportWork: {
+      type: Boolean,
+      default: false,
+    },
+
     pType: {
       type: "",
       default: "",

pages/pda/feeding/details.vue

@@ -20,6 +20,7 @@
           <workOrderBom
             :item="item"
             pType="feed"
+            :isDetails="true"
             :taskType="item.currentTaskDiagram.type"
             @handleScan="handleScan"
           ></workOrderBom>

pages/pda/jobBooking/index/index.vue

@@ -24,6 +24,7 @@
             pType="job"
             :taskType="taskType"
             @handleScan="handleScan"
+            :isReportWork="true"
           >
           </workOrderBom>
 

pages/pda/warehousing/components/workOrderBom.vue

@@ -1,234 +1,221 @@
 <template>
-	<view>
-		<view class="title_box rx-bc">
-			<view class="name">工单信息</view>
-
-			<view class="btn_box rx-bc" @click="handleScan(item.workOrderId)" v-if='!isDetails'>
-				<image class="scan" src="@/static/pda/ScanIt.svg"></image>
-				更换工单
-			</view>
-		</view>
-
-
-		<view class="material ">
-
-			<view class="content_table">
-				<view class="item">
-					<view class="lable rx-cc">工单编号</view>
-					<view class="content">
-						{{item.code}}
-					</view>
-				</view>
-
-				<view class="item">
-					<view class="lable rx-cc">编码</view>
-					<view class="content">{{ item.categoryName }}</view>
-				</view>
-
-				<view class="item">
-					<view class="lable rx-cc">名称</view>
-					<view class="content">{{ item.categoryCode }}</view>
-				</view>
-				
-				
-				<view class="item">
-					<view class="lable rx-cc">批次号</view>
-					<view class="content">{{ item.batchNo }}</view>
-				</view>
-				
-
-
-				<view class="item rx-sc">
-					
-					<view class="rx ww45">
-						<view class="lable rx-cc ww80">牌号</view>
-						<view class="content content_num">
-							<view>{{item.brandNum}}</view>
-					
-						</view>
-					</view>
-					
-					<view class="rx ww55 ">
-						<view class="lable  rx-cc">型号</view>
-						<view class="content rx-sc">
-							<view>{{item.modelType}}</view>
-						
-						</view>
-					</view>
-
-
-				</view>
-
-
-
-			</view>
-		</view>
-
-
-	</view>
+  <view>
+    <view class="title_box rx-bc">
+      <view class="name">工单信息</view>
+
+      <view
+        class="btn_box rx-bc"
+        @click="handleScan(item.workOrderId)"
+        v-if="!isDetails"
+      >
+        <image class="scan" src="@/static/pda/ScanIt.svg"></image>
+        更换工单
+      </view>
+    </view>
+
+    <view class="material">
+      <view class="content_table">
+        <view class="item">
+          <view class="lable rx-cc">工单编号</view>
+          <view class="content">
+            {{ item.code }}
+          </view>
+        </view>
+
+        <view class="item">
+          <view class="lable rx-cc">编码</view>
+          <view class="content">{{ item.categoryName }}</view>
+        </view>
+
+        <view class="item">
+          <view class="lable rx-cc">名称</view>
+          <view class="content">{{ item.categoryCode }}</view>
+        </view>
+
+        <view class="item">
+          <view class="lable rx-cc">批次号</view>
+          <view class="content">{{ item.batchNo }}</view>
+        </view>
+
+        <view class="item rx-sc">
+          <view class="rx ww45">
+            <view class="lable rx-cc ww80">牌号</view>
+            <view class="content content_num">
+              <view>{{ item.brandNum }}</view>
+            </view>
+          </view>
+
+          <view class="rx ww55">
+            <view class="lable rx-cc">型号</view>
+            <view class="content rx-sc">
+              <view>{{ item.modelType }}</view>
+            </view>
+          </view>
+        </view>
+
+        <view class="item">
+          <view class="lable rx-cc">生产要求</view>
+          <!-- <view class="content" :disabled="isDetails">{{
+            item.productionCodes
+          }}</view> -->
+          <view class="content content_num">
+            <input
+              style="width: 100%"
+              disabled
+              class="uni-input"
+              v-model="item.productionRequirements"
+            />
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		props: {
-			item: {
-				type: Object,
-				default: () => {}
-			},
-			isDetails: {
-				type: Boolean,
-				default: false
-			}
-
-		},
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-			handleScan(id) {
-				this.$emit('handleScan', id, 'wordOrder')
-			},
-		}
-	}
+export default {
+  props: {
+    item: {
+      type: Object,
+      default: () => {},
+    },
+    isDetails: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    handleScan(id) {
+      this.$emit("handleScan", id, "wordOrder");
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.title_box {
-		margin-top: 18rpx;
-
-		.name {
-			font-size: 28rpx;
-			font-style: normal;
-			font-weight: 400;
-			color: $theme-color;
-			padding-left: 20rpx;
-
-			position: relative;
-
-			&:before {
-				position: absolute;
-				content: '';
-				left: 0rpx;
-				top: 0rpx;
-				bottom: 0rpx;
-				width: 4rpx;
-				height: 28rpx;
-				background: $theme-color;
-				margin: auto;
-			}
-
-
-		}
-
-		.btn_box {
-			padding: 0 18rpx;
-			height: 60rpx;
-			background: $theme-color;
-			font-size: 26rpx;
-			font-style: normal;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #fff;
-			border-radius: 4rpx;
-
-			.scan {
-				width: 34rpx;
-				height: 34rpx;
-				margin-right: 12rpx;
-
-			}
-
-		}
-
-	}
-
-
-	.material {
-		margin-top: 10rpx;
-
-
-		.content_table {
-			width: 100%;
-			border: 2rpx solid $border-color;
-
-			.item {
-				display: flex;
-				border-bottom: 2rpx solid $border-color;
-
-
-				.lable {
-					width: 132rpx;
-					text-align: center;
-					background-color: #F7F9FA;
-					font-size: 26rpx;
-					border-right: 2rpx solid $border-color;
-					flex-shrink: 0;
-				}
-
-				.lable150 {
-					width: 156rpx !important;
-					font-size: 24rpx;
-				}
-
-				.ww80 {
-					width: 80rpx;
-				}
-
-				.content {
-					width: 518rpx;
-					min-height: 64rpx;
-					font-size: 28rpx;
-					line-height: 28rpx;
-					font-style: normal;
-					font-weight: 400;
-					padding: 18rpx 8rpx;
-					box-sizing: border-box;
-					word-wrap: break-word;
-					flex-grow: 1 !important;
-
-
-					.unit {
-						padding: 0 4rpx;
-						font-size: 24rpx;
-						color: #404446;
-					}
-
-				}
-
-				.content_num {
-					display: flex;
-					align-items: center;
-					padding: 0 4rpx;
-
-					/deep/ .uni-input-input {
-						border: 2rpx solid #F0F8F2;
-						background: #F0F8F2;
-						color: $theme-color;
-					}
-
-
-				}
-
-				.pd4 {
-					padding: 4rpx 8rpx;
-				}
-
-
-
-				&:last-child {
-					border-bottom: none;
-				}
-			}
-
-			.ww55 {
-				width: 55%;
-			}
-
-			.ww45 {
-				width: 45%;
-			}
-		}
-	}
-</style>
+.title_box {
+  margin-top: 18rpx;
+
+  .name {
+    font-size: 28rpx;
+    font-style: normal;
+    font-weight: 400;
+    color: $theme-color;
+    padding-left: 20rpx;
+
+    position: relative;
+
+    &:before {
+      position: absolute;
+      content: "";
+      left: 0rpx;
+      top: 0rpx;
+      bottom: 0rpx;
+      width: 4rpx;
+      height: 28rpx;
+      background: $theme-color;
+      margin: auto;
+    }
+  }
+
+  .btn_box {
+    padding: 0 18rpx;
+    height: 60rpx;
+    background: $theme-color;
+    font-size: 26rpx;
+    font-style: normal;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #fff;
+    border-radius: 4rpx;
+
+    .scan {
+      width: 34rpx;
+      height: 34rpx;
+      margin-right: 12rpx;
+    }
+  }
+}
+
+.material {
+  margin-top: 10rpx;
+
+  .content_table {
+    width: 100%;
+    border: 2rpx solid $border-color;
+
+    .item {
+      display: flex;
+      border-bottom: 2rpx solid $border-color;
+
+      .lable {
+        width: 132rpx;
+        text-align: center;
+        background-color: #f7f9fa;
+        font-size: 26rpx;
+        border-right: 2rpx solid $border-color;
+        flex-shrink: 0;
+      }
+
+      .lable150 {
+        width: 156rpx !important;
+        font-size: 24rpx;
+      }
+
+      .ww80 {
+        width: 80rpx;
+      }
+
+      .content {
+        width: 518rpx;
+        min-height: 64rpx;
+        font-size: 28rpx;
+        line-height: 28rpx;
+        font-style: normal;
+        font-weight: 400;
+        padding: 18rpx 8rpx;
+        box-sizing: border-box;
+        word-wrap: break-word;
+        flex-grow: 1 !important;
+
+        .unit {
+          padding: 0 4rpx;
+          font-size: 24rpx;
+          color: #404446;
+        }
+      }
+
+      .content_num {
+        display: flex;
+        align-items: center;
+        padding: 0 4rpx;
+
+        /deep/ .uni-input-input {
+          border: 2rpx solid #f0f8f2;
+          background: #f0f8f2;
+          color: $theme-color;
+        }
+      }
+
+      .pd4 {
+        padding: 4rpx 8rpx;
+      }
+
+      &:last-child {
+        border-bottom: none;
+      }
+    }
+
+    .ww55 {
+      width: 55%;
+    }
+
+    .ww45 {
+      width: 45%;
+    }
+  }
+}
+</style>

pages/pda/warehousing/index.vue

@@ -19,6 +19,7 @@
             v-if="objData"
             pType="job"
             @handleScan="handleScan"
+            :isReportWork="true"
           ></workOrderBom>
 
           <!-- <jobBom

pages/pda/workOrder/index/details.vue

@@ -22,6 +22,7 @@
             :item="objData"
             v-if="objData"
             :isDetails="true"
+            :isReportWork="true"
           ></workOrderBom>
 
           <paramBom