优化

api/pda/workOrder.js

@@ -67,6 +67,20 @@ export async function treeByPid(params) {
 }
 
 
+// 只查第二层的分类
+
+export async function getTwoTreeByPid(parentId) {
+	const data = await get(
+		Vue.prototype.apiUrl + `/main/categoryLevel/getTwoTreeByPid/${parentId}`
+	);
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}
+
+
+
 
 // 查询库存台账首页列表
 export async function pageeLedgerMain(params) {

components/ba-tree-picker/ba-tree-picker.vue

@@ -1,711 +1,667 @@
 <!-- 树形层级选择器-->
 <!-- 1、支持单选、多选 -->
 <template>
-  <view>
-    <view
-      class="tree-cover"
-      :class="{ show: showDialog }"
-      @tap="_cancel"
-    ></view>
-    <view class="tree-dialog" :class="{ show: showDialog }">
-      <view class="tree-bar">
-        <view
-          class="tree-bar-cancel"
-          :style="{ color: cancelColor }"
-          hover-class="hover-c"
-          @tap="_cancel"
-          >取消
-        </view>
-        <view class="tree-bar-title" :style="{ color: titleColor }">{{
+	<view>
+		<view class="tree-cover" :class="{ show: showDialog }" @tap="_cancel"></view>
+		<view class="tree-dialog" :class="{ show: showDialog }">
+			<view class="tree-bar">
+				<view class="tree-bar-cancel" :style="{ color: cancelColor }" hover-class="hover-c" @tap="_cancel">取消
+				</view>
+				<view class="tree-bar-title" :style="{ color: titleColor }">{{
           title
         }}</view>
-        <view
-          class="tree-bar-confirm"
-          :style="{ color: confirmColor }"
-          hover-class="hover-c"
-          @tap="_confirm"
-        >
-          {{ multiple ? '确定' : '' }}
-        </view>
-      </view>
-      <view class="tree-view">
-        <scroll-view class="tree-list" :scroll-y="true">
-          <block v-for="(item, index) in treeList" :key="index">
-            <view
-              class="tree-item"
-              :style="[
+				<view class="tree-bar-confirm" :style="{ color: confirmColor }" hover-class="hover-c" @tap="_confirm">
+					{{ multiple ? '确定' : '' }}
+				</view>
+			</view>
+			<view class="tree-view">
+				<scroll-view class="tree-list" :scroll-y="true">
+					<block v-for="(item, index) in treeList" :key="index">
+						<view class="tree-item" :style="[
                 {
                   paddingLeft: item.level * 30 + 'rpx'
                 }
-              ]"
-              :class="{
+              ]" :class="{
                 itemBorder: border === true,
                 show: item.isShow
-              }"
-            >
-              <view class="item-label">
-                <view
-                  class="item-icon uni-inline-item"
-                  @tap.stop="_onItemSwitch(item, index)"
-                >
-                  <view
-                    v-if="!item.isLastLevel && item.isShowChild"
-                    class="switch-on"
-                    :style="{ 'border-left-color': switchColor }"
-                  >
-                  </view>
-                  <view
-                    v-else-if="!item.isLastLevel && !item.isShowChild"
-                    class="switch-off"
-                    :style="{ 'border-top-color': switchColor }"
-                  >
-                  </view>
-                  <view
-                    v-else
-                    class="item-last-dot"
-                    :style="{ 'border-top-color': switchColor }"
-                  >
-                  </view>
-                </view>
-                <view
-                  class="uni-flex-item uni-inline-item"
-                  @tap.stop="_onItemSelect(item, index)"
-                >
-			
-                  <view class="item-name">
-                    {{
+              }">
+							<view class="item-label">
+								<view class="item-icon uni-inline-item" @tap.stop="_onItemSwitch(item, index)">
+									<view v-if="!item.isLastLevel && item.isShowChild" class="switch-on"
+										:style="{ 'border-left-color': switchColor }">
+									</view>
+									<view v-else-if="!item.isLastLevel && !item.isShowChild" class="switch-off"
+										:style="{ 'border-top-color': switchColor }">
+									</view>
+									<view v-else class="item-last-dot" :style="{ 'border-top-color': switchColor }">
+									</view>
+								</view>
+								<view class="uni-flex-item uni-inline-item" @tap.stop="_onItemSelect(item, index)">
+
+									<view class="item-name">
+										{{
                       item.name +
                       (item.childCount ? '(' + item.childCount + ')' : '')
                     }}
-                  </view>
-                  <view
-                    class="item-check"
-                    v-if="selectParent ? true : item.isLastLevel"
-                  >
-                    <view
-                      class="item-check-yes"
-                      v-if="item.checkStatus == 1"
-                      :class="{ radio: !multiple }"
-                      :style="{ 'border-color': confirmColor }"
-                    >
-                      <view
-                        class="item-check-yes-part"
-                        :style="{ 'background-color': confirmColor }"
-                      >
-                      </view>
-                    </view>
-                    <view
-                      class="item-check-yes"
-                      v-else-if="item.checkStatus == 2"
-                      :class="{ radio: !multiple }"
-                      :style="{ 'border-color': confirmColor }"
-                    >
-                      <view
-                        class="item-check-yes-all"
-                        :style="{ 'background-color': confirmColor }"
-                      >
-                      </view>
-                    </view>
-                    <view
-                      class="item-check-no"
-                      v-else
-                      :class="{ radio: !multiple }"
-                      :style="{ 'border-color': confirmColor }"
-                    ></view>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </block>
-        </scroll-view>
-      </view>
-    </view>
-  </view>
+									</view>
+									<view class="item-check" v-if="selectParent ? true : item.isLastLevel">
+										<view class="item-check-yes" v-if="item.checkStatus == 1"
+											:class="{ radio: !multiple }" :style="{ 'border-color': confirmColor }">
+											<view class="item-check-yes-part"
+												:style="{ 'background-color': confirmColor }">
+											</view>
+										</view>
+										<view class="item-check-yes" v-else-if="item.checkStatus == 2"
+											:class="{ radio: !multiple }" :style="{ 'border-color': confirmColor }">
+											<view class="item-check-yes-all"
+												:style="{ 'background-color': confirmColor }">
+											</view>
+										</view>
+										<view class="item-check-no" v-else :class="{ radio: !multiple }"
+											:style="{ 'border-color': confirmColor }"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  emits: ['select-change'],
-  name: 'ba-tree-picker',
-  props: {
-    valueKey: {
-      type: String,
-      default: 'id'
-    },
-    textKey: {
-      type: String,
-      default: 'name'
-    },
-    childrenKey: {
-      type: String,
-      default: 'children'
-    },
-    localdata: {
-      type: Array,
-      default: function () {
-        return []
-      }
-    },
-    localTreeList: {
-      //在已经格式化好的数据
-      type: Array,
-      default: function () {
-        return []
-      }
-    },
-    selectedData: {
-      type: Array,
-      default: function () {
-        return []
-      }
-    },
-    title: {
-      type: String,
-      default: ''
-    },
-    multiple: {
-      // 是否可以多选
-      type: Boolean,
-      default: true
-    },
-    selectParent: {
-      //是否可以选父级
-      type: Boolean,
-      default: true
-    },
-    confirmColor: {
-      // 确定按钮颜色
-      type: String,
-      default: '' // #0055ff
-    },
-    cancelColor: {
-      // 取消按钮颜色
-      type: String,
-      default: '' // #757575
-    },
-    titleColor: {
-      // 标题颜色
-      type: String,
-      default: '' //
-    },
-    switchColor: {
-      // 节点切换图标颜色
-      type: String,
-      default: '' // #666
-    },
-    border: {
-      // 是否有分割线
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      showDialog: false,
-      treeList: []
-    }
-  },
-  computed: {},
-  methods: {
-    _show () {
-      this.showDialog = true
-    },
-    _hide () {
-      this.showDialog = false
-    },
-    _cancel () {
-      this._hide()
-      this.$emit('cancel', '')
-    },
-    _confirm () {
-      //多选
-      let selectedList = [] //如果子集全部选中，只返回父级 id
-      let selectedNames
-      let currentLevel = -1
-      this.treeList.forEach((item, index) => {
-        if (currentLevel >= 0 && item.level > currentLevel) {
-        } else {
-          if (item.checkStatus === 2) {
-            currentLevel = item.level
-            selectedList.push(item.id)
-            selectedNames = selectedNames
-              ? selectedNames + ' / ' + item.name
-              : item.name
-          } else {
-            currentLevel = -1
-          }
-        }
-      })
-      //console.log('_confirm', selectedList);
-      this._hide()
-      this.$emit('select-change', selectedList, selectedNames)
-    },
-    //格式化原数据（原数据为tree结构）
-    _formatTreeData (list = [], level = 0, parentItem, isShowChild = true) {
-
-      let nextIndex = 0
-      let parentId = -1
-      let initCheckStatus = 0
-	
-      if (parentItem) {
-        nextIndex =
-          this.treeList.findIndex(item => item.id === parentItem.id) + 1
-        parentId = parentItem.id
-		
-        if (!this.multiple) {
-          //单选
-          initCheckStatus = 0
-        } else initCheckStatus = parentItem.checkStatus == 2 ? 2 : 0
-      }
-      list.forEach(item => {
-		 
-        let isLastLevel = true
-        if (item && item[this.childrenKey]) {
-          let children = item[this.childrenKey]
-          if (Array.isArray(children) && children.length > 0) {
-            isLastLevel = false
-          }
-        }
-
-        let itemT = {
-          id: item[this.valueKey],
-          name: item[this.textKey],
-          level,
-          isLastLevel,
-          isShow: isShowChild,
-          isShowChild: false,
-          checkStatus: initCheckStatus,
-          orCheckStatus: 0,
-          parentId,
-		 rootCategoryLevelId: item.rootCategoryLevelId,
-          children: item[this.childrenKey],
-          childCount: item[this.childrenKey]
-            ? item[this.childrenKey].length
-            : 0,
-          childCheckCount: 0,
-          childCheckPCount: 0
-        }
-
-        if (this.selectedData.indexOf(itemT.id) >= 0) {
-          itemT.checkStatus = 2
-          itemT.orCheckStatus = 2
-          itemT.childCheckCount = itemT.children ? itemT.children.length : 0
-          this._onItemParentSelect(itemT, nextIndex)
-        }
-
-        this.treeList.splice(nextIndex, 0, itemT)
-        nextIndex++
-      })
-      //console.log(this.treeList);
-    },
-    // 节点打开、关闭切换
-    _onItemSwitch (item, index) {
-      // console.log(item)
-      //console.log('_itemSwitch')
-      if (item.isLastLevel === true) {
-        return
-      }
-      item.isShowChild = !item.isShowChild
-      if (item.children) {
-        this._formatTreeData(item.children, item.level + 1, item)
-        item.children = undefined
-      } else {
-        this._onItemChildSwitch(item, index)
-      }
-    },
-    _onItemChildSwitch (item, index) {
-      //console.log('_onItemChildSwitch')
-      const firstChildIndex = index + 1
-      if (firstChildIndex > 0)
-        for (var i = firstChildIndex; i < this.treeList.length; i++) {
-          let itemChild = this.treeList[i]
-          if (itemChild.level > item.level) {
-            if (item.isShowChild) {
-              if (itemChild.parentId === item.id) {
-                itemChild.isShow = item.isShowChild
-                if (!itemChild.isShow) {
-                  itemChild.isShowChild = false
-                }
-              }
-            } else {
-              itemChild.isShow = item.isShowChild
-              itemChild.isShowChild = false
-            }
-          } else {
-            return
-          }
-        }
-    },
-    // 节点选中、取消选中
-    _onItemSelect (item, index) {
-      //console.log('_onItemSelect')
-      //console.log(item)
-      if (!this.multiple) {
-        //单选
-        item.checkStatus = item.checkStatus == 0 ? 2 : 0
-
-        this.treeList.forEach((v, i) => {
-          if (i != index) {
-            this.treeList[i].checkStatus = 0
-          } else {
-            this.treeList[i].checkStatus = 2
-          }
-        })
-
-        let selectedList = []
-        let selectedNames
-		let rootCategoryLevelId 
-        selectedList.push(item.id)
-        selectedNames = item.name
-		rootCategoryLevelId = item?.rootCategoryLevelId
-        this._hide()
-        this.$emit('select-change', selectedList, selectedNames, rootCategoryLevelId)
-        return
-      }
-
-      let oldCheckStatus = item.checkStatus
-      switch (oldCheckStatus) {
-        case 0:
-          item.checkStatus = 2
-          item.childCheckCount = item.childCount
-          item.childCheckPCount = 0
-          break
-        case 1:
-        case 2:
-          item.checkStatus = 0
-          item.childCheckCount = 0
-          item.childCheckPCount = 0
-          break
-        default:
-          break
-      }
-      //子节点 全部选中
-      this._onItemChildSelect(item, index)
-      //父节点 选中状态变化
-      this._onItemParentSelect(item, index, oldCheckStatus)
-    },
-    _onItemChildSelect (item, index) {
-      //console.log('_onItemChildSelect')
-      let allChildCount = 0
-      if (item.childCount && item.childCount > 0) {
-        index++
-        while (
-          index < this.treeList.length &&
-          this.treeList[index].level > item.level
-        ) {
-          let itemChild = this.treeList[index]
-          itemChild.checkStatus = item.checkStatus
-          if (itemChild.checkStatus == 2) {
-            itemChild.childCheckCount = itemChild.childCount
-            itemChild.childCheckPCount = 0
-          } else if (itemChild.checkStatus == 0) {
-            itemChild.childCheckCount = 0
-            itemChild.childCheckPCount = 0
-          }
-          // console.log('>>>>index：', index, 'item：', itemChild.name, '  status：', itemChild
-          // 	.checkStatus)
-          index++
-        }
-      }
-    },
-    _onItemParentSelect (item, index, oldCheckStatus) {
-      //console.log('_onItemParentSelect')
-      //console.log(item)
-      const parentIndex = this.treeList.findIndex(
-        itemP => itemP.id == item.parentId
-      )
-      //console.log('parentIndex：' + parentIndex)
-      if (parentIndex >= 0) {
-        let itemParent = this.treeList[parentIndex]
-        let count = itemParent.childCheckCount
-        let oldCheckStatusParent = itemParent.checkStatus
-
-        if (oldCheckStatus == 1) {
-          itemParent.childCheckPCount -= 1
-        } else if (oldCheckStatus == 2) {
-          itemParent.childCheckCount -= 1
-        }
-        if (item.checkStatus == 1) {
-          itemParent.childCheckPCount += 1
-        } else if (item.checkStatus == 2) {
-          itemParent.childCheckCount += 1
-        }
-
-        if (
-          itemParent.childCheckCount <= 0 &&
-          itemParent.childCheckPCount <= 0
-        ) {
-          itemParent.childCheckCount = 0
-          itemParent.childCheckPCount = 0
-          itemParent.checkStatus = 0
-        } else if (itemParent.childCheckCount >= itemParent.childCount) {
-          itemParent.childCheckCount = itemParent.childCount
-          itemParent.childCheckPCount = 0
-          itemParent.checkStatus = 2
-        } else {
-          itemParent.checkStatus = 1
-        }
-        //console.log('itemParent：', itemParent)
-        this._onItemParentSelect(itemParent, parentIndex, oldCheckStatusParent)
-      }
-    },
-    // 重置数据
-    _reTreeList () {
-      this.treeList.forEach((v, i) => {
-        this.treeList[i].checkStatus = v.orCheckStatus
-      })
-    },
-    _initTree () {
-      this.treeList = []
-      this._formatTreeData(this.localdata)
-    }
-  },
-  watch: {
-    localdata () {
-      this._initTree()
-    },
-    localTreeList () {
-      this.treeList = this.localTreeList
-    }
-  },
-  mounted () {
-    this._initTree()
-  }
-}
+	export default {
+		emits: ['select-change'],
+		name: 'ba-tree-picker',
+		props: {
+			valueKey: {
+				type: String,
+				default: 'id'
+			},
+			textKey: {
+				type: String,
+				default: 'name'
+			},
+			childrenKey: {
+				type: String,
+				default: 'children'
+			},
+			localdata: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			localTreeList: {
+				//在已经格式化好的数据
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			selectedData: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			multiple: {
+				// 是否可以多选
+				type: Boolean,
+				default: true
+			},
+			selectParent: {
+				//是否可以选父级
+				type: Boolean,
+				default: true
+			},
+			confirmColor: {
+				// 确定按钮颜色
+				type: String,
+				default: '' // #0055ff
+			},
+			cancelColor: {
+				// 取消按钮颜色
+				type: String,
+				default: '' // #757575
+			},
+			titleColor: {
+				// 标题颜色
+				type: String,
+				default: '' //
+			},
+			switchColor: {
+				// 节点切换图标颜色
+				type: String,
+				default: '' // #666
+			},
+			border: {
+				// 是否有分割线
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				showDialog: false,
+				treeList: []
+			}
+		},
+		computed: {},
+		methods: {
+			_show() {
+				this.showDialog = true
+			},
+			_hide() {
+				this.showDialog = false
+			},
+			_cancel() {
+				this._hide()
+				this.$emit('cancel', '')
+			},
+			_confirm() {
+				//多选
+				let selectedList = [] //如果子集全部选中，只返回父级 id
+				let selectedAllList = [] // 只返回选中最底层
+				let selectedNames
+				let currentLevel = -1
+				this.treeList.forEach((item, index) => {
+					if (currentLevel >= 0 && item.level > currentLevel) {
+						console.log(item.name)
+						selectedAllList.push({
+							id: item.id,
+							name: item.name
+						})
+					} else {
+						if (item.checkStatus === 2) {
+							if (item.isShowChild == false) {
+								selectedAllList.push({
+									id: item.id,
+									name: item.name
+								})
+							}
+
+							currentLevel = item.level
+							selectedNames = selectedNames ?
+								selectedNames + ' / ' + item.name :
+								item.name
+						} else {
+							currentLevel = -1
+						}
+					}
+				})
+				//console.log('_confirm', selectedList);
+				this._hide()
+				this.$emit('select-change', selectedList, selectedNames, selectedAllList)
+			},
+			//格式化原数据（原数据为tree结构）
+			_formatTreeData(list = [], level = 0, parentItem, isShowChild = true) {
+
+				let nextIndex = 0
+				let parentId = -1
+				let initCheckStatus = 0
+
+				if (parentItem) {
+					nextIndex =
+						this.treeList.findIndex(item => item.id === parentItem.id) + 1
+					parentId = parentItem.id
+
+					if (!this.multiple) {
+						//单选
+						initCheckStatus = 0
+					} else initCheckStatus = parentItem.checkStatus == 2 ? 2 : 0
+				}
+				list.forEach(item => {
+
+					let isLastLevel = true
+					if (item && item[this.childrenKey]) {
+						let children = item[this.childrenKey]
+						if (Array.isArray(children) && children.length > 0) {
+							isLastLevel = false
+						}
+					}
+
+					let itemT = {
+						id: item[this.valueKey],
+						name: item[this.textKey],
+						level,
+						isLastLevel,
+						isShow: isShowChild,
+						isShowChild: false,
+						checkStatus: initCheckStatus,
+						orCheckStatus: 0,
+						parentId,
+						rootCategoryLevelId: item.rootCategoryLevelId,
+						children: item[this.childrenKey],
+						childCount: item[this.childrenKey] ?
+							item[this.childrenKey].length : 0,
+						childCheckCount: 0,
+						childCheckPCount: 0
+					}
+
+					if (this.selectedData.indexOf(itemT.id) >= 0) {
+						itemT.checkStatus = 2
+						itemT.orCheckStatus = 2
+						itemT.childCheckCount = itemT.children ? itemT.children.length : 0
+						this._onItemParentSelect(itemT, nextIndex)
+					}
+
+					this.treeList.splice(nextIndex, 0, itemT)
+					nextIndex++
+				})
+				//console.log(this.treeList);
+			},
+			// 节点打开、关闭切换
+			_onItemSwitch(item, index) {
+				// console.log(item)
+				//console.log('_itemSwitch')
+				if (item.isLastLevel === true) {
+					return
+				}
+				item.isShowChild = !item.isShowChild
+				if (item.children) {
+					this._formatTreeData(item.children, item.level + 1, item)
+					item.children = undefined
+				} else {
+					this._onItemChildSwitch(item, index)
+				}
+			},
+			_onItemChildSwitch(item, index) {
+				//console.log('_onItemChildSwitch')
+				const firstChildIndex = index + 1
+				if (firstChildIndex > 0)
+					for (var i = firstChildIndex; i < this.treeList.length; i++) {
+						let itemChild = this.treeList[i]
+						if (itemChild.level > item.level) {
+							if (item.isShowChild) {
+								if (itemChild.parentId === item.id) {
+									itemChild.isShow = item.isShowChild
+									if (!itemChild.isShow) {
+										itemChild.isShowChild = false
+									}
+								}
+							} else {
+								itemChild.isShow = item.isShowChild
+								itemChild.isShowChild = false
+							}
+						} else {
+							return
+						}
+					}
+			},
+			// 节点选中、取消选中
+			_onItemSelect(item, index) {
+				//console.log('_onItemSelect')
+				//console.log(item)
+				if (!this.multiple) {
+					//单选
+					item.checkStatus = item.checkStatus == 0 ? 2 : 0
+
+					this.treeList.forEach((v, i) => {
+						if (i != index) {
+							this.treeList[i].checkStatus = 0
+						} else {
+							this.treeList[i].checkStatus = 2
+						}
+					})
+
+					let selectedList = []
+					let selectedNames
+					let rootCategoryLevelId
+					selectedList.push(item.id)
+					selectedNames = item.name
+					rootCategoryLevelId = item?.rootCategoryLevelId
+					this._hide()
+					this.$emit('select-change', selectedList, selectedNames, rootCategoryLevelId)
+					return
+				}
+
+				let oldCheckStatus = item.checkStatus
+				switch (oldCheckStatus) {
+					case 0:
+						item.checkStatus = 2
+						item.childCheckCount = item.childCount
+						item.childCheckPCount = 0
+						break
+					case 1:
+					case 2:
+						item.checkStatus = 0
+						item.childCheckCount = 0
+						item.childCheckPCount = 0
+						break
+					default:
+						break
+				}
+				//子节点 全部选中
+				this._onItemChildSelect(item, index)
+				//父节点 选中状态变化
+				this._onItemParentSelect(item, index, oldCheckStatus)
+			},
+			_onItemChildSelect(item, index) {
+				//console.log('_onItemChildSelect')
+				let allChildCount = 0
+				if (item.childCount && item.childCount > 0) {
+					index++
+					while (
+						index < this.treeList.length &&
+						this.treeList[index].level > item.level
+					) {
+						let itemChild = this.treeList[index]
+						itemChild.checkStatus = item.checkStatus
+						if (itemChild.checkStatus == 2) {
+							itemChild.childCheckCount = itemChild.childCount
+							itemChild.childCheckPCount = 0
+						} else if (itemChild.checkStatus == 0) {
+							itemChild.childCheckCount = 0
+							itemChild.childCheckPCount = 0
+						}
+						// console.log('>>>>index：', index, 'item：', itemChild.name, '  status：', itemChild
+						// 	.checkStatus)
+						index++
+					}
+				}
+			},
+			_onItemParentSelect(item, index, oldCheckStatus) {
+				//console.log('_onItemParentSelect')
+				//console.log(item)
+				const parentIndex = this.treeList.findIndex(
+					itemP => itemP.id == item.parentId
+				)
+				//console.log('parentIndex：' + parentIndex)
+				if (parentIndex >= 0) {
+					let itemParent = this.treeList[parentIndex]
+					let oldCheckStatusParent = itemParent.checkStatus
+
+					if (oldCheckStatus == 1) {
+						itemParent.childCheckPCount -= 1
+					} else if (oldCheckStatus == 2) {
+						itemParent.childCheckCount -= 1
+					}
+					if (item.checkStatus == 1) {
+						itemParent.childCheckPCount += 1
+					} else if (item.checkStatus == 2) {
+						itemParent.childCheckCount += 1
+					}
+
+					if (
+						itemParent.childCheckCount <= 0 &&
+						itemParent.childCheckPCount <= 0
+					) {
+						itemParent.childCheckCount = 0
+						itemParent.childCheckPCount = 0
+						itemParent.checkStatus = 0
+					} else if (itemParent.childCheckCount >= itemParent.childCount) {
+						itemParent.childCheckCount = itemParent.childCount
+						itemParent.childCheckPCount = 0
+						itemParent.checkStatus = 2
+					} else {
+						itemParent.checkStatus = 1
+					}
+					//console.log('itemParent：', itemParent)
+					this._onItemParentSelect(itemParent, parentIndex, oldCheckStatusParent)
+				}
+			},
+			// 重置数据
+			_reTreeList() {
+				this.treeList.forEach((v, i) => {
+					this.treeList[i].checkStatus = v.orCheckStatus
+				})
+			},
+			_initTree() {
+				this.treeList = []
+				this._formatTreeData(this.localdata)
+			}
+		},
+		watch: {
+			localdata() {
+				this._initTree()
+			},
+			localTreeList() {
+				this.treeList = this.localTreeList
+			}
+		},
+		mounted() {
+			this._initTree()
+		}
+	}
 </script>
 
 <style scoped>
-.tree-cover {
-  position: fixed;
-  top: 0rpx;
-  right: 0rpx;
-  bottom: 0rpx;
-  left: 0rpx;
-  z-index: 100;
-  background-color: rgba(0, 0, 0, 0.4);
-  opacity: 0;
-  transition: all 0.3s ease;
-  visibility: hidden;
-}
-
-.tree-cover.show {
-  visibility: visible;
-  opacity: 1;
-}
-
-.tree-dialog {
-  position: fixed;
-  top: 0rpx;
-  right: 0rpx;
-  bottom: 0rpx;
-  left: 0rpx;
-  background-color: #fff;
-  border-top-left-radius: 10px;
-  border-top-right-radius: 10px;
-  /* #ifndef APP-NVUE */
-  display: flex;
-  /* #endif */
-  flex-direction: column;
-  z-index: 102;
-  top: 20%;
-  transition: all 0.3s ease;
-  transform: translateY(100%);
-}
-
-.tree-dialog.show {
-  transform: translateY(0);
-}
-
-.tree-bar {
-  /* background-color: #fff; */
-  height: 90rpx;
-  padding-left: 25rpx;
-  padding-right: 25rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  box-sizing: border-box;
-  border-bottom-width: 1rpx !important;
-  border-bottom-style: solid;
-  border-bottom-color: #f5f5f5;
-  font-size: 32rpx;
-  color: #757575;
-  line-height: 1;
-}
-
-.tree-bar-confirm {
-  color: #0055ff;
-  padding: 15rpx;
-}
-
-.tree-bar-title {
-}
-
-.tree-bar-cancel {
-  color: #757575;
-  padding: 15rpx;
-}
-
-.tree-view {
-  flex: 1;
-  padding: 20rpx;
-  /* #ifndef APP-NVUE */
-  display: flex;
-  /* #endif */
-  flex-direction: column;
-  overflow: hidden;
-  height: 100%;
-}
-
-.tree-list {
-  flex: 1;
-  height: 100%;
-  overflow: hidden;
-}
-
-.tree-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  line-height: 1;
-  height: 0;
-  opacity: 0;
-  transition: 0.2s;
-  overflow: hidden;
-}
-
-.tree-item.show {
-  height: 90rpx;
-  opacity: 1;
-}
-
-.tree-item.showchild:before {
-  transform: rotate(90deg);
-}
-
-.tree-item.last:before {
-  opacity: 0;
-}
-
-.switch-on {
-  width: 0;
-  height: 0;
-  border-left: 10rpx solid transparent;
-  border-right: 10rpx solid transparent;
-  border-top: 15rpx solid #666;
-}
-
-.switch-off {
-  width: 0;
-  height: 0;
-  border-bottom: 10rpx solid transparent;
-  border-top: 10rpx solid transparent;
-  border-left: 15rpx solid #666;
-}
-
-.item-last-dot {
-  position: absolute;
-  width: 10rpx;
-  height: 10rpx;
-  border-radius: 100%;
-  background: #666;
-}
-
-.item-icon {
-  width: 26rpx;
-  height: 26rpx;
-  margin-right: 8rpx;
-  padding-right: 20rpx;
-  padding-left: 20rpx;
-}
-
-.item-label {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  height: 100%;
-  line-height: 1.2;
-}
-
-.item-name {
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  width: 450rpx;
-}
-
-.item-check {
-  width: 40px;
-  height: 40px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.item-check-yes,
-.item-check-no {
-  width: 20px;
-  height: 20px;
-  border-top-left-radius: 20%;
-  border-top-right-radius: 20%;
-  border-bottom-right-radius: 20%;
-  border-bottom-left-radius: 20%;
-  border-top-width: 1rpx;
-  border-left-width: 1rpx;
-  border-bottom-width: 1rpx;
-  border-right-width: 1rpx;
-  border-style: solid;
-  border-color: #0055ff;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  box-sizing: border-box;
-}
-
-.item-check-yes-part {
-  width: 12px;
-  height: 12px;
-  border-top-left-radius: 20%;
-  border-top-right-radius: 20%;
-  border-bottom-right-radius: 20%;
-  border-bottom-left-radius: 20%;
-  background-color: #0055ff;
-}
-
-.item-check-yes-all {
-  margin-bottom: 5px;
-  border: 2px solid #007aff;
-  border-left: 0;
-  border-top: 0;
-  height: 12px;
-  width: 6px;
-  transform-origin: center;
-  /* #ifndef APP-NVUE */
-  transition: all 0.3s;
-  /* #endif */
-  transform: rotate(45deg);
-}
-
-.item-check .radio {
-  border-top-left-radius: 50%;
-  border-top-right-radius: 50%;
-  border-bottom-right-radius: 50%;
-  border-bottom-left-radius: 50%;
-}
-
-.item-check .radio .item-check-yes-b {
-  border-top-left-radius: 50%;
-  border-top-right-radius: 50%;
-  border-bottom-right-radius: 50%;
-  border-bottom-left-radius: 50%;
-}
-
-.hover-c {
-  opacity: 0.6;
-}
-
-.itemBorder {
-  border-bottom: 1px solid #e5e5e5;
-}
-</style>
+	.tree-cover {
+		position: fixed;
+		top: 0rpx;
+		right: 0rpx;
+		bottom: 0rpx;
+		left: 0rpx;
+		z-index: 100;
+		background-color: rgba(0, 0, 0, 0.4);
+		opacity: 0;
+		transition: all 0.3s ease;
+		visibility: hidden;
+	}
+
+	.tree-cover.show {
+		visibility: visible;
+		opacity: 1;
+	}
+
+	.tree-dialog {
+		position: fixed;
+		top: 0rpx;
+		right: 0rpx;
+		bottom: 0rpx;
+		left: 0rpx;
+		background-color: #fff;
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		z-index: 102;
+		top: 20%;
+		transition: all 0.3s ease;
+		transform: translateY(100%);
+	}
+
+	.tree-dialog.show {
+		transform: translateY(0);
+	}
+
+	.tree-bar {
+		/* background-color: #fff; */
+		height: 90rpx;
+		padding-left: 25rpx;
+		padding-right: 25rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		border-bottom-width: 1rpx !important;
+		border-bottom-style: solid;
+		border-bottom-color: #f5f5f5;
+		font-size: 32rpx;
+		color: #757575;
+		line-height: 1;
+	}
+
+	.tree-bar-confirm {
+		color: #0055ff;
+		padding: 15rpx;
+	}
+
+	.tree-bar-title {}
+
+	.tree-bar-cancel {
+		color: #757575;
+		padding: 15rpx;
+	}
+
+	.tree-view {
+		flex: 1;
+		padding: 20rpx;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		overflow: hidden;
+		height: 100%;
+	}
+
+	.tree-list {
+		flex: 1;
+		height: 100%;
+		overflow: hidden;
+	}
+
+	.tree-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		line-height: 1;
+		height: 0;
+		opacity: 0;
+		transition: 0.2s;
+		overflow: hidden;
+	}
+
+	.tree-item.show {
+		height: 90rpx;
+		opacity: 1;
+	}
+
+	.tree-item.showchild:before {
+		transform: rotate(90deg);
+	}
+
+	.tree-item.last:before {
+		opacity: 0;
+	}
+
+	.switch-on {
+		width: 0;
+		height: 0;
+		border-left: 10rpx solid transparent;
+		border-right: 10rpx solid transparent;
+		border-top: 15rpx solid #666;
+	}
+
+	.switch-off {
+		width: 0;
+		height: 0;
+		border-bottom: 10rpx solid transparent;
+		border-top: 10rpx solid transparent;
+		border-left: 15rpx solid #666;
+	}
+
+	.item-last-dot {
+		position: absolute;
+		width: 10rpx;
+		height: 10rpx;
+		border-radius: 100%;
+		background: #666;
+	}
+
+	.item-icon {
+		width: 26rpx;
+		height: 26rpx;
+		margin-right: 8rpx;
+		padding-right: 20rpx;
+		padding-left: 20rpx;
+	}
+
+	.item-label {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		height: 100%;
+		line-height: 1.2;
+	}
+
+	.item-name {
+		flex: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		width: 450rpx;
+	}
+
+	.item-check {
+		width: 40px;
+		height: 40px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.item-check-yes,
+	.item-check-no {
+		width: 20px;
+		height: 20px;
+		border-top-left-radius: 20%;
+		border-top-right-radius: 20%;
+		border-bottom-right-radius: 20%;
+		border-bottom-left-radius: 20%;
+		border-top-width: 1rpx;
+		border-left-width: 1rpx;
+		border-bottom-width: 1rpx;
+		border-right-width: 1rpx;
+		border-style: solid;
+		border-color: #0055ff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		box-sizing: border-box;
+	}
+
+	.item-check-yes-part {
+		width: 12px;
+		height: 12px;
+		border-top-left-radius: 20%;
+		border-top-right-radius: 20%;
+		border-bottom-right-radius: 20%;
+		border-bottom-left-radius: 20%;
+		background-color: #0055ff;
+	}
+
+	.item-check-yes-all {
+		margin-bottom: 5px;
+		border: 2px solid #007aff;
+		border-left: 0;
+		border-top: 0;
+		height: 12px;
+		width: 6px;
+		transform-origin: center;
+		/* #ifndef APP-NVUE */
+		transition: all 0.3s;
+		/* #endif */
+		transform: rotate(45deg);
+	}
+
+	.item-check .radio {
+		border-top-left-radius: 50%;
+		border-top-right-radius: 50%;
+		border-bottom-right-radius: 50%;
+		border-bottom-left-radius: 50%;
+	}
+
+	.item-check .radio .item-check-yes-b {
+		border-top-left-radius: 50%;
+		border-top-right-radius: 50%;
+		border-bottom-right-radius: 50%;
+		border-bottom-left-radius: 50%;
+	}
+
+	.hover-c {
+		opacity: 0.6;
+	}
+
+	.itemBorder {
+		border-bottom: 1px solid #e5e5e5;
+	}
+</style>

pages/pda/sample/components/inspectionBom.vue

@@ -0,0 +1,289 @@
+<template>
+	<view>
+		<view class="title_box rx-bc">
+			<view class="name">质检</view>
+		</view>
+
+
+
+		<u-form labelPosition="left" :model="formData" labelWidth="140" labelAlign="left" class="baseForm">
+			<u-form-item label="质检类型:" class="required-form" prop="assetType">
+				<zxz-uni-data-select :localdata="typeList" v-model="formData.parentId" dataValue='id' format='{name}'
+					dataKey="name" filterable></zxz-uni-data-select>
+
+				<view class="btn_box rx-cc" @click="add">新增质检</view>
+			</u-form-item>
+		</u-form>
+
+
+		<view class="content_table2">
+			<view class="head row rx-sc">
+				<view class="item ww35">名称</view>
+				<view class="item ww45">废品数量</view>
+				<view class="item ww20">操作</view>
+			</view>
+
+			<view class="table">
+				<u-list @scrolltolower="scrolltolower" class="z_list">
+					<view class="tr row rx-sc" v-for="(it, idx) in List" :key='idx'>
+						<view class="item ww35">
+							{{ it.name }}
+						</view>
+						<view class="item ww45 content_num">
+							<input class="uni-input" v-model="it.quantity" type="digit"></input>
+						</view>
+
+
+						<view class="ww20 rx-ac">
+							<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20"
+								color="#fa3534"></uni-icons>
+								
+								<uni-icons custom-prefix="iconfont" type="icon-eye" size="20"
+									color="#157A2C"></uni-icons>
+						</view>
+
+
+
+					</view>
+				</u-list>
+
+			</view>
+
+
+		</view>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		<ba-tree-picker ref="treePicker" :selectedData='selectedData' key="verify" :multiple="false"
+			@select-change="confirm" title="选择分类" :localdata="classificationList" valueKey="id" textKey="name"
+			childrenKey="children" multiple :selectParent='false' />
+
+	</view>
+</template>
+
+<script>
+	import {
+		getTwoTreeByPid,
+		treeByPid
+
+	} from '@/api/pda/workOrder.js'
+	import baTreePicker from '@/components/ba-tree-picker/ba-tree-picker.vue'
+	export default {
+
+		components: {
+			baTreePicker,
+
+		},
+
+		data() {
+			return {
+
+
+				typeList: [],
+				formData: {
+					parentId: null
+				},
+				classificationList: [],
+				selectedData: [
+					'1772569297810362370', '1772569381088268289', '1773270364621639681'
+				],
+
+				List: []
+			}
+		},
+
+		created() {
+			this.getTwoTree()
+		},
+
+		methods: {
+			getTwoTree() {
+				getTwoTreeByPid(12).then(res => {
+					this.typeList = res
+				})
+			},
+
+			add() {
+				if (!this.formData.parentId) {
+					uni.showToast({
+						icon: 'none',
+						title: '请先选择质检类型'
+					})
+					return false
+				} else {
+					let params = {
+						'ids': [this.formData.parentId]
+					}
+
+
+					treeByPid(params).then(res => {
+						this.classificationList = res[0].children
+						this.$refs.treePicker._show()
+					})
+				}
+			},
+
+			confirm(id, name, list) {
+
+				this.List = list
+
+
+			},
+
+			scrolltolower() {},
+		}
+
+
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.title_box {
+		margin-top: 28rpx;
+
+		.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 {
+		height: 60rpx;
+		width: 140rpx;
+		background: $theme-color;
+		font-size: 26rpx;
+		font-style: normal;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #fff;
+		border-radius: 4rpx;
+		margin-left: 40rpx;
+
+
+	}
+
+
+
+	.content_table2 {
+		width: 100%;
+
+		.row {
+			width: 100%;
+
+
+			.item {
+				color: #404446;
+				font-size: 28rpx;
+				padding-left: 12rpx;
+
+			}
+
+			.color157 {
+				color: $theme-color;
+			}
+
+			.ww20 {
+				width: 20%;
+			}
+
+			.ww35 {
+				width: 35%;
+
+			}
+
+			.ww45 {
+				width: 45%;
+			}
+		}
+
+		.head {
+			height: 64rpx;
+			background: #F7F9FA;
+			border-top: 2rpx solid #E3E5E5;
+			border-left: 2rpx solid #E3E5E5;
+
+			.item {
+				height: 64rpx;
+				line-height: 64rpx;
+				border-right: 2rpx solid #E3E5E5;
+				box-sizing: border-box;
+			}
+		}
+
+
+
+		.tr {
+			border-top: 2rpx solid #E3E5E5;
+			border-left: 2rpx solid #E3E5E5;
+
+
+			.item {
+				font-size: 24rpx;
+				min-height: 64rpx;
+				display: flex;
+				align-items: center;
+				border-right: 2rpx solid #E3E5E5;
+				box-sizing: border-box;
+				white-space: normal;
+				word-break: break-all;
+
+			}
+
+			&:last-child {
+				border-bottom: 2rpx solid #E3E5E5;
+
+			}
+		}
+	}
+
+
+	.content_num {
+		display: flex;
+		align-items: center;
+		padding: 0 4rpx;
+
+		/deep/ .uni-input-input {
+			border: 2rpx solid #F0F8F2;
+			background: #F0F8F2;
+			color: $theme-color;
+		}
+
+	}
+
+	.z_list {
+		max-height: 400rpx;
+	}
+</style>

pages/pda/sample/inspection/index.vue

@@ -1,22 +1,135 @@
 <template>
-	<view>
-		
+	<view class="content-box">
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" :title="title" background-color="#F7F9FA"
+			color="#000" @clickLeft="back">
+		</uni-nav-bar>
+
+
+		<view class="list_box">
+			<u-list @scrolltolower="scrolltolower">
+				<view class="card_box" v-for="(item,index) in List" :key="index">
+					<workOrderBom :item='item' v-if='item' @handleScan='handleWordScan'></workOrderBom>
+					
+					<inspectionBom></inspectionBom>
+				</view>
+			</u-list>
+		</view>
+
+		<view class="bottom-wrapper">
+			<view class="btn_box" @click="save">一键报工</view>
+		</view>
+
+
 	</view>
+
+
 </template>
 
 <script>
+	import {
+		workorderList,
+
+	} from '@/api/pda/workOrder.js'
+	import {
+		batchSave
+	} from '@/api/pda/feeding.js'
+
+	import workOrderBom from '../../feeding/components/workOrderBom.vue'
+    import inspectionBom from '../components/inspectionBom.vue'
 	export default {
+		components: {
+			workOrderBom,
+			inspectionBom
+		},
 		data() {
 			return {
-				
+				title: null,
+				id: null,
+				taskId: null,
+				List: [],
 			}
 		},
+
+		onLoad(options) {
+			this.title = options.taskName ? options.taskName : '质检'
+			this.id = options.workOrderId
+			this.taskId = options.taskId
+			this.getList()
+		},
+
 		methods: {
-			
+		getList() {
+				workorderList({
+					ids: [this.id],
+					taskId: this.taskId
+				}).then(res => {
+					this.List = res.map(m => {
+						m.workOrderId = m.id
+						delete m.id
+						return {
+							...m
+						}
+					})
+				})
+			},
+
+
+			scrolltolower() {},
+			handleWordScan() {
+				uni.showToast({
+					icon: 'none',
+					title: '不支持换工单'
+				})
+			},
 		}
 	}
 </script>
+<style lang="scss" scoped>
+	.content-box {
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+
+	}
+
+	.list_box {
+		flex: 1;
+		overflow: hidden;
+		padding: 4rpx 0;
+
+		.u-list {
+			height: 100% !important;
+		}
+
+		.card_box {
+			padding: 16rpx 24rpx;
+		}
+
+
 
-<style>
+	}
+
+	.bottom-wrapper {
+		.btn_box {
+			width: 750rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			background: $theme-color;
+			text-align: center;
+			font-size: 36rpx;
+			font-style: normal;
+			font-weight: 400;
+			color: #fff;
+		}
+	}
 
-</style>
+
+	.operate_box {
+		padding: 10rpx 160rpx;
+
+		/deep/ .u-button {
+			width: 160rpx;
+		}
+	}
+</style>