修复作业执行的查询工作区域错误

src/api/mes/job/job.js

@@ -17,7 +17,7 @@ export function getJobTicketInfo(repairId) {
     method: 'get'
   })
 }
-//查询工作区域列表
+//查询作业区域列表
 export function getworkareaList(repairId) {
   return request({
     url: '/dev-api/iscs/workarea/getIsWorkareaList?workshopId='+ repairId,

src/api/mes/wa/workarea.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 
-// 查询工作区域类型-列表page
+// 查询作业区域类型-列表page
 export function listWorkarea(query) {
   return request({
     url: '/iscs/workarea/getIsWorkareaPage',
@@ -9,14 +9,14 @@ export function listWorkarea(query) {
     params: query
   })
 }
-// 获取工作区域list
+// 获取作业区域list
 export function getIsWorkareaList(query) {
   return request({
     url: '/iscs/workarea/getIsWorkareaList?workshopId=' + query,
     method: 'get',
   })
 }
-// 获取工作区域详细信息
+// 获取作业区域详细信息
 export function getWorkareaInfo(repairId) {
   return request({
     url: '/iscs/workarea/selectIsWorkareaById?workareaId=' + repairId,
@@ -38,7 +38,7 @@ export function getMapDataApi(query,query2,query3) {
   })
 }
 
-//新增工作区域
+//新增作业区域
 export function addWorkarea(query) {
   return request({
     url: '/iscs/workarea/insertIsWorkarea',
@@ -47,7 +47,7 @@ export function addWorkarea(query) {
   })
 }
 
-// 修改工作区域
+// 修改作业区域
 export function updateWorkarea(data) {
   return request({
     url: '/iscs/workarea/updateIsWorkarea',
@@ -56,7 +56,7 @@ export function updateWorkarea(data) {
   })
 }
 
-// 删除工作区域
+// 删除作业区域
 export function delWorkarea(repairId) {
   return request({
     url: '/iscs/workarea/deleteIsWorkareaByWorkareaIds?workareaIds='+ repairId,

src/components/separationPoint/workshop.vue

@@ -23,7 +23,6 @@
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
-
             node-key="id"
             default-expand-all
             @node-click="handleNodeClick"
@@ -82,7 +81,7 @@ export default {
         label: 'label'
 
       },
-      // 工作区域名称 树形结构
+      // 作业区域名称 树形结构
       workareaName: undefined,
       treeSelectMap: null,//单节点点击传递map
       queryParams: {
@@ -101,7 +100,7 @@ export default {
           console.log('sopProps 发生变化', newVal)
 
           if (newVal[0].workareaId) {
-            this.workareaName = newVal[0].workareaId  //新工作区域所返回
+            this.workareaName = newVal[0].workareaId  //新作业区域所返回
             this.handleselectProductLine(newVal[0].workareaId)
 
           }
@@ -134,10 +133,10 @@ export default {
           this.isDisabled=true;
           // 在这里处理 jobProps 变化后的逻辑
           if (newVal[0].workareaId) {
-            this.workareaName = newVal[0].workareaId  //新工作区域所返回
+            this.workareaName = newVal[0].workareaId  //新作业区域所返回
             this.handleselectProductLine(newVal[0].workareaId,newVal[0].sopId);//获取已选隔离点的整个数据map
           }
-          this.getTreeselect();//获取工作区域树
+          this.getTreeselect();//获取作业区域树
           this.form.sopId = newVal[0].sopId
 
 
@@ -170,7 +169,7 @@ export default {
   },
 
   mounted() {
-    this.getTreeselect()//获取工作区域下拉
+    this.getTreeselect()//获取作业区域下拉
     if (this.$route.query.sopId == 'null' || this.$route.query.ticketId == 'null') {
       console.log(this.isDisabled, 'isDisabled 我走这里')
       this.isDisabled = false
@@ -235,10 +234,10 @@ export default {
 
     },
 
-    /** 查询工作区域下拉树结构 */
+    /** 查询作业区域下拉树结构 */
     getTreeselect() {
       listWorkarea(this.queryParams).then(response => {
-        // console.log(response.data.records, '工作区域下拉树形结构');
+        // console.log(response.data.records, '作业区域下拉树形结构');
         // 转换为树形结构
         this.deptOptions = this.transformToTree(response.data.records)
         // console.log(this.deptOptions, 'deptOptions')

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

@@ -935,10 +935,10 @@ export default {
     async getWorkareaId(query) {
       try {
         const res = await listWorkarea(query);
-        console.log(res, "工作区域page");
+        console.log(res, "作业区域page");
         return res.data.records[0].workareaId;
       } catch (error) {
-        console.error("获取工作区域ID失败", error);
+        console.error("获取作业区域ID失败", error);
         throw error;
       }
     },

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

@@ -133,7 +133,7 @@
               <el-tab-pane label="隔离点信息" name="second">
                 <!-- 隔离点信息-->
                 <el-form ref="form" :model="form" label-width="90px">
-                  <el-form-item label="工作区域" prop="workline">
+                  <el-form-item label="作业区域" prop="workline">
                     <el-input
                       v-model="form.workline"
                       style="width: 100%"
@@ -480,7 +480,7 @@ export default {
         coLocker: "", //共锁人
         ticketStartTime: "", //开始时间
         ticketEndTime: "", //结束时间
-        workareaId:null,//工作区域id
+        workareaId:null,//作业区域id
         ticketUserDTOList: [
           // {
           //   userId: '',
@@ -582,7 +582,7 @@ export default {
       listCoLockerOption: null,//共锁人下拉数据
       OutSideUserTableData: [],//添加外部人员多个表格
       nextUserId: 0,//新增外部人员表格序号自定义
-      worklineMap:null,//工作区域拿到的mapjson
+      worklineMap:null,//作业区域拿到的mapjson
     };
   },
   watch: {
@@ -1011,7 +1011,7 @@ export default {
       console.log(selectedOption, 'handleWorkshopSelected')
       // this.emitWorkShop = selectedOption
       // this.form.workshopName = selectedOption.label;//这里是回显车间的 暂时不需要
-      this.form.workline = selectedOption.label//这里是回显工作区域的
+      this.form.workline = selectedOption.label//这里是回显作业区域的
       this.emitworklineId = selectedOption.id
       this.worklineMap = selectedOption.map
     },

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

@@ -48,16 +48,16 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="工作区域" prop="workareaId">
-        <el-select v-model="queryParams.workareaId" placeholder="请选择区域">
-          <el-option
-            v-for="dict in this.workareaList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="作业区域" prop="workareaId">
+        <treeselect
+          style="width: 318px"
+          v-model="queryParams.workareaId"
+          :options="deptOptions"
+          :normalizer="normalizer"
+          placeholder="选择作业区域"
+        />
       </el-form-item>
+
       <!-- <el-form-item label="上锁人" prop="teamCode">
         <el-input
           v-model="queryParams.teamCode"
@@ -218,7 +218,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="工作区域" align="center" prop="workareaName">
+      <el-table-column label="作业区域" align="center" prop="workareaName">
       </el-table-column>
       <el-table-column label="隔离点总数" align="center" prop="pointCount">
       </el-table-column>
@@ -280,8 +280,13 @@ import {
 } from "@/api/mes/spm/segregationPoint";
 import { genCode } from "@/api/system/autocode/rule";
 import { mapActions } from "vuex";
+
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listWorkarea } from '@/api/mes/wa/workarea'
 export default {
   name: "Team",
+  components: { Treeselect },
   dicts: ["ticket_type", "ticket_status"],
   data() {
     return {
@@ -303,13 +308,15 @@ export default {
       total: 0,
       // 班组表格数据
       jobList: [],
+      // 部门树选项
+      deptOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       // 车间数据
       workshopList: [],
-      // 工作区域数据
+      // 作业区域数据
       workareaList: [],
       // 查询参数
       createTime: "",
@@ -403,8 +410,31 @@ export default {
         this.total = response.data.total;
         this.loading = false;
       });
+      const data={
+        current:1,
+        size:-1
+      }
+      listWorkarea(data).then((response) => {
+        this.deptOptions = this.handleTree(
+          response.data.records,
+          "workareaId",
+          "parentId",
+          "children"
+        );
+        // console.log(this.deptOptions,'作业区域下拉树形结构');
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.workareaId,
+        label: node.workareaName,
+        children: node.children,
+      };
     },
-
     // 获取车间数据
     getworkShop() {
       workshoplistAll().then((response) => {
@@ -419,14 +449,14 @@ export default {
         console.log(this.workshopList[0].value, "数据拿到了吗");
       });
     },
-    // 所属车间下拉改变工作区域内容
+    // 所属车间下拉改变作业区域内容
     workShopChange() {
       console.log("我被切换了内容");
       this.queryParams.workareaId = "";
       this.getworkArea();
       console.log(this.workareaList, "数据拿到了吗");
     },
-    // 获取工作区域数据
+    // 获取作业区域数据
     getworkArea() {
       const workshopId = this.queryParams.workshopId;
       // const workshopId = this.workshopList.map((workshop) => workshop.value);
@@ -434,7 +464,7 @@ export default {
       console.log(workshopId, "workshopId");
       if (workshopId) {
         getIsWorkareaList(workshopId).then((response) => {
-          // console.log(response, "获取工作区域数据");
+          // console.log(response, "获取作业区域数据");
           this.workareaList = response.data.map((item) => {
             return {
               label: item.workareaName,

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

@@ -185,7 +185,7 @@
             <!-- 隔离点信息-->
             <b class="title">隔离点信息</b>
             <el-form ref="form" :model="form" label-width="90px">
-              <!-- <el-form-item label="工作区域" prop="workline">
+              <!-- <el-form-item label="作业区域" prop="workline">
                 <el-input
                   v-model="form.workline"
                   style="width: 100%"
@@ -524,7 +524,7 @@ export default {
         coLocker: "", //共锁人
         ticketStartTime: "", //开始时间
         ticketEndTime: "", //结束时间
-        workareaId: null, //工作区域id
+        workareaId: null, //作业区域id
         ticketUserDTOList: [
           // {
           //   userId: '',
@@ -626,14 +626,14 @@ export default {
       listCoLockerOption: null, //共锁人下拉数据
       OutSideUserTableData: [], //添加外部人员多个表格
       nextUserId: 0, //新增外部人员表格序号自定义
-      worklineMap: null, //工作区域拿到的mapjson
+      worklineMap: null, //作业区域拿到的mapjson
       // 部门树选项
       deptOptions: undefined,
       defaultProps: {
         children: "children",
         label: "label",
       },
-      showWorkEare: true, //工作区域是否展示
+      showWorkEare: true, //作业区域是否展示
       isVisible: true, // 控制盒子显示状态
     };
   },
@@ -681,7 +681,7 @@ export default {
       this.isVisible = false;
     }, 1000);
 
-    this.getTreeselect(); //获取工作区域下拉de
+    this.getTreeselect(); //获取作业区域下拉de
     this.getSopList();
     this.handleOpenStaffing();
     if (this.$route.query.ticketId !== "null") {
@@ -836,14 +836,14 @@ export default {
       this.form.ticketType = "";
       this.form.ticketName = "";
     },
-    /** 查询工作区域下拉树结构 */
+    /** 查询作业区域下拉树结构 */
     getTreeselect() {
       const data = {
         current: 1,
         size: -1,
       };
       listWorkarea(data).then((response) => {
-        // console.log(response.data.records, '工作区域下拉树形结构');
+        // console.log(response.data.records, '作业区域下拉树形结构');
         // 转换为树形结构
         this.deptOptions = this.transformToTree(response.data.records);
         // console.log(this.deptOptions, 'deptOptions')
@@ -1154,7 +1154,7 @@ export default {
       console.log(selectedOption, "handleWorkshopSelected");
       // this.emitWorkShop = selectedOption
       // this.form.workshopName = selectedOption.label;//这里是回显车间的 暂时不需要
-      this.form.workline = selectedOption.label; //这里是回显工作区域的
+      this.form.workline = selectedOption.label; //这里是回显作业区域的
       this.emitworklineId = selectedOption.id;
       this.worklineMap = selectedOption.map;
     },

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

@@ -25,10 +25,14 @@
         />
       </el-form-item>
 
-      <el-form-item label="工作区域" prop="workareaId">
-        <el-select v-model="queryParams.workareaId" placeholder="请选择区域">
-         
-        </el-select>
+      <el-form-item label="作业区域" prop="workareaId">
+        <treeselect
+          style="width: 318px"
+          v-model="queryParams.workareaId"
+          :options="deptOptions"
+          :normalizer="normalizer"
+          placeholder="选择作业区域"
+        />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -68,7 +72,7 @@
         width="200"
       />
       <el-table-column
-        label="工作区域"
+        label="作业区域"
         align="center"
         prop="workareaName"
         width="200"
@@ -216,9 +220,12 @@ import {
 } from "@/api/mes/jobplay/jobplay";
 
 import { genCode } from "@/api/system/autocode/rule";
+import Treeselect from '@riophae/vue-treeselect'
+import { listWorkarea } from '@/api/mes/wa/workarea'
 
 export default {
   name: "Team",
+  components: { Treeselect },
   dicts: ["ticket_type", "ticket_status"],
   data() {
     return {
@@ -246,8 +253,10 @@ export default {
       open: false,
       // 车间数据
       workshopList: [],
-      // 工作区域数据
+      // 作业区域数据
       workareaList: [],
+      // 部门树选项
+      deptOptions: [],
       // 查询参数
       createTime: "",
       queryParams: {
@@ -329,8 +338,31 @@ export default {
         this.total = response.data.total;
         this.loading = false;
       });
+      const data={
+        current:1,
+        size:-1
+      }
+      listWorkarea(data).then((response) => {
+        this.deptOptions = this.handleTree(
+          response.data.records,
+          "workareaId",
+          "parentId",
+          "children"
+        );
+        console.log(this.deptOptions,'作业区域下拉树形结构');
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.workareaId,
+        label: node.workareaName,
+        children: node.children,
+      };
     },
-
     // 取消按钮
     cancel() {
       this.open = false;

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

@@ -415,7 +415,7 @@ export default {
         this.form.parentTypeId = 0;
       }
       this.open = true;
-      this.title = "添加工作区域";
+      this.title = "添加作业区域";
       listLockType().then((response) => {
         this.deptOptions = this.handleTree(
           response.data.records,
@@ -472,7 +472,7 @@ export default {
               this.getList();
             });
           } else {
-            console.log(this.form, "新增工作区域参数");
+            console.log(this.form, "新增作业区域参数");
             addLockType(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

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

@@ -441,7 +441,7 @@ export default {
         this.form.parentTypeId = 0;
       }
       this.open = true;
-      this.title = "添加工作区域";
+      this.title = "添加作业区域";
       listPadLockTypeAPI().then((response) => {
         this.deptOptions = this.handleTree(
           response.data.records,
@@ -490,7 +490,7 @@ export default {
               this.getList();
             });
           } else {
-            console.log(this.form, "新增工作区域参数");
+            console.log(this.form, "新增作业区域参数");
             addPadLockTypeAPI(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

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

@@ -361,7 +361,7 @@
               <!--              <el-select-->
               <!--                style="width: 300px"-->
               <!--                v-model="form.workareaId"-->
-              <!--                placeholder="请选择工作区域"-->
+              <!--                placeholder="请选择作业区域"-->
               <!--              >-->
               <!--                <el-option-->
               <!--                  v-for="dict in this.workareaList"-->
@@ -480,7 +480,7 @@ export default {
       open: false,
       // 车间数据
       workshopList: [],
-      // 工作区域数据
+      // 作业区域数据
       workareaList: [],
       // 新增或修改
       pointId: null,
@@ -542,7 +542,7 @@ export default {
           { required: true, message: "所属车间不能为空", trigger: "blur" },
         ],
         workareaId: [
-          { required: true, message: "工作区域不能为空", trigger: "blur" },
+          { required: true, message: "作业区域不能为空", trigger: "blur" },
         ],
         pointType: [
           { required: true, message: "隔离点类型不能为空", trigger: "blur" },
@@ -581,8 +581,12 @@ export default {
         this.total = response.data.total;
         this.loading = false;
       });
-      // 获取工作区域数据
-      listWorkarea().then((response) => {
+      // 获取作业区域数据
+      const data={
+        current:1,
+        size:-1
+      }
+      listWorkarea(data).then((response) => {
         this.deptOptions = this.handleTree(
           response.data.records,
           "workareaId",
@@ -762,17 +766,17 @@ export default {
         });
       });
     },
-    // 所属车间下拉改变工作区域内容
+    // 所属车间下拉改变作业区域内容
     workShopChange() {
       this.getworkArea();
     },
-    // 获取工作区域数据
+    // 获取作业区域数据
     getworkArea() {
       const workshopId = this.form.workshopId;
 
       if (workshopId) {
         getIsWorkareaList(workshopId).then((response) => {
-          console.log(response, "获取工作区域数据");
+          console.log(response, "获取作业区域数据");
           this.workareaList = response.data.map((item) => {
             return {
               label: item.workareaName,

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

@@ -80,11 +80,11 @@ export default {
       const sopId=''
       const ticketId=''
       getWorkareaInfo(workareaId).then((response) => {
-        console.log(response,'工作区域信息')
+        console.log(response,'作业区域信息')
         this.form=response.data
       })
       getMapDataApi(workareaId,sopId,ticketId).then(response => {
-        console.log(response,'工作区域预览接口调用');
+        console.log(response,'作业区域预览接口调用');
         this.form.map=response.data;
 
         if (response.data) {

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

@@ -7,18 +7,18 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item label="工作区域编码" prop="workareaCode">
+      <el-form-item label="作业区域编码" prop="workareaCode">
         <el-input
           v-model="queryParams.workareaCode"
-          placeholder="请输入工作区域编码"
+          placeholder="请输入作业区域编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工作区域名称" prop="workareaName">
+      <el-form-item label="作业区域名称" prop="workareaName">
         <el-input
           v-model="queryParams.workareaName"
-          placeholder="请输入工作区域名称"
+          placeholder="请输入作业区域名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -27,7 +27,7 @@
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
-          placeholder="工作区域状态"
+          placeholder="作业区域状态"
           clearable
         >
           <el-option
@@ -382,6 +382,7 @@ export default {
       listWorkarea(this.queryParams).then((response) => {
         debugger;
         var depts = this.handleTree(response.data.records, "workareaId");
+
         this.deptList = depts;
         this.loading = false;
       });
@@ -446,14 +447,17 @@ export default {
         this.form.parentId = 0;
       }
       this.open = true;
-      this.title = "添加工作区域";
-      listWorkarea().then((response) => {
+      this.title = "添加作业区域";
+      const data={
+        current:1,
+        size:-1
+      }
+      listWorkarea(data).then((response) => {
         this.deptOptions = this.handleTree(
           response.data.records,
-          "workareaId",
-          "parentId",
-          "children"
+          "workareaId"
         );
+        console.log(this.deptOptions,'作业区域的树形结构')
       });
     },
     /** 展开/折叠操作 */
@@ -471,9 +475,10 @@ export default {
       getWorkareaInfo(row.workareaId).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改工作区域";
+        this.title = "修改作业区域";
       });
-      listWorkarea().then((response) => {
+      data
+      listWorkarea(data).then((response) => {
         this.deptOptions = this.handleTree(
           response.data.records,
           "workareaId",
@@ -502,7 +507,7 @@ export default {
               this.getList();
             });
           } else {
-            console.log(this.form, "新增工作区域参数");
+            console.log(this.form, "新增作业区域参数");
             addWorkarea(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

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

@@ -8,15 +8,15 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="工作区域编码" prop="workareaCode">
+      <el-form-item label="作业区域编码" prop="workareaCode">
         <el-input
           v-model="queryParams.workareaCode"
-          placeholder="请输入工作区域编码"
+          placeholder="请输入作业区域编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工作区域名称" prop="workareaName">
+      <el-form-item label="作业区域名称" prop="workareaName">
         <el-input
           v-model="queryParams.workareaName"
           placeholder="请输入隔离点名称"
@@ -24,10 +24,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工作区域类型" prop="workareaType">
+      <el-form-item label="作业区域类型" prop="workareaType">
         <el-input
           v-model="queryParams.workareaType"
-          placeholder="请输入工作区域类型"
+          placeholder="请输入作业区域类型"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -103,7 +103,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="工作区域Id" align="center" prop="workareaId">
+      <!-- <el-table-column label="作业区域Id" align="center" prop="workareaId">
         <template slot-scope="scope">
           <el-button v-no-more-click
             type="text"
@@ -113,7 +113,7 @@
           </el-button>
         </template>
       </el-table-column> -->
-      <el-table-column label="工作区域编码" align="center" prop="workareaCode">
+      <el-table-column label="作业区域编码" align="center" prop="workareaCode">
         <template slot-scope="scope">
           <el-button v-no-more-click
             type="text"
@@ -124,12 +124,12 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="工作区域名称"
+        label="作业区域名称"
         align="center"
         prop="workareaName"
       />
       <el-table-column
-        label="工作区域类型"
+        label="作业区域类型"
         align="center"
         prop="workareaType"
       />
@@ -408,7 +408,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加工作区域";
+      this.title = "添加作业区域";
       this.optType = "add";
       this.EditId = null;
     },
@@ -419,7 +419,7 @@ export default {
       getWorkareaInfo(this.EditId).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "查看工作区域";
+        this.title = "查看作业区域";
         this.optType = "view";
       });
     },
@@ -429,10 +429,10 @@ export default {
       this.EditId = row.workareaId || this.ids;
       console.log(row, "row");
       getWorkareaInfo(this.EditId).then((response) => {
-        console.log(response, "获取单条工作区域数据");
+        console.log(response, "获取单条作业区域数据");
         this.form = response.data;
         this.open = true;
-        this.title = "修改工作区域信息";
+        this.title = "修改作业区域信息";
         this.optType = "edit";
       });
     },
@@ -462,7 +462,7 @@ export default {
       const teamIds = row.workareaId || this.ids;
       const workareaCodes = row.workareaCode || this.codes;
       this.$modal
-        .confirm('是否确认删除工作区域编码为"' + workareaCodes + '"的数据项？')
+        .confirm('是否确认删除作业区域编码为"' + workareaCodes + '"的数据项？')
         .then(function () {
           return delWorkarea(teamIds);
         })

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

@@ -129,7 +129,7 @@
                   <!--                      disabled-->
                   <!--                    />-->
                   <!--                  </el-form-item>-->
-                  <el-form-item label="工作区域" prop="workline">
+                  <el-form-item label="作业区域" prop="workline">
                     <el-input
                       v-model="form.workline"
                       style="width: 100%"
@@ -901,7 +901,7 @@ export default {
       console.log(selectedOption, 'handleWorkshopSelected')
       // this.emitWorkShop = selectedOption
       // this.form.workshopName = selectedOption.label;//这里是回显车间的 暂时不需要
-      this.form.workline = selectedOption.label//这里是回显工作区域的
+      this.form.workline = selectedOption.label//这里是回显作业区域的
       this.emitworklineId = selectedOption.id
       this.worklineMap = selectedOption.map
     },

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

@@ -48,10 +48,10 @@
       <!--          />-->
       <!--        </el-select>-->
       <!--      </el-form-item>-->
-      <el-form-item label="工作区域" prop="workareaId">
+      <el-form-item label="作业区域" prop="workareaId">
         <el-select
           v-model="queryParams.workareaId"
-          placeholder="请选择工作区域"
+          placeholder="请选择作业区域"
         >
           <el-option
             v-for="dict in this.workareaList"
@@ -178,7 +178,7 @@
           <dict-tag :options="dict.type.sop_type" :value="scope.row.sopType" />
         </template>
       </el-table-column>
-      <el-table-column label="工作区域" align="center" prop="workareaName">
+      <el-table-column label="作业区域" align="center" prop="workareaName">
       </el-table-column>
       <el-table-column label="隔离点数量" align="center" prop="pointCount">
       </el-table-column>
@@ -270,7 +270,7 @@ export default {
       sopId: null,
       // 车间数据
       workshopList: [],
-      // 工作区域数据
+      // 作业区域数据
       workareaList: [],
       // 查询参数
       createTime: "",
@@ -374,14 +374,14 @@ export default {
         console.log(this.workshopList[0].value, "数据拿到了吗");
       });
     },
-    // 所属车间下拉改变工作区域内容
+    // 所属车间下拉改变作业区域内容
     workShopChange() {
       // console.log("我被切换了内容");
       this.queryParams.workareaId = "";
       this.getworkArea();
       // console.log(this.workareaList, "数据拿到了吗");
     },
-    // 获取工作区域数据
+    // 获取作业区域数据
     getworkArea() {
       const workshopId = this.queryParams.workshopId;
       // const workshopId = this.workshopList.map((workshop) => workshop.value);
@@ -389,7 +389,7 @@ export default {
       console.log(workshopId, "workshopId");
       if (workshopId) {
         getIsWorkareaList(workshopId).then((response) => {
-          // console.log(response, "获取工作区域数据");
+          // console.log(response, "获取作业区域数据");
           this.workareaList = response.data.map((item) => {
             return {
               label: item.workareaName,

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

@@ -186,7 +186,7 @@
               <!--                      disabled-->
               <!--                    />-->
               <!--                  </el-form-item>-->
-              <!-- <el-form-item label="工作区域" prop="workline">
+              <!-- <el-form-item label="作业区域" prop="workline">
                 <el-input
                   v-model="form.workline"
                   style="width: 100%"
@@ -575,7 +575,7 @@ export default {
       listCoLockerOption: null, //共锁人下拉数据
       OutSideUserTableData: [], //添加外部人员多个表格
       nextUserId: 0, //新增外部人员表格序号自定义
-      showWorkEare: true, //工作区域是否展示
+      showWorkEare: true, //作业区域是否展示
       isVisible: true, // 控制盒子显示状态
     };
   },
@@ -586,7 +586,7 @@ export default {
       this.isVisible = false;
     }, 2000);
 
-    this.getTreeselect(); //获取工作区域下拉
+    this.getTreeselect(); //获取作业区域下拉
     this.handleOpenStaffing();
     if (this.$route.query.sopId !== "null") {
       // console.log(this.$route.query.sopId, "接受路由参数");
@@ -632,14 +632,14 @@ export default {
     closeWorkEare() {
       this.showWorkEare = true;
     },
-    /** 查询工作区域下拉树结构 */
+    /** 查询作业区域下拉树结构 */
     getTreeselect() {
       const data = {
         current: 1,
         size: -1,
       };
       listWorkarea(data).then((response) => {
-        // console.log(response.data.records, '工作区域下拉树形结构');
+        // console.log(response.data.records, '作业区域下拉树形结构');
         // 转换为树形结构
         this.deptOptions = this.transformToTree(response.data.records);
         // console.log(this.deptOptions, 'deptOptions')
@@ -1112,7 +1112,7 @@ export default {
       console.log(selectedOption, "handleWorkshopSelected");
       // this.emitWorkShop = selectedOption
       // this.form.workshopName = selectedOption.label;//这里是回显车间的 暂时不需要
-      this.form.workline = selectedOption.label; //这里是回显工作区域的
+      this.form.workline = selectedOption.label; //这里是回显作业区域的
       this.emitworklineId = selectedOption.id;
       this.worklineMap = selectedOption.map;
     },