Merge remote-tracking branch 'origin/master'

src/views/modules/base/maintainProductRouting.vue

@@ -0,0 +1,266 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-form-item :label="'物料编码：'">
+        <el-input v-model="mainData.partNo" readonly   style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'物料名称/规格型号：'">
+        <el-input v-model="mainData.spec"  readonly style="width: 274px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'状态：'">
+        <el-input v-model="mainData.status"  readonly style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工厂编号：'">
+        <el-input v-model="mainData.site"  readonly style="width: 130px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-form-item :label="'工艺路线类型：'">
+        <el-input v-model="mainData.routingType" readonly  style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'版本号：'">
+        <el-input v-model="mainData.revNo"  readonly style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'启用日期：'">
+        <el-input v-model="mainData.phaseInDate"  readonly style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'停用日期：'">
+        <el-input v-model="mainData.phaseOutDate"  readonly style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'计量单位：'">
+        <el-input v-model="mainData.umid" readonly  style="width: 130px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-form-item :label="'备注：'">
+        <el-input v-model="mainData.remark"  readonly style="width: 417px"></el-input>
+        <el-checkbox style="margin-left: 20px" disabled v-model="mainData.defaultflag">默认</el-checkbox>
+        <el-checkbox style="margin-left: 80px" disabled v-model="mainData.repairFlag">修复版本</el-checkbox>
+      </el-form-item>
+    </el-form>
+
+    <el-dialog title="数据表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="680px" >
+      <el-table
+        height="400"
+        :data="dataList"
+        border
+        @row-dblclick="tableHanddle"
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in columnList" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed"
+          :width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="modelFlag2 = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+
+  }from "@/api/base.js"
+    export default {
+      name: "maintainProductRouting",
+      data () {
+        return {
+          dataListLoading: false,
+          mainData:{
+            partNo:'',
+            spec:'',
+            status:'',
+            site:'',
+            routingType:'',
+            revNo:'',
+            phaseInDate:'',
+            phaseOutDate:'',
+            umid:'',
+            remark:'',
+            defaultflag:'',
+            repairFlag:'',
+          },
+          modelFlag:false,
+          dataList:[],
+          columnList:[
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040TablePartNo',
+              tableId: "6040Table",
+              tableName: "维护工艺路线数据表",
+              columnProp: "partNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "物料编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040TableSpec',
+              tableId: "6040Table",
+              tableName: "维护工艺路线数据表",
+              columnProp: "spec",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "名称/规格",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040TablePartNo',
+              tableId: "6040Table",
+              tableName: "维护工艺路线数据表",
+              columnProp: "partNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "工艺路线类型",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040TablePartNo',
+              tableId: "6040Table",
+              tableName: "维护工艺路线数据表",
+              columnProp: "partNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "产品编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040TablePartNo',
+              tableId: "6040Table",
+              tableName: "维护工艺路线数据表",
+              columnProp: "partNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "产品编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040TablePartNo',
+              tableId: "6040Table",
+              tableName: "维护工艺路线数据表",
+              columnProp: "partNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "产品编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040TablePartNo',
+              tableId: "6040Table",
+              tableName: "维护工艺路线数据表",
+              columnProp: "partNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "产品编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6040,
+              serialNumber: '6040TablePartNo',
+              tableId: "6040Table",
+              tableName: "维护工艺路线数据表",
+              columnProp: "partNo",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "产品编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
+
+          ],
+        }
+      },
+      mounted() {
+        this.$nextTick(()=>{
+          this.height = window.innerHeight - 150;
+        })
+      },
+      methods: {
+        tableHanddle(row){
+
+        },
+      },
+      created() {
+
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/modules/base/workCenter.vue

@@ -46,7 +46,7 @@
     </el-form>
     <el-tabs v-model="activeName" >
       <el-tab-pane :label="'基本信息'" name="first">
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
           <el-form-item :label="'加工中心类型：'">
             <el-input v-model="modelData.workCenterType" readonly style="width: 130px"></el-input>
           </el-form-item>
@@ -321,6 +321,8 @@
     </el-dialog>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+
+
   </div>
 </template>
 

src/views/modules/productProcessRoute/searchProductProcessRoute.vue

@@ -724,7 +724,6 @@
           this.partData = data.rows[0];
           this.partFlag=true;
         })
-
       },
       jumpWorkCenter(){
         if(this.currentRow==null){