l

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -812,7 +812,7 @@ export default {
     handleRowNoComfirm() {
       this.selectedInfo.rows = JSON.parse(JSON.stringify(this.chooseLineNo));
       this.selectionRownolModal = false;
-      console.log(`this.selectedInfo.rows`, this.selectedInfo.rows);
+      this.getChipDetail();
     },
     onInput(value) {
       this.currentSearchValue = this.currentSearchValue + "" + value;

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -20,14 +20,6 @@
         >
           打 印
         </Button>
-        <Button
-          @click="handleOk"
-          size="large"
-          type="primary"
-          style="margin-right: 1rem"
-        >
-          完 成
-        </Button>
         <Button @click="back" size="large" type="primary">
           返 回
         </Button>
@@ -426,49 +418,6 @@
         </Button>
       </div>
     </Modal>
-    <Modal
-      class="selection-print-modal"
-      v-model="okModal"
-      title="打印"
-      width="60%"
-    >
-      <div class="selection-print-modal-body">
-        <div class="selection-print-modal-body-top">
-          <div>
-            <span>行号：</span>
-            <span>{{ selectedObj.row_no }}</span>
-          </div>
-          <div>
-            <span>部件名称：</span>
-            <span>{{ selectedObj.part_title }}</span>
-          </div>
-          <div>
-            <span>数量：</span>
-            <InputNumber
-              :max="this.selectedInfo.on_complete - this.selectedInfo.on_print"
-              :min="1"
-              size="large"
-              v-model="selectedObj.ok_num"
-            ></InputNumber>
-          </div>
-        </div>
-        <div class="selection-print-modal-body-info">
-          请确认完成数量是否正确？
-        </div>
-      </div>
-      <div slot="footer">
-        <Button
-          @click="okModal = false"
-          type="primary"
-          style="margin-right: 10px"
-        >
-          返回
-        </Button>
-        <Button @click="handleOkComfirm(selectedObj)" type="primary">
-          确认
-        </Button>
-      </div>
-    </Modal>
   </Modal>
 </template>
 
@@ -492,7 +441,6 @@ export default {
       selectionRownolModal: false,
       selectionDetailModal: false,
       printModal: false,
-      okModal: false,
       contentData: [],
       selectedObj: {},
       ordernoObj: {
@@ -743,7 +691,7 @@ export default {
     getChipDetail() {
       this.axios({
         method: "post",
-        url: "/api/station_get_order_product_pr",
+        url: "/api/station_get_order_on_product_pr",
         data: {
           order_no: this.selectedInfo.order_no,
           product_id: this.selectedInfo.product_id,
@@ -785,37 +733,11 @@ export default {
         }
       });
     },
-    handleOk() {
-      if (!this.selectedObj.isChoosed) {
-        return this.$Message.warning("请选择数据");
-      }
-      this.selectedObj.ok_num =
-        this.selectedObj.on_complete - this.selectedObj.on_print;
-      this.okModal = true;
-    },
-    handleOkComfirm(row) {
-      this.axios({
-        method: "post",
-        url: "/api/station_complete",
-        data: {
-          order_no: this.selectedInfo.order_no,
-          product_id: this.selectedInfo.product_id,
-          rows: this.selectedInfo.rows,
-          num: this.selectedObj.ok_num,
-          id: row.id,
-        },
-      }).then((res) => {
-        if (res.code == 200) {
-          this.okModal = false;
-          this.getChipDetail();
-        }
-      });
-    },
     //行号确认
     handleRowNoComfirm() {
       this.selectedInfo.rows = JSON.parse(JSON.stringify(this.chooseLineNo));
       this.selectionRownolModal = false;
-      console.log(`this.selectedInfo.rows`, this.selectedInfo.rows);
+      this.getChipDetail();
     },
     onInput(value) {
       this.currentSearchValue = this.currentSearchValue + "" + value;