样式调整，移库增加二维码扫描功能，报工二维码扫描回显

yyb

4 天以前 4d98f85da66a261583894af65ad9f53d8017bbf6

样式调整，移库增加二维码扫描功能，报工二维码扫描回显

 common/http.api.js

@@ -489,8 +489,9 @@
            //获取任务类型
            getAssemblyProcessType:(params = {}) => vm.$u.get('/admin/dict/type/assembly_process_type')
        },
        // PDA
        // 报工
        workReporting: {
            // 获取车间订单列表
            getWorkshopOrder:(params = {}) => vm.$u.get('/mes/plan/manufacturingOrder/page' , params),
        }
    };

 pages/product/report/index.vue

@@ -8,20 +8,20 @@
          <u-radio name="铜杆">铜杆</u-radio>
        </u-radio-group>
      </u-form-item>
      <u-form-item label="报工单号" :border-bottom="false" prop="value1">
        <u-input v-model="form.value1" type="select" placeholder="请扫描报工单号" @click="open" />
      <u-form-item label="报工单号" :border-bottom="false" prop="taskNo">
        <u-input v-model="form.taskNo" type="select" placeholder="请扫描报工单号" @click="open" />
      </u-form-item>
      <u-form-item label="工序" :border-bottom="false" prop="value2">
        <u-input v-model="form.value2" type="select" placeholder="请扫描报工单号" />
      <u-form-item label="工序" :border-bottom="false" prop="name">
        <u-input v-model="form.name" type="select" placeholder="请扫描报工单号" />
      </u-form-item>
      <u-form-item label="订单号" :border-bottom="false" prop="value3">
        <u-input v-model="form.value3" type="select" placeholder="点击选择" @click="openList" />
      <u-form-item label="订单号" :border-bottom="false" prop="moOn">
        <u-input v-model="form.moOn" type="select" placeholder="点击选择" @click="openList" />
      </u-form-item>
      <u-form-item label="零件号" :border-bottom="false" prop="value4">
        <u-input v-model="form.value4" placeholder="" disabled />
      <u-form-item label="零件号" :border-bottom="false" prop="partNo">
        <u-input v-model="form.partNo" placeholder="" disabled />
      </u-form-item>
      <u-form-item label="零件描述" :border-bottom="false" prop="value5">
        <u-input v-model="form.value5" placeholder="" disabled />
      <u-form-item label="零件描述" :border-bottom="false" prop="partName">
        <u-input v-model="form.partName" placeholder="" disabled />
      </u-form-item>
      <u-form-item label="批量大小" :border-bottom="false" prop="value6">
        <u-input v-model="form.value6" placeholder="" disabled />
@@ -87,12 +87,11 @@
        }
      ],
      form: {
        value0: '',
        value1: '',
        value2: '',
        value3: '',
        value4: '',
        value5: '',
        taskNo: '',
        name: '',
        moOn: '',
        partNo: '',
        partName: '',
        value6: '',
        value7: '',
        value8: '',
@@ -184,7 +183,7 @@
      console.log('页面扫码结果：', data.code);
      if (data.code) {
        let codeInfo = JSON.parse(data.code)
        if (codeInfo.WorkNo) {
        if (codeInfo.moOn) {
          // 扫描报工单二维码
          that.saveForm(codeInfo);
        }
@@ -229,10 +228,14 @@
    },
    // 回显扫码的信息-报工单
    saveForm(val) {
      let { WorkNo, ProcessName, ORDER_NO } = val
      this.form.value1 = WorkNo
      this.form.value2 = ProcessName
      this.form.value3 = ORDER_NO
      console.log('回显的数据',val)
      let { moOn, name, ORDER_NO,taskNo,partName,partNo } = val
      this.form.moOn = moOn
      this.form.name = name
      this.form.taskNo = taskNo
      this.form.partName = partName
      this.form.partNo = partNo
      // this.form.value3 = ORDER_NO
    }
  }
}

 pages/wareHouse/moveWareHouse/index.vue

@@ -1,8 +1,14 @@
<template>
    <view class="page">
        <view class="movewarehouse-index-bg" />
        <u-navbar title="移库" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
            back-icon-color="#000" />
    <u-navbar
      title="移库"
      :background="background"
      :border-bottom="false"
      :title-bold="true"
      title-color="#000"
      back-icon-color="#000"
    />
        <view class="packing-registration-param">
            <view class="packing-registration-param-view">
                <view class="packing-registration-param-item param-extra">
@@ -10,21 +16,31 @@
                        <text class="item-one">库位</text>
                    </view>
                    <view class="packing-registration-param-item-right">
                        <text class="item-one item-two">{{registerInfo.storageLocation}}</text>
            <text class="item-one item-two">{{ registerInfo.storageLocation == '' ? "请扫描库位" : registerInfo.storageLocation }}</text>
                    </view>
                </view>
                <view class="packing-registration-param-item param-extra">
                    <view class="packing-registration-param-item-left">
                        <text class="item-one">{{`移库记录(${registerInfo.num}条)：`}}</text>
            <text class="item-one">{{
              `移库记录(${registerInfo.num}条)：`
            }}</text>
                    </view>
                </view>
            </view>
        </view>
        <view class="wrap">
                    <scroll-view class="packing-registration-scroll-list" scroll-y="true">
                <u-cell-group class="packing-registration-scroll-list-group" :border="false">
        <u-cell-group
          class="packing-registration-scroll-list-group"
          :border="false"
        >
                    <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-请扫码-</div> -->
                    <view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
          <view
            class="content"
            v-for="(item, index) in hasScanSnList"
            :key="index"
            :index="index"
          >
                        <view class="content-header">
                            <view class="content-header-title">{{ index+1 }}</view>
                        </view>
@@ -66,8 +82,14 @@
                </u-cell-group>
            </scroll-view>
        </view>
        <u-modal v-model="showModal" title="" :show-cancel-button="true" :show-confirm-button="true" @confirm="confirm"
            @cancel="cancel">
    <u-modal
      v-model="showModal"
      title=""
      :show-cancel-button="true"
      :show-confirm-button="true"
      @confirm="confirm"
      @cancel="cancel"
    >
            <view class="popup-content">
                <view class="packing-registration-param">
                    <view class="packing-registration-param-view">
@@ -115,6 +137,7 @@
                </view>
            </view>
        </u-modal>
    <scan></scan>
    </view>
</template>
<script>
@@ -134,40 +157,40 @@
                    backgroundRepeat: "no-repeat",
                },
                registerInfo: {
                    storageLocation: "LG001",
        storageLocation: "",
                    num: 0,
                },
                showModal: true, // 控制弹窗显示隐藏的变量
                hasScanSnList: [
                    {
                        value0: '11111111111111111111111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
          value0: "11111111111111111111111",
          value1: "111",
          value2: "111",
          value3: "111",
                    },
                    {
                        value0: '111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
          value0: "111",
          value1: "111",
          value2: "111",
          value3: "111",
                    },
                    {
                        value0: '111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
          value0: "111",
          value1: "111",
          value2: "111",
          value3: "111",
                    },
                    {
                        value0: '111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
          value0: "111",
          value1: "111",
          value2: "111",
          value3: "111",
                    },
                    {
                        value0: '111',
                        value1: '111',
                        value2: '111',
                        value3: '111',
          value0: "111",
          value1: "111",
          value2: "111",
          value3: "111",
                    },
                ],
            };
@@ -175,21 +198,18 @@
        onLoad() {},
        onShow() {
            let that = this;

            uni.$off("scan"); // 每次进来先 移除全局自定义事件监听器
            uni.$on("scan", function(data) {
                console.log("onscan");
                //扫码成功后的回调，你可以写自己的逻辑代码在这里
                console.log("扫码结果：", data.code);
            });
        },
        onNavigationBarButtonTap(e) {
            uni.scanCode({
                success: (res) => {
                    try {
                        const result = JSON.parse(res.result);
                    } catch (e) {}
                },
      console.log("页面扫码结果：", data.code);
      if (data.code) {
        let codeInfo = JSON.parse(data.code);
        if (codeInfo.WorkNo) {
          // 扫描报工单二维码
          that.saveForm(codeInfo);
        }
      }
            });
        },
        methods: {
@@ -200,6 +220,13 @@
            cancel() {
                this.show = false; // 关闭弹窗
            },
        // 回显扫码的信息-报工单
    saveForm(val) {
      let { WorkNo, ProcessName, ORDER_NO } = val
      this.form.value1 = WorkNo
      this.form.value2 = ProcessName
      this.form.value3 = ORDER_NO
    }
        },
    };
</script>

 pages/wareHouse/nuclearScale/createwriteoffform.vue

@@ -2,22 +2,9 @@
  <!-- 核磅录入 -->
  <div class="page">
    <view class="packing-registration-bg" />
    <u-navbar
      title="核磅录入"
      :background="background"
      :border-bottom="false"
      :title-bold="true"
      title-color="#000"
      back-icon-color="#000"
    />
    <u-form
      :model="form"
      ref="uForm"
      :label-width="200"
      :rules="rules"
      :error-type="['toast']"
      class="uForm"
    >
        <u-navbar title="核磅录入" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
            back-icon-color="#000" />
        <u-form :model="form" ref="uForm" :label-width="200" :rules="rules" :error-type="['toast']" class="uForm">
      <u-form-item label="产品类型" :border-bottom="false" prop="value0">
        <u-radio-group v-model="form.value0">
          <u-radio name="导体">导体</u-radio>
@@ -32,137 +19,71 @@
        </u-radio-group>
      </u-form-item>
      <u-form-item label="车牌号" :border-bottom="false" prop="value2">
        <u-input
          v-model="form.value2"
          type="select"
          placeholder="请输入车牌号"
          @click="lpn"
        />
                <u-input v-model="form.value2" type="select" placeholder="请输入车牌号" @click="lpn" />
      </u-form-item>
      <u-form-item label="客户名称" :border-bottom="false" prop="value3">
        <picker
          class="item-one item-two"
          style="width: 100%; text-align: right"
          @change="locNoNumBindChange($event, locNoList)"
          :value="locNoNumIndex"
          :range="locNoList"
          range-key="label"
        >
                <picker class="item-one item-two" style="width: 100%; text-align: right"
                    @change="locNoNumBindChange($event, locNoList)" :value="locNoNumIndex" :range="locNoList"
                    range-key="label">
          <view>
            <text
              :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }"
              >{{
                        <text :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }">{{
                locNoNumIndex == null
                  ? "请选择"
                  : locNoList[locNoNumIndex].label
              }}</text
            >
              }}</text>
          </view>
        </picker>
        <u-icon
          v-if="locNoNumIndex == null"
          name="arrow-right"
          color="#687792"
          size="28"
        ></u-icon>
                <u-icon v-if="locNoNumIndex == null" name="arrow-right" color="#687792" size="28"></u-icon>
      </u-form-item>
      <u-form-item label="发货通知单号" :border-bottom="false" prop="value4">
        <u-input v-model="form.value4" placeholder="" disabled />
      </u-form-item>
      <u-form-item label="生产车间" :border-bottom="false" prop="value5">
        <picker
          class="item-one item-two"
          style="width: 100%; text-align: right"
          @change="locNoNumBindChange($event, locNoList)"
          :value="locNoNumIndex"
          :range="locNoList"
          range-key="label"
        >
                <picker class="item-one item-two" style="width: 100%; text-align: right"
                    @change="locNoNumBindChange($event, locNoList)" :value="locNoNumIndex" :range="locNoList"
                    range-key="label">
          <view>
            <text
              :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }"
              >{{
                        <text :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }">{{
                locNoNumIndex == null
                  ? "请选择"
                  : locNoList[locNoNumIndex].label
              }}</text
            >
              }}</text>
          </view>
        </picker>
        <u-icon
          v-if="locNoNumIndex == null"
          name="arrow-right"
          color="#687792"
          size="28"
        ></u-icon>
                <u-icon v-if="locNoNumIndex == null" name="arrow-right" color="#687792" size="28"></u-icon>
      </u-form-item>
      <u-form-item label="司磅员" :border-bottom="false" prop="value6">
        <picker
          class="item-one item-two"
          style="width: 100%; text-align: right"
          @change="locNoNumBindChange($event, locNoList)"
          :value="locNoNumIndex"
          :range="locNoList"
          range-key="label"
        >
                <picker class="item-one item-two" style="width: 100%; text-align: right"
                    @change="locNoNumBindChange($event, locNoList)" :value="locNoNumIndex" :range="locNoList"
                    range-key="label">
          <view>
            <text
              :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }"
              >{{
                        <text :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }">{{
                locNoNumIndex == null
                  ? "请选择"
                  : locNoList[locNoNumIndex].label
              }}</text
            >
              }}</text>
          </view>
        </picker>
        <u-icon
          v-if="locNoNumIndex == null"
          name="arrow-right"
          color="#687792"
          size="28"
        ></u-icon>
                <u-icon v-if="locNoNumIndex == null" name="arrow-right" color="#687792" size="28"></u-icon>
      </u-form-item>
      <u-form-item label="叉车工" :border-bottom="false" prop="value7">
        <u-input
          v-model="form.value7"
          type="select"
          placeholder="请选择"
          @click="openForkliftDriverList"
        />
                <u-input v-model="form.value7" type="select" placeholder="请选择" @click="openForkliftDriverList" />
      </u-form-item>
    </u-form>
    <u-button type="primary" class="bottom-button" @click="submit"
      >创建</u-button
    >
        <u-button type="primary" class="bottom-button1" @click="submit">创建</u-button>

    <!--车牌号 -->
    <modalBg ref="modalBg" :confirm="confirm">
      <u-field
        v-model="form.value2"
        label="车牌号："
        placeholder="请输入"
        :border-bottom="false"
      >
            <u-field v-model="form.value2" label="车牌号：" placeholder="请输入" :border-bottom="false">
      </u-field>
    </modalBg>
    <!-- 叉车工 -->
    <u-modal
      v-model="showModal"
      title=""
      :show-cancel-button="true"
      :show-confirm-button="true"
      @confirm="confirmSelection"
      @cancel="cancel"
    >
        <u-modal v-model="showModal" title="" :show-cancel-button="true" :show-confirm-button="true"
            @confirm="confirmSelection" @cancel="cancel">
      <view class="popup-content">
        <view class="popup-header">
          <checkbox-group @change="checkboxChange">
            <label
              class="checkbox-item"
              v-for="(item, index) in checkboxList"
              :key="index"
            >
                        <label class="checkbox-item" v-for="(item, index) in checkboxList" :key="index">
              <checkbox :value="item.value" :checked="item.checked" />
              <text class="label">{{ item.label }}</text>
            </label>
@@ -182,8 +103,7 @@
  },
  data() {
    return {
      checkboxList: [
        {
                checkboxList: [{
          label: "工人1",
          value: "a",
          checked: false,
@@ -204,7 +124,7 @@
          checked: false,
        },
        {
          label: "工人5",
                        label: "工人",
          value: "5",
          checked: false,
        },
@@ -229,27 +149,21 @@
        value8: "",
      },
      rules: {
        value0: [
          {
                    value0: [{
            required: true,
            message: "请选择产品类型",
            trigger: ["change"],
          },
        ],
        value1: [
          {
                    }, ],
                    value1: [{
            required: true,
            message: "请选择是否替换二维码",
            trigger: ["change", "blur"],
          },
        ],
        value2: [
          {
                    }, ],
                    value2: [{
            required: true,
            message: "请输入车牌号",
            trigger: ["change", "blur"],
          },
        ],
                    }, ],
        // value3: [
        //   {
        //     required: true,
@@ -257,38 +171,29 @@
        //     trigger: ["change", "blur"],
        //   },
        // ],
        value4: [
          {
                    value4: [{
            required: true,
            message: "请输入发货通知单号",
            trigger: ["change"],
          },
        ],
        value5: [
          {
                    }, ],
                    value5: [{
            required: true,
            message: "请选择生产车间",
            trigger: ["change"],
          },
        ],
        value6: [
          {
                    }, ],
                    value6: [{
            required: true,
            message: "请选择司磅员",
            trigger: ["change"],
          },
        ],
        value7: [
          {
                    }, ],
                    value7: [{
            type: "array",
            required: true,
            message: "请至少选择一个叉车工",
            trigger: ["change"],
                    }, ],
          },
        ],
      },
      locNoList: [
        {
                locNoList: [{
          value: "0",
          label: "公司1",
        },
@@ -409,10 +314,15 @@

/* 复选框样式 */
.checkbox-item {
        width: 200px;
  display: flex;
  align-items: center;
  padding: 20rpx 0;
  border-bottom: 1rpx solid #f5f5f5;
        .label{
            position: relative;
            left: 130px;
        }
}

.checkbox-item:last-child {

 pages/wareHouse/nuclearScale/index.scss

@@ -52,7 +52,15 @@
.bottom-button {
  position: fixed;
  bottom: 40rpx;
  left: 45%;
  width: calc(100% - 80rpx);
  transform: translateX(-50%);
}
.bottom-button1 {
  position: fixed;
  bottom: 40rpx;
  left: 50%;
  width: calc(100% - 80rpx);
  transform: translateX(-50%);
}