Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-repair-app

pages-home/service/todoDetail.vue

@@ -78,7 +78,7 @@
             <view class="content">
               <view @click="changeChoose(item)" v-for="item in groupItem.twItemList" :key="item.id" class="repairItem" >
                 <view class="repairName">
-                  <radio v-if="canOperate" :value="item.id" :checked="item.selected"/>
+                  <radio v-if="canOperate && item.waresStatus === ''" :value="item.id" :checked="item.selected"/>
                   {{ item.waresName }}×{{ item.waresCount }}{{ item.unitText }}
                 </view>
                 <view class="grid">

pages-warehouse/inOutWarehouse/part.vue

@@ -39,7 +39,7 @@
             <uni-card v-for="(item, index) in value" :key="index">
               <template>
                 <view class="card-header">
-                  <radio :checked="item.isSelected" @click="chooseItem(item)"/>
+                  <radio v-if="isInput" :checked="item.isSelected" @click="chooseItem(item)"/>
                   <text class="card-title">{{ item.wares.name }}</text>
                 </view>
               </template>
@@ -192,10 +192,17 @@ export default {
       this.getSoiId()
     },
     getUnitName(id) {
-      const index = this.unitList.findIndex(item => item.value === id)
-      if (index !== -1) {
-        return this.unitList[index].label
+      if (this.unitList && this.unitList.length > 0) {
+        console.log("我第一次就拿到了")
+        const index = this.unitList.findIndex(item => item.value === id)
+        if (index !== -1) {
+          return this.unitList[index].label
+        }else {
+          return "请选择"
+        }
       }
+      console.log("我是重新去拿的")
+      this.listUnit()
       return "请选择"
     },
     bindUnitChange(e, row) {