fix:返工剔除编辑优化，增加图纸编辑，工艺路线增加产品管理人字段

src/api/craft/route/index.ts

@@ -38,7 +38,7 @@ export function updateProcess(data: object) {
 // 编辑工艺 针对产品负责人的修改
 export function editRouteWith(data: object) {
   return request({
-    url: `/api/v1/op/route/update`,
+    url: `/api/v1/op/route/updateManager`,
     method: "post",
     data: data,
   });

src/views/base/craftManagement/route/index.vue

@@ -137,14 +137,30 @@
       width="500"
       align-center
     >
-      <el-form :model="form" label-width="auto" style="max-width: 800px">
-        <el-form-item label="工艺路线编号" prop="productManager">
-          <el-input v-model="form.productManager" />
+      <el-form
+        :model="form"
+        label-width="auto"
+        style="max-width: 800px"
+        :rules="rules"
+      >
+        <el-form-item label="产品负责人" prop="productManager">
+          <el-select
+            v-model="form.productManager"
+            placeholder="产品负责人"
+            filterable
+          >
+            <el-option
+              v-for="item in userList"
+              :key="item.userName"
+              :label="item.userName"
+              :value="item.userName"
+            />
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="productManagerVisible = false">取消</el-button>
+          <el-button @click="sureCancelProductManager">取消</el-button>
           <el-button type="primary" @click="sureToEditProductManager">
             确定
           </el-button>
@@ -162,7 +178,10 @@ import { copyRoute, editRouteWith } from "@/api/craft/route/index";
 import { getUserList } from "@/api/system/user/index";
 // 数据字典相关
 const { dicts } = useDictionaryStore();
-
+const sureCancelProductManager = () => {
+  productManagerVisible.value = false;
+  dataList();
+};
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -192,6 +211,11 @@ const showProductManager = (row, index) => {
   currentPMRow.value = row;
   form.value = row;
 };
+const rules = reactive({
+  productManager: [
+    { required: true, message: "产品管理员不能为空", trigger: "blur" },
+  ],
+});
 const sureToEditProductManager = () => {
   editRouteWith(currentPMRow.value).then(() => {
     dataList();

src/views/base/information/index.vue

@@ -7,7 +7,7 @@
       :data="data"
       :option="option"
       v-model:page="page"
-      @row-save="addRow"
+      @row-save="createRow"
       @row-update="updateRow"
       @row-del="deleteRow"
       @search-change="searchChange"
@@ -50,6 +50,18 @@
         <el-button @click="deleteRecord(row, index, done)" text type="primary"
           >删除</el-button
         >
+        <el-button @click="doEdit(row, index)" text type="primary"
+          >编辑</el-button
+        >
+      </template>
+      <template #menu-left="{ size }">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          :size="size"
+          @click="rowAdd"
+          >新增</el-button
+        >
       </template>
     </avue-crud>
 
@@ -82,6 +94,18 @@ const testFiles = () => {
   form.value.drawingPath = srcList.value[0];
   form.value.fileNameList = fileNameList.value;
 };
+const rowAdd = () => {
+  pdfUrlList.value = [];
+  srcList.value = [];
+  fileNameList.value = [];
+  crudRef.value.rowAdd();
+};
+const doEdit = (row, index) => {
+  pdfUrlList.value = [];
+  srcList.value = [];
+  fileNameList.value = [];
+  crudRef.value && crudRef.value.rowEdit(row, index);
+};
 const filePath = import.meta.env.VITE_APP_UPLOAD_URL;
 const test = () => {
   isShowTable.value = true;
@@ -95,12 +119,7 @@ const changeItem = (row) => {
   });
 };
 const form2 = ref(null);
-const addRow = (form2, done) => {
-  createRow(form, done, done);
-  pdfUrlList.value = [];
-  srcList.value = [];
-  fileNameList.value = [];
-};
+
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -153,8 +172,9 @@ const uploadFinished = () => {
 option.value = Object.assign(option.value, {
   selection: false,
   viewBtn: false,
-  editBtn: false,
   delBtn: false,
+  addBtn: false,
+  editBtn: false,
   menu: true,
   column: [
     {
@@ -163,6 +183,7 @@ option.value = Object.assign(option.value, {
       width: 150,
       search: true,
       overHidden: true,
+      editDisabled: true,
       rules: [
         {
           required: true,
@@ -186,6 +207,7 @@ option.value = Object.assign(option.value, {
       width: 150,
       overHidden: true,
       search: true,
+      editDisabled: true,
       rules: [
         {
           required: true,
@@ -200,7 +222,7 @@ option.value = Object.assign(option.value, {
       width: 150,
       search: true,
       overHidden: true,
-      editDisplay: false,
+      editDisabled: true,
       addDisplay: false,
       rules: [
         {
@@ -254,6 +276,7 @@ option.value = Object.assign(option.value, {
       type: "select",
       width: 100,
       overHidden: true,
+      editDisabled: true,
       dicUrl: dictDataUtil.request_url + "drawing_type",
       props: { label: "dictLabel", value: "dictValue" },
       rules: [
@@ -315,6 +338,7 @@ option.value = Object.assign(option.value, {
       prop: "drawingVersion",
       type: "number",
       precision: 1,
+      editDisabled: true,
       min: 0,
       rules: [
         {
@@ -338,6 +362,7 @@ option.value = Object.assign(option.value, {
       prop: "enable",
       width: 100,
       addDisplay: false,
+      editDisplay: false,
     },
   ],
 });

src/views/quality/rework/components/rework-detail.vue

@@ -20,7 +20,7 @@
         <el-button
           icon="el-icon-edit"
           text
-          v-if="props.status == 0"
+          v-if="props.status == 0 || props.status == 1"
           @click="doEdit(row, index)"
           type="primary"
           :size="size"

src/views/quality/rework/index.vue

@@ -29,7 +29,7 @@
           text
           @click="doEdit(row, index)"
           type="primary"
-          v-if="row.state === 0"
+          v-if="row.state === 0 || row.state === 1"
           :size="size"
           >编辑</el-button
         >