11

WXL

2024-04-15 ad0f326640b66b63e28dc52139f03ae4822f260a

11

 src/views/project/donatebaseinfo/index.vue

@@ -96,6 +96,22 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="5">
          <el-form-item label="是否终止·">
            <el-select
              v-model="queryParams.terminationCase"
              placeholder="请选择状态"
            >
              <el-option
                v-for="item in terminationCaselist"
                :key="item.value"
                :label="item.name"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="9">
          <el-form-item label="籍贯">
            <div>
@@ -106,6 +122,8 @@
            </div>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="4">
          <el-form-item>
            <el-button
@@ -889,7 +907,7 @@
  exportDonatebaseinfo,
  downloadbaseinfo,
  getDonationNumber,
  getdonatorno,
  getdonatorno
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
@@ -965,6 +983,10 @@
        shi: "",
        qu: ""
      },
      terminationCaselist: [
        { name: "终止状态", value: 1 },
        { name: "正常状态", value: 0 }
      ],
      // 遮罩层
      loading: true,
      // 导出遮罩层
@@ -1253,7 +1275,7 @@
    }

    this.getTimeList();
    

    this.getList();
  },


 src/views/project/travelexpenseapply/travelexpensedetail/index.vue

@@ -1652,7 +1652,6 @@
      this.pdfVisible = true;

      if (this.rbDetails[index].annexfilesList) {

        const fetchPromises = this.rbDetails[index].annexfilesList.map(
          (value, indexson) => {
            const pdfimg = this.Networkheader + "/prod-api" + value.url;
@@ -1705,10 +1704,14 @@
        );

        Promise.all(fetchPromises).then(invoicefileListto => {
          this.invoicefileListto = invoicefileListto.filter(item => item !== null);
          this.invoicefileListto = invoicefileListto.filter(
            item => item !== null
          );
          this.invoicepdfimg = this.invoicefileListto[0].url;
          console.log(this.invoicepdfimg, "invoicepdfimg");
          this.invoicepdfimgsrcList = this.invoicefileListto.map(item => item.url);
          this.invoicepdfimgsrcList = this.invoicefileListto.map(
            item => item.url
          );
        });

        this.previewpdf = true;
@@ -1816,8 +1819,10 @@
        const index = this.getIndexInArray(this.fileListto, row);
        const item = this.fileListto.splice(index, 1)[0]; // 移除指定索引处的元素，并保存到item变量中
        this.fileListto.splice(index - 1, 0, item); // 将item插入到索引位置的前一位
     
        const indexann = this.rbDetails[this.atpresent].annexfilesList.findIndex(item => item.name == row.name);

        const indexann = this.rbDetails[
          this.atpresent
        ].annexfilesList.findIndex(item => item.name == row.name);
        const itemann = this.rbDetails[this.atpresent].annexfilesList.splice(
          indexann,
          1
@@ -1831,8 +1836,10 @@
        const index = this.getIndexInArray(this.invoicefileListto, row);
        const item = this.invoicefileListto.splice(index, 1)[0]; // 移除指定索引处的元素，并保存到item变量中
        this.invoicefileListto.splice(index - 1, 0, item); // 将item插入到索引位置的前一位
      
        const indexinvo = this.rbDetails[this.atpresent].invoicefilesList.findIndex(item => item.name == row.name);

        const indexinvo = this.rbDetails[
          this.atpresent
        ].invoicefilesList.findIndex(item => item.name == row.name);
        const iteminvo = this.rbDetails[this.atpresent].invoicefilesList.splice(
          indexinvo,
          1
@@ -2508,6 +2515,49 @@

          const rbDetails = [...this.rbDetails];
          const rbPayees = [...this.rbPayees];
          //保存前校验数据
          for (let k = 0; k < rbDetails.length; k++) {
            let tempDetail = rbDetails[k];
            console.log(tempDetail,'tem');
            if (!tempDetail.persontype) {
              this.$modal.msgWarning(
                "明细表中，第" +
                  (k + 1).toString() +
                  "行的人员类别未选择，请先选择人员类别后再提交保存！"
              );
              return;
            }

            
              if (!tempDetail.personname) {
                this.$modal.msgWarning(
                  "明细表中，第" +
                    (k + 1).toString() +
                    "行的费用人员未选择,请选择费用人员后再提交保存！"
                );
                return;
              }

              if (!tempDetail.starttime) {
                this.$modal.msgWarning(
                  "明细表中，第" +
                    (k + 1).toString() +
                    "行的开始日期未选择,请选择开始日期后再提交保存！"
                );
                return;
              }

              if (!tempDetail.endtime) {
                this.$modal.msgWarning(
                  "明细表中，第" +
                    (k + 1).toString() +
                    "行的结束日期姓名为选择,请选择结束日期后再提交保存！"
                );
                return;
              }
            
          }

          if (this.form.id != null) {
            console.log(this.form);
            updateReimbursement(this.form);