WXL
2024-01-18 695ae7f01da0d593ee3928a4b706af50819fee85
Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
已修改3个文件
35 ■■■■■ 文件已修改
src/views/project/donatebaseinfo/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donationdetails/index.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatebaseinfo/index.vue
@@ -88,12 +88,12 @@
    </el-row>
    <el-table v-loading="loading" :data="donatebaseinfoList" @selection-change="handleSelectionChange" border
      :default-sort="{ prop: 'reporttime', order: 'descending' }">
      :default-sort="{ prop: 'donatetime', order: 'descending' }">
      <!-- <el-table-column label="报告时间" align="center" prop="id" /> -->
      <!-- <el-table-column type="selection" width="55" align="center" /> -->
      <el-table-column label="时间" align="center" prop="reporttime" width="100">
      <el-table-column label="案例时间" align="center" prop="donatetime" width="100">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
          <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <el-table-column label="捐献编号" align="center" prop="donorno" width="200" />
@@ -1298,7 +1298,6 @@
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
        console.log("提交的数据们:", this.form);
        if (valid) {
          this.form.birthday = this.$moment(this.form.birthday).format(
            "YYYY-MM-DD HH:mm:ss"
@@ -1329,6 +1328,7 @@
          this.form.registertownname = this.registerAddresss.qu;
          this.form.reportername = this.$refs.getReportname.$data.selectedLabel;
          this.form.donatetime = this.form.reporttime;
          try {
            this.form.treatmenthospitalname = this.$refs.addOrgSelect.getOptionByValue(
src/views/project/donationdetails/index.vue
@@ -618,9 +618,8 @@
            <el-col :span="12">
              <el-form-item label="签字亲属" prop="kinshipconfirmationsign">
                <el-checkbox-group v-model="organdecision">
                  <el-checkbox v-for="item in kinshiplist" :label="item">
                    {{ item == "子女" ? item + "(人)" : item }}
                  </el-checkbox>
                  <el-checkbox v-for="item in kinshiplist" :key="item" :label="item"> {{ item == "子女" ? item + "(人)" :
                    item }} </el-checkbox>
                </el-checkbox-group>
              </el-form-item>
            </el-col>
@@ -638,11 +637,10 @@
          <el-row>
            <el-form-item label-width="100px" label="捐献决定">
              <el-checkbox-group v-model="organdecision">
                <el-checkbox v-for="item in organselection" :label="item">
                  {{ item }}
                </el-checkbox>
                <el-checkbox v-for="item in organselection" :key="item" :label="item">{{ item }} </el-checkbox>
              </el-checkbox-group>
            </el-form-item></el-row>
            </el-form-item>
          </el-row>
          <el-row>
            <!-- <el-col :span="18">
              <el-form-item align="left" label="捐献决定">
@@ -1774,7 +1772,7 @@
        listDonationwitnessorgan(searchParam).then(res => {
          if (res.code == 200) {
            if (res.rows[0]) {
              this.procureddata = res.rows;
              this.procureddata = res.rows;
              this.procureddata.infoid = this.infoid;
            }
            this.organList.organprocured = [];
@@ -1894,6 +1892,15 @@
            this.form.redorganname = this.form.redorganno;
          }
          //案例时间更新成获取时间
          if (this.actives == 5) {
            this.$refs["witnessform"].validate(valid1 => {
              this.$refs["form"].validate(valid2 => {
                this.form.donatetime = this.witnessform.operationbegtime;
              });
            });
          }
          if (this.form.id != null) {
            if (this.form.workflow == 0) {
              this.form.workflow = 1;
src/views/project/fund/applyDetail/index.vue
@@ -1635,14 +1635,14 @@
      else if (this.checkObj.flowlevelone == 1) {
        if (this.userprofile.nickName == "陈慕华") {
          //检查是否收到纸质材料
          if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
          if (this.form.checkstatus != 3) {
            this.$modal.msgError("请先确认报销的纸质材料是否已经收到!");
            return;
          }
          //检查个税计算
          if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
            this.$modal.msgError("提交专家费用申请单审核,需要先完成个税计算!");
            this.$modal.msgError("请先完成专家费用的个税计算后,再提交审核通过!");
            return;
          }
        }