出库确认

src/views/page/orderManage-sup/purOrderAccept/index.vue

@@ -79,8 +79,8 @@
             <el-table-column label="采购时间" prop="docmkDate" width="140" />
             <el-table-column label="采购类型" prop="purcType" width="100">
               <template #default="{ row }">
-                <span v-if="row.purcType">{{row.oprn}}</span>
-                <span v-if="row.purcType == ''">普通采购</span>
+                <span v-if="row.purcType=='2'">{{row.oprn}}</span>
+                <span v-if="row.purcType == '1'">普通采购</span>
               </template>
             </el-table-column>
             <el-table-column label="当前状态" prop="stas">
@@ -430,6 +430,10 @@ export default {
           spdId:this.listQueryC.spdId,
           activeName:this.activeName,
           oprn:row.oprn,
+          oprtRoom:row.oprtRoom,
+          oprtTime:row.oprtTime,
+          atddr:row.atddr,
+          purcType:row.purcType,
         },
       });
     },

src/views/page/orderManage-sup/purOrderDelivery/deliveryDetail.vue

@@ -888,6 +888,10 @@ export default {
     this.listForm.OutboundDate = moment(new Date()).format("YYYY-MM-DD HH:mm:ss");
     this.listForm.branchName = this.$route.query.branchName;
     this.listForm.deptName = this.$route.query.deptName;
+    this.listForm.oprn = this.$route.query.oprn;
+    this.listForm.oprtRoom = this.$route.query.oprtRoom;
+    this.listForm.oprtTime = this.$route.query.oprtTime;
+    this.listForm.atddr = this.$route.query.atddr;
     if(this.listForm.stas=='部分出库'){
       this.endBtn = true
     }
@@ -1326,9 +1330,11 @@ export default {
     },
     // 填写UDI码
     handleudi(row,index){
-      if(!row.lotNum && !row.manuDate && !row.prodExpy && !row.delvCnt){
-        this.$message.warning("先填写必填信息，再填写UDI码")
-      }else{
+      console.log(row.lotNum,"row.lotNum")
+      console.log(row.manuDate,"row.manuDate")
+      console.log(row.prodExpy,"row.prodExpy")
+      console.log(row.delvCnt,"row.delvCnt")
+      if(row.lotNum && row.manuDate && row.prodExpy && row.delvCnt){
         this.rowIndex = index;
       this.udidialog = true;
       let udiObj={
@@ -1355,6 +1361,8 @@ export default {
       const copiedObjects = Array.from({ length: n }, () => ({ ...udiObj }));
       console.log(copiedObjects,"copiedObjects")
       this.udiData = copiedObjects
+      }else{
+        this.$message.warning("先填写必填信息，再填写UDI码")
       }
       
     },
@@ -1421,6 +1429,7 @@ export default {
     // 出库
     handleDelivery() {
       this.tableData.forEach((item) => {
+        console.log(this.cShow,item.udiList)
         if (item.delvCnt=='0') {
           this.$message({
             message: "本次出库数量必须大于0",
@@ -1436,8 +1445,9 @@ export default {
           });
           throw new Error("请填写相应信息，并选择报关单");
         }
-        if(this.cShow==true && item.udiList==[]){
+        if(this.cShow==true &&(  !item.udiList|| item.udiList.length==0)){
           this.$message.warning("请填写udi再提交")
+          throw new Error("请填写udi再提交");
         }
       });
       let lotnum = this.pf(this.tableData);

src/views/page/orderManage-sup/purOrderDelivery/index.vue

@@ -90,8 +90,8 @@
           <el-table-column label="来源部门" prop="deptName" />
           <el-table-column label="采购类型" prop="purcType" width="100">
             <template #default="{ row }">
-                <span v-if="row.purcType">{{row.oprn}}</span>
-                <span v-if="row.purcType == ''">普通采购</span>
+                <span v-if="row.purcType=='2'">{{row.oprn}}</span>
+                <span v-if="row.purcType == '1'">普通采购</span>
               </template>
             </el-table-column>
           <el-table-column label="采购时间" prop="docmkDate" width="140" />
@@ -420,6 +420,7 @@ export default {
           oprtRoom:row.oprtRoom,
           oprtTime:row.oprtTime,
           atddr:row.atddr,
+          purcType:row.purcType,
         },
       });
     },
@@ -466,6 +467,7 @@ export default {
           oprtRoom:row.oprtRoom,
           oprtTime:row.oprtTime,
           atddr:row.atddr,
+          purcType:row.purcType,
         },
       });
     },