55

package.json

@@ -16,6 +16,7 @@
 	"dependencies": {
 		"dayjs": "^1.11.7",
 		"echarts": "^5.4.2",
+		"element-china-category-data": "^1.0.4",
 		"lodash": "^4.17.21",
 		"mpvue-echarts": "^0.3.2",
 		"mqtt": "^4.3.7",

pages/pda/components/bottomOperate.vue

@@ -382,6 +382,7 @@
 
 
 			handOutsource() {
+				console.log(this.newTaskObj)
 
 				let param = {
 					taskId: this.newTaskObj.currentTaskId,
@@ -468,9 +469,7 @@
 
 				this.newStepsList = []
 				this.stepsList.forEach((f, i) => {
-					if (f.taskId != '-1' && f.taskId != '-2' && f.taskTypeName != '包装' && i > this
-						.activeIndex && f
-						.type == 1) {
+					if (f.taskId != '-1' && f.taskId != '-2'  && i > this.activeIndex && (f.type == 1 ||  f.type == 4 )) {
 						this.newStepsList.push(f)
 					}
 				})

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -185,7 +185,7 @@
 						</view>
 
 						<view class="item ww25 content_num"
-							v-if="!Object.prototype.hasOwnProperty.call(it.extInfo, 'newWeight') || it.extInfo.newWeight == 0  ">
+						>
 							<input class="uni-input " v-model="it.extInfo.weight" type='digit'></input>
 						</view>