盘点样式调整

ruoyi-admin-vue/src/views/inventory/stocktakes/stocktakeItemsTable.vue

@@ -44,7 +44,6 @@
             readonly
             @focus="openLocationSelector"
             :suffix-icon="''"
-            :disabled="!searchParams.warehouseId"
           >
             <template v-if="queryLocationName" #suffix>
               <i
@@ -84,13 +83,13 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="批次编号" align="center" prop="batchCode" min-width="150px" >
+          <!-- <el-table-column label="批次编号" align="center" prop="batchCode" min-width="150px" >
             <template slot-scope="scope">
               <div class="disabled-input">
                 {{ scope.row.batchCode }}
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="仓库" align="center" prop="warehouseName" min-width="150px" >
             <template slot-scope="scope">
               <div class="disabled-input">
@@ -157,43 +156,39 @@
             </template>
           </el-table-column>
           <el-table-column prop="adjustedType" align="center" label="调整原因类型" min-width="150px">
-            <template v-if="isConfirm" slot-scope="scope">
-              <div
-                class="disabled-input"
-              >
-                {{ getAdjustReasonName(scope.row.adjustedType) }}
-              </div>
-            </template>
-            <template v-else slot-scope="scope">
-            <!-- <template slot-scope="scope"> -->
-              <el-select
-                v-model="scope.row.adjustedType"
-                placeholder="请选择调整原因类型"
-                :disabled="isConfirm"
-                :style="getAdjustTypeErrorStyle(scope.row)"
-                @change="handleItemChange(scope.row)"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="item in dict.type.adjusted_type"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
+            <template slot-scope="scope">
+              <template v-if="isConfirm">
+                <div>
+                  {{ getAdjustReasonName(scope.row.adjustedType) }}
+                </div>
+              </template>
+              <template v-if="!isConfirm">
+                <el-select
+                  v-model="scope.row.adjustedType"
+                  placeholder="请选择调整原因类型"
+                  :style="getAdjustTypeErrorStyle(scope.row)"
+                  @change="handleItemChange(scope.row)"
+                  clearable
+                  size="small"
+                >
+                  <el-option
+                    v-for="item in dict.type.adjusted_type"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </template>
             </template>
           </el-table-column>
           <el-table-column label="调整原因" align="center" prop="adjustmentReason" min-width="150px" >
             <template slot-scope="scope">
               <template v-if="isConfirm">
-                <div
-                  class="disabled-input"
-                >
+                <div>
                   {{ scope.row.adjustmentReason }}
                 </div>
               </template>
-              <template v-else>
+              <template v-if="!isConfirm">
                 <el-input
                   v-model="scope.row.adjustmentReason"
                   placeholder="请输入调整原因"
@@ -204,7 +199,7 @@
               </template>
             </template>
           </el-table-column>
-          <el-table-column label="调整人" align="center" prop="adjustedBy" v-if="isConfirm" min-width="150px" >
+          <!-- <el-table-column label="调整人" align="center" prop="adjustedBy" v-if="isConfirm" min-width="150px" >
             <template slot-scope="scope">
               <div class="disabled-input">
                 {{ scope.row.adjustedBy }}
@@ -217,7 +212,7 @@
                 {{ scope.row.adjustedAt }}
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </div>
       <pagination
@@ -307,7 +302,8 @@ export default {
           : true
         return matchMaterial && matchWarehouse && matchLocation
       })
-
+console.log('itemlist', filtered)
+console.log(this.isConfirm)
       // 更新总数+分页
       this.total = filtered.length
       const start = (this.searchParams.pageNum - 1) * this.searchParams.pageSize
@@ -339,9 +335,9 @@ export default {
       // 供列表筛选：存仓库编码333（匹配列表里的warehouseId:333
       this.searchParams.warehouseId = warehouse.warehouseId
       this.queryWarehouseName = warehouse.warehousesName || warehouse.warehouseId
-      // 仓库选择后，清空库位信息
-      this.queryLocationName = null
-      this.searchParams.locationId = null
+      // // 仓库选择后，清空库位信息
+      // this.queryLocationName = null
+      // this.searchParams.locationId = null
       this.handleQuery()
     },
 
@@ -349,9 +345,9 @@ export default {
     clearQueryWarehouse() {
       this.queryWarehouseName = null
       this.searchParams.warehouseId = null
-      // 清空仓库时，同时清空库位
-      this.queryLocationName = null
-      this.searchParams.locationId = null
+      // // 清空仓库时，同时清空库位
+      // this.queryLocationName = null
+      // this.searchParams.locationId = null
       this.handleQuery()
     },
 
@@ -495,6 +491,8 @@ export default {
     },
     /** 获取调整原因名称 */
     getAdjustReasonName(status) {
+      console.log('status', status)
+      console.log('typelist', this.dict.type.adjusted_type)
       const item = this.dict.type.adjusted_type.find(item => item.value === status)
       return item ? item.label : '未知'
     }