代码合并

zhuo

2025-05-20 7eb190f13437b2e67788e9f4bdea725fdb165f01

代码合并

 src/api/business/add.js

@@ -16,6 +16,14 @@
    data: query
  })
}
// æ£€éªŒç±»åˆ«ä¸ºæŠ½æ£€æ—¶æŽ‰æŽ¥å£
export function judgeNotSpotCheckOrder(query) {
  return request({
    url: '/insOrder/judgeNotSpotCheckOrder',
    method: 'post',
    data: query
  })
}
// æ·»åŠ æ£€éªŒä¸‹å•æ•°æ®
export function addInsOrder(query) {
  return request({

 src/api/cnas/process/ensureResults/managementReview.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
//质量监督管理评审输入材料相关接口
import request from '@/utils/request'

// åˆ†é¡µæŸ¥è¯¢
export function pageManagementReview(query) {
  return request({
    url: '/managementReview/pageManagementReview',
    method: 'get',
    params: query
  })
}
// å¯¼å‡º
export function exportManagementReview(query) {
  return request({
    url: '/managementReview/exportManagementReview',
    method: 'get',
    params: query,
    responseType: 'blob'
  })
}
// åˆ é™¤
export function deleteManagementReview(query) {
  return request({
    url: '/managementReview/deleteManagementReview',
    method: 'delete',
    params: query
  })
}
// æ–°å¢žä¿®æ”¹æäº¤
export function saveOrUpdateManagementReview(query) {
  return request({
    url: '/managementReview/saveOrUpdateManagementReview',
    method: 'post',
    data: query
  })
}

 src/api/cnas/process/reportResults.js

@@ -7,6 +7,7 @@
    url: "/processReport/exportProcessReport",
    method: "get",
    params: data,
    responseType: "blob",
  });
}


 src/components/Preview/filePreview.vue

@@ -3,10 +3,11 @@
    <div v-if="isImage">
      <img :src="imgUrl" alt="Image Preview" />
    </div>
    <div v-if="isPdf">
      <object :data="fileUrl" type="application/pdf" width="100%" height="750px">
        <p>您的浏览器不支持 PDF é¢„览。<a :href="fileUrl" style="color: #3a7bfa;" target="_blank">下载 PDF æ–‡ä»¶</a></p>
      </object>
    <div v-if="isPdf" style="height: 80vh;">
<!--      <object :data="fileUrl" type="application/pdf" width="100%" height="750px">-->
<!--        <p>您的浏览器不支持 PDF é¢„览。<a :href="fileUrl" style="color: #3a7bfa;" target="_blank">下载 PDF æ–‡ä»¶</a></p>-->
<!--      </object>-->
      <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
    </div>
    <div v-if="isDoc">
      <p v-if="!isDocShow">文档无法直接预览，请下载查看。</p>
@@ -58,8 +59,10 @@
import VueOfficeExcel from '@vue-office/excel'
//引入相关样式
import '@vue-office/excel/lib/index.css'
import onlyoffice from "@/components/Onlyoffice/onlyoffice.vue";
export default {
  components: {
    onlyoffice,
    VueOfficeDocx,
    VueOfficeExcel,
  },
@@ -72,6 +75,9 @@
      type: Object,
      required: true
    },
    option: {
      type: Object,
    },
  },
  data() {
    return {

 src/components/Table/lims-table.vue

@@ -505,4 +505,7 @@
.lims-table .highlight-danger-row-border td:last-child {
  border-right: 4px solid #f56c6c;
}
>>>.red-row td {
  background: #FFCCCC !important;
}
</style>

 src/layout/components/TagsView/index.vue

@@ -168,8 +168,12 @@
    closeSelectedTag(view) {
      this.$tab.closePage(view).then(({ visitedViews }) => {
        if (this.isActive(view)) {
          if (view.fullPath.includes('/materialOrder/customsInspectionOrder') || view.fullPath.includes('/materialOrder/customsInspectionView')) {
            this.$router.push('/business/materialOrder')
          } else {
          this.toLastView(visitedViews, view)
        }
        }
      })
    },
    closeRightTags() {

 src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue

@@ -85,7 +85,7 @@
    </el-dialog>
    <!--预览报告-->
    <el-dialog :visible.sync="lookDialogVisible" fullscreen title="查看附件" top="5vh" width="800px">
      <filePreview v-if="lookDialogVisible" :currentFile="{}"
      <filePreview v-if="lookDialogVisible" :currentFile="{}" :option="option"
        :fileUrl="javaApi + '/word/' + currentInfo.finishReportUrl" style="height: 70vh;overflow-y: auto;" />
      <div>
        æ‰¹å‡†çŠ¶æ€ï¼š
@@ -153,7 +153,7 @@
      <div style="margin: 0 auto;">
        <el-upload ref="upload1" :action="action1" :auto-upload="false"
          :data="{ qualityMonitorDetailsId: qualityMonitorDetailsId }" :file-list="fileList1" :headers="uploadHeader"
          :limit="1" :on-change="beforeUpload1" :on-error="onError1" :on-success="onSuccess1" accept='.doc,.docx' drag
          :limit="1" :on-change="beforeUpload1" :on-error="onError1" :on-success="onSuccess1" accept='.doc,.docx,application/pdf,' drag
          name="file">
          <i class="el-icon-upload"></i>
          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
@@ -569,7 +569,8 @@
      ratifyRemark: '',
      downloadDialog: false,
      download: {},
      planYear: ''
      planYear: '',
      option: {}
    };
  },
  mounted() {
@@ -802,6 +803,23 @@
      if (row.finishReportUrl) {
        this.currentInfo = row
        this.ratifyStatus = row.ratifyStatus
        const userName = this.nickName
        const isPdf = /\.pdf$/i.test(row.finishReportUrl)
        if (isPdf) {
          this.option = {
            url: this.javaApi + "/word/" + row.finishReportUrl,
            isEdit: false,
            fileType: 'pdf',
            title: '报告',
            lang: 'zh-CN',
            isPrint: false,
            user_id: 1,
            user_name: userName,
            editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + row.finishReportUrl
          }
        } else {
          this.option = {}
        }
        this.lookDialogVisible = true
      } else {
        this.uploadDia1 = true
@@ -935,7 +953,7 @@
  },
  // ç”¨äºŽä¸Šä¼ æ–‡ä»¶çš„信息
  computed: {
    ...mapGetters(["userId"]),
    ...mapGetters(["userId", "nickName"]),
    action() {
      return this.javaApi + '/qualityMonitor/importQualityMonitor'
    },

 src/views/CNAS/process/ensureResults/managementReview/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,284 @@
<template>
  <div class="capacity-scope">
    <div style="display: flex;justify-content: space-between">
      <div style="display: flex;">
        <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
          <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">文件名称</span>
          <el-input v-model="queryParams.fileName" clearable placeholder="请输入" size="small"
                    @keyup.enter.native="refreshTable()"></el-input>
        </div>
        <div style="line-height: 30px;">
          <el-button type="primary" size="mini" @click="refreshTable">查询</el-button>
          <el-button size="mini" @click="refresh">重置</el-button>
        </div>
      </div>
      <div style="line-height: 30px;">
        <el-button :loading="outLoading" size="small" type="primary" style="margin-right: 10px" @click="openForm('add')">新增</el-button>
      </div>
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 270px)'"
                  :page="page" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :visible.sync="addDialogVisible" title="评价" width="900px" @close="closeDia">
      <el-form ref="form" :model="form" label-position="right" label-width="120px" :rules="formRules">
        <el-row>
          <el-col :span="12">
            <el-form-item label="文件名称:" prop="fileName">
              <el-input v-model="form.fileName" placeholder="请输入" size="small"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="计划内容:" prop="implementationContent">
              <el-input v-model="form.implementationContent" placeholder="请输入"
                        size="small"
                        :rows="6"
                        type="textarea"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="动态内容:" prop="dynamicContent">
              <el-input v-model="form.dynamicContent" placeholder="请输入"
                        size="small"
                        :rows="6"
                        type="textarea"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="监督人:" prop="supervisor">
              <el-select v-model="form.supervisor"
                         clearable filterable
                         placeholder="请选择" size="small" style="width: 100%;">
                <el-option v-for="item in responsibleOptions" :key="item.name" :label="item.name" :value="item.name">
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="质量评审日期:" prop="superviseDate">
              <el-date-picker v-model="form.superviseDate" format="yyyy-MM-dd"
                              placeholder="选择日期" size="small" value-format="yyyy-MM-dd"
                              type="date" style="width: 100%"></el-date-picker>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="closeDia">取 æ¶ˆ</el-button>
        <el-button :loading="addLoading" type="primary" @click="handleAdd">ç¡® å®š</el-button>
      </span>
    </el-dialog>
  </div>
</template>

<script>
import limsTable from "@/components/Table/lims-table.vue";
import filePreview from "@/components/Preview/filePreview.vue";
import {
  exportProcessEvaluate,
  doProcessEvaluate,
  delProcessEvaluate,
  pageProcessEvaluate,
} from '@/api/cnas/process/uncertainty.js'
import { mapGetters } from "vuex";
import {
  deleteManagementReview,
  exportManagementReview,
  pageManagementReview, saveOrUpdateManagementReview
} from "@/api/cnas/process/ensureResults/managementReview";
import {selectUserCondition} from "@/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment";
export default {
  name: 'Uncertainty',
  components: {
    limsTable,
    filePreview
  },
  data() {
    return {
      addPower: false,
      outPower: false,
      outLoading: false,
      addDialogVisible: false,
      operationType: '',
      addInfo: {},
      addLoading: false,
      queryParams: {},
      tableData: [],
      column: [
        { label: "文件名称", prop: "fileName" },
        { label: "监督人", prop: "supervisor" },
        { label: "质量评审日期", prop: "superviseDate" },
        {
          dataType: "action",
          label: "操作",
          operation: [
            {
              name: "编辑",
              type: "text",
              clickFun: (row) => {
                this.openForm('edit', row);
              },
            },
            {
              name: "删除",
              type: "text",
              clickFun: (row) => {
                this.handleDelete(row);
              },
            },
            {
              name: "导出",
              type: "text",
              clickFun: (row) => {
                this.handleDown0(row);
              },
            },
          ],
        },
      ],
      page: {
        total: 0,
        size: 10,
        current: 0,
      },
      tableLoading: false,
      form: {
        fileName: '',
        implementationContent: '',
        dynamicContent: '',
        supervisor: '',
        superviseDate: '',
      },
      formRules: {
        fileName: [{required: true, message: '请填写文件名称',trigger: 'blur'}],
        implementationContent: [{required: true, message: '请填写计划内容',trigger: 'blur'}],
        dynamicContent: [{required: true, message: '请填动态内容',trigger: 'blur'}],
        supervisor: [{required: true, message: '请选择监督人',trigger: 'change'}],
        superviseDate: [{required: true, message: '请选择日期',trigger: 'change'}],
      },
      responsibleOptions: [],
    }
  },
  // ç”¨äºŽä¸Šä¼ æ–‡ä»¶çš„信息
  computed: {
    ...mapGetters(["userId"]),
  },
  mounted() {
    this.getList()
  },
  methods: {
    getList() {
      this.tableLoading = true;
      let param = { ...this.queryParams, ...this.page };
      delete param.total;
      pageManagementReview({ ...param })
        .then((res) => {
          this.tableLoading = false;
          if (res.code === 200) {
            this.tableData = res.data.records;
            this.page.total = res.data.total;
          }
        })
        .catch((err) => {
          this.tableLoading = false;
        });
    },
    pagination({ page, limit }) {
      this.page.current = page;
      this.page.size = limit;
      this.getList();
    },
    refresh() {
      this.queryParams = {};
      this.page.current = 1;
      this.getList();
    },
    refreshTable() {
      this.page.current = 1;
      this.getList();
    },
    handleDown0(row) {
      exportManagementReview({managementReviewId: row.managementReviewId}).then(res => {
        const blob = new Blob([res], { type: 'application/msword' });
        this.$download.saveAs(blob, row.fileName + '.docx');
      })
    },
    // æ‰“开新增编辑弹框
    openForm (type, row) {
      this.addDialogVisible = true;
      this.$nextTick(() => {
        this.form = {}
        this.$refs['form'].resetFields();
        if (type === 'edit') {
          this.form = {...row}
        }
        this.operationType = type;
        this.getUserList()
      })
    },
    // æäº¤è¡¨å•
    handleAdd() {
      this.addLoading = true;
      saveOrUpdateManagementReview(this.form).then((res) => {
        this.addLoading = false;
        this.$message.success('评价成功');
        this.closeDia();
        this.refreshTable()
      })
    },
    closeDia() {
      this.$refs['form'].resetFields();
      this.addDialogVisible = false;
    },
    handleDelete(row) {
      this.$confirm("是否删除该条数据?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      }).then(() => {
        deleteManagementReview({ managementReviewId: row.managementReviewId }).then((res) => {
          this.$message.success("删除成功");
          this.refresh();
        });
      }).catch(() => { });
    },
    getUserList(){
      selectUserCondition({type: 2}).then(res => {
        if (res.code == 200) {
          this.responsibleOptions = res.data
        }
      })
    },
  }
}
</script>

<style scoped>
.search {
  height: 46px;
  display: flex;
  justify-content: space-between;
}

.search_thing {
  width: 350px;
  display: flex;
  align-items: center;
}

.search_label {
  width: 80px;
  font-size: 14px;
  text-align: right;
}

.search_input {
  width: calc(100% - 80px);
}
</style>

 src/views/CNAS/process/reportResults/index.vue

@@ -19,8 +19,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 270px)'"
        :page="page" @pagination="pagination" :isSelection="true"
        :handleSelectionChange="handleSelectionChange"></lims-table>
        :page="page" @pagination="pagination"></lims-table>
    </div>
    <el-dialog :title="title" :visible.sync="addDialogVisible" width="400px" top="6vh">
      <el-row>
@@ -83,12 +82,8 @@
        <el-col :span="24" style="margin-bottom: 16px;">
          <div class="search_thing">
            <div class="search_label">签收人：</div>
            <div class="search_input">
              <el-select v-model="addInfo.signatory" placeholder="请选择" size="small" style="width: 100%;" multiple>
                <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
                </el-option>
              </el-select>
            </div>
            <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                                                v-model="addInfo.signatory"></el-input></div>
          </div>
        </el-col>
        <el-col :span="24" style="margin-bottom: 16px;">
@@ -132,11 +127,8 @@
      personList: [],
      title: '新增',
      addDialogVisible: false,
      addInfo: {
        signatory: []
      },
      addInfo: {},
      addLoading: false,
      mutilSelect: [],
      queryParams: {
        insReportCode: ''
      },
@@ -152,7 +144,7 @@
        { label: "发送方式", prop: "method" },
        { label: "发送日期", prop: "sendTime" },
        { label: "发送人", prop: "sendUserName" },
        { label: "签收人", prop: "signatoryName" },
        { label: "签收人", prop: "signatory" },
        { label: "备注", prop: "remark" },
        {
          dataType: "action",
@@ -191,21 +183,16 @@
  },
  methods: {
    handleDown() {
      if (this.mutilSelect.length == 0) {
        this.$message.warning('请选择要导出的数据')
        return
      }
      this.outLoading = true
      exportProcessReport({ ids: this.mutilSelect.map(m => m.id) }).then(res => {
      exportProcessReport(this.queryParams).then(res => {
        this.outLoading = false
        this.$download.saveAs(res.data, "报告结果");
        const blob = new Blob([res], { type: 'application/msword' });
        this.$download.saveAs(blob, '报告结果' + '.docx');
      })
    },
    openAdd() {
      this.title = '新增'
      this.addInfo = {
        signatory: []
      }
      this.addInfo = {}
      this.addDialogVisible = true;
    },
    getList() {
@@ -238,9 +225,6 @@
      this.page.current = 1;
      this.getList();
    },
    handleSelectionChange(val) {
      this.mutilSelect = val
    },
    getAuthorizedPerson() {
      selectUserCondition().then(res => {
        let data = []
@@ -258,13 +242,10 @@
      delete this.addInfo.createTime
      delete this.addInfo.createUser
      delete this.addInfo.updateTime
      delete this.addInfo.signatoryUrl
      delete this.addInfo.updateUserer
      delete this.addInfo.sendUserName
      let addInfo = this.HaveJson(this.addInfo)
      addInfo.signatory = addInfo.signatory.join(',')
      if (this.title == '新增') {
        addProcessReport(addInfo).then(res => {
        addProcessReport(this.addInfo).then(res => {
          this.addLoading = false
          this.addDialogVisible = false
          this.$message({
@@ -274,7 +255,7 @@
          this.refreshTable()
        }).catch(err => { })
      } else {
        doProcessReport(addInfo).then(res => {
        doProcessReport(this.addInfo).then(res => {
          this.addLoading = false
          this.addDialogVisible = false
          this.$message({
@@ -289,11 +270,7 @@
      this.title = '修改'
      this.addInfo = row
      console.log(this.addInfo)
      this.addInfo.signatory = this.addInfo.signatory ? this.addInfo.signatory.split(',').map(m => Number(m)) : []
      this.addDialogVisible = true;
    },
    handleChangeTask(list) {
      this.mutilSelect = list
    },
    handleDelete(row) {
      this.$confirm("是否删除该条数据?", "提示", {

 src/views/CNAS/resourceDemand/device/component/management.vue

@@ -16,9 +16,9 @@
                      @keyup.enter.native="refreshTable()">
            </el-input>
          </el-form-item>
          <el-form-item label="规格型号" prop="specificationModel">
          <el-form-item label="管理编号" prop="managementNumber">
            <el-input size="small" placeholder="请输入" clearable
                      v-model="queryParams.specificationModel" @keyup.enter.native="refreshTable()"></el-input>
                      v-model="queryParams.managementNumber" @keyup.enter.native="refreshTable()"></el-input>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" size="mini" @click="refreshTable">查询</el-button>
@@ -33,7 +33,7 @@
    </div>
        <div class="table" v-show="!showData">
            <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 300px)'"
                :page="page" @pagination="pagination"></lims-table>
                :page="page" @pagination="pagination" :row-class-name="tableRowClassName"></lims-table>
        </div>
        <el-dialog :title="isUp ? '设备详情' : '档案修订'" :visible.sync="dialogVisible" width="70%" top="5vh"
            :before-close="handleClose">
@@ -477,7 +477,7 @@
                { label: "管理编号", prop: "managementNumber" },
                { label: "技术指标", prop: "technicalIndicators" },
                { label: "购置日期", prop: "acquisitionDate" },
                { label: "启用日期", prop: "activationDate" },
                { label: "校准有效期", prop: "activationDate" },
                { label: "管理人", prop: "equipmentManagerUser" },
                { label: "存放点", prop: "storagePoint" },
                { label: "所属部门", prop: "laboratoryName" },
@@ -606,6 +606,18 @@
            this.page.size = limit;
            this.getList();
        },
    tableRowClassName({ row }) {
      const today = new Date();
      const targetDate = new Date(row.activationDate);
      const fiveDaysBeforeTarget = new Date(targetDate);
      // è®¡ç®—前五天的日期
      fiveDaysBeforeTarget.setDate(targetDate.getDate() - 5);
      // æ¯”较时需要确保比较的是完整的日期时间，包含时分秒
      if (today > fiveDaysBeforeTarget) {
        return 'red-row';
      }
      return '';
    },
        refresh() {
            this.queryParams = {};
            this.page.current = 1;

 src/views/CNAS/resourceDemand/device/component/record.vue

@@ -108,7 +108,8 @@
              prop="useDateList">
              <el-date-picker v-model="form.useDateList" :disabled="operationType === 'view'" end-placeholder="结束日期"
                format="yyyy-MM-dd HH:mm:ss" size="small" start-placeholder="开始日期" style="width:100%"
                type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss">
                type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
                              :picker-options="pickerOptions">
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -213,7 +214,12 @@
      dialogVisible: false,
      operationType: '',
      formParamList: [],
      tableLoading: false
      tableLoading: false,
      pickerOptions: {
        disabledDate(time) {
          return time.getTime() > Date.now();
        }
      }
    }
  },
  mounted() {

 src/views/CNAS/resourceDemand/device/index.vue

@@ -12,7 +12,9 @@
        <div slot-scope="{ node, data }" class="custom-tree-node">
          <el-row style="width: 100%;">
            <el-col :span="24">
              <p class="single-line-ellipsis" style="width: 100%">
              <p class="single-line-ellipsis" style="width: 100%" :style="{
              color: isLeafNode(data) && shouldHighlight(data) ? 'red' : ''
            }">
                <i :class="`node_i ${data.children != undefined
                  ? data.code === '[1]'
                    ? 'el-icon-folder-opened'
@@ -22,7 +24,9 @@
                  "></i>
                {{ data.label }}
              </p>
              <p>
              <p :style="{
              color: isLeafNode(data) && shouldHighlight(data) ? 'red' : ''
            }">
                {{ data.managementNumber === undefined ? '' : data.managementNumber }}
              </p>
            </el-col>
@@ -198,9 +202,25 @@
      treeDevice().then(res => {
        let data = res.data;
        this.list = data;
        console.log('this.list--', this.list)
        this.loading = false
      });
    },
    // åˆ¤æ–­æ˜¯å¦æ˜¯å¶å­èŠ‚点
    isLeafNode(data) {
      return !data.children || data.children.length === 0;
    },
    // åˆ¤æ–­æ˜¯å¦éœ€è¦æ ‡çº¢
    shouldHighlight(data) {
      if (!data.activationDate) return false;
      const today = new Date();
      const targetDate = new Date(data.activationDate);
      const fiveDaysBeforeTarget = new Date(targetDate);
      // è®¡ç®—前五天的日期
      fiveDaysBeforeTarget.setDate(targetDate.getDate() - 5);

      return today > fiveDaysBeforeTarget;
    },
    handleNodeClick(val, node, el) {
      // ç‚¹å‡»ä¸´æ—¶ç¼“å­˜
      this.clickNodeVal = val;

 src/views/business/inspectionTask/inspection.vue

@@ -2663,12 +2663,23 @@
          } else {
            param = this.param;
          }
          let isNoTestValue = ''
          for (let key in param) {
            if (param[key]) {
              if (param[key].insValue?.length === 0) {
                isNoTestValue = 1
              } else {
                isNoTestValue = ''
              }
            }
          }
          saveInsContext({
            param: JSON.stringify(param),
            currentTable: this.currentTable,
            sampleId: this.currentSample.id,
            orderId: this.orderId,
            sonLaboratory: this.sonLaboratory
            sonLaboratory: this.sonLaboratory,
            isNoTestValue: isNoTestValue
          }).then((res) => {
            this.$message.success("已保存");
          });

 src/views/business/materialOrder/customsInspectionOrder.vue

@@ -12,9 +12,13 @@
          <el-select v-show="active==1" v-model="template" placeholder="下单模板" size="small" style="margin-right: 10px;"
                     @change="selectInsOrderTemplateByIdList">
            <el-option v-for="(a, ai) in templates" :key="ai" :label="a.name" :value="a.id">
              <span style="float: left">{{ a.name }}</span>
              <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px"
                 @click.stop="handleDelete(a)"></i>
              <div style="display: flex; align-items: center; justify-content: space-between;">
                <span>{{ a.name }}</span>
                <i class="el-icon-delete"
                   style="color: #66b1ff; font-size: 16px; cursor: pointer;"
                   @click.stop="handleDelete(a)">
                </i>
              </div>
            </el-option>
          </el-select>
          <el-button v-show="active==1" size="small" @click="templateDia=true">

 src/views/business/productOrder/components/addOrder.vue

@@ -14,9 +14,13 @@
          <el-select v-show="active==1" v-model="template" placeholder="下单模板" size="small"
                     @change="selectInsOrderTemplateById">
            <el-option v-for="(a, ai) in templates" :key="ai" :label="a.name" :value="a.id">
              <span style="float: left">{{ a.name }}</span>
              <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px"
                 @click.stop="handleDelete(a)"></i>
              <div style="display: flex; align-items: center; justify-content: space-between;">
                <span>{{ a.name }}</span>
                <i class="el-icon-delete"
                   style="color: #66b1ff; font-size: 16px; cursor: pointer;"
                   @click.stop="handleDelete(a)">
                </i>
              </div>
            </el-option>
          </el-select>
          <el-button v-show="active==1" size="small" @click="templateDia=true">
@@ -587,7 +591,7 @@
} from "@/api/business/rawMaterialOrder";
import {
  addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
  getQuarterOnOrder, selectInsOrderTemplateById,
  getQuarterOnOrder, judgeNotSpotCheckOrder, selectInsOrderTemplateById,
  selectOrderManDay,
  updateInsOrder,
  upInsOrder,
@@ -598,6 +602,7 @@
import limsTable from "@/components/Table/lims-table.vue";
import {selectCustomPageList} from "@/api/system/customer";
import {mapGetters} from "vuex";
import {addQuarter, updateQuarterOnOrder} from "@/api/business/finishedProductSampling";

export default {
  name: 'AddOrder',
@@ -1255,14 +1260,41 @@
        }
      },
      saveMethod(sampleList){
        this.saveLoad = true
        if (this.addObj.quarterItemId) {
          this.addObj.quarterItemId = this.addObj.quarterItemId[1]
        }
        if(this.tabIndex==4&&this.active==2){
          if (this.addObj.createTime) {
            delete this.addObj.createTime
          }
        if (this.addObj.orderType === '抽检') {
          judgeNotSpotCheckOrder({ insOrder: this.addObj, sampleList: sampleList }).then(res => {
            if (res.data === true) {
              this.saveData(sampleList);
            } else {
              // const message = res.message.replace(/\n/g, '<br>');
              this.$confirm(res.message, '提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning',
                dangerouslyUseHTMLString: true, // ðŸ‘ˆ å…³é”®ç‚¹ï¼šå…è®¸ HTML
                message: res.message // è¿™é‡Œä¹Ÿå¯ä»¥çœç•¥ï¼Œå› ä¸ºç¬¬äºŒä¸ªå‚数是 title，第三个是 options
              }).then(() => {
                this.saveData(sampleList);
              }).catch(() => {
                this.$message({
                  type: 'info',
                  message: '已取消'
                });
              });
            }
          });
        } else {
          this.saveData(sampleList)
        }
      },
    saveData(sampleList) {
      this.saveLoad = true
      if(this.tabIndex==4&&this.active==2){
          // é€€å›žåŽæäº¤
          updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
            this.saveLoad = false
@@ -1283,7 +1315,6 @@
            this.saveLoad = false
          })
        }

      },
      upInsOrderOfState(state) {
        if (state == 1) {

 src/views/business/productOrder/index.vue

@@ -985,6 +985,16 @@
    },
    // ç‚¹å‡»æ ·å“åç§°
    selectAllByOne(row) {
      if (this.tabIndex === 4) {
        this.$router.push({
          path: "/productOrder/addOrder", query: {
            examine: 1,
            active: 2,
            currentId: row.id,
            tabIndex: this.tabIndex,
          }
        });
      } else {
      this.$router.push({
        path: "/productOrder/addView", query: {
          examine: 1,
@@ -993,6 +1003,8 @@
          tabIndex: this.tabIndex,
        }
      });
      }

    },
    // ä¿®æ”¹æ ·å“åž‹å·
    editSampleModel (row) {

 src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue

@@ -175,6 +175,15 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="抽检类型绑定：" prop="spotCheckType">
              <el-select v-model="editForm.spotCheckType" clearable placeholder="请选择" size="small" style="width: 100%">
                <el-option v-for="item in dict.type.spot_check_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
<!--        <el-col :span="12">-->
<!--          <el-form-item label="字典类型：" prop="dic">-->
<!--            <el-select v-model="editForm.dic" clearable placeholder="请选择" size="small" style="width: 100%">-->
@@ -207,7 +216,7 @@
  name: "EditForm",
  // import å¼•å…¥çš„组件需要注入到对象中才能使用
  components: {},
  dicts: ['sys_sub_lab', 'inspection_item_type', 'sys_unit', 'inspection_value_type', 'inspection_bsm'],
  dicts: ['sys_sub_lab', 'inspection_item_type', 'sys_unit', 'inspection_value_type', 'inspection_bsm', 'spot_check_type'],
  data() {
    // è¿™é‡Œå­˜æ”¾æ•°æ®
    return {
@@ -237,7 +246,8 @@
        inspectionItemClassEn: '', // æ£€éªŒé¡¹åˆ†ç±»EN
        method: '', // è¯•éªŒæ–¹æ³•
        radiusList: [], // æ¡ä»¶
        rates: '', // æ¡ä»¶
        rates: '', // æ”¶è´¹æ ‡å‡†(元/次)
        spotCheckType: '', // æŠ½æ£€ç±»åž‹ç»‘定
        deviceId: [], // è®¾å¤‡
      },
      sampleList: [], // æ£€éªŒå¯¹è±¡ä¸‹æ‹‰æ¡†
@@ -313,7 +323,8 @@
            inspectionItemClassEn: '', // æ£€éªŒé¡¹åˆ†ç±»EN
            method: '', // è¯•éªŒæ–¹æ³•
            radiusList: [], // æ¡ä»¶
            rates: '', // æ¡ä»¶
            rates: '', // æ”¶è´¹æ ‡å‡†(元/次)
            spotCheckType: '', // æŠ½æ£€ç±»åž‹ç»‘定
        }
        this.resetForm('editForm')
      } else {