Merge branch 'dev' of https://e.coding.net/g-pheu9517/grt-iscs/ISCS_Ui_Admin_Base into dev

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

@@ -173,11 +173,11 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
+      <!-- <el-table-column
         label="作业票Id"
         prop="ticketId"
         width="75"
-      ></el-table-column>
+      ></el-table-column> -->
       <el-table-column label="作业票编号" align="center" prop="ticketCode">
         <!-- <template slot-scope="scope">
           <el-button

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

@@ -38,10 +38,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>
@@ -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
             type="text"
@@ -112,7 +112,7 @@
             >{{ scope.row.workareaId }}
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="工作区域编码" align="center" prop="workareaCode">
         <template slot-scope="scope">
           <el-button
@@ -146,7 +146,7 @@
         </template> -->
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="look(scope.row)"
-          >预览
+            >预览
           </el-button>
         </template>
       </el-table-column>
@@ -338,7 +338,6 @@ export default {
     this.getList();
   },
   methods: {
-    
     /** 查询班组列表 */
     getList() {
       this.loading = true;

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

@@ -2,19 +2,21 @@
   <div class="newOperations">
     <!--    newOperations盒子开始-->
     <div class="left">
-      <!-- 车间 -->
-      <SopLeft
-        v-if="this.activeName == 'first'"
-        @product-line-selected="handleProductLineSelected"
-        @work-shop-selected="handleWorkshopSelected"
-        :sopProps="sopProps"
-      />
-      <!-- 隔离点 -->
-      <IsolationLeftVue
-        v-else
-        :points="points"
-        @selection-changed="handleSelectPoint"
-      />
+      <keep-alive>
+        <!-- 车间 -->
+        <SopLeft
+          v-if="this.activeName == 'first'"
+          @product-line-selected="handleProductLineSelected"
+          @work-shop-selected="handleWorkshopSelected"
+          :sopProps="sopProps"
+        />
+        <!-- 隔离点 -->
+        <IsolationLeftVue
+          v-else
+          :points="points"
+          @selection-changed="handleSelectPoint"
+        />
+      </keep-alive>
     </div>
     <div class="right">
       <div class="right_top">
@@ -264,6 +266,7 @@ export default {
       points: null, //车间逆向传递拿到的隔离点数据
       emitWorkShop: null, //车间逆向传递拿到车间相关数据
       sopProps: [], //正传递
+      worklineMap: "",
     };
   },
   mounted() {
@@ -293,7 +296,7 @@ export default {
     preStep() {
       this.activeName = "first";
 
-      this.tableData = [];
+      // this.tableData = [];
       console.log(this.form, "sopform");
     },
 
@@ -428,9 +431,11 @@ export default {
     },
     // 车间你逆向传递拿到的隔离点数据产线
     handleProductLineSelected(selectedOption) {
-      // console.log(selectedOption, '父组件接收到的 selectedOption');
+      console.log(selectedOption.map, "父组件接收到的 selectedOption");
       this.points = selectedOption;
       this.form.workline = selectedOption.label;
+      this.worklineMap = selectedOption.map;
+      console.log(this.worklineMap.length, "父组件接收到的 worklineMap");
     },
     // 车间子组件逆传递车间相关数据车间
     handleWorkshopSelected(selectedOption) {

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

@@ -150,7 +150,12 @@
         prop="sopId"
         v-if="(showId = false)"
       /> -->
-      <el-table-column label="SOPID" align="center" prop="sopId" />
+      <!-- <el-table-column
+        label="SOPID"
+        align="center"
+        prop="sopId"
+        v-show="this.noShow"
+      /> -->
       <el-table-column label="SOP编号" align="center" prop="sopCode">
         <!-- <template slot-scope="scope">
           <el-button
@@ -319,6 +324,7 @@ export default {
       },
       // 表单参数
       form: {},
+      noShow: false,
     };
   },
   created() {
@@ -435,7 +441,7 @@ export default {
     /** 新增按钮操作a */
     handleAdd() {
       this.reset();
-      
+
       this.setSopLook(false);
       this.$router.push("/mes/sop/sopm/NewSop?sopId=null");
       this.title = "添加隔离点";