生产版本详情提交

src/views/factoryModel/productionLine/components/edit.vue

@@ -10,186 +10,234 @@
     width="1200px"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item
-            label="产线编码:"
-            prop="code"
-            style="margin-bottom: 22px"
-          >
-            <el-input
-              clearable
-              :maxlength="20"
-              v-model="form.code"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item
-            label="产线名称:"
-            prop="name"
-            style="margin-bottom: 22px"
-          >
-            <el-input
-              clearable
-              :maxlength="20"
-              v-model="form.name"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
-          <el-form-item label="所属工厂:" prop="extInfo.factoryId">
-            <el-select
-              v-model="form.extInfo.factoryId"
-              placeholder="请选择"
-              @change="change_factoryId"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in options_factory"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
-          <el-form-item label="所属车间:" prop="parentId">
-            <el-select
-              v-model="form.parentId"
-              placeholder="请选择"
-              style="width: 100%"
-              @change="change_workshop"
-            >
-              <el-option
-                v-for="item in options.workshop"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item
-            label="负责人部门:"
-            prop="extInfo.principalDep"
-            style="margin-bottom: 22px"
-          >
-            <ele-tree-select
-              clearable
-              :data="options.principalDep"
-              v-model="form.extInfo.principalDep"
-              valueKey="id"
-              labelKey="name"
-              placeholder="请选择"
-              @change="change_principalDep"
-              default-expand-all
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
-          <el-form-item label="负责人:" prop="extInfo.principal">
-            <el-select
-              v-model="form.extInfo.principal"
-              placeholder="请选择"
-              @change="change_principal"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in options.principal"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
-          <el-form-item label="联系方式:" prop="extInfo.phone">
-            <el-input
-              clearable
-              :maxlength="20"
-              v-model="form.extInfo.phone"
-              οninput="value=value.replace(/[^\d]/g,'');if(value.length > 11)value = value.slice(0, 11)"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
-          <el-form-item label="工作节拍:" prop="extInfo.workMeter">
-            <el-input
-              clearable
-              :maxlength="20"
-              v-model="form.extInfo.workMeter"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
-          <el-form-item label="加工能力:" prop="extInfo.workingAbility">
-            <el-input
-              clearable
-              :maxlength="20"
-              v-model="form.extInfo.workingAbility"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="margin-bottom: 22px">
-          <el-form-item label="状态:" prop="enabled">
-            <el-select
-              v-model="form.enabled"
-              placeholder="请选择"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in options.enabled"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" style="margin-bottom: 22px">
-          <el-form-item label="地址:" prop="extInfo.location">
-            <div class="location-warp">
-              <el-cascader
-                clearable
-                style="width: 400px"
-                v-model="form.extInfo.location"
-                :options="options.cityDataLabel"
-              ></el-cascader>
-              <el-input
-                class="detail"
-                clearable
-                :maxlength="20"
-                v-model="form.extInfo.locationDetail"
-                placeholder="请输入详细地址"
-              />
-            </div>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" style="margin-bottom: 22px">
-          <el-form-item label="备注:" prop="remark">
-            <el-input
-              clearable
-              :maxlength="100"
-              type="textarea"
-              v-model="form.remark"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-card
+        shadow="never"
+        header="基本信息"
+        body-style="padding: 22px 22px 0 22px;"
+      >
+         <el-row>
+           <el-col :span="8">
+             <el-form-item
+               label="产线编码:"
+               prop="code"
+               style="margin-bottom: 22px"
+             >
+               <el-input
+                 clearable
+                 :maxlength="20"
+                 v-model="form.code"
+                 placeholder="请输入"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="8">
+             <el-form-item
+               label="产线名称:"
+               prop="name"
+               style="margin-bottom: 22px"
+             >
+               <el-input
+                 clearable
+                 :maxlength="20"
+                 v-model="form.name"
+                 placeholder="请输入"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="8" style="margin-bottom: 22px">
+             <el-form-item label="所属工厂:" prop="extInfo.factoryId">
+               <el-select
+                 v-model="form.extInfo.factoryId"
+                 placeholder="请选择"
+                 @change="change_factoryId"
+                 style="width: 100%"
+               >
+                 <el-option
+                   v-for="item in options_factory"
+                   :key="item.id"
+                   :label="item.name"
+                   :value="item.id"
+                 >
+                 </el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
+           <el-col :span="8" style="margin-bottom: 22px">
+             <el-form-item label="所属车间:" prop="parentId">
+               <el-select
+                 v-model="form.parentId"
+                 placeholder="请选择"
+                 style="width: 100%"
+                 @change="change_workshop"
+               >
+                 <el-option
+                   v-for="item in options.workshop"
+                   :key="item.id"
+                   :label="item.name"
+                   :value="item.id"
+                 >
+                 </el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
+           <el-col :span="8">
+             <el-form-item
+               label="负责人部门:"
+               prop="extInfo.principalDep"
+               style="margin-bottom: 22px"
+             >
+               <ele-tree-select
+                 clearable
+                 :data="options.principalDep"
+                 v-model="form.extInfo.principalDep"
+                 valueKey="id"
+                 labelKey="name"
+                 placeholder="请选择"
+                 @change="change_principalDep"
+                 default-expand-all
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="8" style="margin-bottom: 22px">
+             <el-form-item label="负责人:" prop="extInfo.principal">
+               <el-select
+                 v-model="form.extInfo.principal"
+                 placeholder="请选择"
+                 @change="change_principal"
+                 style="width: 100%"
+               >
+                 <el-option
+                   v-for="item in options.principal"
+                   :key="item.id"
+                   :label="item.name"
+                   :value="item.id"
+                 >
+                 </el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
+           <el-col :span="8" style="margin-bottom: 22px">
+             <el-form-item label="联系方式:" prop="extInfo.phone">
+               <el-input
+                 clearable
+                 :maxlength="20"
+                 v-model="form.extInfo.phone"
+                 οninput="value=value.replace(/[^\d]/g,'');if(value.length > 11)value = value.slice(0, 11)"
+                 placeholder="请输入"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="8" style="margin-bottom: 22px">
+             <el-form-item label="工作节拍:" prop="extInfo.workMeter">
+               <el-input
+                 clearable
+                 :maxlength="20"
+                 v-model="form.extInfo.workMeter"
+                 placeholder="请输入"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="8" style="margin-bottom: 22px">
+             <el-form-item label="加工能力:" prop="extInfo.workingAbility">
+               <el-input
+                 clearable
+                 :maxlength="20"
+                 v-model="form.extInfo.workingAbility"
+                 placeholder="请输入"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="8" style="margin-bottom: 22px">
+             <el-form-item label="状态:" prop="enabled">
+               <el-select
+                 v-model="form.enabled"
+                 placeholder="请选择"
+                 style="width: 100%"
+               >
+                 <el-option
+                   v-for="item in options.enabled"
+                   :key="item.value"
+                   :label="item.label"
+                   :value="item.value"
+                 >
+                 </el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
+           <el-col :span="24" style="margin-bottom: 22px">
+             <el-form-item label="地址:" prop="extInfo.location">
+               <div class="location-warp">
+                 <el-cascader
+                   clearable
+                   style="width: 400px"
+                   v-model="form.extInfo.location"
+                   :options="options.cityDataLabel"
+                 ></el-cascader>
+                 <el-input
+                   class="detail"
+                   clearable
+                   :maxlength="20"
+                   v-model="form.extInfo.locationDetail"
+                   placeholder="请输入详细地址"
+                 />
+               </div>
+             </el-form-item>
+           </el-col>
+           <el-col :span="24" style="margin-bottom: 22px">
+             <el-form-item label="备注:" prop="remark">
+               <el-input
+                 clearable
+                 :maxlength="100"
+                 type="textarea"
+                 v-model="form.remark"
+                 placeholder="请输入"
+               />
+             </el-form-item>
+           </el-col>
+         </el-row>
+      </el-card>
+      <el-card
+        shadow="never"
+        header="产能计划"
+        body-style="padding: 0 22px 10px 22px;"
+      >
+        <el-button type="primary" class="add-btn">添加</el-button>
+        <el-table
+          :data="planList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          :header-cell-style="{
+            background: '#F0F3F3',
+            border: 'none'
+          }"
+        >
+          <el-table-column prop="code" label="计划周期">
+            <!-- <template slot-scope="{ row }">
+              <div>{{ row.code }}</div>
+            </template> -->
+          </el-table-column>
+          <el-table-column label="计划时段">
+          </el-table-column>
+          <el-table-column label="产量目标">
+          </el-table-column>
+          <el-table-column label="创建人">
+          </el-table-column>
+          <el-table-column label="创建时间">
+          </el-table-column>
+          <el-table-column label="状态">
+          </el-table-column>
+          <el-table-column width="80" label="操作">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="danger"
+                >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+
     </el-form>
     <template v-slot:footer>
       <el-button @click="handleClose">取消</el-button>
@@ -243,7 +291,7 @@ export default {
       enabled: 1,
       parentId: '',
       remark: '',
-      type: 4 //  FACTORY(1, "工厂"), WORKSHOP_PLAN(2, "厂房"), WORKSHOP(3, "车间"), LINE(4, "厂线");
+      type: 4  //  FACTORY(1, "工厂"), WORKSHOP_PLAN(2, "厂房"), WORKSHOP(3, "车间"), LINE(4, "厂线");
     };
     return {
       defaultForm,
@@ -285,7 +333,8 @@ export default {
           }
         ],
         cityDataLabel
-      }
+      },
+      planList:[]
     };
   },
   computed: {
@@ -418,4 +467,8 @@ export default {
     margin-left: 10px;
   }
 }
+.add-btn{
+  display:black;
+  margin: 20px 0;
+}
 </style>

src/views/factoryModel/station/components/AssetSelection.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="container">
+    <!-- 单据弹窗 -->
+    <el-dialog
+      title="选择设备"
+      :before-close="handleClose"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+      width="60%"
+    >
+      <el-form label-width="60px">
+        <el-row>
+          <el-col :span="6">
+             <el-form-item label="编码：">
+               <el-input
+                 clearable
+                 placeholder="请输入"
+                 v-model.trim="search.code"
+               ></el-input>
+             </el-form-item>
+          </el-col>
+          <el-col :span="6">
+             <el-form-item label="名称：">
+               <el-input
+                 clearable
+                 v-model="search.name"
+                 placeholder="请输入"
+               ></el-input>
+             </el-form-item>
+          </el-col>
+          <el-col :span="6">
+             <el-form-item label="型号：">
+               <el-input
+                 clearable
+                 v-model="search.model"
+                 placeholder="请输入"
+               ></el-input>
+             </el-form-item>
+          </el-col>
+          <el-col :span="6">
+             <el-form-item  label-width="20px">
+                <el-button type="primary" @click="getList">搜索</el-button>
+                <el-button @click="reset">重置</el-button>
+             </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
+         :data="tableData"
+         height="450"
+         highlight-current-row
+         @row-click="single"
+       >
+         <el-table-column label="设备编码" prop="code" width="200"></el-table-column>
+         <el-table-column label="设备分类" prop="name"></el-table-column>
+         <el-table-column label="设备名称" prop="remark"></el-table-column>
+         <el-table-column label="型号" prop="name"></el-table-column>
+         <el-table-column label="供应商" prop="remark"></el-table-column>
+         <el-table-column label="选择" align="center">
+            <template slot-scope="scope">
+         	 <el-radio class="radio" v-model="radio" :label="scope.row.id"><i></i></el-radio>
+            </template>
+         </el-table-column>
+       </el-table>
+      <div class="pagination">
+         <el-pagination
+           background
+           layout="total, sizes, prev, pager, next, jumper"
+           :total="total"
+           :page-sizes="[10, 20, 50, 100]"
+           :page-size="pagination.size"
+           :current-page.sync="pagination.pageNum"
+           @current-change="handleCurrent"
+           @size-change="handleSize"
+         >
+         </el-pagination>
+       </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="handleClose">关 闭</el-button>
+        <el-button size="small" @click="sumbit" type="primary">确 认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+  <script>
+import { getAssetList } from '@/api/ledgerAssets';
+export default {
+  data() {
+    return {
+      tableData:[],
+      search:{},
+      pagination: {
+        pageNum: 1,
+        size: 10,
+      },
+      total: 0,
+      radio: '',
+      current:null,
+      dialogVisible: false
+    };
+  },
+  created() {},
+  methods: {
+    // 单击获取id
+    single (row) {
+        this.current = row
+        this.radio = row.id
+    },
+    open() {
+      this.dialogVisible = true;
+      this.getList();
+    },
+    getList(){
+       let params = {
+          rootCategoryLevelId:'1666337718796607490',
+          ...this.search,
+          ...this.pagination
+        }
+       getAssetList(params).then(res=>{
+           console.log('rrr',res)
+       })
+    },
+    reset(){
+       this.search={}
+       this.getList()
+    },
+    handleCurrent (page) {
+      this.pagination.pageNum = page
+      this.getList()
+    },
+    handleSize (size) {
+      this.pagination.pageNum = 1
+      this.pagination.size = size
+      this.getList()
+    },
+    //保存
+    sumbit() {
+      if (this.selectStafflist.length === 0) {
+        this.$message.warning('请选择设备');
+      } else {
+        this.$emit('confirm', JSON.parse(JSON.stringify(this.selectStafflist)));
+        this.handleClose();
+      }
+    },
+    handleClose() {
+      this.staffList = [];
+      this.selectStafflist = [];
+      this.dialogVisible = false;
+    }
+  }
+};
+</script>
+
+  <style lang='scss' scoped>
+.container {
+  padding: 10px 0;
+}
+.zw-container {
+  height: 500px;
+}
+.zw-header-title {
+  display: inline-block;
+  margin-right: 10px;
+  font-weight: 600;
+}
+.details-title {
+  line-height: 32px;
+  height: 32px;
+}
+.zw-page-list-p {
+  font-size: 14px;
+  margin-bottom: 18px;
+  display: flex;
+  justify-content: space-between;
+  // align-items: center;
+  .zw-page-list-right {
+    display: flex;
+  }
+}
+.zw-page {
+  background: #fff;
+  //   padding: 20px 0;
+  .zw-page-left {
+    padding: 0 10px;
+  }
+  .zw-page-main {
+    padding: 0 10px;
+    .zw-page-main-list {
+      span {
+        margin-right: 10px;
+      }
+      .zw-page-span-num {
+        font-size: 12px;
+        color: #157a2c;
+      }
+      .zw-page-p-operation {
+        text-align: right;
+        // width: 200px;
+      }
+      .zw-page-operation-num {
+        width: 100px;
+        margin: 0 10px;
+      }
+    }
+    .zw-page-list-more {
+      text-align: center;
+    }
+  }
+  .zw-page-right {
+    .zw-card-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 32px;
+    }
+    span {
+      margin-right: 10px;
+    }
+    .zw-page-span-num {
+      font-size: 12px;
+      color: #157a2c;
+    }
+  }
+}
+.notes {
+  font-size: 12px;
+  color: #909090;
+}
+</style>

src/views/factoryModel/station/components/edit.vue

@@ -9,7 +9,7 @@
     :close-on-press-escape="false"
     width="1200px"
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
       <el-card
         shadow="never"
         header="基本信息"
@@ -54,6 +54,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备编码:" prop="assetCode">
+              <el-input
+                v-model="form.assetCode"
+                readonly
+                @click.native="chooseAsset"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称:" prop="assetName">
+              <el-input
+                disabled
+                v-model="form.assetName"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="所属车间:" prop="extInfo.workshopId">
               <el-select
@@ -121,8 +138,41 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
+            <el-form-item label="所属工作中心:" prop="workCenterId">
+              <el-select
+                v-model="form.workCenterId"
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in options.productionLineId"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="可执行工序:" prop="processId">
+              <el-select
+                v-model="form.processId"
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in options.productionLineId"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14">
             <el-form-item label="节拍时间:" prop="extInfo.meterTime">
               <div class="workMeter-warp">
                 <el-input
@@ -145,12 +195,25 @@
                   >
                   </el-option>
                 </el-select>
-                <span class="s3">/次</span>
+                <span class="s3">/</span>
+                <el-select
+                  class="s2"
+                  v-model="form.extInfo.meterTimeUnit"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in options.meterTimeUnit"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </div>
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+<!--          <el-col :span="8">
             <el-form-item label="状态:" prop="enabled">
               <el-select
                 v-model="form.enabled"
@@ -166,7 +229,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="24">
             <el-form-item label="备注:" prop="remark">
@@ -181,13 +244,13 @@
           </el-col>
         </el-row>
       </el-card>
-      <el-card
+<!--      <el-card
         shadow="never"
         header="关联设备"
         body-style="padding: 22px 22px 0 22px;"
       >
         <equipmentTable ref="equipmentTable"></equipmentTable>
-      </el-card>
+      </el-card> -->
     </el-form>
     <template v-slot:footer>
       <el-button @click="handleClose">取消</el-button>
@@ -195,6 +258,9 @@
         保存
       </el-button>
     </template>
+
+     <!-- 选择设备 -->
+    <AssetSelection ref="equipmentTable" @confirm="assetConfirm"></AssetSelection>
   </el-dialog>
 </template>
 
@@ -206,10 +272,10 @@ import {
   getById
 } from '@/api/factoryModel';
 import { getUserPage } from '@/api/system/organization';
-import equipmentTable from './equipmentTable.vue';
+import AssetSelection from './AssetSelection.vue';
 export default {
   components: {
-    equipmentTable
+    AssetSelection
   },
   props: {
     options_groupId: {
@@ -258,6 +324,8 @@ export default {
       rules: {
         code: [{ required: true, message: '请输入', trigger: 'blur' }],
         name: [{ required: true, message: '请输入', trigger: 'blur' }],
+        workCenterId:[{ required: true, message: '请选择', trigger: 'change' }],
+        processId:[{ required: true, message: '请选择', trigger: 'change' }],
         'extInfo.factoryId': [
           { required: true, message: '请输入', trigger: 'change' }
         ],
@@ -333,6 +401,14 @@ export default {
     }
   },
   methods: {
+    chooseAsset(){
+        this.$refs.equipmentTable.open()
+    },
+    
+    assetConfirm(data){
+      
+    },
+
     open(type, row) {
       this.type = type;
       this.visible = true;
@@ -482,10 +558,10 @@ export default {
 }
 .workMeter-warp {
   .s1 {
-    width: 40%;
+    width: 30%;
   }
   .s2 {
-    width: 40%;
+    width: 20%;
     margin-left: 10px;
   }
   .s3 {

src/views/technology/version/components/user-search.vue

@@ -37,17 +37,19 @@
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button @click="reset">重置</el-button>
-        </div>
+        <el-form-item label="" label-width="20px">
+           <div class="ele-form-actions">
+             <el-button
+               type="primary"
+               icon="el-icon-search"
+               class="ele-btn-icon"
+               @click="search"
+             >
+               查询
+             </el-button>
+             <el-button @click="reset">重置</el-button>
+           </div>
+        </el-form-item>
       </el-col>
     </el-row>
   </el-form>

src/views/technology/version/details.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="ele-body">
+    <el-card shadow="never">
+       <div class="back-btn">
+         <el-button type="plain" @click="goBack" > 返回 </el-button>
+       </div>
+       <el-form label-width="110px">
+           <div class="basic-details-title">
+             <span class="border-span">基本信息</span>
+           </div>
+           <el-row>
+             <el-col :span="8">
+               <el-form-item label="版本号">
+                 <span>  </span>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="版本名称">
+                 <span>  </span>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="所属工厂">
+                 <span>
+                 </span>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="产品编码">
+
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="产品名称">
+                 <span> </span>
+               </el-form-item>
+             </el-col>
+           </el-row>
+           <div class="basic-details-title">
+             <span class="border-span">关联生产信息</span>
+           </div>
+           <el-row>
+             <el-col :span="8">
+               <el-form-item label="工艺路线编码">
+                 <span>  </span>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="工艺路线名称">
+                 <span>  </span>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="工艺路线版本">
+                 <span>
+                 </span>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="产品BOM编码">
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="产品BOM名称">
+                 <span> </span>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="产品BOM版本">
+                 <span> </span>
+               </el-form-item>
+             </el-col>
+           </el-row>
+           <ele-pro-table
+             ref="table"
+             :columns="columns"
+             :datasource="datasource"
+             row-key="id"
+           >
+           </ele-pro-table>
+       </el-form>
+    </el-card>
+  </div>
+</template>
+<script>
+  import dictMixins from '@/mixins/dictMixins';
+  import {  getDetail  } from '@/api/ruleManagement/matter'
+  import route from '@/api/technology/route';
+export default {
+  mixins: [dictMixins],
+  components: {  },
+  data () {
+    return {
+       // 表格列配置
+       columns: [
+         {
+           prop: 'code',
+           label: '工序编号',
+           showOverflowTooltip: true,
+           align: 'center',
+           minWidth: 110
+         },
+         {
+           prop: 'name',
+           label: '工序名称',
+           showOverflowTooltip: true,
+           align: 'center',
+           minWidth: 110
+         },
+         {
+           align: 'center',
+           prop: 'categoryCode',
+           label: '工序控制码',
+           showOverflowTooltip: true,
+           minWidth: 110
+         },
+         {
+           prop: 'categoryName',
+           label: '工作中心',
+           align: 'center',
+           showOverflowTooltip: true,
+           minWidth: 110
+         }
+       ],
+    }
+  },
+  async created () {
+  //   this.getInfo()
+	 // this.requestDict('规则类型');
+  },
+  methods: {
+    /* 表格数据源 */
+    async datasource({ page, limit, where, order }) {
+      const res = await route.list({
+        ...where,
+        ...order,
+        pageNum: page,
+        size: limit
+      });
+      return res;
+    },
+    async getInfo () {
+      const data = await getDetail(this.$route.query.id)
+        this.tableData = data.ruleItems
+        this.infoData = data
+    },
+
+    goBack(){
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.back-btn{
+  width:100%;
+  display: flex;
+  align-items: center;
+  justify-content:flex-end;
+}
+.basic-details-title {
+  margin-bottom: 12px;
+  margin-top: 10px;
+  border-bottom: 1px solid #1890ff;
+  padding-bottom: 8px;
+  display: flex;
+  justify-content: space-between;
+}
+.basic-details-title .border-span {
+  height: 18px;
+  font-size: 16px;
+  border-left: 4px solid #1890ff;
+  padding-left: 8px;
+  font-weight: 500;
+}
+</style>

src/views/technology/version/index.vue

@@ -12,7 +12,7 @@
         row-key="code"
       >
         <!-- 表头工具栏 -->
-        <template v-slot:toolbar>
+<!--        <template v-slot:toolbar>
           <el-button
             size="small"
             type="primary"
@@ -22,7 +22,7 @@
           >
             新建
           </el-button>
-        </template>
+        </template> -->
 
         <!-- 状态列 -->
         <template v-slot:status="{ row }">
@@ -37,19 +37,8 @@
             icon="el-icon-edit"
             @click="openEdit(row)"
           >
-            修改
+            查看
           </el-link>
-          <el-popconfirm
-            class="ele-action"
-            title="确定要删除当前工序吗？"
-            @confirm="remove(row)"
-          >
-            <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">
-                删除
-              </el-link>
-            </template>
-          </el-popconfirm>
         </template>
       </ele-pro-table>
     </el-card>
@@ -69,14 +58,13 @@
       return {
         // 表格列配置
         columns: [
-          {
-            columnKey: 'selection',
-            type: 'selection',
-            width: 45,
-            align: 'center',
-            fixed: 'left'
-          },
-
+          // {
+          //   columnKey: 'selection',
+          //   type: 'selection',
+          //   width: 45,
+          //   align: 'center',
+          //   fixed: 'left'
+          // },
           {
             prop: 'code',
             label: '产品编码',
@@ -166,12 +154,12 @@
       reload(where) {
         this.$refs.table.reload({ page: 1, where: where });
       },
-      /* 打开编辑弹窗 */
-      openEdit(row) {
-        this.current = row;
-        this.showEdit = true;
-        this.$refs.userEdit.$refs.form &&
-          this.$refs.userEdit.$refs.form.clearValidate();
+      /* 查看详情 */
+      openEdit({id}) {
+        this.$router.push({
+          path: '/technology/version/details',
+          query: {id}
+        })
       },
 
       /* 删除 */