Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-m...

chenhj

8 天以前 caff3373cde7f6bdaa139c72c91a3e0d472a7c7f

Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG

 src/views/productionManagement/productionOrder/New.vue

@@ -48,13 +48,27 @@
                       :value="item.id" />
          </el-select>
        </el-form-item>

        <el-form-item
            label="生产日期"
            prop="productionDate"
        >
          <el-date-picker
              v-model="formState.productionDate"
              type="date"
              placeholder="请选择生产日期"
              :size="size"
              format="YYYY-MM-DD"
              value-format="YYYY-MM-DD"
              style="width: 100%"
          />
        </el-form-item>
        <el-form-item
            label="需求数量"
            prop="quantity"
        >
          <el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%" />
        </el-form-item>

      </el-form>

      <!-- 产品选择弹窗 -->
@@ -102,6 +116,7 @@
  productModelName: "",
  unit: "",
  quantity: 0,
  productionDate: new Date().toISOString().substr(0, 10),
});

const isShow = computed({
@@ -126,6 +141,7 @@
    productName: "",
    productModelName: "",
    quantity: '',
    productionDate: new Date().toISOString().substr(0, 10),
  };
  isShow.value = false;
};

 src/views/productionManagement/productionOrder/index.vue

@@ -11,14 +11,6 @@
                    style="width: 160px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="合同号:">
          <el-input v-model="searchForm.salesContractNo"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                    style="width: 160px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="产品名称:">
          <el-input v-model="searchForm.productCategory"
                    placeholder="请输入"
@@ -52,7 +44,6 @@
                :tableData="tableData"
                :page="page"
                :tableLoading="tableLoading"
                :row-class-name="tableRowClassName"
                :isSelection="true"
                @selection-change="handleSelectionChange"
                @pagination="pagination">
@@ -119,16 +110,16 @@
  const isShowNewModal = ref(false);

  const tableColumn = ref([
    {
      label: "生产订单号",
      prop: "npsNo",
      width: '120px',
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
      width: '150px',
    },
    // {
    //   label: "生产订单号",
    //   prop: "npsNo",
    //   width: '120px',
    // },
    // {
    //   label: "销售合同号",
    //   prop: "salesContractNo",
    //   width: '150px',
    // },
    {
      label: "客户名称",
      prop: "customerName",
@@ -249,23 +240,6 @@
    if (p < 50) return "#e6a23c";
    if (p < 80) return "#409eff";
    return "#67c23a";
  };

  // 添加表行类名方法
  const tableRowClassName = ({ row }) => {
    if (!row.deliveryDate) return '';
    if (row.isFh) return '';

    const diff = row.deliveryDaysDiff;
    if (diff === 15) {
      return 'yellow';
    } else if (diff === 10) {
      return 'pink';
    } else if (diff === 2) {
      return 'purple';
    } else if (diff < 2) {
      return 'red';
    }
  };

  // 绑定工艺路线弹框
@@ -453,21 +427,5 @@
<style scoped lang="scss">
.search_form{
  align-items: start;
}

::v-deep .yellow {
  background-color: #FAF0DE;
}

::v-deep .pink {
  background-color: #FAE1DE;
}

::v-deep .red {
  background-color: #f80202;
}

::v-deep .purple{
  background-color: #F4DEFA;
}
</style>