Merge branch 'feature_20260107_金牌店根据等级设置色卡可发放数量' into uat(dev)

src/views/deviceWithin/addStoreVisit.vue

@@ -52,22 +52,28 @@
         class="table-headermd table-headermdwl"
         style="width: 100%"
         :span-method="objectSpanMethod">
-        <el-table-column label="物料类型" prop="signDictype"
+        <el-table-column label="物料类型" prop="signDictype" align="center"
           ><template slot-scope="scope"
             ><span class="tipTitle" @click="tipTitle(scope.row.signDictype)">{{
               scope.row.signDictype
             }}</span></template
           ></el-table-column
         >
-        <el-table-column label="物料名称" prop="collectionName"
+        <el-table-column label="物料名称" prop="collectionName" align="center"
           ><template slot-scope="scope"
             ><span class="tipTitle" @click="tipTitle(scope.row.collectionName)">{{
               scope.row.collectionName
             }}</span></template
           ></el-table-column
         >
-        <el-table-column label="库存" prop="inventoryNum" />
-        <el-table-column class="t-center" prop="value">
+        <el-table-column label="库存" prop="inventoryNum" align="center" />
+        <el-table-column
+          label="应发本数"
+          prop="yfNum"
+          align="center"
+          key="yfNum"
+          v-if="yfNumFlage" />
+        <el-table-column class="t-center" prop="value" align="center">
           <template slot="header" class="t-center">
             <span>发放量</span><span class="xing">*</span>
           </template>
@@ -3893,6 +3899,7 @@ export default {
       machineInTheStore: '否',
       validatorFlag: true, //是否验证通过
       confirmed: false,
+      yfNumFlage: false,
     };
   },
   beforeRouteLeave(to, from, next) {
@@ -5153,6 +5160,8 @@ export default {
               }
             }
             this.tableData1 = collectionItemLists;
+            let yfNumArr = this.tableData1.filter((val) => val.yfNum);
+            this.yfNumFlage = yfNumArr.length ? true : false;
           }
         }
       });

src/views/historicalVisit/hisvistdeils.vue

@@ -40,6 +40,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="inventoryNum" width="180" label="库存" />
+        <el-table-column prop="yfNum" width="200" label="应发本数" />
         <el-table-column prop="address">
           <template slot="header">
             <span>发放量</span>