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

huminmin

19 小时以前 599acb85ecc54f9b579cabe77156a1cc578ed8d9

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

 src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue

@@ -215,6 +215,9 @@
      if (form.value.sysPostId === 0) {
        form.value.sysPostId = undefined
      }
      if (form.value.sysDeptId === 0) {
        form.value.sysDeptId = undefined
      }
      // ç¼–辑时也计算一次合同年限
      calculateContractTerm();
    })
@@ -259,6 +262,9 @@
  if (!form.value.sysPostId) {
    form.value.sysPostId = 0;
  }
  if (!form.value.sysDeptId) {
    form.value.sysDeptId = 0;
  }
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      if (operationType.value === "add") {

 src/views/productionManagement/productionDispatching/components/formDia.vue

@@ -111,7 +111,7 @@

<script setup>
import {ref} from "vue";
import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js";
// import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import {productionDispatch} from "@/api/productionManagement/productionOrder.js";
import useUserStore from "@/store/modules/user.js";

 src/views/safeProduction/dangerInvestigation/index.vue

@@ -288,7 +288,9 @@
          <span class="detail-title">{{ form.type }}</span>
        </el-descriptions-item>
        <el-descriptions-item label="隐患风险等级">
          <span class="detail-title">{{ form.riskLevel }}</span>
          <el-tag :type="getTypeTagType(form.riskLevel)">
            {{ form.riskLevel }}
          </el-tag>
        </el-descriptions-item>
        <el-descriptions-item label="上报人">
          <span class="detail-title">{{ form.createUserName }}</span>
@@ -466,6 +468,16 @@
      return "验收页面";
    }
  };
  // èŽ·å–类型标签类型
  const getTypeTagType = type => {
    const typeMap = {
      è¾ƒå¤§é£Žé™©: "warning",
      ä½Žé£Žé™©: "info",
      ä¸€èˆ¬é£Žé™©: "info",
      é‡å¤§é£Žé™©: "danger",
    };
    return typeMap[type] || "info";
  };
  // ç”¨æˆ·ä¿¡æ¯è¡¨å•å¼¹æ¡†æ•°æ®
  const operationType = ref("");
  const dialogFormVisible = ref(false);

 src/views/safeProduction/safeWorkApproval/index1.vue

ÎļþÒÑɾ³ý

 src/views/salesManagement/receiptPayment/index.vue

@@ -421,7 +421,11 @@
    proxy.$modal.msgError("请选择至少一条数据");
    return;
  }
  const validRows = selectedRows.value.filter((item) => item.noReceiptAmount !== 0);
  // ä»…允许“待回款金额 > 0”的记录进入新增回款弹窗，并过滤掉可能混入的空对象
  const validRows = selectedRows.value.filter((item) => {
    if (!item || !item.id) return false;
    return Number(item.pendingInvoiceTotal ?? 0) > 0;
  });
  if (validRows.length === 0) {
    proxy.$modal.msgWarning("所选记录均无需回款");
    return;
@@ -485,6 +489,8 @@
const closeDia = () => {
  forms.value = [];
  dialogFormVisible.value = false;
  // é¿å…äºŒæ¬¡æ‰“开弹窗时仍携带上一次的选择导致“多出一行/脏数据”
  selectedRows.value = [];
};

// åˆ é™¤å›žæ¬¾è®°å½•