Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-CLIENT-TEMP into qingban

src/styles/index.scss

@@ -194,7 +194,7 @@
   position: fixed;
   width: 100vw;
   height: 100vh;
-  z-index: 99999999;
+  z-index: 999;
   background-color: #00000030;
   top: 0;
   left: 0;

src/views/pro-operation/pdm-file/index.vue

@@ -125,6 +125,7 @@ const getDatas = async () => {
   const { data } = await getData({
     pageNo: pageObj.value.pageNo,
     pageSize: pageObj.value.pageSize,
+    materialCode: store.scanInfo.materialCode,
   });
   fileDatas.value = data.records;
   pageObj.value.total = data.totalCount;

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

@@ -28,9 +28,9 @@
               <div class="operate">
                 <div class="describeText operateText">录入数量</div>
                 <template v-if="selectIndex == index">
-                  <NumberInput v-model="item.num" :max="item.needNum" />
+                  <NumberInput v-model="item.scanNum" :max="item.needNum" />
                 </template>
-                <div v-else class="titleText">0</div>
+                <div v-else class="titleText">{{ item.scanNum }}</div>
               </div>
             </div>
           </div>
@@ -83,9 +83,7 @@ const enterfnc = async () => {
     workOrderCode: store.odersData.workOrderCode,
   });
   if (code == "200") {
-    console.log(data);
     scanData.value.push(data[0]);
-    console.log(scanData.value);
   }
 };
 const handleClose = () => {