Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

schangxiang@126.com

2024-12-11 a27f35ea06c7b6bd9a6dc310c86c366e8052897b

 LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue

@@ -20,8 +20,8 @@
            prop="packageCode"
            required
            class="uFormItem"
          >
            <u-input
          >
              v-model.trim="warehouse.packageCode"
              @confirm="getContainerData(1)"
              placeholder="请录入或扫码"
@@ -43,6 +43,7 @@
              ref="materialRef"
              placeholder="请扫码录入"
              @focus="warehouse.upi = ''"
              :focus="curFoucus"
              @confirm="getContainerData"
              style="font-weight: bolder; margin-left: 15rpx"
              class="width padding_left25rpx"
@@ -72,7 +73,6 @@
              :class="item.checked ? 'bg_item' : ''"
              class="fontSize32rpx width margin_auto background_fff padding10 relative box_sizing transition"
            >
              <!-- 部件名称 upi、材料、尺寸，位置、板件状态 -->
              <u-row>
                <u-col span="12" class="flex align-center">
                  <!-- <u-checkbox v-model="item.checked" size="50rpx"></u-checkbox> -->
@@ -94,33 +94,69 @@
                </u-col>
              </u-row>
              <u-row>
                <u-col span="8">
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    部件名称： {{ item.detailName }}
                  </text>
                </u-col>
                <u-col span="4">
                  <text class="color_80"> 位置：{{ item.location }} </text>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    位置：{{ getAreaCodeEnumName(item.areaCode) }}
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="8">
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    材料：{{ item.info18 }}
                  </text>
                </u-col>
                <u-col span="4">
                  <text class="color_80"> 尺寸：{{ item.info16 }} </text>
              </u-row>

              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> 尺寸：{{ item.info16 }} </text>
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="8">
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    板件状态：{{ getEnumName(item.upiStatus) }}
                  </text>
                </u-col>
                <u-col span="4">
                  <text class="color_80"> 次序：{{ item.shelf }} </text>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> 次序：{{ item.shelf }} </text>
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> 生产单号：{{ item.info5 }} </text>
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80">
                      包装编号：{{ item.packageCode }}</text
                    >
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> 批次号：{{ item.planNo }}</text>
                  </text>
                </u-col>
              </u-row>
            </view>
@@ -129,6 +165,129 @@
      </u-swipe-action>
    </view>
    <modal-code :rescode="rescode" :resmessage="resmessage" ref="resmodal" />

    <u-popup
      v-model="detailshow"
      border-radius="14"
      @close="detailshow = false"
      mode="bottom"
    >
      <h2 class="text_align_center padding_bottom18 padding15">信息</h2>
      <div style="height: 400px; overflow-y: auto; padding: 0 15rpx">
        <view class="line flex justify-between">
          <text class="text-gray">订单号</text>
          <text>{{ materlist.orderId }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">长</text>
          <text>{{ materlist.length }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">宽</text>
          <text>{{ materlist.width }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">厚</text>
          <text>{{ materlist.thk }}</text>
        </view>
        <!-- <view class="line flex justify-between">
          <text class="text-gray">行号</text>
          <text>{{ materlist.lineNumber }}</text>
        </view> -->
        <!-- <view class="line flex justify-between">
        <text class="text-gray">部件纹理</text>
        <text>{{ materlist.Matgrid }}</text>
      </view> -->
        <!-- <view class="line flex justify-between">
        <text class="text-gray">打孔设备编号</text>
        <text>{{ materlist.DRNum }}</text>
      </view> -->

        <!-- <view class="line flex justify-between">
          <text class="text-gray">锯切图号</text>
          <text>{{ materlist.materialIndex }}</text>
        </view> -->

        <view class="line flex justify-between">
          <text class="text-gray">包装X坐标</text>
          <text>{{ materlist.machineXCenter }}</text>
        </view>

        <view class="line flex justify-between">
          <text class="text-gray">包装Y坐标</text>
          <text>{{ materlist.machineYCenter }}</text>
        </view>

        <view class="line flex justify-between">
          <text class="text-gray">包装Z坐标</text>
          <text>{{ materlist.machineZCenter }}</text>
        </view>
        <!-- <view class="line flex justify-between">
          <text class="text-gray">转向角度</text>
          <text>{{ materlist.rotation }}</text>
        </view> -->
        <view class="line flex justify-between">
          <text class="text-gray">层数</text>
          <text>{{ materlist.sequence }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">销售合同单号</text>
          <text>{{ materlist.info4 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">生产单号</text>
          <text>{{ materlist.info5 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">第几包</text>
          <text>{{ materlist.info6 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">经销店名称</text>
          <text>{{ materlist.info7 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">产品名称</text>
          <text>{{ materlist.info8 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">包装编码</text>
          <text>{{ materlist.info9 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">客户名称</text>
          <text>{{ materlist.info10 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">自提或发货</text>
          <text>{{ materlist.info11 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">包装部件总数量</text>
          <text>{{ materlist.info12 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">包装面积</text>
          <text>{{ materlist.info13 }}</text>
        </view>
        <!-- <view class="line flex justify-between">
          <text class="text-gray">部件名称</text>
          <text>{{ materlist.info14 }}</text>
        </view> -->
        <view class="line flex justify-between">
          <text class="text-gray">部件数量</text>
          <text>{{ materlist.info15 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">部件尺寸</text>
          <text>{{ materlist.info16 }}</text>
        </view>
        <view class="line flex justify-between">
          <text class="text-gray">包装机械手旋转</text>
          <text>{{ materlist.info17 }}</text>
        </view>
      </div>
    </u-popup>

    <button-modal
      :subShow="true"
@@ -159,7 +318,7 @@
      resmessage: "",
      options: [
        {
          text: "打印",
          text: "详情",
          style: {
            backgroundColor: "#fc9f35",
          },
@@ -176,6 +335,7 @@
      gridable: true,
      kwbhAllowed: false,
      enumList: [],
      areaCodeEnum: [],
    };
  },
  components: {
@@ -188,6 +348,11 @@
    }).then((res) => {
      this.enumList = res.result || [];
    });
    getenumDataList({
      EnumName: "AreaCodeEnum",
    }).then((res) => {
      this.areaCodeEnum = res.result || [];
    });
  },
  onLoad() {
    this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -197,6 +362,10 @@
  methods: {
    getEnumName(value) {
      const name = this.enumList.find((item) => item.value === value);
      return name ? name.name : "";
    },
    getAreaCodeEnumName(value) {
      const name = this.areaCodeEnum.find((item) => item.value === value);
      return name ? name.name : "";
    },
    // 如果打开一个的时候，不需要关闭其他，则无需实现本方法
@@ -241,10 +410,12 @@
          uni.showToast({
            title: "数据不存在",
            icon: "none",
            duration: 2000,
            duration: 5000,
          });
         this.singlist = [];
          return;
        }

        this.singlist = res.result;
      });
    },