数据采集更改

src/views/pro-steps/popUpView/caijiRightPopUp.vue

@@ -16,9 +16,13 @@
             :key="index"
           >
             <div class="leftInfo">
-              <div class="titleText">{{ item.materialName }}</div>
+              <div class="titleText">{{ item.materialName }}({{item.spec}})</div>
               <div class="describeText">{{ item.materialCode }}</div>
-              <div class="describeText">规格:{{ item.spec }}</div>
+              <div class="describeText">批次号:</div>
+              <template v-if="selectIndex == index">
+                <ScanCodeInput v-model="item.batchNo" />
+              </template>
+              <div v-else class="titleText">{{ item.batchNo }}</div>
               <!-- <div class="describeText">批次号:xxx</div>
               <div class="describeText">计划编号：xxx</div>
               <div class="describeText">订单编号：xxx</div>

src/views/pro-steps/popUpView/xiangqingPopUp.vue

@@ -26,10 +26,20 @@
         <div class="body">
           <div
             class="info titleText"
+            style="margin-top:5px;"
             v-for="(item, index) in showInfoData"
             :key="index"
           >
-            {{ item.batchNo }} &nbsp;&nbsp;&nbsp;&nbsp;* {{ item.num }}
+
+            {{item.batchNo}} * {{item.num}}
+<!--            <el-form span="24" :inline="true" >
+              <el-form-item label="批号" span="12">
+                <el-input v-model="item.batchNo"></el-input>
+              </el-form-item>
+              <el-form-item label="数量" span="12">
+                <el-input v-model="item.num"></el-input>
+              </el-form-item>
+            </el-form>-->
             <span style="margin-right: 10px"></span>
           </div>
           <Empty v-if="showInfoData.length == 0" />

src/views/traceability/components/materials.vue

@@ -13,8 +13,9 @@
             <el-table-column prop="itemModel" label="物料规格" />
             <el-table-column prop="itemCode" label="物料编号" />
             <el-table-column prop="batchNo" label="采集批次" />
-            <el-table-column prop="needNum" label="需求数量" />
+<!--            <el-table-column prop="needNum" label="需求数量" />-->
             <el-table-column prop="realNum" label="已采集数量" />
+            <el-table-column prop="trackWhen" label="采集时间" />
           </el-table>
         </el-collapse-item>
       </el-collapse>