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

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -4,6 +4,15 @@
       <div slot="header">
         <span style="font-size: 0.5rem">工位屏</span>
         <div class="fullscreen-title-btn">
+          <!-- <Button
+            @click="handleWideScreenClick"
+            size="large"
+            id="full_screen_btn"
+            type="primary"
+            style="margin-right: 1rem"
+          >
+            {{ isWideScreen ? "退  出" : "宽屏模式" }}
+          </Button> -->
           <Button
             @click="handleFullScreenClick"
             size="large"
@@ -139,7 +148,7 @@
               芯片
               <Icon
                 size="20px"
-                style="font-size: 1rem; transform: translate(-12%, -40%)"
+                style="font-size: 1rem; transform: translate(0, -40%)"
                 :color="choose.isChoosed ? '#2d8cf0' : 'white'"
                 type="md-arrow-dropup"
               />
@@ -183,7 +192,12 @@
           </div>
         </div>
         <div class="fullscreen-content-page">
-          <Page @on-change="changePage" :current="page_index" :total="total" />
+          <Page
+            @on-change="changePage"
+            :page-size="page_size"
+            :current="page_index"
+            :total="total"
+          />
         </div>
       </div>
       <div slot="footer"></div>
@@ -612,7 +626,7 @@ export default {
         rows: [],
       },
       page_index: 1,
-      page_size: 12,
+      page_size: 6,
       total: 0,
       currentSearchValue: "",
       modal_1_page_index: 1,
@@ -632,6 +646,7 @@ export default {
       keyboardVal: "",
       modalRoomList: [],
       modalRoomListSelected: [],
+      isWideScreen: false,
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -781,6 +796,16 @@ export default {
         this.exitFullScreen();
       }
     },
+    handleWideScreenClick() {
+      this.isWideScreen = !this.isWideScreen;
+      if (this.isWideScreen) {
+        this.enterWideScreen();
+      } else {
+        this.exitWideScreen();
+      }
+    },
+    enterWideScreen() {},
+    exitWideScreen() {},
     handleSelectionRoom() {
       this.getModalRoomList();
       this.roomModal = true;
@@ -1352,6 +1377,9 @@ export default {
   top: 0.175rem;
 }
 .fullscreen-content {
+  font-size: 26px;
+  font-family: "Microsoft YaHei", 微软雅黑;
+  font-weight: bold;
   .fullscreen-content-select {
     display: flex;
     justify-content: space-around;
@@ -1378,7 +1406,7 @@ export default {
     padding-top: 0.1rem;
     margin-bottom: 0.5rem;
     .fullscreen-content-choose-block {
-      width: 25%;
+      width: 33.33%;
       border-radius: 5px;
       border: 1px solid #2d8cf0;
       // margin: 0.1rem 1%;
@@ -1387,13 +1415,15 @@ export default {
       div {
         display: flex;
         justify-content: space-between;
+        // margin-top: 5px;
       }
       .chip-tag {
         display: inline-block;
         position: absolute;
-        width: 0.75rem;
+        width: 1rem;
         top: 0;
         left: 50%;
+        font-size: 18px;
         background-color: #fadb14;
         color: black;
         height: 0.75rem;

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -125,7 +125,7 @@
             芯片
             <Icon
               size="20px"
-              style="font-size: 1rem; transform: translate(-12%, -40%)"
+              style="font-size: 1rem; transform: translate(0, -40%)"
               :color="choose.isChoosed ? '#2d8cf0' : 'white'"
               type="md-arrow-dropup"
             />
@@ -169,7 +169,12 @@
         </div>
       </div>
       <div class="fullscreen-content-page">
-        <Page @on-change="changePage" :current="page_index" :total="total" />
+        <Page
+          @on-change="changePage"
+          :page-size="page_size"
+          :current="page_index"
+          :total="total"
+        />
       </div>
     </div>
     <div slot="footer"></div>
@@ -538,7 +543,7 @@ export default {
         rows: [],
       },
       page_index: 1,
-      page_size: 12,
+      page_size: 6,
       total: 0,
       currentSearchValue: "",
       modal_1_page_index: 1,
@@ -1256,6 +1261,9 @@ export default {
   top: 0.175rem;
 }
 .fullscreen-content {
+  font-size: 26px;
+  font-family: "Microsoft YaHei", 微软雅黑;
+  font-weight: bold;
   .fullscreen-content-select {
     display: flex;
     justify-content: space-around;
@@ -1282,7 +1290,7 @@ export default {
     padding-top: 0.1rem;
     margin-bottom: 0.5rem;
     .fullscreen-content-choose-block {
-      width: 25%;
+      width: 33.33%;
       border-radius: 5px;
       border: 1px solid #2d8cf0;
       // margin: 0.1rem 1%;
@@ -1291,13 +1299,15 @@ export default {
       div {
         display: flex;
         justify-content: space-between;
+        // margin-top: 5px;
       }
       .chip-tag {
         display: inline-block;
         position: absolute;
-        width: 0.75rem;
+        width: 1rem;
         top: 0;
         left: 50%;
+        font-size: 18px;
         background-color: #fadb14;
         color: black;
         height: 0.75rem;

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -525,7 +525,6 @@
                 filter-by-label
                 label-in-value
                 v-model="scope.row.product_id"
-                @change="$refs.xTable.updateStatus(scope)"
                 @on-change="
                   handleSelectProductMetail(
                     scope.row,
@@ -928,12 +927,12 @@
           </vxe-column>
           <vxe-column title="附加项" min-width="150" :edit-render="{}">
             <template #edit="scope">
-              <div v-if="!scope.row.is_metal">
+              <div>
                 <div
                   v-for="(ext_detail, idx) in scope.row.extArray"
                   :key="ext_detail.ext_id"
                   :style="
-                    idx != scope.row.ext.length - 1
+                    idx != scope.row.extArray.length - 1
                       ? {
                           borderBottom: '1px solid #e8eaec',
                           padding: '10px 0',
@@ -3149,6 +3148,7 @@ export default {
       this.axios("/api/employee_list").then((res) => (this.users = res.data));
     },
     handleExtraAdd(array, type) {
+      console.log(`array`, array);
       array.push({
         num: 0,
         price: 0,
@@ -3343,6 +3343,7 @@ export default {
                 this.clientDetailList_address[0].id || 0;
               this.info.service_id = re.data.detail.service_id;
               this.fax = re.data.detail.fax;
+              this.HandleAutoCreateNewLine();
             });
           });
         // }
@@ -3354,6 +3355,7 @@ export default {
           JSON.stringify(this.charge_list)
         );
         this.clientList = JSON.parse(JSON.stringify(this.cus_list));
+        this.HandleAutoCreateNewLine();
       }
     },
     handleClientDetailChange(value) {
@@ -3694,12 +3696,25 @@ export default {
           measure: this._measure, //测量字段数组
           support_remark: this.support_remark, //备注列表
           is_metal: false,
+          extArray: [
+            {
+              num: 0,
+              price: 0,
+              total_price: 0,
+              type: 2,
+              remark: "",
+              title: "",
+              id: "",
+              is_metal: true,
+            },
+          ],
           process_obj: JSON.parse(JSON.stringify(this.process_obj)), //工艺属性含选项对象
         };
         obj.process_obj.map(
           (v) => ((obj[v.id] = ""), (obj.procedure_properties[v.id] = ""))
         );
         this.tableData.push(obj);
+        this.$forceUpdate();
       } else {
         this.$Message.warning("请先选择客户");
       }
@@ -3718,7 +3733,6 @@ export default {
       });
     },
     handleSet(row, index, type) {
-      console.log("row :>> ", row);
       let obj;
       // 1 新增 2 编辑 3 删除 4复制  5详情
       switch (type) {
@@ -4440,11 +4454,11 @@ export default {
                 });
               }
             });
-            this.handleClearExtInfo(
-              this.modalData,
-              this.pre_bp_id,
-              res.data.bp_id
-            );
+            // this.handleClearExtInfo(
+            //   this.modalData,
+            //   this.pre_bp_id,
+            //   res.data.bp_id
+            // );
             // 是否有上一个的工艺属性ID
             this.chooseLastRouteId(this.modalData, res);
             this.$forceUpdate();
@@ -4883,33 +4897,39 @@ export default {
                         match_item.max > v.long * 1 + product["H"] * 1 &&
                         match_item.min <= v.long * 1 + product["H"] * 1
                       ) {
-                        part_arr.part_detail.map((v) => {
-                          if (v.part_detail_id == k) {
-                            v.material_detail_id =
-                              match_item.material_detail_id;
-                            v.material_detail_org_num = match_item.num;
-                            v.material_detail_num = match_item.num;
-                          }
-                        });
+                        part_arr &&
+                          part_arr.part_detail &&
+                          part_arr.part_detail.map((v) => {
+                            if (v.part_detail_id == k) {
+                              v.material_detail_id =
+                                match_item.material_detail_id;
+                              v.material_detail_org_num = match_item.num;
+                              v.material_detail_num = match_item.num;
+                            }
+                          });
                       }
                     }
                   });
-                }
-                if (
-                  match_item.max > product[match_item.e_title] &&
-                  match_item.min <= product[match_item.e_title]
-                ) {
-                  part_arr.part_detail.map((v) => {
-                    if (v.part_detail_id == k) {
-                      v.material_detail_id = match_item.material_detail_id;
-                      v.material_detail_org_num = match_item.num;
-                      v.material_detail_num = match_item.num;
-                    }
-                  });
+                } else {
+                  if (
+                    match_item.max > product[match_item.e_title] &&
+                    match_item.min <= product[match_item.e_title]
+                  ) {
+                    part_arr &&
+                      part_arr.part_detail &&
+                      part_arr.part_detail.map((v) => {
+                        if (v.part_detail_id == k) {
+                          v.material_detail_id = match_item.material_detail_id;
+                          v.material_detail_org_num = match_item.num;
+                          v.material_detail_num = match_item.num;
+                        }
+                      });
+                  }
                 }
               });
             }
           }
+          this.handleCalcCount();
           this.$forceUpdate();
         });
     },
@@ -4934,10 +4954,10 @@ export default {
               if (part_detail.material_detail_list.length > 1) {
                 try {
                   part_detail.longCalcFinal = eval(part_detail._longCalc);
-                  part_detail.material_detail_id = this.handleFindNearest(
-                    part_detail.material_detail_list,
-                    part_detail.longCalcFinal
-                  );
+                  // part_detail.material_detail_id = this.handleFindNearest(
+                  //   part_detail.material_detail_list,
+                  //   part_detail.longCalcFinal
+                  // );
                 } catch (error) {
                   console.log("error :>> ", error);
                 }

src/views/ProductionOrderList/InboundForm/details.vue

@@ -93,13 +93,13 @@
           @click="row.sub_state != 3 ? outShip(row, 2) : ''"
           >{{ row.sub_state != 3 ? "运输" : "" }}</a
         > -->
-         <a 
+        <a
           class="map-margin"
           v-if="row.in_out_value !== 1"
-          @click="outShip(row,3)"
-          >包装完成</a
+          @click="outShip(row, 3)"
+          >确认出库</a
         >
-         <a
+        <a
           class="map-margin"
           @click="row.sub_state != 3 ? outShip(row, 2) : ''"
           >{{ row.sub_state != 3 ? "发货指令" : "" }}</a
@@ -204,7 +204,7 @@ export default {
           value: "",
           option: [],
         },
-         {
+        {
           title: "图号",
           name: "Select",
           serverName: "url_number",
@@ -227,6 +227,8 @@ export default {
           placeholder: "入库状态",
           value: "",
           option: [
+            // { label: "未指派", value: 0 },
+            // { label: "可以派工", value: 1 },
             { label: "未入库", value: 2 },
             { label: "已入库", value: 3 },
           ],
@@ -347,7 +349,7 @@ export default {
       total: 0,
       pageSize: 10,
       loading: false,
-      selectedReturnArr:[],
+      selectedReturnArr: [],
       selects: [],
       selects_out: [],
       showStock: false,
@@ -442,7 +444,10 @@ export default {
     },
     getOptions() {
       this.axios("/api/orders_list_detail", {
-        params: { order_no: this.$route.query.order_no ,type:this.$route.query.type},
+        params: {
+          order_no: this.$route.query.order_no,
+          type: this.$route.query.type,
+        },
       }).then((res) => {
         res.data.house.map((v) => {
           v.value = v.house;
@@ -466,9 +471,9 @@ export default {
         res.data.part_title.map((v) => {
           (v.value = v.title), (v.label = v.title);
         });
-        res.data.url_number.map(v=>{
-          (v.value=v.url_number),(v.label = v.url_number);
-        })
+        res.data.url_number.map((v) => {
+          (v.value = v.url_number), (v.label = v.url_number);
+        });
         this.list[0].option = res.data.house;
         this.list[1].option = res.data.unit;
         this.list[2].option = res.data.layer;
@@ -529,7 +534,7 @@ export default {
       });
     },
     selectTable(row) {
-      this.selectedReturnArr = row
+      this.selectedReturnArr = row;
       let result = [],
         outResult = [];
       if (this.$route.query.type == 2) {
@@ -602,44 +607,47 @@ export default {
 
     outShip(row, type) {
       //type 1出库  2运输
-      if(type == 3){
-             this.confirmDelete({
-        title:  "确认出库" ,
-        content: "确认出库么？" ,
-        type: "primary",
-         then: (e) => {
-          this.axios.post('/api/orders_transport', {transport_no:row.transport_no}).then((res) => {
-            if (res.code == 200) {
-              this.$Message.success(res.msg);
-              this.getData(this.proxyObj);
-            }
-          });
-        },
-        cancel: (e) => {},
-      });
-      }else{
-      if (!row || row.length < 1) {
-        return this.$Message.error("请至少选择一项");
+      if (type == 3) {
+        this.confirmDelete({
+          title: "确认出库",
+          content: "确认出库么？",
+          type: "primary",
+          then: (e) => {
+            this.axios
+              .post("/api/orders_transport", { transport_no: row.transport_no })
+              .then((res) => {
+                if (res.code == 200) {
+                  this.$Message.success(res.msg);
+                  this.getData(this.proxyObj);
+                }
+              });
+          },
+          cancel: (e) => {},
+        });
+      } else {
+        if (!row || row.length < 1) {
+          return this.$Message.error("请至少选择一项");
+        }
+        let id = Array.isArray(row) ? row.join(",") : row.id;
+        let post_url =
+          type == 1 ? "/api/orders_transport" : "/api/orders_transport_confirm";
+        let params = {};
+        params.id = id;
+        this.confirmDelete({
+          title: type == 1 ? "确认出库" : "确认运输",
+          content: type == 1 ? "确认出库么？" : "确认运输么",
+          type: "primary",
+          then: (e) => {
+            this.axios.post(post_url, params).then((res) => {
+              if (res.code == 200) {
+                this.$Message.success(res.msg);
+                this.getData(this.proxyObj);
+              }
+            });
+          },
+          cancel: (e) => {},
+        });
       }
-      let id = Array.isArray(row) ? row.join(",") : row.id;
-      let post_url =
-        type == 1 ? "/api/orders_transport" : "/api/orders_transport_confirm";
-      let params = {};
-      params.id = id;
-      this.confirmDelete({
-        title: type == 1 ? "确认出库" : "确认运输",
-        content: type == 1 ? "确认出库么？" : "确认运输么",
-        type: "primary",
-        then: (e) => {
-          this.axios.post(post_url, params).then((res) => {
-            if (res.code == 200) {
-              this.$Message.success(res.msg);
-              this.getData(this.proxyObj);
-            }
-          });
-        },
-        cancel: (e) => {},
-      });}
     },
     async exportData() {
       const res = await this.axios("/api/orders_list_detail", {

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";