yuan
5 天以前 945e2e65de5edde82f831d77d5ce2ab76e73cb9a
Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
已添加2个文件
已修改5个文件
221 ■■■■ 文件已修改
multiple/assets/favicon/SDTXfavicon.ico 补丁 | 查看 | 原始文档 | blame | 历史
multiple/assets/logo/SDTXLogo.png 补丁 | 查看 | 原始文档 | blame | 历史
multiple/config.json 117 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/purchaseApproval/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/measurementEquipment/filesDia.vue 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
multiple/assets/favicon/SDTXfavicon.ico
multiple/assets/logo/SDTXLogo.png
multiple/config.json
@@ -15,33 +15,6 @@
    "logo": "logo/Logo.png",
    "favicon": "favicon/favicon.ico"
  },
  "SDJC": {
    "env": {
      "VITE_APP_TITLE": "黎城县胜德建材有限公司",
      "VITE_BASE_API": "http://36.138.236.153:9000",
      "VITE_JAVA_API": "http://36.138.236.153:9001"
    },
    "logo": "logo/SDJCLogo.png",
    "favicon": "favicon/SDJCfavicon.ico"
  },
  "KS": {
    "env": {
      "VITE_APP_TITLE": "黎城康森商砼有限公司",
      "VITE_BASE_API": "http://36.138.236.176:9000",
      "VITE_JAVA_API": "http://36.138.236.176:9001"
    },
    "logo": "logo/KSLogo.png",
    "favicon": "favicon/KSfavicon.ico"
  },
  "DZZB": {
    "env": {
      "VITE_APP_TITLE": "山西丹朱装备制造股份有限公司",
      "VITE_BASE_API": "http://36.138.236.176:9000",
      "VITE_JAVA_API": "http://36.138.236.176:9001"
    },
    "logo": "logo/DZZBLogo.png",
    "favicon": "favicon/DZZBfavicon.ico"
  },
  "BTYX": {
    "env": {
      "VITE_APP_TITLE": "河南帮太优选食品有限公司",
@@ -60,41 +33,32 @@
    "logo": "logo/ZXZNLogo.png",
    "favicon": "favicon/ZXZNfavicon.ico"
  },
  "HYZC": {
  "SDTX": {
    "env": {
      "VITE_APP_TITLE": "山西华亿众成建材有限公司",
      "VITE_BASE_API": "http://36.137.13.103:9001",
      "VITE_JAVA_API": "http://36.137.13.103:9000"
      "VITE_APP_TITLE": "河南善鼎通信科技有限公司",
      "VITE_BASE_API": "http://36.213.156.184:9001",
      "VITE_JAVA_API": "http://36.213.156.184:9000"
    },
    "logo": "logo/HYZCLogo.png",
    "favicon": "favicon/HYZCfavicon.ico"
    "logo": "logo/SDTXLogo.png",
    "favicon": "favicon/SDTXfavicon.ico"
  },
  "WTXC": {
  "QXY": {
    "env": {
      "VITE_APP_TITLE": "宁夏万通新材",
      "VITE_BASE_API": "http://42.63.71.140:9001",
      "VITE_JAVA_API": "http://42.63.71.140:9000"
      "VITE_APP_TITLE": "强信宇电器管理系统",
      "VITE_BASE_API": "http://36.134.154.10:9001",
      "VITE_JAVA_API": "http://36.134.154.10:9000"
    },
    "logo": "logo/WTXCLogo.png",
    "favicon": "favicon/WTXCfavicon.ico"
    "logo": "logo/QXYLogo.png",
    "favicon": "favicon/QXYfavicon.ico"
  },
  "KYHG": {
  "XCDQ": {
    "env": {
      "VITE_APP_TITLE": "山西坤源化工有限公司",
      "VITE_BASE_API": "http://36.137.13.29:9001",
      "VITE_JAVA_API": "http://36.137.13.29:9000"
      "VITE_APP_TITLE": "旭晨电器管理系统",
      "VITE_BASE_API": "http://36.133.45.183:9001",
      "VITE_JAVA_API": "http://36.133.45.183:9002"
    },
    "logo": "logo/KYHGLogo.png",
    "favicon": "favicon/KYHGfavicon.ico"
  },
  "DYKJ": {
    "env": {
      "VITE_APP_TITLE": "山西德益科技有限公司",
      "VITE_BASE_API": "http://36.137.12.37:9001",
      "VITE_JAVA_API": "http://36.137.12.37:9000"
    },
    "logo": "logo/DYKJLogo.png",
    "favicon": "favicon/DYKJfavicon.ico"
    "logo": "logo/XCDQLogo.png",
    "favicon": "favicon/XCDQfavicon.ico"
  },
  "ZQSY": {
    "env": {
@@ -167,51 +131,6 @@
    },
    "logo": "logo/XCDQLogo.png",
    "favicon": "favicon/XCDQfavicon.ico"
  },
  "YSJX": {
    "env": {
      "VITE_APP_TITLE": "宁夏玉山机械设备制造有限公司",
      "VITE_BASE_API": "http://36.133.45.183:9001",
      "VITE_JAVA_API": "http://36.133.45.183:9002"
    },
    "logo": "logo/YSJXLogo.png",
    "favicon": "favicon/YSJXico.ico"
  },
  "XLZB": {
    "env": {
      "VITE_APP_TITLE": "宁夏协力装备有限公司",
      "VITE_BASE_API": "http://36.133.45.183:9001",
      "VITE_JAVA_API": "http://36.133.45.183:9002"
    },
    "logo": "logo/XLZBLogo.png",
    "favicon": "favicon/XLZBico.ico"
  },
  "JXSM": {
    "env": {
      "VITE_APP_TITLE": "襄垣县洁鑫商贸有限公司",
      "VITE_BASE_API": "http://36.133.45.183:9001",
      "VITE_JAVA_API": "http://36.133.45.183:9002"
    },
    "logo": "logo/JXSMLogo.png",
    "favicon": "favicon/JXSMico.ico"
  },
  "JHHG": {
    "env": {
      "VITE_APP_TITLE": "宁夏九泓化工科技有限公司",
      "VITE_BASE_API": "http://42.63.70.90:9001",
      "VITE_JAVA_API": "http://42.63.70.90:9002"
    },
    "logo": "logo/JHHGLogo.png",
    "favicon": "favicon/JHHGfavicon.ico"
  },
  "LFJZ": {
    "env": {
      "VITE_APP_TITLE": "力发建筑装饰有限公司",
      "VITE_BASE_API": "http://36.212.201.241:9001",
      "VITE_JAVA_API": "http://36.212.201.241:9000"
    },
    "logo": "logo/LFJZLogo.png",
    "favicon": "favicon/LFJZfavicon.ico"
  },
  "logo": "/src/assets/logo/logo.png",
  "favicon": "/public/favicon.ico"
src/views/collaborativeApproval/purchaseApproval/index.vue
@@ -654,14 +654,10 @@
      return;
    }
    if (operationType.value === "add") {
      productSelectedRows.value.forEach(selectedRow => {
        const index = productData.value.findIndex(
          product => product.id === selectedRow.id
      productData.value = productData.value.filter(
        item => !productSelectedRows.value.includes(item)
        );
        if (index !== -1) {
          productData.value.splice(index, 1);
        }
      });
      productSelectedRows.value = [];
    } else {
      let ids = [];
      if (productSelectedRows.value.length > 0) {
src/views/equipmentManagement/measurementEquipment/filesDia.vue
@@ -1,38 +1,16 @@
<template>
  <div>
    <el-dialog
        v-model="dialogFormVisible"
        title="上传附件"
        width="50%"
        @close="closeDia"
    >
    <el-dialog v-model="dialogFormVisible" title="上传附件" width="50%" @close="closeDia">
      <div style="margin-bottom: 10px;text-align: right">
        <el-upload
            v-model:file-list="fileList"
            class="upload-demo"
            :action="uploadUrl"
            :on-success="handleUploadSuccess"
            :on-error="handleUploadError"
            name="files"
            :show-file-list="false"
            :headers="headers"
            style="display: inline;margin-right: 10px"
        >
        <el-upload v-model:file-list="fileList" class="upload-demo" :action="uploadUrl"
          :on-success="handleUploadSuccess" :on-error="handleUploadError" name="files" :show-file-list="false"
          :headers="headers" style="display: inline;margin-right: 10px">
          <el-button type="primary">上传附件</el-button>
        </el-upload>
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
      <PIMTable
          rowKey="id"
          :column="tableColumn"
          :tableData="tableData"
          :page="page"
          :tableLoading="tableLoading"
          :isSelection="true"
          @selection-change="handleSelectionChange"
          @pagination="paginationSearch"
          height="500"
      >
      <PIMTable rowKey="id" :column="tableColumn" :tableData="tableData" :page="page" :tableLoading="tableLoading"
        :isSelection="true" @selection-change="handleSelectionChange" @pagination="paginationSearch" height="500">
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
@@ -136,7 +114,11 @@
function handleUploadSuccess(res, file) {
  // 如果上传成功
  if (res.code == 200 && res.data && res.data.length > 0) {
    const mergedFiles = [...tableData.value, ...res.data];
    const newFiles = res.data.map(item => ({
      ...item,
      name: item.originalFilename || item.name
    }));
    const mergedFiles = [...(tableData.value || []), ...newFiles];
    const storageAttachmentDTO = {
      recordType: accountType.value,
      recordId: currentId.value,
@@ -191,6 +173,4 @@
});
</script>
<style scoped>
</style>
<style scoped></style>
src/views/procurementManagement/procurementLedger/index.vue
@@ -1640,14 +1640,10 @@
      return;
    }
    if (operationType.value === "add") {
      productSelectedRows.value.forEach(selectedRow => {
        const index = productData.value.findIndex(
          product => product.id === selectedRow.id
      productData.value = productData.value.filter(
        item => !productSelectedRows.value.includes(item)
        );
        if (index !== -1) {
          productData.value.splice(index, 1);
        }
      });
      productSelectedRows.value = [];
    } else {
      let ids = [];
      if (productSelectedRows.value.length > 0) {
src/views/salesManagement/salesLedger/index.vue
@@ -285,13 +285,13 @@
            <el-form-item label="销售合同号:"
                          prop="salesContractNo">
              <div style="display: flex; align-items: center; gap: 12px;width: 100%;">
                <el-checkbox v-model="form.autoGenerateContractNo" v-if="operationType === 'add'">自动生成
                <el-checkbox v-model="form.autoGenerateContractNo"
                             v-if="operationType === 'add'">自动生成
                </el-checkbox>
                <el-input v-model="form.salesContractNo"
                          :placeholder="form.autoGenerateContractNo ? '自动生成' : '请输入'"
                          clearable
                          :disabled="form.autoGenerateContractNo" />
              </div>
            </el-form-item>
          </el-col>
@@ -920,7 +920,8 @@
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="24" v-if="deliveryForm.type === '货车'">
          <el-col :span="24"
                  v-if="deliveryForm.type === '货车'">
            <el-form-item label="发货车牌号:"
                          prop="shippingCarNumber">
              <el-input v-model="deliveryForm.shippingCarNumber"
@@ -928,7 +929,8 @@
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-else>
          <el-col :span="24"
                  v-else>
            <el-form-item label="快递公司:"
                          prop="expressCompany">
              <el-input v-model="deliveryForm.expressCompany"
@@ -937,7 +939,8 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30" v-if="deliveryForm.type === '快递'">
        <el-row :gutter="30"
                v-if="deliveryForm.type === '快递'">
          <el-col :span="24">
            <el-form-item label="快递单号:"
                          prop="expressNumber">
@@ -950,7 +953,8 @@
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="发货图片:">
              <ImageUpload v-model:file-list="deliveryFileList" :limit="9" />
              <ImageUpload v-model:file-list="deliveryFileList"
                           :limit="9" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -1271,7 +1275,9 @@
      shippingCarNumber: [
        { validator: validateDeliveryShippingCarNumber, trigger: "blur" },
      ],
      expressCompany: [{ validator: validateDeliveryExpressCompany, trigger: "blur" }],
      expressCompany: [
        { validator: validateDeliveryExpressCompany, trigger: "blur" },
      ],
      type: [{ required: true, message: "请选择发货类型", trigger: "change" }],
    },
  });
@@ -1725,7 +1731,7 @@
        invoiceType: "增普票",
        isProduction: true,
        productId: p.productId,
        productModelId: p.productModelId
        productModelId: p.productModelId,
      };
    });
@@ -1750,7 +1756,7 @@
        form.value.storageBlobDTOs = fileList;
        form.value.type = 1;
        if (form.value.autoGenerateContractNo) {
          form.value.salesContractNo = '';
          form.value.salesContractNo = "";
        }
        addOrUpdateSalesLedger(form.value).then(res => {
          proxy.$modal.msgSuccess("提交成功");
@@ -1860,14 +1866,10 @@
    }
    if (operationType.value === "add") {
      productSelectedRows.value.forEach(selectedRow => {
        const index = productData.value.findIndex(
          product => product.id === selectedRow.id
      productData.value = productData.value.filter(
        item => !productSelectedRows.value.includes(item)
        );
        if (index !== -1) {
          productData.value.splice(index, 1);
        }
      });
      productSelectedRows.value = [];
    } else {
      let ids = [];
      if (productSelectedRows.value.length > 0) {
@@ -2676,7 +2678,11 @@
    // 发货状态必须是"待发货"或"审核拒绝"
    const statusStr = shippingStatus ? String(shippingStatus).trim() : "";
    return statusStr === "待发货" || statusStr === "审核拒绝" || statusStr === "部分发货";
    return (
      statusStr === "待发货" ||
      statusStr === "审核拒绝" ||
      statusStr === "部分发货"
    );
  };
  // 打开附件弹窗