Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventor...

yyb

2026-04-02 1cf342fa23a6c34bd9dd1ff4e416cd255c044fdd

 src/views/productionManagement/productionOrder/index.vue

@@ -91,10 +91,14 @@
                       :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
        </template>
        <template #quantity="{ row }">
          {{ row.quantity || '-' }}<span style="color:rgb(63, 95, 211)"> 块</span>
          {{ row.quantity || '-' }}<span style="color:rgb(63, 95, 211)"> 方</span>
        </template>
        <template #completeQuantity="{ row }">
          {{ row.completeQuantity || '-' }}<span style="color:rgb(42, 169, 146)"> 方</span>
        </template>
        <template #strength="{ row }">
          <el-tag v-if="row.strength"
                  :type="row.strength === 'A3.5' ? 'primary' : 'warning'">{{ row.strength }}</el-tag>
        </template>
      </PIMTable>
    </div>
@@ -208,7 +212,7 @@
                  </div>
                  <div class="info-item">
                    <div class="info-label">已下发方数</div>
                    <div class="info-value">{{ item.assignedQuantity ? `${item.assignedQuantity}` : 0 }}<span style="color:rgba(214, 134, 22, 0.76)"> 方</span></div>
                    <div class="info-value">{{ item.totalAssignedQuantity ? `${item.totalAssignedQuantity}` : 0 }}<span style="color:rgba(214, 134, 22, 0.76)"> 方</span></div>
                  </div>
                  <div class="info-item">
                    <div class="info-label">尺寸</div>
@@ -312,7 +316,7 @@
    {
      label: "生产订单号",
      prop: "npsNo",
      width: "120px",
      width: "150px",
    },
    {
      label: "产品名称",
@@ -329,7 +333,9 @@
      label: "强度",
      prop: "strength",
      width: "120px",
      dataType: "tag",
      dataType: "slot",
      slot: "strength",
      // formatData: val => (val ? val : ""),
    },
    {
      label: "物料编码",
@@ -533,7 +539,7 @@
    },
    {
      label: "已下发方数",
      prop: "assignedQuantity",
      prop: "totalAssignedQuantity",
      width: "150px",
      className: "spec-cell",
      formatData: cell => (cell ? `${cell}方` : 0),
@@ -808,6 +814,7 @@
          orderId: row.id,
          type: "order",
          editable: true,
          status: row.status || false,
        },
      });
    } catch (e) {
@@ -864,6 +871,7 @@
                  volume: plan.volume,
                  status: plan.status,
                  assignedQuantity: plan.assignedQuantity,
                  totalAssignedQuantity: plan.totalAssignedQuantity,
                  length: plan.length,
                  width: plan.width,
                  height: plan.height,