Merge branch 'master' of 121.41.102.225:Nidong/jiufang into hw

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -11,7 +11,7 @@
             type="primary"
             style="margin-right: 1rem"
           >
-            {{ isWideScreen ? "退  出" : "宽屏模式" }}
+            {{ isWideScreen ? "正常模式" : "简单模式" }}
           </Button>
           <Button
             @click="handleFullScreenClick"
@@ -20,7 +20,7 @@
             type="primary"
             style="margin-right: 1rem"
           >
-            {{ isFullScreen ? "退  出" : "全  屏" }}
+            {{ isFullScreen ? "收  缩" : "全  屏" }}
           </Button>
           <Button
             @click="handlePrint"
@@ -139,6 +139,7 @@
               choose.isChoosed
                 ? 'fullscreen-content-choose-block fullscreen-content-choose-block-choosen'
                 : 'fullscreen-content-choose-block fullscreen-content-choose-block-unchoosen',
+              isWideScreen ? 'fullscreen-content-choose-block-wide' : '',
             ]"
             v-for="choose in contentData"
             :key="choose.row"
@@ -817,10 +818,13 @@ export default {
     handleWideScreenClick() {
       this.isWideScreen = !this.isWideScreen;
       if (this.isWideScreen) {
+        this.page_size = 12;
         this.enterWideScreen();
       } else {
+        this.page_size = 6;
         this.exitWideScreen();
       }
+      this.getChipDetail();
     },
     enterWideScreen() {},
     exitWideScreen() {},
@@ -1617,7 +1621,6 @@ export default {
   .fullscreen-content-select {
     display: flex;
     justify-content: flex-start;
-    // justify-content: space-around;
     padding-bottom: 0.1rem;
     border-bottom: 1px solid #e8eaec;
     .fullscreen-content-select-block {
@@ -1684,6 +1687,9 @@ export default {
         transform: translate(-10%, -10%) !important;
       }
     }
+    .fullscreen-content-choose-block-wide {
+      width: 24.5%;
+    }
     .fullscreen-content-choose-block-choosen {
       color: white;
       background-color: #2d8cf0;
@@ -1789,6 +1795,9 @@ export default {
     font-size: 0.5rem;
   }
 }
+/deep/.ivu-modal-close {
+  border: 1px solid black;
+}
 /deep/.fullscreen-content-page {
   display: flex;
   justify-content: space-around;

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -4,13 +4,13 @@
       <span style="font-size: 0.5rem">工位屏-补打</span>
       <div class="fullscreen-title-btn">
         <Button
-          @click="handleFullScreenClick"
+          @click="handleWideScreenClick"
           size="large"
           id="full_screen_btn"
           type="primary"
           style="margin-right: 1rem"
         >
-          {{ isFullScreen ? "退  出" : "全  屏" }}
+          {{ isWideScreen ? "正常模式" : "简单模式" }}
         </Button>
         <Button
           @click="handlePrint"
@@ -116,40 +116,56 @@
             choose.isChoosed
               ? 'fullscreen-content-choose-block fullscreen-content-choose-block-choosen'
               : 'fullscreen-content-choose-block fullscreen-content-choose-block-unchoosen',
+            isWideScreen ? 'fullscreen-content-choose-block-wide' : '',
           ]"
           v-for="choose in contentData"
           :key="choose.row"
           @click="handleChooseBlockClick(choose)"
         >
-          <div class="chip-tag">
+          <div :class="[isWideScreen ? 'chip-tag-choosed' : 'chip-tag']">
             芯片
             <Icon
               size="20px"
+              :style="
+                isWideScreen
+                  ? 'font-size: 1rem; transform: translate(0, -50%)'
+                  : 'font-size: 1rem; transform: translate(0, -40%)'
+              "
               style="font-size: 1rem; transform: translate(0, -40%)"
               :color="choose.isChoosed ? '#2d8cf0' : 'white'"
               type="md-arrow-dropup"
             />
           </div>
-          <div>
+          <div v-show="!isWideScreen">
             <span>行号</span>
             <span>{{ choose.row_no }}</span>
           </div>
-          <div>
+          <div v-show="!isWideScreen">
             <span>部件</span>
             <span>{{ choose.part_title }}</span>
           </div>
-          <div>
+          <div v-show="!isWideScreen">
             <span>材料</span>
             <span>{{ choose.sub_part_title }}</span>
           </div>
-          <div>
+          <div v-show="!isWideScreen">
             <span>毛料尺寸</span>
             <span>{{ choose.wool_size }}</span>
           </div>
-          <div>
+          <div v-show="!isWideScreen">
             <span>精裁尺寸</span>
             <span>{{ choose.cut_size }}</span>
           </div>
+          <div v-show="isWideScreen" class="wide-screen-rowno">
+            <span
+              :class="[
+                choose.isChoosed
+                  ? 'wide-screen-rowno-span-choosed'
+                  : 'wide-screen-rowno-span',
+              ]"
+              >{{ choose.row_no }}</span
+            >
+          </div>
           <div>
             <span>未完成数量</span>
             <span>
@@ -563,6 +579,7 @@ export default {
       keyboardVal: "",
       modalRoomList: [],
       modalRoomListSelected: [],
+      isWideScreen: false,
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -681,6 +698,15 @@ export default {
         this.exitFullScreen();
       }
     },
+    handleWideScreenClick() {
+      this.isWideScreen = !this.isWideScreen;
+      if (this.isWideScreen) {
+        this.page_size = 12;
+      } else {
+        this.page_size = 6;
+      }
+      this.getChipDetail();
+    },
     enterFullScreen() {
       let el = document.documentElement;
       let rfs =
@@ -1315,6 +1341,24 @@ export default {
         padding-top: 0.15rem;
         transform: translate(-50%, -10%);
       }
+      .chip-tag-choosed {
+        display: inline-block;
+        position: absolute;
+        width: 1rem;
+        top: 0;
+        left: 15%;
+        font-size: 18px;
+        background-color: #fadb14;
+        color: black;
+        height: 0.75rem;
+        border-radius: 15%;
+        text-align: center;
+        padding-top: 0.15rem;
+        transform: translate(-10%, -10%) !important;
+      }
+    }
+    .fullscreen-content-choose-block-wide {
+      width: 24.5%;
     }
     .fullscreen-content-choose-block-choosen {
       color: white;
@@ -1410,6 +1454,9 @@ export default {
   line-height: 1rem;
   width: 1rem;
 }
+/deep/.ivu-modal-close {
+  border: 1px solid black;
+}
 /deep/.ivu-page-prev,
 /deep/.ivu-page-next {
   display: inline-block;
@@ -1425,4 +1472,25 @@ export default {
   display: flex;
   justify-content: space-around;
 }
+.wide-screen-rowno {
+  display: flex;
+  justify-content: center !important;
+  span {
+    display: inline-block;
+    text-align: center;
+    width: 3rem;
+    height: 3rem;
+    line-height: 3rem;
+    border-radius: 50%;
+    font-size: 1.5rem;
+  }
+  .wide-screen-rowno-span-choosed {
+    color: #2d8cf0;
+    background-color: white;
+  }
+  .wide-screen-rowno-span {
+    color: white;
+    background-color: #2d8cf0;
+  }
+}
 </style>

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -684,7 +684,13 @@
                     v-model="part_detail.change_id"
                     @on-change="
                       (e) =>
-                        changeEditPart(scope.row, part_type, part_detail, e)
+                        changeEditPart(
+                          scope.row,
+                          part_type,
+                          part_detail,
+                          e,
+                          scope.rowIndex
+                        )
                     "
                   >
                     <Option
@@ -1679,7 +1685,8 @@
                           element,
                           modalData.measure,
                           modalData.total_num
-                        )
+                        );
+                        handleIsSpecialPart(modalData);
                       "
                       v-model="element.change_id"
                       style="width: 180px"
@@ -4088,7 +4095,7 @@ export default {
         row.title = "";
       }
     },
-    changeEditPart(row, part_type, part_detail, e) {
+    changeEditPart(row, part_type, part_detail, e, rowIndex) {
       if (e) {
         row.isEdit = true;
         part_detail.change_id = e.value;
@@ -4099,6 +4106,7 @@ export default {
           (v) => v.id == e.value
         )[0].part_title;
         this.handlePartChange(e, part_detail, row.measure, row.total_num);
+        this.handleIsSpecialPart(this.tableData[rowIndex]);
         this.handleCalcCount();
       }
     },
@@ -4737,6 +4745,7 @@ export default {
       } else {
         row.change_id = "";
       }
+
       this.$forceUpdate();
     },
     handleProductNumChange(e, product) {

vue.config.js

@@ -2,7 +2,7 @@ const axios_default_ip =
   process.env.NODE_ENV == "dev"
     ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://121.41.102.225:82" //测试服
+    ? "http://124.71.176.88:882" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:82";