Merge remote-tracking branch 'origin/master'

src/api/business/drawing.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+const baseUrl = import.meta.env.VITE_APP_BASE_API
+
+// 查询电子图纸列表
+export function listDrawing(query) {
+  return request({
+   url: baseUrl +'/business/drawing/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询图纸名
+export function drawingByName(query) {
+  return request({
+   url: baseUrl +'/business/drawing/byName',
+    method: 'get',
+    params: query
+  })
+}
+// 查询电子图纸详细
+export function getDrawing(id) {
+  return request({
+   url: baseUrl +'/business/drawing/' + id,
+    method: 'get'
+  })
+}
+
+// 新增电子图纸
+export function addDrawing(data) {
+  return request({
+   url: baseUrl +'/business/drawing',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电子图纸
+export function updateDrawing(data) {
+  return request({
+   url: baseUrl +'/business/drawing',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电子图纸
+export function delDrawing(id) {
+  return request({
+   url: baseUrl +'/business/drawing/' + id,
+    method: 'delete'
+  })
+}

src/api/business/drawingRecords.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+const baseUrl = import.meta.env.VITE_APP_BASE_API
+// 查询电子图纸操作记录列表
+export function listRecords(query) {
+  return request({
+    url: baseUrl +'/business/records/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电子图纸操作记录详细
+export function getRecords(id) {
+  return request({
+    url: baseUrl +'/business/records/' + id,
+    method: 'get'
+  })
+}
+
+// 新增电子图纸操作记录
+export function addRecords(data) {
+  return request({
+    url: baseUrl +'/business/records',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电子图纸操作记录
+export function updateRecords(data) {
+  return request({
+    url: baseUrl +'/business/records',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电子图纸操作记录
+export function delRecords(id) {
+  return request({
+    url: baseUrl +'/business/records/' + id,
+    method: 'delete'
+  })
+}

src/views/business/product/drawingForm.vue

@@ -0,0 +1,331 @@
+<template>
+  <!-- 添加或修改项目信息对话框 -->
+  <el-drawer v-model="visible" size="30%" direction="rtl" :close-on-press-escape="false">
+    <div class="page-container form-container">
+      <div class="form-btns-container">
+        <span class="title-label"><el-icon>
+            <Document />
+          </el-icon>
+          电子工艺图纸</span>
+      </div>
+
+      <!-- 搜索区域 -->
+      <el-form class="list-search-container" :inline="true">
+        <el-form-item>
+          <el-upload :action="webHost + '/common/upload'" :headers="headers" :on-success="handleSuccess"
+            :on-exceed="handleExceed" :before-upload="beforeUpload" :show-file-list="false">
+            <el-button type="success" icon="Plus">上传图纸
+            </el-button>
+          </el-upload>
+          <el-button type="primary" icon="Search" @click="handleRecords" style="margin-left: 10px;">操作历史
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <!-- 列表区 -->
+      <div class="el-table-container">
+        <el-table ref="equipmentTable" v-loading="loading" row-key="id" @selection-change="handleSelectionChange"
+          :data="form.drawingList" height="100%">
+          <!-- <el-table-column type="selection" width="40" align="center" /> -->
+          <el-table-column label="图纸" prop="drawingName" align="center" />
+          <el-table-column fixed="right" label="操作" align="center" width="140px">
+            <template #default="scope">
+              <el-button link type="primary" @click="handlePreview(scope.row)">预览
+              </el-button>
+              <el-button link type="success" plain @click="handleDownload(scope.row)">下载</el-button>
+
+              <el-button link type="danger" @click="handleDelete(scope.row.id)">删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <pagination v-show="total > 0" :total="total" v-model:page="form.pageNum" v-model:limit="form.pageSize"
+        @pagination="open" />
+    </div>
+
+    <el-dialog v-model="dialogVisible" width="1500px">
+      <iframe :src="pdfCover" style="width: 100%; height: 800px"></iframe>
+    </el-dialog>
+
+    <!-- 添加或修改app版本管理对话框 -->
+    <el-dialog title="查询到有同名文件" v-model="openRecords" width="280px" append-to-body>
+
+      <template #footer>
+        <div>
+          <el-button type="primary" @click="coverDrawing">覆 盖</el-button>
+          <el-button type="success" @click="saveDrawing">不 覆 盖</el-button>
+          <el-button type="info" @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </el-drawer>
+  <!-- 图纸弹窗 -->
+  <redcord-dialog ref="redcordsForm" />
+  <!-- <pdf :src="pdfUrl" /> -->
+</template>
+<script setup>
+// import  PDF  from 'vue-pdf';
+import {
+  listDrawing,
+  addDrawing,
+  delDrawing,
+  updateDrawing,
+  drawingByName
+} from "@/api/business/drawing";
+import { addRecords } from '@/api/business/drawingRecords'
+import redcordDialog from './recordsDialog'
+import { getToken } from '@/utils/auth'
+import useUserStore from '@/store/modules/user'
+const webHost = import.meta.env.VITE_APP_BASE_API
+const { proxy } = getCurrentInstance();
+const total = ref(0)
+const emit = defineEmits(["handleSaveResourceSuccess"]);
+/** 表单抽屉 页变量 */
+const processDetail = ref({});
+/**覆盖对话框显示 */
+const openRecords = ref(false)
+const formLoading = ref(false)
+const pdfCover = ref('')
+const dialogVisible = ref(false)
+/**覆盖用对象 */
+const editRow = ref({})
+const pdfUrl = ref('')
+/**不覆盖文件名 */
+const coverName = ref('')
+const repeatingDrawings = ref([])
+const selections = ref([]);
+const headers = { Authorization: getToken() }
+const loading = ref(false);
+const visible = ref(false);
+/** 查询对象 */
+const data = reactive({
+  form: {
+    pageNum: 1,
+    pageSize: 10,
+    groupDetailList: [],
+    code: "",
+    remark: "",
+    type: false
+  },
+  rules: {
+    code: [{ required: true, message: "资源组编码不能为空", trigger: "blur" }],
+  },
+});
+const { form, rules } = toRefs(data);
+
+/***********************  方法区  ****************************/
+/** 打开抽屉 */
+function open(row) {
+
+  processDetail.value = row
+  loading.value = true;
+  form.value.technologicalProcessDetailId = row.id
+  listDrawing(form.value).then(res => {
+    form.value.drawingList = res.rows
+    total.value = res.total
+
+  })
+  loading.value = false;
+  visible.value = true;
+};
+/**
+ * 打开操作页面
+ */
+function handleRecords() {
+  proxy.$refs.redcordsForm.open(processDetail.value);
+}
+
+/**
+ * 列表checkbox列选择 事件
+ */
+function handleSelectionChange(selection) {
+  selections.value = selection;
+}
+
+
+
+/** 文件下载 */
+function handleDownload(row) {
+
+  return new Promise((resolve, reject) => {
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', webHost + row.url, true);
+    xhr.responseType = 'blob';
+    xhr.upload.onprogress = (e) => {
+      if (e.lengthComputable) {
+        let progress = e.loaded / e.total;
+      }
+    };
+    xhr.onload = function () {
+      const url = window.URL.createObjectURL(xhr.response);
+      const eleLink = document.createElement('a');
+      eleLink.href = webHost + row.url;
+      eleLink.download = `${row.drawingName}`;
+      eleLink.style.display = 'none';
+      document.body.appendChild(eleLink);
+      eleLink.click();
+      document.body.removeChild(eleLink);
+
+      var recordsItem = {}
+      recordsItem.technologicalProcessDetailId = row.technologicalProcessDetailId;
+      recordsItem.technologicalProcessDetailDrawingId = row.id
+      recordsItem.userId = useUserStore().user.userId
+      recordsItem.type = "下载"
+      recordsItem.drawingName = row.drawingName
+      addRecords(recordsItem).then(res => {
+        if (res.code == 200) {
+          resolve('success');
+        }
+      })
+
+    };
+    xhr.onerror = (e) => {
+      proxy.$modal.msgError('下载文件失败!')
+      reject(e);
+    };
+    xhr.send();
+  });
+
+  // window.location.href = webHost + url
+}
+/**删除 */
+function handleDelete(id) {
+  proxy.$modal
+    .confirm('是否确认删除选中的电子图纸？')
+    .then(function () {
+      return delDrawing(id)
+    })
+    .then(() => {
+      reset();
+      open(processDetail.value)
+      proxy.$modal.msgSuccess('删除成功！')
+    })
+
+}
+
+/**上传成功回调 */
+function handleSuccess(row) {
+  form.value.url = row.fileName
+  console.log(row.fileName, "上传成功")
+  var fileDrawing = {}
+  fileDrawing.drawingName = row.originalFilename
+  fileDrawing.technologicalProcessDetailId = processDetail.value.id
+  drawingByName(fileDrawing).then(res => {
+    // debugger;
+    if (res.code == 200) {
+      console.log(res, "数据库查询")
+      repeatingDrawings.value = res.data
+      if (repeatingDrawings.value.length == 0) {
+        coverName.value = row.originalFilename
+        saveDrawing();
+      } else {
+        /**覆盖对象 */
+        editRow.value = JSON.parse(JSON.stringify(repeatingDrawings.value[0]));
+        editRow.value.url = form.value.url
+        //有同名文件，询问是否覆盖
+        openRecords.value = true
+        coverName.value = row.originalFilename
+        // coverName.value = row.originalFilename.slice(0, -4) + "_" + row.newFileName.slice(-6, -4) + row.originalFilename.slice(-4);
+      }
+    }
+  })
+}
+//覆盖保存
+function coverDrawing() {
+  updateDrawing(editRow.value).then(res => {
+    if (res.code == 200) {
+      reset();
+      open(processDetail.value)
+      formLoading.value = false
+      openRecords.value = false
+      // form.value.type = true
+      // form.value.drawingName = coverName.value
+      // saveDrawing();
+
+    }
+  })
+}
+//不覆盖保存
+function saveDrawing() {
+
+  form.value.drawingName = coverName.value
+  addDrawing(form.value).then(res => {
+    if (res.code == 200) {
+      reset();
+      open(processDetail.value)
+      formLoading.value = false
+      openRecords.value = false
+    }
+  })
+}
+
+/**预览 */
+function handlePreview(row) {
+
+  //  pdfUrl.value = webHost +row.url
+  dialogVisible.value = true
+  pdfCover.value = webHost + row.url
+  // window.open((webHost + row.url))
+}
+
+// 取消按钮
+function cancel() {
+  openRecords.value = false
+}
+/**文件数量超出的回调 */
+function handleExceed(files) {
+  form.value.url = files[0].url
+}
+/** 文件上传前的 回调事件 */
+function beforeUpload(file) {
+  formLoading.value = true
+  const allowedTypes = ['application/pdf'];
+  const isAllowed = allowedTypes.includes(file.type);
+  if (!isAllowed) {
+    proxy.$modal.msgError('只能上传 PDF 格式的文件!')
+    return false
+  }
+
+}
+/**
+ * 对话框关闭 事件
+ */
+function close() {
+  reset();
+  visible.value = false;
+}
+
+/** 表单重置 */
+function reset() {
+  form.value = {
+    pageNum: 1,
+    pageSize: 10,
+    code: null,
+    remark: null,
+    groupDetailList: [],
+    url: null,
+    drawingName: null,
+    type: false
+  };
+  coverName.value = ''
+  repeatingDrawings.value = []
+  proxy.resetForm("formRef");
+}
+
+
+
+
+
+/** 取消按钮 */
+const handleCancel = () => {
+  visible.value = false;
+  reset();
+};
+
+/** 暴露给父组件的方法 */
+defineExpose({
+  open,
+});
+</script>
+  

src/views/business/product/index.vue

@@ -160,6 +160,7 @@
 							<el-table-column label="工序简称" align="center" prop="processAlias" />
 							<el-table-column v-if="!editStatus" label="操作" width="140px" align="center">
 								<template #default="scope">
+									<el-button link type="primary" @click="handleShowResourceGroupDetailForm(scope.row)"  v-hasPermi="['business:product:add']"> 图纸 </el-button>
 									<el-button v-show="false" v-if="scope.row.editStatus && !editStatus" link type="primary" icon="Check" @click="handleSaveTechnologicalProcessDetail(scope.row)" v-hasPermi="['business:product:add']"> 保存 </el-button>
 									<el-button v-show="false" v-else-if="!editStatus && !scope.row.editStatus" link type="warning" icon="Edit" @click.prevent="scope.row.editStatus = true" v-hasPermi="['business:product:edit']"> 编辑 </el-button>
 									<el-button v-show="false" link type="danger" icon="Delete" @click="handleDeleteTechnologicalProcessDetail(scope.row, scope.$index)" v-hasPermi="['business:product:remove']"> 删除 </el-button>
@@ -174,6 +175,8 @@
 		<product-form ref="productRef" @handleSaveSuccess="handleQueryProduct"></product-form>
 		<!-- 工序弹窗 -->
 		<process-choice ref="processChoiceRef" :multiple-selected="handleProcessSelected"></process-choice>
+		<!-- 图纸弹窗 -->
+		<drawing ref="drawingForm" @handleSaveResourceSuccess="handleRefreshEquipment"/>
 	</div>
 </template>
 
@@ -182,6 +185,7 @@ import { listProduct, delProduct } from '@/api/business/product'
 import { getP2Product } from '@/api/business/p2.js'
 import productForm from './form'
 import processChoice from './DialogProcessChoice'
+import drawing from './drawingForm'
 import { listTechnologicalProcessDetail, saveTechnologicalProcessDetail, delTechnologicalProcessDetail, saveSingleTechnologicalProcessDetail } from '@/api/business/technologicalProcessDetail'
 import { listTechnologicalProcess, saveTechnologicalProcess, delTechnologicalProcess } from '@/api/business/technologicalProcess'
 import { ref } from 'vue'
@@ -526,6 +530,19 @@ function handleAddProcess() {
 	proxy.$refs.processChoiceRef.open()
 }
 
+/**
+ * 打开图纸抽屉
+ */
+function handleShowResourceGroupDetailForm(row) {
+	console.log(row)
+    proxy.$refs.drawingForm.open(row);
+ 
+}
+
+function handleRefreshEquipment(){
+
+}
+
 onMounted(() => {
 	getList()
 })

src/views/business/product/recordsDialog.vue

@@ -0,0 +1,100 @@
+<template>
+  <el-dialog title="电子图纸操作记录" v-model="visible" :width="width" @close="close" append-to-body draggable>
+    <template #header>
+      <span style="color: #fff">电子图纸操作记录</span>
+    </template>
+    <div class="page-container column-container">
+      <el-table ref="dialogTable" :data="list" height="460px" row-key="id" align="center">
+        <el-table-column label="行号" type="index" width="50" align="center" />
+        <el-table-column label="操作人" prop="userName" align="center" />
+        <el-table-column label="操作图纸名称" prop="drawingName" align="center" />
+        <el-table-column label="产品描述"  align="center" >
+          <template #default="scope" >
+            <span>{{ scope.row.processDetail.productDescription }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工艺版本" prop="type" align="center" >
+          <template #default="scope" >
+            <span>{{ scope.row.processDetail.technologyVersion }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工序编码" prop="type" align="center"  >
+          <template #default="scope" >
+            <span>{{ scope.row.processDetail.processCode }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工序简称" prop="type" align="center"  >
+          <template #default="scope" >
+            <span>{{ scope.row.processDetail.processAlias }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作时间" prop="createTime" align="center" />
+        <el-table-column label="操作类型" prop="type" align="center" />
+      </el-table>
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
+    
+  </el-dialog>
+</template>
+<script setup>
+import { ref } from '@vue/reactivity'
+import { listRecords } from '@/api/business/drawingRecords'
+const { proxy } = getCurrentInstance()
+const visible = ref(false)
+/**设备弹窗变量 */
+const total = ref(0)
+const props = defineProps({
+  width: {
+    type: String,
+    default: '900px'
+  }
+})
+const list = ref([])
+
+/**查询对象 */
+const data = reactive({
+  queryParams: {
+    name: '',
+    pageSize: 10,
+    pageNum: 1
+  }
+})
+const { queryParams } = toRefs(data)
+/***********************  方法区  ****************************/
+/**
+ * 对话框打开 事件
+ */
+function open(row) {
+  visible.value = true
+  if (row) {
+    console.log(row)
+    queryParams.value.technologicalProcessDetailId = row.id
+    getList()
+
+  }
+}
+
+/**
+ * 对话框关闭 事件
+ */
+function close() {
+  // proxy.$refs.dialogForm.resetFields()
+  proxy.$refs.dialogTable.clearSelection()
+  // handleSearch('clear')
+  visible.value = false
+}
+
+/**
+ * 加载数据
+ */
+function getList() {
+  listRecords(queryParams.value).then((res) => {
+    list.value = res.rows
+    total.value = res.total
+  })
+}
+
+defineExpose({
+  open
+})
+</script>

src/views/business/supplier/index.vue

@@ -5,24 +5,16 @@
 			<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
 				<el-form-item class="section-title" label="外协商管理" />
 				<el-form-item label="外协商名称：">
-					<el-input
-						placeholder="请输入关键字"
-						v-model.trim="queryParams.name"
-						style="width: 120px"
-						clearable
-						@keyup.enter="handleQuery"
-						@keydown.enter.prevent
-					/>
+					<el-input placeholder="请输入关键字" v-model.trim="queryParams.name" style="width: 120px" clearable
+						@keyup.enter="handleQuery" @keydown.enter.prevent />
 				</el-form-item>
 				<el-form-item label="助记码：">
-					<el-input
-						placeholder="请输入关键字"
-						v-model.trim="queryParams.mnemonicCode"
-						style="width: 120px"
-						clearable
-						@keyup.enter="handleQuery"
-						@keydown.enter.prevent
-					/>
+					<el-input placeholder="请输入助记码" v-model.trim="queryParams.mnemonicCode" style="width: 120px" clearable
+						@keyup.enter="handleQuery" @keydown.enter.prevent />
+				</el-form-item>
+				<el-form-item label="外协厂编码：">
+					<el-input placeholder="请输入外协厂编码" v-model.trim="queryParams.code" style="width: 120px" clearable
+						@keyup.enter="handleQuery" @keydown.enter.prevent />
 				</el-form-item>
 				<el-form-item>
 					<el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
@@ -32,18 +24,11 @@
 			<!-- 列表区 -->
 			<div class="el-table-container">
 				<div class="el-table-inner-container">
-					<el-table
-						ref="supplierTable"
-						v-loading="loading"
-						border
-						:data="supplierList"
-						highlight-current-row
-						height="100%"
-						@current-change="handleCurrentSupplierChange"
-					>
+					<el-table ref="supplierTable" v-loading="loading" border :data="supplierList" highlight-current-row
+						height="100%" @current-change="handleCurrentSupplierChange">
 						<el-table-column type="index" label="行号" width="50" align="center" />
 						<el-table-column label="外协商名称" width="320" align="center" prop="name" />
-						<el-table-column label="助记码" width="120" align="center" prop="mnemonicCode" />
+						<el-table-column label="外协厂编码" width="120" align="center" prop="code" />
 						<el-table-column label="发货方式" width="96" align="center" prop="deliveryMethod">
 							<template #default="scope">
 								<dict-tag :options="delivery_method" :value="scope.row.deliveryMethod" />
@@ -58,44 +43,24 @@
 							<template #default="scope"> {{ scope.row.lossLimit }}% </template>
 						</el-table-column>
 						<el-table-column label="默认联系人" width="120" align="center" prop="contactName" />
-							<el-table-column label="默认联系电话" width="120" align="center" prop="contactPhoneNumber" />
+						<el-table-column label="默认联系电话" width="120" align="center" prop="contactPhoneNumber" />
 						<el-table-column label="备注" align="center" prop="remark" />
 						<el-table-column label="操作" width="350" align="center">
 							<template #default="scope">
-								<el-button
-									v-hasPermi="['business:supplier:edit']"
-									link
-									type="primary"
-									icon="User"
-									@click="handleSetSupplierAdmin(scope.row)"
-								>
+								<el-button v-hasPermi="['business:supplier:edit']" link type="primary" icon="User"
+									@click="handleSetSupplierAdmin(scope.row)">
 									设置管理员
 								</el-button>
-								<el-button
-									v-hasPermi="['business:supplier:edit']"
-									link
-									type="success"
-									icon="Iphone"
-									@click="handleSetSupplierContacts(scope.row)"
-								>
+								<el-button v-hasPermi="['business:supplier:edit']" link type="success" icon="Iphone"
+									@click="handleSetSupplierContacts(scope.row)">
 									设置联系人
 								</el-button>
-								<el-button
-									v-hasPermi="['business:supplier:edit']"
-									link
-									type="warning"
-									icon="Edit"
-									@click="handleShowSupplierDialog(scope.row)"
-								>
+								<el-button v-hasPermi="['business:supplier:edit']" link type="warning" icon="Edit"
+									@click="handleShowSupplierDialog(scope.row)">
 									编辑
 								</el-button>
-								<el-button
-									v-hasPermi="['business:supplier:remove']"
-									link
-									type="danger"
-									icon="Delete"
-									@click="handleDelete(scope.row)"
-								>
+								<el-button v-hasPermi="['business:supplier:remove']" link type="danger" icon="Delete"
+									@click="handleDelete(scope.row)">
 									删除
 								</el-button>
 							</template>
@@ -105,13 +70,8 @@
 			</div>
 		</section>
 		<!-- 分页 -->
-		<pagination
-			v-show="supplierTotal > 0"
-			:total="supplierTotal"
-			v-model:page="queryParams.pageNum"
-			v-model:limit="queryParams.pageSize"
-			@pagination="getList"
-		/>
+		<pagination v-show="supplierTotal > 0" :total="supplierTotal" v-model:page="queryParams.pageNum"
+			v-model:limit="queryParams.pageSize" @pagination="getList" />
 
 		<section class="list-part-container row-container" style="flex: 1">
 			<section class="list-part-container" style="flex: 2">
@@ -119,39 +79,22 @@
 				<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
 					<el-form-item class="section-title" label="产品" />
 					<el-form-item label="产品描述：">
-						<el-input
-							placeholder="请输入关键字"
-							v-model.trim="queryProductParams.productDescription"
-							style="width: 120px"
-							clearable
-							@keyup.enter="handleQuery"
-							@keydown.enter.prevent
-						/>
+						<el-input placeholder="请输入关键字" v-model.trim="queryProductParams.productDescription" style="width: 120px"
+							clearable @keyup.enter="handleQuery" @keydown.enter.prevent />
 					</el-form-item>
 					<el-form-item>
 						<el-button type="info" icon="Search" @click="handleQueryProducts">搜索</el-button>
-						<el-button
-							type="primary"
-							icon="Plus"
-							@click="handleShowProductsDialog(null)"
-							:disabled="!currentSupplier.id"
-						>
+						<el-button type="primary" icon="Plus" @click="handleShowProductsDialog(null)"
+							:disabled="!currentSupplier.id">
 							添加产品
 						</el-button>
 					</el-form-item>
 				</el-form>
 				<div class="el-table-container">
 					<div class="el-table-inner-container">
-						<el-table
-							ref="productTable"
-							:data="supplierProductList ? supplierProductList : []"
-							v-loading="supplierProductLoading"
-							highlight-current-row
-							height="100%"
-							size="small"
-							header-row-class-name="list-header-row"
-							@current-change="handleCurrentProductChange"
-						>
+						<el-table ref="productTable" :data="supplierProductList ? supplierProductList : []"
+							v-loading="supplierProductLoading" highlight-current-row height="100%" size="small"
+							header-row-class-name="list-header-row" @current-change="handleCurrentProductChange">
 							<el-table-column type="index" label="行号" width="50" align="center" />
 							<el-table-column label="料号" width="120" align="center" prop="productCode" />
 							<el-table-column label="产品描述" align="center" prop="productDescription" />
@@ -164,38 +107,21 @@
 					</div>
 				</div>
 				<!-- 分页 -->
-				<pagination
-					v-show="productTotal > 0"
-					:total="productTotal"
-					v-model:page="queryProductParams.pageNum"
-					v-model:limit="queryProductParams.pageSize"
-					@pagination="getCurrentSupplierProduct"
-				/>
+				<pagination v-show="productTotal > 0" :total="productTotal" v-model:page="queryProductParams.pageNum"
+					v-model:limit="queryProductParams.pageSize" @pagination="getCurrentSupplierProduct" />
 			</section>
 			<section class="list-part-container" style="flex: 3">
-				<el-form
-					class="list-search-container list-search-container-child"
-					:model="queryParams"
-					ref="queryRef"
-					:inline="true"
-				>
+				<el-form class="list-search-container list-search-container-child" :model="queryParams" ref="queryRef"
+					:inline="true">
 					<el-form-item class="section-title" label="外协工序" />
 					<el-form-item>
-						<el-button
-							type="primary"
-							icon="Plus"
-							@click="handleShowProcessesDialog"
-							:disabled="!currentProduct.id || processEditStatus"
-						>
+						<el-button type="primary" icon="Plus" @click="handleShowProcessesDialog"
+							:disabled="!currentProduct.id || processEditStatus">
 							添加工序
 						</el-button>
-						<el-button
-							v-if="!processEditStatus"
-							type="warning"
-							icon="Edit"
+						<el-button v-if="!processEditStatus" type="warning" icon="Edit"
 							:disabled="!currentProduct.id || supplierProductProcessList.length === 0"
-							@click="processEditStatus = true"
-						>
+							@click="processEditStatus = true">
 							编辑
 						</el-button>
 						<template v-if="processEditStatus">
@@ -206,38 +132,24 @@
 				</el-form>
 				<div class="el-table-container">
 					<div class="el-table-inner-container">
-						<el-table
-							:data="supplierProductProcessList"
-							v-loading="supplierProductProcessLoading"
-							highlight-current-row
-							height="100%"
-						>
+						<el-table :data="supplierProductProcessList" v-loading="supplierProductProcessLoading" highlight-current-row
+							height="100%">
 							<el-table-column type="index" label="行号" width="50" align="center" />
 							<el-table-column label="工序编码" width="120" align="center" prop="processCode" />
 							<el-table-column label="工序简称" width="120" align="center" prop="processAlias" />
 							<el-table-column label="结算方式" width="120" align="center" prop="settlementType">
 								<template #default="scope">
 									<el-select v-if="processEditStatus" v-model="scope.row.settlementType" clearable placeholder="请选择">
-										<el-option
-											v-for="dict in settlement_type"
-											:key="dict.value"
-											:label="dict.label"
-											:value="dict.value"
-										/>
+										<el-option v-for="dict in settlement_type" :key="dict.value" :label="dict.label"
+											:value="dict.value" />
 									</el-select>
 									<dict-tag v-else :options="settlement_type" :value="scope.row.settlementType" />
 								</template>
 							</el-table-column>
 							<el-table-column label="单价(元)" width="120" align="center" prop="price">
 								<template #default="scope">
-									<el-input-number
-										v-if="processEditStatus"
-										v-model="scope.row.price"
-										:precision="8"
-										:min="0.0"
-										:step="0.00000001"
-										controls-position="right"
-									/>
+									<el-input-number v-if="processEditStatus" v-model="scope.row.price" :precision="8" :min="0.0"
+										:step="0.00000001" controls-position="right" />
 									<span v-else>{{ scope.row.priceLabel }}</span>
 								</template>
 							</el-table-column>
@@ -258,24 +170,17 @@
 			</section>
 		</section>
 		<!-- 供应商表单 -->
-		<dialog-form
-			ref="formRef"
-			@handleSaveSuccess="handleQuery"
-			:delivery-method="delivery_method"
-			:settlement-type="settlement_type"
-		/>
+		<dialog-form ref="formRef" @handleSaveSuccess="handleQuery" :delivery-method="delivery_method"
+			:settlement-type="settlement_type" />
 		<!-- 产品添加对话框 -->
 		<dialog-products ref="productsRef" :supplier-id="currentSupplier.id" :multiple-selected="handleProductSelected" />
 		<!-- 工序添加对话框 -->
-		<dialog-processes
-			ref="processesRef"
-			:product-id="currentProduct.productId"
-			:multiple-selected="handleProcessSelected"
-		/>
+		<dialog-processes ref="processesRef" :product-id="currentProduct.productId"
+			:multiple-selected="handleProcessSelected" />
 		<!-- 管理员设置 -->
 		<dialog-set-admin ref="setAdminRef" />
 		<!-- 联系人设置 -->
-		<contacts-form ref="setContactsRef" @handleSaveSuccess =getList() />
+		<contacts-form ref="setContactsRef" @handleSaveSuccess=getList() />
 	</div>
 </template>
 
@@ -384,7 +289,7 @@ const handleDelete = (row) => {
 				}
 			})
 		})
-		.catch(() => {})
+		.catch(() => { })
 }
 
 /** 设置管理员 **/
@@ -413,7 +318,7 @@ const getCurrentSupplierProduct = () => {
 		if (supplierProductList.value.length > 0) {
 			currentProduct.value = supplierProductList.value[0]
 			proxy.$refs.productTable.setCurrentRow(supplierProductList.value[0])
-		}else{
+		} else {
 			supplierProductProcessList.value = []
 			currentProduct.value = {}
 		}
@@ -463,7 +368,7 @@ const handleDelProduct = (row) => {
 				}
 			})
 		})
-		.catch(() => {})
+		.catch(() => { })
 }
 
 /**************************************** 工序相关 ****************************************/
@@ -505,7 +410,7 @@ const handleProcessSelected = (selection) => {
 			price: 0.0,
 			settlementType: currentSupplier.value.settlementType,
 			remark: '',
-			supplierProductId:currentProduct.value.id
+			supplierProductId: currentProduct.value.id
 		}
 		dataList.push(newProcess)
 	})
@@ -539,7 +444,7 @@ const handleDelProcess = (row) => {
 				}
 			})
 		})
-		.catch(() => {})
+		.catch(() => { })
 }
 
 onMounted(() => {