Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventor...

spring

5 天以前 76d8eff2cfc1a428a948fe6f57f0ff93b2e3a444

 src/views/productionManagement/workOrder/index.vue

@@ -14,7 +14,8 @@
        </div>
        <div class="search-item">
          <el-button type="primary"
                     @click="handleQuery">搜索</el-button>
                     @click="handleQuery">搜索
          </el-button>
        </div>
      </div>
    </div>
@@ -26,7 +27,9 @@
                :tableLoading="tableLoading"
                @pagination="pagination">
                <template #completionStatus="{ row }">
                  <el-progress :percentage="toProgressPercentage(row?.completionStatus)" :color="progressColor(toProgressPercentage(row?.completionStatus))" :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
          <el-progress :percentage="toProgressPercentage(row?.completionStatus)"
                       :color="progressColor(toProgressPercentage(row?.completionStatus))"
                       :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"/>
                </template>
              </PIMTable>
    </div>
@@ -161,7 +164,8 @@
      margin-bottom: 40px;">
        <el-button type="primary"
                   style="margin-top: 20px;"
                   @click="printTransferCard">打印流转卡</el-button>
                   @click="printTransferCard">打印流转卡
        </el-button>
      </div>
    </el-dialog>
    <el-dialog v-model="reportDialogVisible"
@@ -217,6 +221,12 @@
      </template>
    </el-dialog>
    <FilesDia ref="workOrderFilesRef" />
    <CopperPrintingForm
        v-if="copperPrintingFormVisible"
        v-model:isShow="copperPrintingFormVisible"
        :isEdit="true"
        :row="currentReportRowData"
        @refreshData="getList"/>
  </div>
</template>

@@ -234,9 +244,11 @@
  import QRCode from "qrcode";
  import { getCurrentInstance, reactive, toRefs } from "vue";
  import FilesDia from "./components/filesDia.vue";

  const { proxy } = getCurrentInstance();
  const { priority_type } = proxy.useDict("priority_type");

const CopperPrintingForm = defineAsyncComponent(() => import("./components/CopperPrintingForm.vue"));
  const tableColumn = ref([
    {
      label: "优先级",
@@ -332,6 +344,7 @@
          name: "编辑",
          clickFun: row => {
            handleEdit(row);
          handleEdit(row);
          },
        },
        {
@@ -361,6 +374,7 @@
  const qrCodeUrl = ref("");
  const qrRowData = ref(null);
  const editDialogVisible = ref(false);
const copperPrintingFormVisible = ref(false);
  const transferCardVisible = ref(false);
  const transferCardData = ref([]);
  const transferCardQrUrl = ref("");
@@ -611,6 +625,10 @@

  const showReportDialog = row => {
    currentReportRowData.value = row;
  if (row.processName === '印铜') {
    copperPrintingFormVisible.value = true
    return
  }
    reportForm.planQuantity = row.planQuantity;
    reportForm.quantity = row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
    reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
@@ -744,10 +762,12 @@
<style scoped lang="scss">
  .search_form {
    margin-bottom: 20px;

    .search-row {
      display: flex;
      gap: 20px;
      align-items: center;

      .search-item {
        display: flex;
        align-items: center;
@@ -767,26 +787,32 @@
    display: flex;
    gap: 20px;
    height: 350px;

    .transfer-card-info {
      flex: 1;
      overflow: auto;

      .info-group {
        width: 50%;
        float: left;
      }

      .info-item {
        display: flex;
        margin-bottom: 15px;

        .info-label {
          width: 120px;
          font-weight: bold;
          margin-right: 20px;
        }

        .info-value {
          flex: 1;
        }
      }
    }

    .transfer-card-qr {
      width: 240px;
      display: flex;
@@ -845,20 +871,24 @@
    }
    .transfer-card-info {
      flex: 1;

      .info-group {
        width: 100%;
        float: none;
        margin-bottom: 20px;
      }

      .info-item {
        display: flex;
        margin-bottom: 10px;

        .info-label {
          width: 100px;
          font-weight: bold;
          margin-right: 15px;
          white-space: nowrap;
        }

        .info-value {
          flex: 1;
          word-break: break-word;