huang_an пре 1 година
родитељ
комит
546dc43383

+ 2 - 1
src/views/warehouseManagement/components/AssetsDialog.vue

@@ -70,7 +70,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="6">
           <el-form-item label="物品名称:">
             <el-input
               type="text"
@@ -127,6 +127,7 @@
         <el-col v-if="dimension != 2" :span="6">
           <el-form-item label="质检结果">
             <el-select
+              style="width: 100%"
               clearable
               v-model="searchForm.qualityResult"
               placeholder="请选择质检结果"

+ 2 - 2
src/views/warehouseManagement/stockManagement/add_export.vue

@@ -952,7 +952,7 @@
           return item['型号'];
         });
         let nameList = xlsxData.map((item) => {
-          return item['物品名'];
+          return item['物品名'];
         });
         this.formData.extInfo.assetType = '6'; //备品备件
         this.selectEquiType = '6';
@@ -983,7 +983,7 @@
                 // 添加包装数量和最小包装单元
                 let filterArray = xlsxData.filter(
                   (xlsxItem) =>
-                    xlsxItem['物品名'] == item.assetName &&
+                    xlsxItem['物品名'] == item.assetName &&
                     xlsxItem['型号'] == item.modelType
                 );
                 if (filterArray.length > 0) {