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

src/views/deviceWithin/addStoreVisit.vue

@@ -49,25 +49,32 @@
         v-if="wuliaoMust"
         :data="tableData1"
         border
-        class="table-headermd table-headermdwl"
+        class="table-headermd"
         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"
+          width="200"
+          v-if="yfNumFlage" />
+        <el-table-column class="t-center" prop="value" align="center" width="60">
           <template slot="header" class="t-center">
             <span>发放量</span><span class="xing">*</span>
           </template>
@@ -3893,6 +3900,7 @@ export default {
       machineInTheStore: '否',
       validatorFlag: true, //是否验证通过
       confirmed: false,
+      yfNumFlage: false,
     };
   },
   beforeRouteLeave(to, from, next) {
@@ -5153,6 +5161,8 @@ export default {
               }
             }
             this.tableData1 = collectionItemLists;
+            let yfNumArr = this.tableData1.filter((val) => val.yfNum);
+            this.yfNumFlage = yfNumArr.length ? true : false;
           }
         }
       });
@@ -6533,7 +6543,7 @@ export default {
   }
   .table-headermd col:nth-child(2),
   .table-headermd col:nth-child(3) {
-    width: 4.6rem;
+    width: 5.6rem;
   }
   .table-headermdwl col:nth-child(2) {
     width: auto;
@@ -6550,7 +6560,7 @@ export default {
     text-align: center;
   }
   .table-headermd th.el-table__cell:first-child > .cell {
-    text-align: left;
+    // text-align: left;
   }
   .table-headermd th.el-table__cell {
     background-color: #1989fa;

src/views/historicalVisit/hisvistdeils.vue

@@ -25,22 +25,23 @@
         style="width: 100%"
         class="table-headermd"
         :span-method="objectSpanMethod">
-        <el-table-column prop="collectionName" label="物料类型" width="180">
+        <el-table-column prop="collectionName" label="物料类型" width="180" 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 prop="collectionName" label="物料名称" width="180">
+        <el-table-column prop="collectionName" label="物料名称" width="180" 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 prop="inventoryNum" width="180" label="库存" />
-        <el-table-column prop="address">
+        <el-table-column prop="inventoryNum" width="180" label="库存" align="center" />
+        <el-table-column prop="yfNum" key="yfNum" width="200" v-if="yfNumFlage" label="应发本数" />
+        <el-table-column prop="address" align="center">
           <template slot="header">
             <span>发放量</span>
           </template>
@@ -354,6 +355,7 @@ export default {
       inspectionType: '',
       equipmentCode: '',
       taskPhotoRecognitionResult: null,
+      yfNumFlage: false,
     };
   },
   activated() {
@@ -521,6 +523,8 @@ export default {
             }
           }
           this.tableData1 = collectionItemLists;
+          let yfNumArr = this.tableData1.filter((val) => val.yfNum);
+          this.yfNumFlage = yfNumArr.length ? true : false;
         }
       });
     },