Merge remote-tracking branch 'origin/master'

zss

2023-12-19 7af57170702277127862dd2c791ea72eaf9a086e

 src/views/plan/manufacturingorder/index.vue

@@ -211,19 +211,48 @@
            <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-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.code.moNo2 }}</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.orderNo }}</el-col>
                  </el-row>
                  <el-row>
                    <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="80" :margin="2"></vueQr>
                      <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
                    </el-col>
                  </el-row>
                  </el-row> -->
                   <div style="display: flex;">
                      <div>
                        <el-col :span="8" :offset="2">
                          <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
                        </el-col>
                      </div>
                      <div style="margin-left: 20px;width: 100%;">
                        <el-row >
                          <el-col  style="font-weight: bold;"><span>批次号:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;"><span>订单号:&nbsp; </span>{{ item.orderNo }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;"><span>客户名称:&nbsp; </span>{{ item.cName }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
                        </el-row>
                      </div>
                  </div>
            </el-card>
          </el-checkbox-group>
        </div>
@@ -233,23 +262,31 @@
        <el-button type="primary" @click="printFun">打 印</el-button>
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
    <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
        <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-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="110" :margin="2"></vueQr>
                </el-col>
              </el-row>
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">批次号</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
            </el-row>
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">订单号：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
            </el-row>
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">客户名称：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
            </el-row>
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">零件名称：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
            </el-row>
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">订单二维码：</el-col>
              <el-col :span="10">
                <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
              </el-col>
            </el-row>
          </el-card>
        </div>
      </div>
@@ -1152,15 +1189,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 = {
              moNo: data.moNo,
              moNo2: null,
              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)
          }
        }