Merge branch 'master' of http://114.132.189.42:9002/r/mes-jdhj-uniapp

spring

9 天以前 5fc7b0755d658b70c33c18b0531acb6e0ad28b17

 pages/wareHouse/inventory/index.vue

@@ -11,7 +11,7 @@
               </view>
               <view class="packing-registration-param-item-right">
                  <text class="item-one item-two" @click="seachPersonnelNo()">{{ registerInfo.value1 == '' ?
                     "点击选择" : registerInfo.value1}}</text>
                     "点击选择" : registerInfo.value1 }}</text>
                  <u-icon name="arrow-right" color="#687792" size="28" @click="seachPersonnelNo()"
                     v-show="registerInfo.value1 == ''"></u-icon>
               </view>
@@ -30,9 +30,9 @@
               </view>
               <view class="packing-registration-param-item-right">
                  <view class="item-one item-two" @click="openPN()">
                     <text>{{ registerInfo.value2 == '' ? "点击输入" : registerInfo.value2 }}</text>
                     <text>{{ registerInfo.value6 == '' ? "点击输入" : registerInfo.value6 }}</text>
                  </view>
                  <u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value2 == ''"></u-icon>
                  <u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value6 == ''"></u-icon>
               </view>
            </view>
            <view class="packing-registration-param-item param-extra">
@@ -77,11 +77,42 @@
         <scroll-view class="packing-registration-scroll-list" scroll-y="true">
            <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="(x, index) in hasScanSnList" :key="index" :index="index">
                  <view class="row-list">
                     <view class="row-list-left">
                        <view class="num-icon" style="color: #fff;">{{ index + 1 }}</view>
                        <view style="margin-left: 30rpx;">{{ x }}</view>
               <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>
                  <view class="content-body">
                     <view class="row-list">
                        <view class="_label">
                           <view class="_label-name">零件号：</view>
                        </view>
                        <view class="_content">
                           {{ item.value0 }}
                        </view>
                     </view>
                     <view class="row-list">
                        <view class="_label">
                           <view class="_label-name">批次号：</view>
                        </view>
                        <view class="_content">
                           {{ item.value1 }}
                        </view>
                     </view>
                     <view class="row-list">
                        <view class="_label">
                           <view class="_label-name">库位号：</view>
                        </view>
                        <view class="_content">
                           {{ item.value0 }}
                        </view>
                     </view>
                     <view class="row-list">
                        <view class="_label">
                           <view class="_label-name">盘点数量：</view>
                        </view>
                        <view class="_content">
                           {{ item.value1 }}
                        </view>
                     </view>
                  </view>
               </view>
@@ -93,7 +124,7 @@
         <scan></scan>
         <!-- 零件号 -->
         <modalBg ref="openPN" :confirm="confirmPN">
            <u-field v-model="registerInfo.value2" label="零件号：" placeholder="请输入" :border-bottom="false">
            <u-field v-model="registerInfo.value6" label="零件号：" placeholder="请输入" :border-bottom="false">
            </u-field>
         </modalBg>
         <!-- 批次号 -->
@@ -108,7 +139,7 @@
         </modalBg>
         <!-- 盘点数量 -->
         <modalBg ref="openPhysicalInventory" :confirm="confirmPhysicalInventory">
            <u-field v-model="registerInfo.value5" label="盘点数量：" placeholder="请输入" :border-bottom="false">
            <u-field v-model="registerInfo.value5" label="盘点数量：" label-width="140" placeholder="请输入" :border-bottom="false">
            </u-field>
         </modalBg>
      </view>
@@ -140,9 +171,34 @@
            value2: '',
            value3: '',
            value4: '',
            value5: ''
            value5: '',
            value6: ''
         },
         hasScanSnList: [],
         hasScanSnList: [{
            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',
         },
         ],
         delContent: null,
         staffList: [],
      };
@@ -173,12 +229,12 @@
      },
      // 弹框保存
      confirmPN() {
         console.log('保存', this.registerInfo.value2);
         console.log('保存', this.registerInfo.value6);
         // 请求接口，根据工单号查询其他信息并赋值
      },
      //批次号
      openBatch() {
         this.$refs.openBatch.openBatch();
         this.$refs.openBatch.open();
      },
      // 弹框保存
      confirmBatch() {
@@ -206,7 +262,9 @@

      setNo(val) {
         console.log('11111', val)
         this.registerInfo = val
         this.registerInfo.value1 = val.value1
         this.registerInfo.value2 = val.value2

      },
      //盘点报告号
      seachPersonnelNo() {
@@ -399,52 +457,75 @@
   }

   .content {
      background-image: url('~@/static/custom/packing/row_bg.png');
      background-size: 100% auto;
      background-repeat: no-repeat;
      height: 89rpx;
      width: 691rpx;
      font-size: 12px;
      background-color: #FFFFFF;
      background-color: #ffffff;
      box-sizing: border-box;
      border-radius: 10rpx;
      margin: 0rpx 0rpx 20rpx;
      padding: 0rpx 50rpx 0rpx 32rpx;
      margin: 0rpx 0rpx 16rpx;
      padding: 20rpx 8rpx;
      box-shadow: none;
      display: flex;
      align-items: center;

      .row-list {
         height: 100%;
      .content-header {
         width: 40rpx;
         height: 90rpx;
         display: flex;
         justify-content: space-between;
         align-items: center;
         padding-top: 0rpx !important;

         .row-list-left {
         .content-header-icon {
            background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
            background-size: 100% auto;
            background-repeat: no-repeat;
            height: 28rpx;
            width: 28rpx;
         }

         .content-header-title {
            margin-left: 11rpx;
            font-size: 26rpx;
            font-weight: bold;
            color: #626369;
         }
      }

      .content-body {
         flex: 1;
         background-color: #ffffff;
         border-radius: 10rpx;
         padding: 0rpx 23rpx;

         .row-list {
            height: 60rpx;
            display: flex;
            color: #333333;
            flex-direction: row;
            padding: 0px;
            align-items: center;
         }

            .num-icon {
               background-image: url('~@/static/custom/packing/num-bg.png');
               background-size: 100% auto;
               background-repeat: no-repeat;
               height: 38rpx;
               width: 38rpx;
               text-align: center;
               line-height: 38rpx;
         .row-list ._label {
            display: flex;
            flex: 0.8;
            color: #909399;
            align-items: center;

            ._label-name {
               margin-left: 11rpx;
               font-size: 26rpx;
               font-weight: 500;
               color: #666666;
            }
         }

         .row-list-right {
            display: flex;
            color: #428BF7;
         .row-list ._content {
            flex: 1.5;
            text-align: right;
            color: #909399;
            font-size: 24rpx;
         }

            .del-icon {
               background-image: url('~@/static/custom/packing/icon_dele.png');
               background-size: 100% auto;
               background-repeat: no-repeat;
               height: 30rpx;
               width: 28rpx;
            }
         .row-list .s1 {
            color: #d35651;
         }
      }
   }