Merge remote-tracking branch 'origin/dev' into dev

chenrui

2025-03-05 f6082c04ca8c98c1f130d88585d8e7cf67175279

Merge remote-tracking branch 'origin/dev' into dev

 src/api/business/materialInspection.js

@@ -92,7 +92,7 @@
export function rawAllExport(query) {
  return request({
    url: '/rawMaterialOrder/rawAllExport',
    method: 'post',
    method: 'get',
    data: query,
    responseType: "blob"
  })

 src/api/business/productOrder.js

@@ -21,7 +21,7 @@
export function rawAllInsOrderExport(query) {
  return request({
    url: '/insOrder/rawAllInsOrderExport',
    method: 'post',
    method: 'get',
    data: query,
    responseType: "blob"
  })
@@ -98,3 +98,27 @@
    data: query
  })
}
// 根据订单id查询样品
export function getSampleByOrderId(query) {
  return request({
    url: '/insOrder/getSampleByOrderId',
    method: 'get',
    params: query
  })
}
// 根据样品id查询检验项树
export function getProductTreeBySampleId(query) {
  return request({
    url: '/insOrder/getProductTreeBySampleId',
    method: 'get',
    params: query
  })
}
// 添加遗漏的检验项
export function addOmitOrderProduct(query) {
  return request({
    url: '/insOrder/addOmitOrderProduct',
    method: 'post',
    data: query
  })
}

 src/api/business/rawMaterialOrder.js

@@ -218,7 +218,7 @@
export function rawAllExport(query) {
  return request({
    url: '/rawMaterialOrder/rawAllExport',
    method: 'post',
    method: 'get',
    data: query,
    responseType: "blob"
  })

 src/assets/styles/variables.scss

@@ -1,25 +1,25 @@
// base color
$blue:#324157;
$light-blue:#3A71A8;
$red:#C03639;
$pink: #E65D6E;
$green: #30B08F;
$tiffany: #4AB7BD;
$yellow:#FEC171;
$panGreen: #30B08F;
$blue: #324157;
$light-blue: #3a71a8;
$red: #c03639;
$pink: #e65d6e;
$green: #30b08f;
$tiffany: #4ab7bd;
$yellow: #fec171;
$panGreen: #30b08f;

// 默认菜单主题风格
$base-menu-color:#bfcbd9;
$base-menu-color-active:#ffffff;
$base-menu-background:#1890FF;
$base-menu-color: #bfcbd9;
$base-menu-color-active: #ffffff;
$base-menu-background: #3a7bfa;
$base-logo-title-color: #ffffff;

$base-menu-light-color:#ffffff;
$base-menu-light-background:#1890FF;
$base-menu-light-color: #ffffff;
$base-menu-light-background: #3a7bfa;
$base-logo-light-title-color: #606266;

$base-sub-menu-background:#ffffff;
$base-sub-menu-hover:#001528;
$base-sub-menu-background: #ffffff;
$base-sub-menu-hover: #001528;

// 自定义暗色菜单风格
/**
@@ -50,5 +50,5 @@
  subMenuHover: $base-sub-menu-hover;
  sideBarWidth: $base-sidebar-width;
  logoTitleColor: $base-logo-title-color;
  logoLightTitleColor: $base-logo-light-title-color
  logoLightTitleColor: $base-logo-light-title-color;
}

 src/components/Table/value-table.vue

@@ -699,10 +699,6 @@
          }
        )
        .then((res) => {
          if (res.code === 201) {
            this.loading = false;
            return;
          }
          this.total = res.data.body.total;
          this.tableHead = res.data.head;
          this.tableData = res.data.records;
@@ -947,9 +943,6 @@
                  id: row.id,
                })
                .then((res) => {
                  if (res.code === 201) {
                    return;
                  }
                  this.$message.success("删除成功");
                  this.selectList("page");
                  this.$emit("delete");
@@ -1024,10 +1017,6 @@
          },
        })
        .then((res) => {
          if (res.code === 201) {
            this.upLoad = false;
            return;
          }
          this.$message.success("修改成功");
          this.upDia = false;
          this.selectList("page");

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

@@ -519,7 +519,8 @@
          delProcessDeal({ id: row.id }).then((res) => {
            if (res.code == 201) return;
            this.$message.success("删除成功");
            this.refresh();
            this.page.current = 0;
            this.getList();
          });
        })
        .catch(() => { });

 src/views/business/inspectionTask/index.vue

@@ -376,6 +376,9 @@
          formatData: (params) => {
            return this.urgencyLevel.find((m) => m.value == params).label;
          },
          formatType: (params) => {
            return this.urgencyLevel.find((m) => m.value == params).type;
          },
        },
        {
          label: "检验类型",
@@ -394,8 +397,7 @@
          prop: "insState",
          dataType: "tag",
          formatData: (params) => {
            return this.inspectionTaskState.find((m) => m.value == params)
              .label;
            return this.inspectionTaskState.find((m) => m.value == params).label;
          },
          formatType: (params) => {
            return this.inspectionTaskState.find((m) => m.value == params).type;
@@ -566,7 +568,7 @@
      // 数据查看相关字段---结束
    };
  },
  created() {
  mounted() {
    this.getAuthorizedPerson();
    this.currentTime = getYearAndMonthAndDays();
    this.getDicts("urgency_level").then((response) => {
@@ -576,8 +578,6 @@
      this.inspectionTaskState = this.dictToValue(response.data);
    });
    this.refreshTable();
  },
  mounted() {
    this.queryParams.userId = this.userId;
  },
  activated() {

 src/views/business/inspectionTask/inspection.vue

@@ -897,15 +897,12 @@
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          delfile({ id: row.id }).then((res) => {
            if (res.code == 201) return;
            this.$message.success("删除成功");
            this.refresh();
          });
        })
        .catch(() => { });
      }).then(() => {
        delfile({ id: row.id }).then((res) => {
          this.$message.success("删除成功");
          this.getList();
        });
      }).catch(() => { });
    },
    // 文件管理--结束

@@ -2857,7 +2854,7 @@
      this.upLoading = false;
      if (response.code == 200) {
        this.$message.success("上传成功");
        this.$refs.fileList.selectList();
        this.getList();
      }
    },
    beforeUpload(file) {

 src/views/business/materialOrder/copperOrder.vue

@@ -617,11 +617,12 @@
  mounted() {
    this.active = this.$route.query.active
    this.currentId = this.$route.query.currentId
    this.getInfoRow();
  },
  activated() {
    if (this.active==1) {
      this.getInfoRow();
    }
    this.active = this.$route.query.active
    this.currentId = this.$route.query.currentId
    this.getInfoRow();
  },
  methods: {
    getInfoRow() {
@@ -1195,7 +1196,7 @@
    },
    getProNum() {
      this.sampleSelectionList.forEach((m, i) => {
        Vue.set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
        Vue.set(this.sampleSelectionList[i], 'proNum', 1)
      })
      this.$refs.sampleTable.doLayout()
    },

 src/views/business/materialOrder/customsInspection.vue

@@ -235,7 +235,7 @@
        </el-table-column>
        <el-table-column align="center" label="待检项数量" prop="quantity" width="105">
          <template slot-scope="scope">
            <el-select v-model="scope.row.quantity" :disabled="active>1|| scope.$index !== 0 || sampleList.length > 1" clearable
            <el-select v-model="scope.row.quantity" disabled clearable
                       size="small">
              <el-option v-for="item in quantityList" :key="item.value" :label="item.label" :value="item.value"></el-option>
            </el-select>
@@ -639,11 +639,15 @@
    this.currentId = this.$route.query.currentId
    this.isReport = this.$route.query.isReport
    this.customsInspection = this.$route.query.customsInspection
    this.getInfo();
  },
  activated() {
    if (this.active==1) {
      this.getInfo();
    }
    this.active = this.$route.query.active
    this.orderType = this.$route.query.orderType
    this.currentId = this.$route.query.currentId
    this.isReport = this.$route.query.isReport
    this.customsInspection = this.$route.query.customsInspection
    this.getInfo();
  },
  getInfo() {
    this.getUserNowList() // 获取当前用户信息
@@ -900,10 +904,6 @@
            this.$message.error('请选择检验标准')
            return
          }
          if (!this.sampleList.every(m => m.quantity)) {
            this.$message.error('请选择待检项数量')
            return
          }
          const sampleList = this.HaveJson(this.sampleList)
          sampleList.forEach(item => {
            item.insProduct = this.productList
@@ -1021,7 +1021,6 @@
        }),
      }).then(res => {
        this.noNeedCheckLoad = false
        if (res.code == 201) return
        this.noNeedCheckDia = false
        this.$message.success('已提交')
        this.closeOpenPage()

 src/views/business/materialOrder/index.vue

@@ -359,8 +359,42 @@
      tableData2: [],
      tableLoading2: false,
      column2: [
        { label: '委托编号', prop: 'entrustCode' },
        { label: '检验状态', prop: 'inspectStatus' },
        { label: '委托编号', prop: 'entrustCode',width: "160px", },
        {
          dataType: 'tag',
          label: '检验状态',
          prop: 'inspectStatus',
          formatData: (params) => {
            if (params == 0) {
              return '检验中'
            } else if (params == 1) {
              return '合格'
            } else if (params == 2) {
              return '不合格'
            } else if (params == 3) {
              return '未下单'
            } else if (params == 4) {
              return '让步放行'
            } else {
              return null
            }
          },
          formatType: (params) => {
            if (params == 0) {
              return 'warning'
            } else if (params == 1) {
              return 'success'
            } else if (params == 2) {
              return 'danger'
            } else if (params == 3) {
              return 'info'
            } else if (params == 4) {
              return ''
            } else {
              return null
            }
          }
        },
        { label: '订单号', prop: 'orderNo' },
        { label: '抵达的采购数量', prop: 'qtyArrived' },
        { label: '下发时间', prop: 'sendTime' },
@@ -472,8 +506,42 @@
      tableData3: [],
      tableLoading3: false,
      column3: [
        { label: '委托编号', prop: 'entrustCode' },
        { label: '检验状态', prop: 'inspectStatus' },
        { label: '委托编号', prop: 'entrustCode',width: "160px", },
        {
          dataType: 'tag',
          label: '检验状态',
          prop: 'inspectStatus',
          formatData: (params) => {
            if (params == 0) {
              return '检验中'
            } else if (params == 1) {
              return '合格'
            } else if (params == 2) {
              return '不合格'
            } else if (params == 3) {
              return '未下单'
            } else if (params == 4) {
              return '让步放行'
            } else {
              return null
            }
          },
          formatType: (params) => {
            if (params == 0) {
              return 'warning'
            } else if (params == 1) {
              return 'success'
            } else if (params == 2) {
              return 'danger'
            } else if (params == 3) {
              return 'info'
            } else if (params == 4) {
              return ''
            } else {
              return null
            }
          }
        },
        { label: '订单号', prop: 'orderNo' },
        { label: '抵达的采购数量', prop: 'qtyArrived' },
        { label: '下发时间', prop: 'sendTime' },
@@ -538,8 +606,42 @@
      tableData4: [],
      tableLoading4: false,
      column4: [
        { label: '委托编号', prop: 'entrustCode' },
        { label: '检验状态', prop: 'inspectStatus' },
        { label: '委托编号', prop: 'entrustCode',width: "160px", },
        {
          dataType: 'tag',
          label: '检验状态',
          prop: 'inspectStatus',
          formatData: (params) => {
            if (params == 0) {
              return '检验中'
            } else if (params == 1) {
              return '合格'
            } else if (params == 2) {
              return '不合格'
            } else if (params == 3) {
              return '未下单'
            } else if (params == 4) {
              return '让步放行'
            } else {
              return null
            }
          },
          formatType: (params) => {
            if (params == 0) {
              return 'warning'
            } else if (params == 1) {
              return 'success'
            } else if (params == 2) {
              return 'danger'
            } else if (params == 3) {
              return 'info'
            } else if (params == 4) {
              return ''
            } else {
              return null
            }
          }
        },
        { label: '订单号', prop: 'orderNo' },
        { label: '抵达的采购数量', prop: 'qtyArrived' },
        { label: '下发时间', prop: 'sendTime' },
@@ -1077,8 +1179,8 @@
      this.outLoading = true
      rawAllExport({ entity: entity }).then(res => {
        this.outLoading = false
        let url = this.javaApi + '/word/' + res.data
        this.$download.saveAs(url, '原材料检测信息导出.xlsx');
        const blob = new Blob([res], { type: 'application/octet-stream' });
        this.$download.saveAs(blob, '原材料检测信息导出.xlsx');
      })
    },
    // 提交修改委托编号信息

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

@@ -46,7 +46,7 @@
      title="添加检验项"
      width="90%">
      <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table"
                max-height="700px" style="margin-bottom: 10px;" tooltip-effect="dark"
                max-height="580px" tooltip-effect="dark"
                @selection-change="selectProduct">
        <el-table-column type="selection" width="65"></el-table-column>
        <el-table-column label="检验项分类" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
@@ -105,6 +105,8 @@
</template>

<script>
import {addOmitOrderProduct, getProductTreeBySampleId, getSampleByOrderId} from "@/api/business/productOrder";

export default {
  name: "addInspectionDia",
  // import 引入的组件需要注入到对象中才能使用
@@ -132,10 +134,7 @@
  methods: {
    getDataList(row) {
      this.dialogVisible = true
      this.$axios.get(this.$api.insOrder.getSampleByOrderId + '?insOrderId=' + row.id).then(res => {
        if (res.code === 201) {
          return
        }
      getSampleByOrderId({insOrderId: row.id}).then(res => {
        this.sampleList = res.data
      })
    },
@@ -143,11 +142,8 @@
      this.itemDialogVisible = true
      this.getProductLoad = true
      this.id=row.id
      this.$axios.get(this.$api.insOrder.getProductTreeBySampleId + '?insSampleId=' + row.id).then(res => {
      getProductTreeBySampleId({insSampleId: row.id}).then(res => {
        this.getProductLoad = false
        if (res.code === 201) {
          return
        }
        this.productList = res.data
      }).catch(err => {
        this.getProductLoad = false
@@ -170,16 +166,8 @@
        type: 'warning'
      }).then(() => {
        this.upLoad = true
        this.$axios.post(this.$api.insOrder.addOmitOrderProduct,{insProductBindingList:this.productListSelected,insSampleId:this.id}, {
          headers: {
            "Content-Type": "application/json"
          },
          noQs: true
        } ).then(res => {
        addOmitOrderProduct({insProductBindingList:this.productListSelected,insSampleId:this.id}).then(res => {
          this.upLoad = false
          if (res.code === 201) {
            return
          }
          this.$message.success('添加成功！')
          this.itemDialogVisible = false
        }).catch(err => {
@@ -188,7 +176,7 @@
      }).catch(() => {
        this.$message({
          type: 'info',
          message: '已取消删除'
          message: '已取消添加'
        });
      });
    },

 src/views/business/productOrder/index.vue

@@ -316,6 +316,7 @@
} from "@/api/business/productOrder";
import { selectUserCondition } from "@/api/performance/class";
import { downFile, getFileList, selectSampleAndProductByOrderId } from "@/api/business/rawMaterialOrder";
import {mapGetters} from "vuex";
// import Inspection from "../do/b1-inspect-order-plan/Inspection.vue";
export default {
  components: {
@@ -736,6 +737,9 @@
      }
    }
  },
  computed: {
    ...mapGetters(["nickName"]),
  },
  mounted() {
    this.refreshTable()
    this.getAuthorizedPerson()
@@ -869,8 +873,8 @@
    // 导出记录
    downLoad() {
      rawAllInsOrderExport({ ...this.entity }).then(res => {
        let url = this.javaApi + '/word/' + res.data
        this.$download.saveAs(url, '委托检测信息导出.xlsx');
        const blob = new Blob([res], { type: 'application/octet-stream' });
        this.$download.saveAs(blob, '委托检测信息导出.xlsx');
      }).catch(err => {
        console.log('err---', err);
      })
@@ -1183,15 +1187,17 @@
      if (row.userName) {
        inspectorList = row.userName.split(',')
      }
      let user = JSON.parse(localStorage.getItem('user'))
      if (user) {
        inspectorList.push(user.name)
      }
      this.inspectorList = inspectorList
      this.sonLaboratory = row.sonLaboratory
      this.state = 3;
      this.typeSource = row.typeSource
      this.orderId = row.id
      inspectorList.push(this.nickName)
      this.$router.push({
        path: "/inspectionTask/inspection",
        query: {
          sonLaboratory: row.sonLaboratory,
          state: 3,
          typeSource: row.typeSource,
          orderId: row.id,
          inspectorList: inspectorList,
        },
      })
    },
    goback() {
      this.state = 0

 src/views/business/rawMaterialInspection/index.vue

@@ -792,8 +792,8 @@
        entity: entity
      }).then(res => {
        this.outLoading = false
        let url = this.javaApi + '/word/' + res.data
        this.$download.saveAs(url, "原材料检测信息导出.xlsx");
        const blob = new Blob([res], { type: 'application/octet-stream' });
        this.$download.saveAs(blob, "原材料检测信息导出.xlsx");
      })
    },
    clear() {

 src/views/business/reportPreparation/index.vue

@@ -600,8 +600,11 @@
      this.outLoading = true
      downAll({ ids: str }).then(res => {
        this.outLoading = false
        this.$download.saveAs(this.javaApi + res.message, row.fileName);
        this.$download.zip(res.data, '报告.zip');
      }).catch(() => {
        this.outLoading = false
      })

    },
    beforeUpload(file) {
      const isZip = file.type === 'application/zip' || file.name.endsWith('.zip');

 src/views/performance/class/index.vue

@@ -530,7 +530,6 @@
        laboratory: this.query.laboratory,
      }).then((res) => {
        this.pageLoading = false;
        if (res.code == 201) return;
        this.total = res.data.page.total;
        this.list = res.data.page.records.map((item) => {
          for (let key in item.monthlyAttendance) {
@@ -551,7 +550,9 @@
          };
          this.weeks.push(obj);
        });
      });
      }).catch(() => {
        this.pageLoading = false;
      })
    },
    initYear() {
      this.pageLoading = true;

 src/views/performance/manHour/workTimeManagement.vue

@@ -637,7 +637,6 @@
      })
        .then(() => {
          deleteAuxiliaryWorkingHoursDay({ id: row.id }).then((res) => {
            if (res.code == 201) return;
            this.$message.success("删除成功");
            this.refreshTable("page");
          });

 src/views/standard/model/index.vue

@@ -226,7 +226,6 @@
              delete params.id;
              addStandardTemplate(params)
                .then((res) => {
                  if (res.code == 201) return;
                  this.isShowCopyTem = false;
                  this.submitCopyInfoLoading = false;
                  this.$message.success("新增成功");
@@ -241,7 +240,6 @@
              params.thing = this.copyForm.thing ? this.copyForm.thing : "";
              upStandardTemplate(params)
                .then((res) => {
                  if (res.code == 201) return;
                  this.isShowCopyTem = false;
                  this.submitCopyInfoLoading = false;
                  this.$message.success("修改成功");
@@ -255,7 +253,6 @@
            case "复制模版":
              copyStandardTemplate(params)
                .then((res) => {
                  if (res.code == 201) return;
                  this.isShowCopyTem = false;
                  this.submitCopyInfoLoading = false;
                  this.$message.success("复制成功");
@@ -286,7 +283,6 @@
      })
        .then(() => {
          delStandardTemplate({ id: row.id }).then((res) => {
            if (res.code == 201) return;
            this.$message.success("删除成功");
            this.refreshTable("page");
          });
@@ -360,7 +356,6 @@
        thing: JSON.stringify(data),
        name: luckysheet.getWorkbookName(["name"]),
      }).then((res) => {
        if (res.code == 201) return;
        this.loading = false;
        this.$message.success("已保存");
        this.isShow = false;

 src/views/standard/standardLibrary/index.vue

@@ -778,7 +778,6 @@
          }
          this.selectTree = data2.replace(" - ", "");
          delStandardTree({ tree: this.selectTree }).then((res) => {
            if (res.code == 201) return;
            this.$message.success("已删除");
            let arr = this.selectTree.split(" - ");
            this.deleteStandard(this.list, arr[arr.length - 1]);

 src/views/structural/capabilityAndLaboratory/capability/index.vue

@@ -13,7 +13,7 @@
                     style="display: inline;margin-right: 8px"
                     :action="uploadAction1"
                     :before-upload="beforeUpload1" :headers="token" :on-error="onError1"
                     :on-success="handleSuccessUp" :show-file-list="false" accept='.doc,.docx,.xls,.xlsx'>
                     :on-success="handleSuccessUp1" :show-file-list="false" accept='.doc,.docx,.xls,.xlsx'>
            <el-button size="small" type="primary">导入</el-button>
          </el-upload>
          <el-button size="small" type="primary" v-if="radio === 1" @click="uploadDia = true">导入</el-button>
@@ -430,10 +430,10 @@
        return true;
      }
    },
    handleSuccessUp (response, file, fileList) {
      this.$refs.upload.clearFiles()
      if (response.code === 201) {
        this.$message.error(response.message)
    handleSuccessUp1 (response, file, fileList) {
      this.$refs.upload1.clearFiles()
      if (response.code !== 200) {
        this.$message.error(response.msg)
        return
      }
      this.$message.success('上传成功')

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

@@ -143,7 +143,7 @@
          <el-col :span="12">
            <el-form-item label="试验方法：" prop="method">
              <el-select v-model="editForm.method" clearable multiple placeholder="请选择" size="small" style="width: 100%">
                <el-option v-for="item in methodList" :key="item.value" :label="item.label" :value="item.value"></el-option>
                <el-option v-for="item in methodList" :key="item.value" :label="item.label" :value="item.label"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -317,7 +317,11 @@
          let obj = this.HaveJson(this.editForm)
          obj.method = JSON.stringify(obj.method)
          obj.sample = JSON.stringify(obj.sample)
          obj.radiusList = JSON.stringify(obj.radiusList)
          if (obj.radiusList?.length > 0) {
            obj.radiusList = JSON.stringify(obj.radiusList)
          } else {
            obj.radiusList = null
          }
          if(obj.id){
            // 修改
            upItemParameter(obj).then(res => {
@@ -387,7 +391,7 @@
            res.data.forEach(a => {
              data.push({
                label: a.code,
                value: a.code
                value: a.id,
              })
            })
            this.methodList = data

 src/views/system/user/index.vue

@@ -448,10 +448,6 @@
      }
      this.addLoad = true
      addDepartment(this.addOb).then(res => {
        if (res.code === 201) {
          this.addLoad = false
          return
        }
        this.$message.success('添加成功')
        this.addDia = false
        this.getList()
@@ -656,10 +652,6 @@
        person: this.multipleSelection,
        roleId: this.componentData.entity.roleId
      }).then(res => {
        if (res.code === 201) {
          this.addLoad = false
          return
        }
        this.$message.success('操作成功')
        this.multipleSelection = []
        this.$refs.personTable.clearSelection()