修改目前所用模块删除信息提示内容

src/views/mes/hw/information/index.vue

@@ -423,6 +423,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      codes: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -641,6 +642,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
+      this.codes = selection.map((item) => item.hardwareCode);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -686,8 +688,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const repairIds = row.id || this.ids;
+      const repairCodes = row.hardwareCode || this.codes;
       this.$modal
-        .confirm('是否确认删除硬件编号为"' + repairIds + '"的数据项？')
+        .confirm('是否确认删除硬件编码为"' + repairCodes + '"的数据项？')
         .then(function () {
           return delHardware(repairIds);
         })

src/views/mes/hw/type/index.vue

@@ -48,10 +48,10 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-        >搜索</el-button
+          >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置</el-button
+          >重置</el-button
         >
       </el-form-item>
     </el-form>
@@ -60,7 +60,7 @@
       :data="machinerytypeList"
       row-key="id"
       default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
       <el-table-column
         label="硬件编号"
@@ -86,19 +86,19 @@
           <!--          />-->
         </template>
       </el-table-column>
-<!--      <el-table-column label="硬件层级" align="center" prop="level">-->
-<!--        <template slot-scope="scope">-->
-<!--          {{-->
-<!--            scope.row.level == "1"-->
-<!--              ? "一"-->
-<!--              : scope.row.level == "2"-->
-<!--                ? "二"-->
-<!--                : scope.row.level == "3"-->
-<!--                  ? "三"-->
-<!--                  : scope.row.level-->
-<!--          }}级-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="硬件层级" align="center" prop="level">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          {{-->
+      <!--            scope.row.level == "1"-->
+      <!--              ? "一"-->
+      <!--              : scope.row.level == "2"-->
+      <!--                ? "二"-->
+      <!--                : scope.row.level == "3"-->
+      <!--                  ? "三"-->
+      <!--                  : scope.row.level-->
+      <!--          }}级-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="操作"
@@ -112,7 +112,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:hw:type:edit']"
-          >编辑</el-button
+            >编辑</el-button
           >
           <el-button
             size="mini"
@@ -120,7 +120,8 @@
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['mes:hw:type:add']"
-          >新增</el-button>
+            >新增</el-button
+          >
           <el-button
             v-if="scope.row.parentTypeId != 0"
             size="mini"
@@ -128,7 +129,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:hw:type:remove']"
-          >删除</el-button
+            >删除</el-button
           >
         </template>
       </el-table-column>
@@ -140,7 +141,12 @@
         <el-row>
           <el-col :span="24" v-if="form.parentTypeId !== 0">
             <el-form-item label="父类型" prop="parentTypeId">
-              <treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" />
+              <treeselect
+                v-model="form.parentTypeId"
+                :options="machinerytypeOptions"
+                :normalizer="normalizer"
+                placeholder="请选择父类型"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -169,7 +175,10 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="硬件名称" prop="machineryTypeName">
-              <el-input v-model="form.hardwareTypeName" placeholder="请输入设备类型名称" />
+              <el-input
+                v-model="form.hardwareTypeName"
+                placeholder="请输入设备类型名称"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -182,7 +191,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -201,16 +214,17 @@ import {
   getHardwareTypeInfo,
   delHardwareType,
   addHardwareType,
-  updateHardwareType, delHardware
-} from '@/api/mes/hw/hadrwareType'
+  updateHardwareType,
+  delHardware,
+} from "@/api/mes/hw/hadrwareType";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { genCode } from "@/api/system/autocode/rule";
 export default {
   name: "hardwareType",
-  dicts: ['sys_yes_no'],
+  dicts: ["sys_yes_no"],
   components: {
-    Treeselect
+    Treeselect,
   },
   data() {
     return {
@@ -254,7 +268,7 @@ export default {
         hardwareTypeName: [
           { required: true, message: "硬件名称不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -264,10 +278,14 @@ export default {
     /** 查询设备类型列表 */
     getList() {
       this.loading = true;
-      listHanrware(this.queryParams).then(response => {
-        this.machinerytypeList = this.handleTree(response.data.records, "id", "parentTypeId");
+      listHanrware(this.queryParams).then((response) => {
+        this.machinerytypeList = this.handleTree(
+          response.data.records,
+          "id",
+          "parentTypeId"
+        );
         this.loading = false;
-        console.log(this.machinerytypeList,'machinerytypeList')
+        console.log(this.machinerytypeList, "machinerytypeList");
       });
     },
     /** 转换设备类型数据结构 */
@@ -278,16 +296,20 @@ export default {
       return {
         id: node.id,
         label: node.hardwareTypeName,
-        children: node.children
+        children: node.children,
       };
     },
     /** 查询设备类型下拉树结构 */
     getTreeselect() {
-      listHanrware().then(response => {
+      listHanrware().then((response) => {
         debugger;
         this.machinerytypeOptions = [];
-        const data = this.handleTree(response.data.records, "id", "parentTypeId")[0];
-        console.log(data,'父类型回显')
+        const data = this.handleTree(
+          response.data.records,
+          "id",
+          "parentTypeId"
+        )[0];
+        console.log(data, "父类型回显");
         this.machinerytypeOptions.push(data);
       });
     },
@@ -345,7 +367,7 @@ export default {
       if (row != null) {
         this.form.parentTypeId = row.id;
       }
-      getHardwareTypeInfo(row.id).then(response => {
+      getHardwareTypeInfo(row.id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "编辑硬件类型";
@@ -353,16 +375,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateHardwareType(this.form).then(response => {
+            updateHardwareType(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addHardwareType(this.form).then(response => {
+            addHardwareType(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -384,8 +406,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const repairIds = row.id || this.ids;
+      const repairCodes = row.hardwareTypeCode;
       this.$modal
-        .confirm('是否删除硬件编号为"' + repairIds + '"的硬件类型？')
+        .confirm('是否删除硬件编号为"' + repairCodes + '"的硬件类型？')
         .then(function () {
           return delHardwareType(repairIds);
         })
@@ -395,6 +418,6 @@ export default {
         })
         .catch(() => {});
     },
-  }
+  },
 };
 </script>

src/views/mes/job/jobm/index.vue

@@ -281,6 +281,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      codes: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -464,6 +465,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.ticketId);
+      this.codes = selection.map((item) => item.ticketCode);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -522,8 +524,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const teamIds = row.ticketId || this.ids;
+      const titcketCodes = row.ticketCode || this.codes;
       this.$modal
-        .confirm('是否确认删除作业票编号为"' + teamIds + '"的数据项？')
+        .confirm('是否确认删除作业票编号为"' + titcketCodes + '"的数据项？')
         .then(function () {
           return deleteIsJobTicket(teamIds);
         })

src/views/mes/md/segregationpoint/index.vue

@@ -380,6 +380,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      codes: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -546,6 +547,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.pointId);
+      this.codes = selection.map((item) => item.pointCode);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -606,8 +608,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const teamIds = row.pointId || this.ids;
+      const pointcodes = row.pointCode || this.codes;
       this.$modal
-        .confirm('是否确认删除隔离点ID为"' + teamIds + '"的数据项？')
+        .confirm('是否确认删除隔离点编号为"' + pointcodes + '"的数据项？')
         .then(function () {
           return deleteIsIsolationPointByPointIds(teamIds);
         })

src/views/mes/md/workarea/index.vue

@@ -292,6 +292,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      codes: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -399,6 +400,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.workareaId);
+      this.codes = selection.map((item) => item.workareaCode);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -458,8 +460,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const teamIds = row.workareaId || this.ids;
+      const workareaCodes = row.workareaCode || this.codes;
       this.$modal
-        .confirm('是否确认删除工作区域编号为"' + teamIds + '"的数据项？')
+        .confirm('是否确认删除工作区域编码为"' + workareaCodes + '"的数据项？')
         .then(function () {
           return delWorkarea(teamIds);
         })

src/views/mes/md/workshop/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="车间名称" prop="workshopName">
         <el-input
           v-model="queryParams.workshopName"
@@ -31,8 +38,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -45,7 +60,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:md:workshop:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -55,66 +71,91 @@
           size="mini"
           @click="handlerefresh"
           v-hasPermi="['mes:cal:workshop:refresh']"
-        >刷新
+          >刷新
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['mes:md:workshop:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['mes:md:workshop:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['mes:md:workshop:edit']"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['mes:md:workshop:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="workshopList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="workshopList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="车间编码" align="center" prop="workshopCode" >
+      <el-table-column label="车间编码" align="center" prop="workshopCode">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:md:workshop:query']"
-          >{{scope.row.workshopCode}}</el-button>
+            >{{ scope.row.workshopCode }}</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="车间名称" align="center" prop="workshopName" />
       <el-table-column label="面积" align="center" prop="area" />
-<!--      <el-table-column label="状态" align="center" prop="calendarType">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.mes_calendar_type" :value="scope.row.calendarType"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="状态" align="center" prop="calendarType">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.mes_calendar_type" :value="scope.row.calendarType"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column label="负责人" align="center" prop="charge" />
-      <el-table-column label="是否启用" align="center" prop="enableFlag" >
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enableFlag"
+          />
         </template>
       </el-table-column>
       <el-table-column label="车间地图" align="center" prop="attr1">
         <template slot-scope="scope">
-          <img v-if="scope.row.attr1" style="width:50px;height:50px" :src="scope.row.attr1" alt="">
+          <img
+            v-if="scope.row.attr1"
+            style="width: 50px; height: 50px"
+            :src="scope.row.attr1"
+            alt=""
+          />
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -122,7 +163,8 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:md:workshop:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             type="text"
             plain
@@ -130,7 +172,7 @@
             size="mini"
             @click="handleAdd"
             v-hasPermi="['mes:cal:team:add']"
-          >新增
+            >新增
           </el-button>
           <el-button
             size="mini"
@@ -138,13 +180,14 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:md:workshop:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -155,64 +198,94 @@
     <el-dialog :title="title" :visible.sync="open" width="660px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="车间名称" prop="workshopName">
-          <el-input style="width: 318px" v-model="form.workshopName" placeholder="请输入车间名称" />
+          <el-input
+            style="width: 318px"
+            v-model="form.workshopName"
+            placeholder="请输入车间名称"
+          />
+        </el-form-item>
+        <el-form-item label="车间编码" prop="workshopCode">
+          <el-input
+            style="width: 318px"
+            v-model="form.workshopCode"
+            placeholder="请输入车间编码"
+          />
         </el-form-item>
-            <el-form-item label="车间编码" prop="workshopCode">
-              <el-input style="width: 318px" v-model="form.workshopCode" placeholder="请输入车间编码" />
-            </el-form-item>
 
-            <el-form-item  label-width="80">
-                <el-switch v-model="autoGenFlag"
-                    active-color="#13ce66"
-                    active-text="自动生成"
-                    @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
-                </el-switch>
-            </el-form-item>
+        <el-form-item label-width="80">
+          <el-switch
+            v-model="autoGenFlag"
+            active-color="#13ce66"
+            active-text="自动生成"
+            @change="handleAutoGenChange(autoGenFlag)"
+            v-if="optType != 'view'"
+          >
+          </el-switch>
+        </el-form-item>
 
-<!--        <el-form-item label="车间状态" prop="calendarType">-->
-<!--          <el-radio v-model="radio" label="1">启用</el-radio>-->
-<!--          <el-radio v-model="radio" label="2">停用</el-radio>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="车间状态" prop="calendarType">-->
+        <!--          <el-radio v-model="radio" label="1">启用</el-radio>-->
+        <!--          <el-radio v-model="radio" label="2">停用</el-radio>-->
+        <!--        </el-form-item>-->
         <el-form-item label="车间地图" prop="attr1">
-          <ImageUpload :limit="1" :value="form.attr1" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload>
+          <ImageUpload
+            :limit="1"
+            :value="form.attr1"
+            :fileSize="5"
+            @onUploaded="handleImgUplaoded"
+            @onRemoved="handleImgRemoved"
+          ></ImageUpload>
         </el-form-item>
 
+        <el-form-item label="面积" prop="area">
+          <el-input-number
+            :min="0"
+            :percision="2"
+            :step="1"
+            v-model="form.area"
+            placeholder="请输入面积"
+          />
+        </el-form-item>
 
+        <el-form-item label="负责人" prop="charge">
+          <el-input v-model="form.charge" placeholder="请输入负责人" />
+        </el-form-item>
 
-            <el-form-item label="面积" prop="area">
-              <el-input-number :min="0" :percision="2" :step="1" v-model="form.area" placeholder="请输入面积" />
-            </el-form-item>
-
-
-            <el-form-item label="负责人" prop="charge">
-              <el-input v-model="form.charge" placeholder="请输入负责人" />
-            </el-form-item>
-
-            <el-form-item label="是否启用" prop="enableFlag">
-              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
-                <el-radio
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-              <el-radio-group v-model="form.enableFlag" v-else>
-                <el-radio
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-
-
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
+        <el-form-item label="是否启用" prop="enableFlag">
+          <el-radio-group
+            v-model="form.enableFlag"
+            disabled
+            v-if="optType == 'view'"
+          >
+            <el-radio
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio
+            >
+          </el-radio-group>
+          <el-radio-group v-model="form.enableFlag" v-else>
+            <el-radio
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio
+            >
+          </el-radio-group>
+        </el-form-item>
 
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -221,19 +294,26 @@
 </template>
 
 <script>
-import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/mes/md/workshop";
-import {genCode} from "@/api/system/autocode/rule"
+import {
+  listWorkshop,
+  getWorkshop,
+  delWorkshop,
+  addWorkshop,
+  updateWorkshop,
+} from "@/api/mes/md/workshop";
+import { genCode } from "@/api/system/autocode/rule";
 export default {
   name: "Workshop",
-  dicts: ['sys_yes_no'],
+  dicts: ["sys_yes_no"],
   data() {
     return {
-      autoGenFlag:false,
+      autoGenFlag: false,
       optType: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
+      codes: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -263,15 +343,15 @@ export default {
       // 表单校验
       rules: {
         workshopCode: [
-          { required: true, message: "车间编码不能为空", trigger: "blur" }
+          { required: true, message: "车间编码不能为空", trigger: "blur" },
         ],
         workshopName: [
-          { required: true, message: "车间名称不能为空", trigger: "blur" }
+          { required: true, message: "车间名称不能为空", trigger: "blur" },
         ],
         enableFlag: [
-          { required: true, message: "是否启用不能为空", trigger: "blur" }
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -281,7 +361,7 @@ export default {
     /** 查询车间列表 */
     getList() {
       this.loading = true;
-      listWorkshop(this.queryParams).then(response => {
+      listWorkshop(this.queryParams).then((response) => {
         this.workshopList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -292,8 +372,8 @@ export default {
       this.open = false;
       this.reset();
     },
-    handlerefresh(){
-      this.getList()
+    handlerefresh() {
+      this.getList();
     },
     // 表单重置
     reset() {
@@ -303,7 +383,7 @@ export default {
         workshopName: null,
         area: null,
         charge: null,
-        enableFlag: 'Y',
+        enableFlag: "Y",
         remark: null,
         attr1: null,
         attr2: null,
@@ -312,7 +392,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.autoGenFlag = false;
       this.resetForm("form");
@@ -329,16 +409,17 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.workshopId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.workshopId);
+      this.codes = selection.map((item) => item.workshopCode);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     //图片上传成功
-    handleImgUplaoded(imgUrl){
+    handleImgUplaoded(imgUrl) {
       this.form.attr1 = imgUrl;
     },
     //图片移除
-    handleImgRemoved(imgUrl){
+    handleImgRemoved(imgUrl) {
       this.form.attr1 = null;
     },
     /** 新增按钮操作 */
@@ -349,10 +430,10 @@ export default {
       this.optType = "add";
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
-      const workshopId = row.workshopId || this.ids
-      getWorkshop(workshopId).then(response => {
+      const workshopId = row.workshopId || this.ids;
+      getWorkshop(workshopId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "查看车间";
@@ -362,8 +443,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const workshopId = row.workshopId || this.ids
-      getWorkshop(workshopId).then(response => {
+      const workshopId = row.workshopId || this.ids;
+      getWorkshop(workshopId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改车间";
@@ -372,16 +453,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.workshopId != null) {
-            updateWorkshop(this.form).then(response => {
+            updateWorkshop(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addWorkshop(this.form).then(response => {
+            addWorkshop(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -393,31 +474,39 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const workshopIds = row.workshopId || this.ids;
-      this.$modal.confirm('是否确认删除车间编号为"' + workshopIds + '"的数据项？').then(function() {
-        return delWorkshop(workshopIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      const workshopCodes = row.workshopCode || this.codes;
+      this.$modal
+        .confirm('是否确认删除车间编码为"' + workshopCodes + '"的数据项？')
+        .then(function () {
+          return delWorkshop(workshopIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('md/workshop/export', {
-        ...this.queryParams
-      }, `workshop_${new Date().getTime()}.xlsx`)
+      this.download(
+        "md/workshop/export",
+        {
+          ...this.queryParams,
+        },
+        `workshop_${new Date().getTime()}.xlsx`
+      );
     },
     //自动生成物料编码
-    handleAutoGenChange(autoGenFlag){
+    handleAutoGenChange(autoGenFlag) {
       debugger;
-      if(autoGenFlag){
-        genCode('WORKSHOP_CODE').then(response =>{
+      if (autoGenFlag) {
+        genCode("WORKSHOP_CODE").then((response) => {
           this.form.workshopCode = response;
         });
-      }else{
+      } else {
         this.form.workshopCode = null;
       }
-
-    }
-  }
+    },
+  },
 };
 </script>

src/views/mes/sop/sopm/index.vue

@@ -258,6 +258,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      codes: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -435,6 +436,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.sopId);
+      this.codes = selection.map((item) => item.sopCode);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -463,8 +465,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const sopIds = row.sopId || this.ids;
+      const sopCodes = row.sopCode || this.codes;
       this.$modal
-        .confirm('是否确认删除sop序号为"' + sopIds + '"的数据项？')
+        .confirm('是否确认删除SOP编号为"' + sopCodes + '"的数据项？')
         .then(function () {
           return deleteIsSopBySopIds(sopIds);
         })