Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/plan/manufacturingorder/index.vue

@@ -211,17 +211,21 @@
            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
                  <el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
                  <el-row>
                    <el-col :span="10" :offset="3">序号：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
                    <el-col :span="10" :offset="3">订单号：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</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-col :span="10" :offset="3">客户名称：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
                  </el-row>
                  <el-row>
                    <el-col :span="10" :offset="3">订单二维码：</el-col>
                    <el-col :span="10" :offset="3">零件名称：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</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>
                      <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
                    </el-col>
                  </el-row>
            </el-card>
@@ -237,17 +241,21 @@
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-bottom:10px;font-size: 16px !important;">
              <el-row>
                <el-col :span="10" :offset="3">序号：</el-col>
                <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
                    <el-col :span="10" :offset="3">订单号：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.customerOrderNo }}</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-col :span="10" :offset="3">客户名称：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
                  </el-row>
                  <el-row>
                    <el-col :span="10" :offset="3">零件名称：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
              </el-row>
              <el-row>
                <el-col :span="10" :offset="3">订单二维码：</el-col>
                <el-col :span="10">
                  <vueQr :text="JSON.stringify(item)" :size="110" :margin="2"></vueQr>
                  <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
                </el-col>
              </el-row>
          </el-card>
@@ -1152,15 +1160,21 @@
    initQrData(data){
      this.qrData = []
      if(data){
        console.log(data);
        let index = Number(data.qtyRequired) + Number(data.scrapQty)
        if(index>0){
          for(var i=1;i<= index;i++){
            let obj = {
              orderNo: data.customerOrderNo,
              cName: data.customerName,
              pName: data.partName,
              code: {
              moNo: data.moNo,
              moNo2: null,
            }
            }
            let no = (i+"").padStart(3,'0')
            obj.moNo2 = data.moNo + no
            obj.code.moNo2 = data.moNo + no
            this.qrData.push(obj)
          }
        }