1.南洋电缆修改

gaoluyang

2025-12-08 0d6464400b1b1852b10cc7cd0863ea74c0a4803a

1.南洋电缆修改

 src/views/basicData/customerFile/index.vue

@@ -555,12 +555,6 @@
const handleDelete = () => {
  let ids = [];
  if (selectedRows.value.length > 0) {
    // 检查是否有他人维护的数据
    const unauthorizedData = selectedRows.value.filter(item => item.maintainer !== userStore.nickName);
    if (unauthorizedData.length > 0) {
      proxy.$modal.msgWarning("不可删除他人维护的数据");
      return;
    }
    ids = selectedRows.value.map((item) => item.id);
  } else {
    proxy.$modal.msgWarning("请选择数据");

 src/views/basicData/supplierManage/index.vue

@@ -493,12 +493,6 @@
const handleDelete = () => {
  let ids = [];
  if (selectedRows.value.length > 0) {
        // 检查是否有他人维护的数据
        const unauthorizedData = selectedRows.value.filter(item => item.maintainUserName !== userStore.nickName);
        if (unauthorizedData.length > 0) {
            proxy.$modal.msgWarning("不可删除他人维护的数据");
            return;
        }
    ids = selectedRows.value.map((item) => item.id);
  } else {
    proxy.$modal.msgWarning("请选择数据");

 src/views/customerService/feedbackRegistration/index.vue

@@ -172,12 +172,6 @@
const handleDelete = () => {
    let ids = [];
    if (selectedRows.value.length > 0) {
        // 检查是否有他人维护的数据
        const unauthorizedData = selectedRows.value.filter(item => item.checkUserId !== userStore.id);
        if (unauthorizedData.length > 0) {
            proxy.$modal.msgWarning("不可删除他人维护的数据");
            return;
        }
        ids = selectedRows.value.map((item) => item.id);
    } else {
        proxy.$modal.msgWarning("请选择数据");

 src/views/equipmentManagement/ledger/Form.vue

@@ -81,8 +81,8 @@
            clearable
            @change="mathNum"
          >
            <el-option label="1" :value="1" />
            <el-option label="6" :value="6" />
<!--            <el-option label="1" :value="1" />-->
<!--            <el-option label="6" :value="6" />-->
            <el-option label="13" :value="13" />
          </el-select>
        </el-form-item>
@@ -171,7 +171,7 @@
  number: 1, // 数量
  taxIncludingPriceUnit: undefined, // 含税单价
  taxIncludingPriceTotal: undefined, // 含税总价
  taxRate: undefined, // 税率
  taxRate: '13', // 税率
  unTaxIncludingPriceTotal: undefined, // 不含税总价
  // createUser: useUserStore().nickName, // 录入人
  createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 录入日期

 src/views/equipmentManagement/measurementEquipment/index.vue

@@ -221,12 +221,6 @@
const handleDelete = () => {
    let ids = [];
    if (selectedRows.value.length > 0) {
        // 检查是否有他人维护的数据
        const unauthorizedData = selectedRows.value.filter(item => item.userId !== userStore.id);
        if (unauthorizedData.length > 0) {
            proxy.$modal.msgWarning("不可删除他人维护的数据");
            return;
        }
        ids = selectedRows.value.map((item) => item.id);
    } else {
        proxy.$modal.msgWarning("请选择数据");

 src/views/procurementManagement/invoiceEntry/components/Modal.vue

@@ -199,8 +199,7 @@

const rules = ref({
  invoiceNumber: [
    { required: true, message: "请输入发票号", trigger: "blur" },
    { type: "string" },
    { required: false, message: "请输入发票号", trigger: "blur" },
  ],
  invoiceAmount: [
    { required: true, message: "请输入发票金额", trigger: "blur" },

 src/views/procurementManagement/invoiceEntry/index.vue

@@ -151,11 +151,11 @@
      label: "录入人",
      prop: "recorderName",
    },
    {
      label: "录入日期",
      prop: "entryDate",
      width:110
    },
    // {
    //   label: "录入日期",
    //   prop: "entryDate",
    //   width:110
    // },
    {
      label: "合同金额(元)",
      prop: "contractAmount",

 src/views/procurementManagement/paymentEntry/index.vue

@@ -95,7 +95,7 @@
                            </template>
                        </el-table-column>
                        <el-table-column label="登记人" prop="registrant" />
                        <el-table-column label="登记日期" prop="registrationtDate" />
<!--                        <el-table-column label="登记日期" prop="registrationtDate" />-->
                        <el-table-column label="操作" width="150">
                            <template #default="scope">
                                <el-button
@@ -244,15 +244,15 @@
                            />
                        </el-form-item>
                    </el-col>
          <el-col :span="12">
            <el-form-item label="登记日期：" prop="registrationtDate">
              <el-input
                v-model="form.registrationtDate"
                placeholder="请输入"
                clearable
              />
            </el-form-item>
          </el-col>
<!--          <el-col :span="12">-->
<!--            <el-form-item label="登记日期：" prop="registrationtDate">-->
<!--              <el-input-->
<!--                v-model="form.registrationtDate"-->
<!--                placeholder="请输入"-->
<!--                clearable-->
<!--              />-->
<!--            </el-form-item>-->
<!--          </el-col>-->
        </el-row>
      </el-form>
      <template #footer>

 src/views/procurementManagement/procurementInvoiceLedger/index.vue

@@ -188,7 +188,7 @@
      },
    },
    {
      label: "开票日期",
      label: "来票日期",
      prop: "createdAt",
      width: 110,
    },

 src/views/procurementManagement/procurementLedger/index.vue

@@ -25,7 +25,7 @@
            <el-input v-model="searchForm.projectName" placeholder="请输入" clearable prefix-icon="Search"
                      @change="handleQuery" />
          </el-form-item>
          <el-form-item label="录入日期：">
          <el-form-item label="签订日期：">
            <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                            placeholder="请选择" clearable @change="changeDaterange" />
          </el-form-item>
@@ -138,7 +138,7 @@
          show-overflow-tooltip
        />
        <el-table-column
          label="录入日期"
          label="签订日期"
          prop="entryDate"
           width="100"
          show-overflow-tooltip
@@ -256,11 +256,24 @@
                            />
                        </el-form-item>
                    </el-col>
<!--                    <el-col :span="12">-->
<!--                        <el-form-item label="签订日期：" prop="executionDate">-->
<!--                            <el-date-picker-->
<!--                                style="width: 100%"-->
<!--                                v-model="form.executionDate"-->
<!--                                value-format="YYYY-MM-DD"-->
<!--                                format="YYYY-MM-DD"-->
<!--                                type="date"-->
<!--                                placeholder="请选择"-->
<!--                                clearable-->
<!--                            />-->
<!--                        </el-form-item>-->
<!--                    </el-col>-->
                    <el-col :span="12">
                        <el-form-item label="签订日期：" prop="executionDate">
                        <el-form-item label="签订日期：" prop="entryDate">
                            <el-date-picker
                                style="width: 100%"
                                v-model="form.executionDate"
                                v-model="form.entryDate"
                                value-format="YYYY-MM-DD"
                                format="YYYY-MM-DD"
                                type="date"
@@ -286,19 +299,6 @@
                  :value="item.userId"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="录入日期：" prop="entryDate">
              <el-date-picker
                style="width: 100%"
                v-model="form.entryDate"
                value-format="YYYY-MM-DD"
                format="YYYY-MM-DD"
                type="date"
                placeholder="请选择"
                clearable
              />
            </el-form-item>
          </el-col>
        </el-row>
@@ -480,8 +480,8 @@
                                clearable
                                @change="mathNum"
                            >
                                <el-option label="1" value="1" />
                                <el-option label="6" value="6" />
<!--                                <el-option label="1" value="1" />-->
<!--                                <el-option label="6" value="6" />-->
                                <el-option label="13" value="13" />
                            </el-select>
                        </el-form-item>
@@ -852,7 +852,7 @@
    purchaseContractNumber: "", // 采购合同编号
    salesContractNo: "", // 销售合同编号
    projectName: "", // 项目名称
    entryDate: null, // 录入日期
    entryDate: null, // 签订日期
    entryDateStart: undefined,
    entryDateEnd: undefined,
  },
@@ -866,7 +866,7 @@
    supplierName: "",
    supplierId: "",
    paymentMethod: "",
        executionDate: "",
        // executionDate: "",
  },
  rules: {
    purchaseContractNumber: [
@@ -875,7 +875,7 @@
    projectName: [{ required: true, message: "请输入", trigger: "blur" }],
    supplierId: [{ required: true, message: "请输入", trigger: "blur" }],
        entryDate: [{ required: true, message: "请选择", trigger: "change" }],
        executionDate: [{ required: true, message: "请选择", trigger: "change" }],
        // executionDate: [{ required: true, message: "请选择", trigger: "change" }],
  },
});
const {  form, rules } = toRefs(data);
@@ -895,10 +895,10 @@
    unit: "",
    quantity: "",
    taxInclusiveUnitPrice: "",
    taxRate: "",
    taxRate: 13,
    taxInclusiveTotalPrice: "",
    taxExclusiveTotalPrice: "",
    invoiceType: "",
    invoiceType: "增专票",
        warnNum: "",
  },
  productRules: {
@@ -1142,6 +1142,10 @@
  proxy.resetForm("productFormRef");
  if (type === "edit") {
    productForm.value = { ...row };
  } else {
    // 新增产品时默认税率为13%，发票类型为增专票
    productForm.value.taxRate = "13";
    productForm.value.invoiceType = "增专票";
  }
  productFormVisible.value = true;
  getProductOptions();

 src/views/salesManagement/invoiceLedger/index.vue

@@ -11,10 +11,10 @@
            format="YYYY-MM-DD" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间" clearable
            @change="changeDateRange" @clear="clearRange" />
        </el-form-item>
        <el-form-item label="录入日期">
          <el-date-picker style="width: 100%" v-model="searchForm.createTimeStart" value-format="YYYY-MM-DD HH:mm:ss"
            format="YYYY-MM-DD" type="date" placeholder="请选择" clearable @change="handleQuery" />
        </el-form-item>
<!--        <el-form-item label="录入日期">-->
<!--          <el-date-picker style="width: 100%" v-model="searchForm.createTimeStart" value-format="YYYY-MM-DD HH:mm:ss"-->
<!--            format="YYYY-MM-DD" type="date" placeholder="请选择" clearable @change="handleQuery" />-->
<!--        </el-form-item>-->
        <el-form-item label="不显示有发票行">
          <el-checkbox v-model="searchForm.status" @change="handleQuery" />
        </el-form-item>
@@ -41,7 +41,7 @@
          width="200" />
        <el-table-column label="税率(%)" prop="taxRate" show-overflow-tooltip />
        <el-table-column label="录入人" prop="invoicePerson" show-overflow-tooltip />
        <el-table-column label="录入日期" prop="createTime" show-overflow-tooltip :formatter="formatDate" width="180" />
<!--        <el-table-column label="录入日期" prop="createTime" show-overflow-tooltip :formatter="formatDate" width="180" />-->
        <el-table-column label="开票日期" prop="invoiceDate" show-overflow-tooltip width="120" />
        <el-table-column label="发票" prop="invoiceFileName" width="120" align="center" show-overflow-tooltip fixed="right">
          <template #default="scope">

 src/views/salesManagement/receiptPayment/index.vue

@@ -113,7 +113,7 @@
                </template>
              </el-table-column>
              <el-table-column label="登记人" prop="registrant" width="90"/>
              <el-table-column label="登记日期" prop="createTime"   width="130"/>
<!--              <el-table-column label="登记日期" prop="createTime"   width="130"/>-->
              <el-table-column label="操作" width="150" align="center">
                <template #default="scope">
                  <el-button

 src/views/salesManagement/receiptPaymentHistory/index.vue

@@ -128,11 +128,11 @@
    label: "登记人",
    prop: "registrant",
  },
  {
    label: "登记日期",
    prop: "createTime",
    width:100
  },
  // {
  //   label: "登记日期",
  //   prop: "createTime",
  //   width:100
  // },
]);
const tableData = ref([]);
const selectedRows = ref([]);

 src/views/salesManagement/salesLedger/index.vue

@@ -18,10 +18,10 @@
          <el-input v-model="searchForm.projectName" placeholder="请输入" clearable prefix-icon="Search"
            @change="handleQuery" />
        </el-form-item>
        <el-form-item label="录入日期：">
          <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
            placeholder="请选择" clearable @change="changeDaterange" />
        </el-form-item>
<!--        <el-form-item label="录入日期：">-->
<!--          <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"-->
<!--            placeholder="请选择" clearable @change="changeDaterange" />-->
<!--        </el-form-item>-->
        <el-form-item>
          <el-button type="primary" @click="handleQuery"> 搜索 </el-button>
        </el-form-item>
@@ -68,7 +68,7 @@
        <el-table-column label="合同金额(元)" prop="contractAmount" width="220" show-overflow-tooltip
          :formatter="formattedNumber" />
        <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="entryDate" width="120" show-overflow-tooltip />-->
        <el-table-column label="签订日期" prop="executionDate" width="120" show-overflow-tooltip />
        <el-table-column fixed="right" label="操作" min-width="200" align="center">
          <template #default="scope">
@@ -139,14 +139,12 @@
                            </el-select>
                        </el-form-item>
                    </el-col>
          <el-col :span="12">
            <el-form-item label="录入日期：" prop="entryDate">
              <el-date-picker style="width: 100%" v-model="form.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
                type="date" placeholder="请选择" clearable />
            </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.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"-->
<!--                type="date" placeholder="请选择" clearable />-->
<!--            </el-form-item>-->
<!--          </el-col>-->
          <el-col :span="12">
            <el-form-item label="付款方式">
              <el-input v-model="form.paymentMethod" placeholder="请输入" clearable :disabled="operationType === 'view'" />
@@ -241,8 +239,6 @@
                    <el-col :span="12">
                        <el-form-item label="税率(%)：" prop="taxRate">
                            <el-select v-model="productForm.taxRate" placeholder="请选择" clearable @change="calculateFromTaxRate">
                                <el-option label="1" value="1" />
                                <el-option label="6" value="6" />
                                <el-option label="13" value="13" />
                            </el-select>
                        </el-form-item>
@@ -547,7 +543,7 @@
    unit: "",
    quantity: "",
    taxInclusiveUnitPrice: "",
    taxRate: "",
    taxRate: "13",
    taxInclusiveTotalPrice: "",
    taxExclusiveTotalPrice: "",
    invoiceType: "",