Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-07 75e035a10a0faeff6b2ec4b9fcbf98d1536274f2

 src/views/plan/manufacturingorder/index.vue

@@ -109,7 +109,7 @@
            @click="labelPrint"
            type="primary"
            style="margin-left:10px;"
            >打印标签
            >标签打印
          </el-button>
          <!-- <el-button
            v-if="permissions.manufacturingorder_update_orderno"
@@ -195,38 +195,32 @@
          </div>
        </span>
      </el-dialog>
      <!-- 标签打印 -->
      <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="30%">
        <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
          <el-card class="box-card" v-for="(tem, i) in orderDatalist" :key="i" style="margin-bottom: 15px;">
            <!-- <el-row>
              <el-col :span="10" :offset="3">序号：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
            </el-row> -->
            <!-- <el-row>
              <el-col :span="10" :offset="3">客户订单号：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ tem.customerOrderNo }}</el-col>
            </el-row> -->
            <el-row style="font-size: 18px;">
              <!-- <el-col :span="10" :offset="3">零件名称：</el-col> -->
              <el-col :span="10" :offset="6" style="font-weight: bold;" >{{ tem.partNo }}</el-col>
            </el-row>
            <el-row>
              <el-col :span="10" style="padding-left: 20px;">
                <vueQr :text="tem.moNo" :size="150" :margin="1"></vueQr>
              </el-col>
              <el-col :span="10" :offset="3" style="font-weight: bold;" >批次号: &nbsp;{{ tem.moNo }}</el-col>
              <!-- <el-col :span="10" :offset="4" style="font-weight: bold;" ></el-col> -->
              <!-- <el-col :span="10" :offset="4" style="font-weight: bold;" >{{ tem.partName }}</el-col> -->
            </el-row>
          </el-card>
        </div>
        <span slot="footer" class="dialog-footer">
          <el-button @click="diaPrintTab = false">取 消</el-button>
          <el-button type="primary" @click="diaPrintTab = false">打 印</el-button>
        </span>
      </el-dialog>
    </basic-container>
    <!-- 标签打印 -->
    <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px">
      <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
        <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px;width:100%">
              <el-row>
                <el-col :span="10" :offset="3">序号：</el-col>
                <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
              </el-row>
              <el-row>
                <el-col :span="10" :offset="3">车间订单号：</el-col>
                <el-col :span="10" style="font-weight: bold;">{{ item.moNo2 }}</el-col>
              </el-row>
              <el-row>
                <el-col :span="10" :offset="3">订单二维码：</el-col>
                <el-col :span="10">
                  <vueQr :text="JSON.stringify(item)" :size="80" :margin="2"></vueQr>
                </el-col>
              </el-row>
          </el-card>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="diaPrintTab = false">取 消</el-button>
        <el-button type="primary" @click="diaPrintTab = false">打 印</el-button>
      </span>
    </el-dialog>
  </div>
</template>

@@ -259,6 +253,8 @@
export default {
  data() {
    return {
      checkList: [],
      qrData: [],
      orderDatalist:[],
      diaPrintTab:false,
      showCustomerorder: false,
@@ -461,6 +457,15 @@
            minWidth: '120',
            prop: 'lengthRequirement',
            label: '盘长要求',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
           {
            minWidth: '120',
            prop: 'scrapQty',
            label: '报废数量',
            sort: true,
            isTrue: true,
            isSearch: true,
@@ -1037,7 +1042,6 @@
      }
    })
  },

  computed: {
    ...mapGetters(['permissions'])
  },
@@ -1396,6 +1400,23 @@
        }
      }
    },
    //初始化二维码标签数据
    initQrData(data){
      if(data){
        let index = Number(data.qtyRequired) + Number(data.scrapQty)
        if(index>0){
          for(var i=1;i<= index;i++){
            let obj = {
              moNo: data.moNo,
              moNo2: null,
            }
            let no = (i+"").padStart(3,'0')
            obj.moNo2 = data.moNo + no
            this.qrData.push(obj)
          }
        }
      }
    },
    // table自带事件
    handleSelectionChange(val) {
      console.log(val,"一行");
@@ -1403,21 +1424,12 @@
      orderData =val.map( el =>{
         return{
            moNo:el.moNo,
            workShop:el.workShop,
            operationNames:el.operationNames,
            customerOrderNo:el.customerOrderNo,
            customerName:el.customerName,
            mpsNo:el.mpsNo,
            remark:el.remark,
            partNo:el.partNo,
            partName:el.partName,
            unit:el.unit,
            requiredDate:el.requiredDate,
            id:el.id,
            qtyRequired: el.qtyRequired,
            scrapQty: el.scrapQty
         }
      })
     this.orderDatalist = orderData
      console.log(orderData,"二维码需要的");
     this.initQrData(orderData[0])
      // 根据状态，禁用表头按钮
      // 筛选出选中记录的状态
      var stateArr = val.map(function(value, index) {