Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

zhangwencui

2 天以前 3fb35d46d0c6181f367b82a8e2b6015718b8d90b

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

 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue

@@ -197,10 +197,6 @@
              <div v-if="!activity.isShen" class="node-reason">
                <span>审批意见：</span>{{ activity.approveNodeReason }}
              </div>
              <div v-if="!activity.isShen" class="node-reason">
                <span>签名：</span>
                                <img :src="activity.urlTem" class="signImg" alt="" v-if="activity.urlTem"/>
              </div>
              <div v-else-if="activity.isShen">
                <el-form-item
                  :prop="'activities.' + index + '.approveNodeReason'"

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -45,7 +45,7 @@
          type="danger"
          plain
          @click="handleDelete"
          v-if="currentApproveType !== 7"
          v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7"
        >删除</el-button>
      </div>
    </div>

 src/views/procurementManagement/invoiceEntry/index.vue

@@ -112,6 +112,8 @@
  gePurchaseListPage,
  {
    purchaseContractNumber: undefined,
    // 只查询已审批通过（或指定状态为 3）的记录
    approvalStatus: 3,
  },
  [
    {

 src/views/procurementManagement/paymentEntry/index.vue

@@ -261,7 +261,6 @@
  {
    label: "供应商名称",
    prop: "supplierName",
    width:240
  },
    {
        label: "付款状态",
@@ -282,7 +281,6 @@
        label: "产品大类",
        prop: "productCategory",
        showOverflowTooltip: true,
        width: 100
    },
    {
        label: "规格型号",
@@ -293,7 +291,6 @@
  {
    label: "已付款金额(元)",
    prop: "ticketsTotal",
    width: 120,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },
@@ -301,7 +298,6 @@
  {
    label: "待付款金额(元)",
    prop: "pendingTicketsTotal",
    width: 120,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },
@@ -327,6 +323,8 @@
  searchForm: {
    supplierNameOrContractNo: "",
    status: false,
    // 只查询审批状态为 3 的记录
    approvalStatus: 3,
  },
  form: {
    purchaseContractNumber: "",

 src/views/productionManagement/productionOrder/index.vue

@@ -50,6 +50,7 @@
                :tableData="tableData"
                :page="page"
                :tableLoading="tableLoading"
                :row-class-name="tableRowClassName"
                @pagination="pagination">
        <template #completionStatus="{ row }">
          <el-progress
@@ -163,6 +164,12 @@
      width: 120,
    },
    {
      label: "交付日期",
      prop: "deliveryDate",
      formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
      width: 120,
    },
    {
      dataType: "action",
      label: "操作",
      align: "center",
@@ -228,6 +235,18 @@
    if (p < 50) return "#e6a23c";
    if (p < 80) return "#409eff";
    return "#67c23a";
  };

  // 添加表行类名方法
  const tableRowClassName = ({ row }) => {
    switch (row.deliveryDaysDiff) {
      case 15:
        return 'yellow'
      case 10:
        return 'red'
      case 2:
        return 'purple'
    }
  };

  // 绑定工艺路线弹框
@@ -388,4 +407,17 @@
<style scoped lang="scss">
.search_form{
  align-items: start;
}</style>
}

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

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

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

 src/views/salesManagement/salesLedger/index.vue

@@ -37,7 +37,7 @@
        </div>
      </div>
      <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
        :expand-row-keys="expandedRowKeys" :row-key="(row) => row.id" show-summary style="width: 100%"
        :expand-row-keys="expandedRowKeys" :row-key="(row) => row.id" :row-class-name="tableRowClassName" show-summary style="width: 100%"
        :summary-method="summarizeMainTable" @expand-change="expandChange" height="calc(100vh - 18.5em)">
        <el-table-column align="center" type="selection" width="55" fixed="left"/>
        <el-table-column type="expand" width="60" fixed="left">
@@ -117,6 +117,7 @@
        <el-table-column label="录入人" prop="entryPersonName" width="100" show-overflow-tooltip />
        <el-table-column label="录入日期" prop="entryDate" width="120" show-overflow-tooltip />
        <el-table-column label="签订日期" prop="executionDate" width="120" show-overflow-tooltip />
        <el-table-column label="交付日期" prop="deliveryDate" width="120" show-overflow-tooltip />
        <el-table-column fixed="right" label="操作" min-width="100" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="openForm('edit', scope.row)">编辑</el-button>
@@ -204,6 +205,14 @@
                        </el-form-item>
                    </el-col>
                </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="交货日期：" prop="entryDate">
              <el-date-picker style="width: 100%" v-model="form.deliveryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
                              type="date" placeholder="请选择" clearable />
            </el-form-item>
          </el-col>
        </el-row>
                <el-row>
                    <el-form-item label="产品信息：" prop="entryDate">
                        <el-button v-if="operationType !== 'view'" type="primary" @click="openProductForm('add')">添加</el-button>
@@ -694,6 +703,7 @@
        customerId: "",
        entryPerson: "",
        entryDate: "",
    deliveryDate: "",
        maintenanceTime: "",
        productData: [],
        executionDate: "",
@@ -703,6 +713,7 @@
        customerId: [{ required: true, message: "请选择", trigger: "change" }],
        entryPerson: [{ required: true, message: "请选择", trigger: "change" }],
        entryDate: [{ required: true, message: "请选择", trigger: "change" }],
    deliveryDate: [{ required: true, message: "请选择", trigger: "change" }],
        executionDate: [{ required: true, message: "请选择", trigger: "change" }],
    },
});
@@ -986,6 +997,18 @@
    } else {
        expandedRowKeys.value = [];
    }
};

// 添加表行类名方法
const tableRowClassName = ({ row }) => {
  switch (row.deliveryDaysDiff) {
    case 15:
      return 'yellow'
    case 10:
      return 'red'
    case 2:
      return 'purple'
  }
};
// 主表合计方法
const summarizeMainTable = (param) => {
@@ -2084,6 +2107,19 @@
    margin-left: 10px;
}

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

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

::v-deep .purple{
  background-color: #F4DEFA;
}


.table_list {
    margin-top: unset;
}