modified: .env.development modified: src/api/CNAS/reviewAnnualPlan.js...

“zhuo”

2023-08-11 e93a917320825bdfb92b1a9e60da96c0e9491976

	modified:   .env.development
	modified:   src/api/CNAS/reviewAnnualPlan.js
	modified:   src/views/CNAS/reviewAnnualPlan/index.vue
	modified:   src/views/experiment/checkTheReport/index.vue
	modified:   src/views/experiment/reportAuditing/index.vue
	modified:   src/views/laboratory/ledger/index.vue

 .env.development

@@ -3,3 +3,4 @@

# base api
VUE_APP_BASE_API = 'http://localhost:1234/'
 

 src/api/CNAS/reviewAnnualPlan.js

@@ -17,3 +17,22 @@
      data
    })
  }


  //上传附件
export function addAccessory(data) {
  return request({
    url: '/cnasAnnualPlan/addAccessory',
    method: 'post',
    data
  })
}

//删除审核年度计划
export function deleteCnasAnnualPlan(params) {
  return request({
    url: '/cnasAnnualPlan/deleteCnasAnnualPlan',
    method: 'get',
    params
  })
}

 src/views/CNAS/reviewAnnualPlan/index.vue

@@ -5,7 +5,8 @@
        <el-form-item>
          <el-date-picker
            v-model="input"
            type="date"
            class="input-form"
            type="month"
            placeholder="请选择查询日期"
          >
          </el-date-picker>
@@ -15,69 +16,261 @@
          <el-button type="primary" plain @click="resetData()">重置</el-button>
        </el-form-item>
      </el-form>
      <el-form>
      <el-form class="rightBtn">
        <!-- 上传附件 -->
        <el-button
          class="rightBtn"
          type="primary"
          icon="el-icon-upload2"
          @click="dialogFormVisible1 = true"
          >上传附件</el-button
        >

        <el-dialog title="新增计划" :visible.sync="dialogFormVisible1">
          <el-form :model="uploadingForm">
            <el-form-item label="审核日期:" :label-width="formLabelWidth">
              <el-date-picker
                v-model="uploadingForm.auditTime"
                type="date"
                placeholder="请选择日期"
                autocomplete="off"
        <el-form-item class="createBtn">
          <el-button
            type="primary"
            icon="el-icon-upload2"
            @click="
              dialogFormVisible1 = true;
              uploading = {};
              resetForm('uploading');
            "
            >上传附件</el-button
          >
          <el-dialog
            title="上传附件"
            :visible.sync="dialogFormVisible1"
            width="30%"
          >
            <el-form :model="uploading" :rules="rules1" ref="uploading">
              <el-form-item
                label="审核日期:"
                :label-width="formLabelWidth1"
                prop="auditTime"
                style="margin-bottom: 20px"
              >
              </el-date-picker>
            </el-form-item>
            <el-form-item label="录入人:" :label-width="formLabelWidth">
              <el-input
                v-model="uploadingForm.keyboarder"
                autocomplete="off"
                placeholder="请输入录入人"
              ></el-input>
            </el-form-item>
            <el-form-item label="上传附件:" :label-width="formLabelWidth">
              <el-input
                v-model="uploadingForm.attachment"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-form>
          <div slot="footer" class="dialog-footer">
            <el-button @click="dialogFormVisible1 = false">取 消</el-button>
            <el-button type="primary" @click="dialogFormVisible1 = false"
              >确 定</el-button
            >
          </div>
        </el-dialog>
                <el-date-picker
                  class="uploading-form"
                  v-model="uploading.auditTime"
                  type="date"
                  placeholder="请选择日期"
                  autocomplete="off"
                >
                </el-date-picker>
              </el-form-item>
              <el-form-item
                prop="accessoryFile"
                label="上传附件:"
                :label-width="formLabelWidth1"
              >
                <el-input
                  class="uploading-form"
                  v-model="uploading.accessoryFile"
                  autocomplete="off"
                  placeholder="请选择文件"
                ></el-input>
              </el-form-item>
            </el-form>
            <div slot="footer" class="dialog-footer">
              <el-button @click="dialogFormVisible1 = false">取 消</el-button>
              <el-button type="primary" @click="submitUp('uploading')"
                >确 定</el-button
              >
            </div>
          </el-dialog>
        </el-form-item>
        <!-- 新增计划 -->
        <el-form-item class="createBtn">
          <el-button
            type="primary"
            icon="el-icon-document-add"
            @click="
              dialogFormVisible2 = true;
              newly = {};
              resetForm('newly');
            "
            >新增计划</el-button
          >

        <!-- 上传计划 -->
        <el-button
          class="rightBtn"
          type="primary"
          icon="el-icon-document-add"
          @click="addPlan"
          >新增计划</el-button
        >
        <el-button
          class="rightBtn"
          type="primary"
          icon="el-icon-document-checked"
          >导出年度计划</el-button
        >
        <el-button
          class="rightBtn"
          type="primary"
          icon="el-icon-document-checked"
          >导出内部实施计划</el-button
        >
          <el-dialog
            title="新增计划"
            :visible.sync="dialogFormVisible2"
            width="55%"
          >
            <el-form :model="newly" :rules="rules2" ref="newly">
              <!-- 第一行 -->
              <el-row class="newly-margin-bottom">
                <el-col :span="12">
                  <el-form-item
                    label="计划时间:"
                    :label-width="formLabelWidth2"
                    prop="planTime"
                  >
                    <el-date-picker
                      class="newly-form"
                      v-model="newly.planTime"
                      type="date"
                      placeholder="请选择计划日期"
                      autocomplete="off"
                    >
                    </el-date-picker>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item
                    label="部门:"
                    :label-width="formLabelWidth2"
                    prop="department"
                  >
                    <el-input
                      class="newly-form"
                      v-model="newly.department"
                      placeholder="请选择部门"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
              <!-- 第二行 -->
              <el-row class="newly-margin-bottom">
                <el-col :span="12">
                  <el-form-item
                    label="性质:"
                    :label-width="formLabelWidth2"
                    prop="auditType"
                  >
                    <el-select
                      class="newly-form"
                      v-model="newly.auditType"
                      placeholder="请选择性质"
                      autocomplete="off"
                    >
                      <el-option label="内审" value="0"></el-option>
                      <el-option label="管理评审" value="1"></el-option>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item
                    label="审核目的:"
                    :label-width="formLabelWidth2"
                    prop="auditPurpose"
                  >
                    <el-input
                      class="newly-form"
                      v-model="newly.auditPurpose"
                      placeholder="请输入审核目的"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
              <!-- 第三行 -->
              <el-row class="newly-margin-bottom">
                <el-col :span="12">
                  <el-form-item
                    label="审核组长:"
                    :label-width="formLabelWidth2"
                    prop="auditLeader"
                  >
                    <el-input
                      class="newly-form"
                      v-model="newly.auditLeader"
                      placeholder="请输入审核组长"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item
                    label="审核范围:"
                    :label-width="formLabelWidth2"
                    prop="auditScope"
                  >
                    <el-input
                      class="newly-form"
                      v-model="newly.auditScope"
                      placeholder="请输入审核范围"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
              <!-- 第四行 -->
              <el-row class="newly-margin-bottom">
                <el-col :span="12">
                  <el-form-item
                    label="组员:"
                    :label-width="formLabelWidth2"
                    prop="auditEmp"
                  >
                    <el-input
                      class="newly-form"
                      v-model="newly.auditEmp"
                      placeholder="请输入组员"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item
                    label="审核依据:"
                    :label-width="formLabelWidth2"
                    prop="auditPursuant"
                  >
                    <el-input
                      class="newly-form"
                      v-model="newly.auditPursuant"
                      placeholder="请输入审核依据"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
              <!-- 第五行 -->
              <el-row class="newly-margin-bottom">
                <el-col :span="12">
                  <el-form-item
                    label="编制人:"
                    :label-width="formLabelWidth2"
                    prop="writeUser"
                  >
                    <el-input
                      class="newly-form"
                      v-model="newly.writeUser"
                      placeholder="请输入编制人"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item
                    label="审核日期:"
                    :label-width="formLabelWidth2"
                  >
                    <el-date-picker
                      class="newly-form"
                      v-model="newly.auditTime"
                      type="date"
                      placeholder="请选择审核日期"
                      autocomplete="off"
                    >
                    </el-date-picker>
                  </el-form-item>
                </el-col>
              </el-row>
            </el-form>
            <div slot="footer" class="dialog-footer">
              <el-button @click="dialogFormVisible2 = false">取 消</el-button>
              <el-button type="primary" @click="submitAddData('newly')"
                >确 定</el-button
              >
            </div>
          </el-dialog>
        </el-form-item>
        <!-- 导出年度计划 -->
        <el-form-item class="createBtn">
          <el-button type="primary" icon="el-icon-document-checked"
            >导出年度计划</el-button
          >
        </el-form-item>
        <el-form-item class="createBtn">
          <el-button type="primary" icon="el-icon-document-checked"
            >导出内部实施计划</el-button
          >
        </el-form-item>
      </el-form>
    </div>
    <div class="library-table">
@@ -160,13 +353,13 @@
          </el-table-column>
          <el-table-column label="操作" min-width="100" fixed="right">
            <template slot-scope="scope">
              <el-button type="text" size="small">查看</el-button>
              <el-button
                type="text"
                size="small"
                @click="handleClick(scope.row)"
                >查看</el-button
                @click="deleteClick(scope.row.id)"
                >删除</el-button
              >
              <el-button type="text" size="small">删除</el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -188,28 +381,148 @@
</template>

<script>
import { selectAllList, addCnasAnnualPlan } from "@/api/CNAS/reviewAnnualPlan";
import {
  selectAllList,
  addCnasAnnualPlan,
  addAccessory,
  deleteCnasAnnualPlan,
} from "@/api/CNAS/reviewAnnualPlan";
import { P } from "af-table-column";
export default {
  data() {
    return {
      input: [],
      input: "",
      auditTable: [],
      page: 1,
      total: 0,
      pageSize: 10,
      dialogFormVisible1: false,
      uploadingForm: {
      dialogFormVisible2: false,
      formLabelWidth1: "80px",
      formLabelWidth2: "80px",
      //上传附件参数
      uploading: {
        auditTime: "",
        keyboarder: "",
        keyboarder: "",
        //====================文件上传还没做,此处是应是文件参数,暂时还是文本
        accessoryFile: "",
      },
      formLabelWidth: "80px",
      rules1: {
        auditTime: [
          {
            type: "date",
            required: true,
            message: "请选择日期",
            trigger: "blur",
          },
        ],
        accessoryFile: [
          { required: true, message: "请输入活动名称", trigger: "blur" },
          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
        ],
      },
      //新增计划对象
      newly: {
        planTime: "",
        auditType: "",
        department: "",
        auditPurpose: "",
        auditLeader: "",
        auditEmp: "",
        auditPursuant: "",
        auditScope: "",
        writeUser: "",
        auditTime: "",
      },
      rules2: {
        planTime: [
          {
            type: "date",
            required: true,
            message: "请选择日期",
            trigger: "blur",
          },
        ],
        auditType: [
          { required: true, message: "请选择性质", trigger: "change" },
        ],
        department: [
          { required: true, message: "请输入部门", trigger: "blur" },
          { min: 1, max: 25, message: "字数过长", trigger: "blur" },
        ],
        auditPurpose: [
          { required: true, message: "请输入审核目的", trigger: "blur" },
          { min: 1, max: 25, message: "字数过长", trigger: "blur" },
        ],
        auditLeader: [
          { required: true, message: "请输入审核组长", trigger: "blur" },
          { min: 1, max: 25, message: "字数过长", trigger: "blur" },
        ],
        auditEmp: [
          { required: true, message: "请输入组员", trigger: "blur" },
          { min: 1, max: 25, message: "字数过长", trigger: "blur" },
        ],
        auditPursuant: [
          { required: true, message: "请输入审核依据", trigger: "blur" },
          { min: 1, max: 25, message: "字数过长", trigger: "blur" },
        ],
        auditScope: [
          { required: true, message: "请输入审核范围", trigger: "blur" },
          { min: 1, max: 5, message: "字数过长", trigger: "blur" },
        ],
        writeUser: [
          { required: true, message: "请输入编制人", trigger: "blur" },
          { min: 1, max: 25, message: "字数过长", trigger: "blur" },
        ],
      },
    };
  },
  created() {
    this.getData();
  },
  methods: {
    //====================================================上传附件
    //上传附件字段确认
    submitUp(uploading) {
      this.$refs[uploading].validate((valid) => {
        if (!valid) {
          return false;
        } else {
          //   this.upData();
        }
      });
    },
    // //上传附件
    // async upData() {
    //   try {
    //     const res = await addAccessory(this.uploading);
    //     console.log(res);
    //   } catch (error) {
    //     this.$message.error("添加失败");
    //   }
    //   this.resetData();
    //   this.dialogFormVisible1 = false;
    // },

    //新增计划字段确认
    submitAddData(newly) {
      this.$refs[newly].validate((valid) => {
        if (!valid) {
          return false;
        } else {
          this.addData();
        }
      });
    },
    //新增计划
    async addData() {
      try {
        const res = await deleteCnasAnnualPlan(this.newly);
      } catch (error) {
        this.$message.error("添加失败");
      }
      this.getData();
      this.dialogFormVisible2 = false;
    },
    // 每页条数改变时触发 选择一页显示多少行
    handleSizeChange(val) {
      console.log(`每页 ${val} 条`);
@@ -234,10 +547,29 @@
      const params = {
        page: this.page,
        pageSize: this.pageSize,
        planTime: this.input ? this.input : undefined,
      };
      const { data } = await selectAllList(params);
      this.auditTable = data.row;
      this.total = data.total;
    },
    async deleteOneData(planId) {
      await deleteCnasAnnualPlan({ planId: planId });
      this.getData();
      console.log(planId);
    },

    deleteClick(planId) {
      this.$confirm("确认删除?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
      }).then(() => {
        this.deleteOneData(planId);
      });
    },
    //重置表单
    resetForm(formName) {
      this.$refs[formName].resetFields();
    },
  },
};
@@ -250,7 +582,22 @@
  display: flex;
  justify-content: space-between;
  padding: 5px 24px 0px 24px;
  .input-form {
    width: 400px;
  }
  .uploading-form {
    // margin-bottom: 20px;
    width: 400px;
  }
  .newly-form {
    // margin-bottom: 20px;
    width: 400px;
  }
  .newly-margin-bottom {
    margin-bottom: 23px;
  }
}

.library-table {
  background-color: #fff;
  flex: 1;
@@ -258,6 +605,7 @@
  margin-top: 40px;
  display: flex;
  flex-direction: column;

  .table-box {
    padding: 0px 20px;
    margin-top: 20px;
@@ -275,4 +623,11 @@
    }
  }
}
.rightBtn {
  display: flex;
  justify-content: flex-end;
}
.createBtn {
  margin-left: 10px;
}
</style>

 src/views/experiment/checkTheReport/index.vue

@@ -24,11 +24,7 @@
        </el-dropdown>
      </el-form>
      <el-form>
        <el-button
          class="rightBtn"
          type="primary"
          icon="el-icon-document"
          @click="exportData"
        <el-button class="rightBtn" type="primary" icon="el-icon-document"
          >导出报告</el-button
        >
      </el-form>
@@ -70,19 +66,37 @@
            label="样品编号"
            sortable
            min-width="10%"
          />
          >
            <template slot-scope="scope">
              <span style="color: #409eff;">
                  {{ scope.row.materialCode }}
              </span>
            </template></el-table-column
          >
          <el-table-column
            prop="reportCode"
            prop="materialCode"
            label="报告单号"
            sortable
            min-width="10%"
          />
          >
            <template slot-scope="scope">
              <span style="color: #409eff;">
                  {{ scope.row.materialCode }}
              </span>
            </template></el-table-column
          >
          <el-table-column
            prop="inspectionCode"
            label="申请单号"
            sortable
            min-width="10%"
          />
          >
            <template slot-scope="scope">
              <span style="color: #409eff;">
                  {{ scope.row.inspectionCode }}
              </span>
            </template></el-table-column
          >
          <el-table-column prop="approver" label="审批人" min-width="8%">
            <template slot-scope="scope">
              <span>

 src/views/experiment/reportAuditing/index.vue

@@ -24,9 +24,7 @@
        </el-dropdown>
      </el-form>
      <el-form>
        <el-button class="rightBtn" type="primary" @click="exportData"
          >审核</el-button
        >
        <el-button class="rightBtn" type="primary">审核</el-button>
      </el-form>
    </div>
    <div class="library-table">
@@ -58,12 +56,20 @@
          style="width: 100%"
        >
          <el-table-column type="selection" label="" min-width="5%" />
          <el-table-column
            prop="materialCode"
            label="样品编号"
            min-width="10%"
          />
          <el-table-column prop="reportCode" label="报告单号" min-width="10%" />
          <el-table-column prop="materialCode" label="样品编号" min-width="10%">
            <template slot-scope="scope">
              <span style="color: #409eff">
                {{ scope.row.materialCode }}
              </span>
            </template></el-table-column
          >
          <el-table-column prop="reportCode" label="报告单号" min-width="10%">
            <template slot-scope="scope">
              <span style="color: #409eff">
                {{ scope.row.reportCode }}
              </span>
            </template></el-table-column
          >
          <el-table-column
            prop="materialName"
            label="样品名称"

 src/views/laboratory/ledger/index.vue

@@ -655,8 +655,7 @@
    <el-dialog
      title="提示"
      :visible.sync="deletedialogVisible"
      width="30%"
      :before-close="handleClose">
      width="30%">
      <span>确定删除该仪器吗？</span>
      <span slot="footer" class="dialog-footer">
        <el-button @click="deletedialogVisible = false">取 消</el-button>