Merge branch 'feature_20260310_物料发放增加已发数量' into uat(dev)

src/views/deviceWithin/addStoreVisit.vue

@@ -61,13 +61,12 @@
         class="table-headermd"
         style="width: 100%"
         :span-method="objectSpanMethod">
-        <el-table-column label="物料类型" prop="signDictype" align="center"
+        <!-- <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
-        >
+            }}</span></template>
+        </el-table-column> -->
         <el-table-column label="物料名称" prop="collectionName" align="center"
           ><template slot-scope="scope"
             ><span class="tipTitle" @click="tipTitle(scope.row.collectionName)">{{
@@ -83,6 +82,11 @@
           key="yfNum"
           width="200"
           v-if="yfNumFlage" />
+        <el-table-column
+          label="已发数量"
+          prop="inventorySentNum"
+          align="center"
+          key="inventorySentNum" />
         <el-table-column class="t-center" prop="value" align="center" width="60">
           <template slot="header" class="t-center">
             <span>发放量</span><span class="xing">*</span>
@@ -6594,18 +6598,10 @@ export default {
   .table-headermd .el-table__body {
     width: 100% !important;
   }
-  .table-headermd col:nth-child(4) {
-    width: 5.6rem;
-  }
   .table-headermd col:nth-child(2),
-  .table-headermd col:nth-child(3) {
-    width: 5.6rem;
-  }
-  .table-headermdwl col:nth-child(2) {
-    width: auto;
-  }
-  .table-headermdwl col:nth-child(3) {
-    width: 4.6rem;
+  .table-headermd col:nth-child(3),
+  .table-headermd col:nth-child(4) {
+    width: 4.5rem;
   }
   .table-headermd .van-cell {
     padding: 0 4px;

src/views/historicalVisit/hisvistdeils.vue

@@ -25,13 +25,13 @@
         style="width: 100%"
         class="table-headermd"
         :span-method="objectSpanMethod">
-        <el-table-column prop="collectionName" label="物料类型" width="180" align="center">
+        <!-- <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> -->
         <el-table-column prop="collectionName" label="物料名称" width="180" align="center">
           <template slot-scope="scope">
             <span class="tipTitle" @click="tipTitle(scope.row.collectionName)">{{
@@ -40,7 +40,8 @@
           </template>
         </el-table-column>
         <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="yfNum" key="yfNum" width="200" v-if="yfNumFlage" label="应发本数" align="center" />
+        <el-table-column prop="inventorySentNum" key="inventorySentNum" width="200" label="已发数量" align="center" />
         <el-table-column prop="address" align="center">
           <template slot="header">
             <span>发放量</span>