mushencc 3 年之前
父節點
當前提交
7fe9d340c0

+ 9 - 2
src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -433,14 +433,20 @@
           </div>
           </div>
         </div>
         </div>
         <div class="selection-print-modal-body-info">
         <div class="selection-print-modal-body-info">
-          {{
+          <!-- {{
             selectedObj.isFinished
             selectedObj.isFinished
               ? "该部件已打印,是否再次打印?"
               ? "该部件已打印,是否再次打印?"
               : "请确认打印数量是否正确!"
               : "请确认打印数量是否正确!"
+          }} -->
+           {{
+           
+              "该部件已打印,是否再次打印?"
+
           }}
           }}
           <div>
           <div>
+              <!-- v-show="selectedObj.isFinished" -->
             <Button
             <Button
-              v-show="selectedObj.isFinished"
+            
               @click="handleSelectionRoom"
               @click="handleSelectionRoom"
               type="primary"
               type="primary"
             >
             >
@@ -465,6 +471,7 @@
     <Modal
     <Modal
       class="selection-modal"
       class="selection-modal"
       v-model="roomModal"
       v-model="roomModal"
+      @on-cancel='handleRoomCancel'
       title="选择房间号"
       title="选择房间号"
       width="80%"
       width="80%"
     >
     >

+ 2 - 2
src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -323,9 +323,9 @@ export default {
              if(element.id == 3){
              if(element.id == 3){
                element.content.forEach(v=>{
                element.content.forEach(v=>{
                  if(v.title === '详情导出'){
                  if(v.title === '详情导出'){
-                         this.export_state = v.state;
+                         this.export_state = v.value==1?true:false;
                  }else if(v.title === 'NC下载'){
                  }else if(v.title === 'NC下载'){
-                          this.NC_state = v.state;
+                          this.NC_state = v.value==1?true:false;
                  }
                  }
                })
                })
              }
              }