Merge branch 'master' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP

# Conflicts:
#	src/views/base/information/columns.ts
#	src/views/base/information/index.vue

src/api/bom/index.ts

@@ -29,3 +29,4 @@ export function batchAddBom(data: any) {
     data: data,
   });
 }*/
+

src/api/drawing/index.ts

@@ -14,3 +14,30 @@ export function updateDrawaing(data: Drawing) {
     data: data,
   });
 }
+
+
+/**
+ * 新增图纸
+ *
+ * @param data
+ */
+export function addDrawing(data: Object) {
+  return request({
+    url: "/api/v1/base/drawing/add",
+    method: "post",
+    data: data,
+  });
+}
+
+
+/**
+ * 获取图纸版本
+ *
+ * @param materialCode 物料编码
+ */
+export function getDrawing(materialCode: String) {
+  return request({
+    url: "/api/v1/base/drawing/list/"+materialCode,
+    method: "get",
+  });
+}

src/api/material/index.ts

@@ -28,3 +28,16 @@ export function getOperationCompent(opId: String): AxiosPromise<any> {
   });
 }
 
+
+/**
+ * 根据物料编码获取最大版本号
+ *
+ * @param id
+ * @param data
+ */
+export function getBomVersion(materialCode: String): AxiosPromise<any> {
+  return request({
+    url: "/api/v1/base/bomVersion/max/" + materialCode,
+    method: "get",
+  });
+}

src/api/productionLine/index.ts

@@ -10,7 +10,7 @@ import { ProductionLineInfo} from "./types";
  */
 export function updateProductionLine(data: ProductionLineInfo) {
   return request({
-    url: "/api/v1/base/productionLine/update",
+    url: "/api/v1/base/productionLine/list/update",
     method: "post",
     data: data,
   });

src/store/modules/dictionary.ts

@@ -20,12 +20,11 @@ export const useDictionaryStore = defineStore("dictionaryStore", () => {
     "workshop_section",
     "skill_requirements",
     "accessories_type",
-    "danwei_type",
     "trace_type",
     "skill_type",
     "drawing_type",
     "vehicle_level",
-	"fault_current_state",
+	  "fault_current_state",
     "escalation_fault_state",
     "defect_mana",
     "disposal_measures_type",

src/views/base/bom/components/version-drawing.vue

@@ -0,0 +1,147 @@
+<template>
+
+
+  <div class="mainContentBox">
+    <avue-crud
+      ref="crudRef"
+      v-model:search="search"
+      v-model="form"
+      :data="data"
+      :option="option"
+      v-model:page="page"
+      @row-save="createRow"
+      @row-click="rowClick"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      search-option="false"
+    >
+
+
+    </avue-crud>
+    <div class="detail-footer">
+      <el-button type="primary" @click="onSelected"> 确定 </el-button>
+      <el-button @click="cancelWindow">取消</el-button>
+
+    </div>
+  </div>
+
+
+
+</template>
+
+<script setup>
+  import { ref, getCurrentInstance } from "vue";
+  import { useCrud } from "@/hooks/userCrud";
+  import ButtonPermKeys from "@/common/configs/buttonPermission";
+  import { useCommonStoreHook } from "@/store";
+
+  const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+  import { useDictionaryStoreHook } from "@/store";
+  const test = () => {
+    isShowTable.value = true;
+    tableType.value = tableType.value == 1 ? 2 : 1;
+  };
+
+  // 传入一个url，后面不带/
+  const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+    useCrud({
+      src: "/api/v1/base/bomVersion",
+    });
+  const commonTableEmits = defineEmits(["selectedSure"]);
+  const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+    Methords; //增删改查
+  const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
+  const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
+  // checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
+  // const permission = reactive({
+  //   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
+  //   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
+  //   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
+  //   menu: true,
+  // });
+  function rowSave(form2,done,loading) {
+    form.value.materialCode=props.materialCode;
+    createRow(form,done,loading);
+
+  }
+
+
+
+  const crudRef = ref(null); //crudRef.value 获取avue-crud对象
+
+  onMounted(() => {
+    console.log(props)
+    search.value.materialCode=props.materialCode;
+    dataList();
+  });
+
+
+  const uploadFinished = () => {
+    // 上传完成后的刷新操作
+    page.currentPage = 1;
+    dataList();
+  };
+
+
+
+
+  // 设置表格列或者其他自定义的option
+  option.value = Object.assign(option.value, {
+    highlightCurrentRow: true,
+    align:'center',
+    menuAlign:'center',
+    editBtn:false,
+    menu:false,
+    column: [
+      {
+        label: "版本号",
+        prop: "bomVersion",
+        type:"number",
+        controlsPosition: '',
+        min:1.0,
+        precision: 1,
+      },
+      { label: "物料编码", prop: "materialCode", width: 130,overHidden: true,display:false,hide:true},
+
+
+
+      ],
+    viewBtn: false,
+    addBtn:false,
+  });
+  const props = defineProps({
+    materialCode: {
+      type: String,
+      default: () => {
+        return 0;
+      }
+    },
+    dialog:{
+      type:Object,
+      default:()=>{
+        return {};
+      }
+    }
+  })
+  const selectRowValue = ref({});
+  const rowClick = (row) => {
+    selectRowValue.value = row;
+  };
+  const onSelected = () => {
+    commonTableEmits("selectedSure", selectRowValue.value);
+    props.dialog.visible = false;
+  };
+  const cancelWindow=()=>{
+    props.dialog.visible = false;
+  }
+</script>
+
+<style>
+  .detail-footer{
+    float: right;
+  }
+</style>

src/views/base/bom/components/version-page.vue

@@ -8,9 +8,6 @@
       :option="option"
       @submit="rowSave"
     >
-      <template #drawingPath="scope">
-        <single-upload v-model="form.drawingPath" />
-      </template>
     </avue-form>
     <avue-crud
       ref="crudRef"
@@ -149,3 +146,8 @@
   }
 </script>
 
+<style>
+  .detail-footer{
+    float: right;
+  }
+</style>

src/views/base/bom/index.vue

@@ -6,9 +6,16 @@
       物料信息
     </div>
     <div class="detail">
-      <div class="title-detail">物料名称:{{dataDetail.materialCode}}</div>
-      <div class="title-detail">物料编码:{{dataDetail.materialName}}</div>
-      <div class="title-detail">物料属性:{{dataDetail.attributeDictLabel}}</div>
+      <div class="title-detail">物料编码 : {{dataDetail.materialCode}}</div>
+      <div class="title-detail">物料名称 : {{dataDetail.materialName}}</div>
+      <div class="title-detail">物料属性 : {{dataDetail.attributeDictValue}}</div>
+      <div class="title-detail">物料规格 : {{dataDetail.spec}}</div>
+      <div class="title-detail">单位 : {{dataDetail.unitDictValue}}</div>
+      <div class="title-detail">物料级别 : {{dataDetail.levelDictValue}}</div>
+      <div class="title-detail">产品阶段 : {{dataDetail.stageDictValue}}</div>
+      <div class="title-detail">生产厂家 : {{dataDetail.manufacturer}}</div>
+      <div class="title-detail">创建时间 : {{dataDetail.created}}</div>
+      <div class="title-detail">备注 : {{dataDetail.remark}}</div>
     </div>
     <avue-crud
       ref="crudRef"
@@ -29,7 +36,7 @@
           icon="el-icon-plus"
           @click="openMaterial"
           >新增</el-button>
-           <el-select v-model="version" placeholder="请选择BOM版本" style="width:150px;margin-left:15px" @click="openBomVersion">
+          <el-select v-model="version" placeholder="请选择BOM版本" style="width:150px;margin-left:15px" @click="openBomVersion">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -106,6 +113,7 @@ import { useCommonStoreHook, useDictionaryStoreHook } from "../../../store/index
 
 import {
   getMaterialDetails,
+  getBomVersion
 } from "@/api/material";
 
 import {
@@ -123,7 +131,7 @@ const test = () => {
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
 const openMaterial=()=>{
-  if(version.value.value===0||version.value.value===null){
+  if(version.value.value===0||version.value.value===null||version.value.value=="0"){
     ElMessage({
       message: "没有选择BOM版本",
       type: "error",
@@ -217,9 +225,20 @@ const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
 onMounted(() => {
   // console.log("crudRef", crudRef)
-  search.value.materialCode=route.params.materialCode;
-  queryMaterialDetail();
-  dataNoPageList();
+  getBomVersion(route.params.materialCode).then(
+    (data)=>{
+      version.value.value=data.data;
+      search.value.bomVersion = data.data;
+      version.value.value=data.data;
+      if(data.data!="0") {
+        version.value.label = data.data;
+      }
+      search.value.materialCode=route.params.materialCode;
+      queryMaterialDetail();
+      dataNoPageList();
+    }
+  )
+
 
 });
 
@@ -285,13 +304,38 @@ const queryMaterialDetail = () => {
 
     ({ data }) => {
       dataDetail.value=data;
-      dicts.material_properties;
-      for(var i=0;i<dicts.material_properties.length;i++){
-        if(data.attributeDictValue===dicts.material_properties[i].dictValue){
-          dataDetail.value.attributeDictLabel=dicts.material_properties[i].dictLabel;
+
+      if(null!=dicts.material_properties&&undefined!=dicts.material_properties&&dicts.material_properties.length>0){
+        for(var i=0;i<dicts.material_properties.length;i++){
+          if(data.attributeDictValue===dicts.material_properties[i].dictValue){
+            dataDetail.value.attributeDictValue=dicts.material_properties[i].dictLabel;
+          }
         }
       }
 
+      if(null!=dicts.danwei_type&&undefined!=dicts.danwei_type&&dicts.danwei_type.length>0){
+        for(var i=0;i<dicts.danwei_type.length;i++){
+          if(data.unitDictValue===dicts.danwei_type[i].dictValue){
+            dataDetail.value.unitDictValue=dicts.danwei_type[i].dictLabel;
+          }
+        }
+      }
+      if(null!=dicts.material_level&&undefined!=dicts.material_level&&dicts.material_level.length>0){
+        for(var i=0;i<dicts.material_level.length;i++){
+          if(data.levelDictValue===dicts.material_level[i].dictValue){
+            dataDetail.value.levelDictValue=dicts.material_level[i].dictLabel;
+          }
+        }
+      }
+      if(null!=dicts.stage&&undefined!=dicts.stage&&dicts.stage.length>0){
+        for(var i=0;i<dicts.stage.length;i++){
+          if(data.stageDictValue===dicts.stage[i].dictValue){
+            dataDetail.value.stageDictValue=dicts.stage[i].dictLabel;
+          }
+        }
+      }
+
+
     }
   );
 };
@@ -307,14 +351,16 @@ const selectedFinish=(selectedValue)=> {
 <style type="text/css">
   .title-detail{
     width: 30%;
-    height: 50px;
+    height: 30px;
     line-height: 50px;
-    margin: 25px 20px 25px 0;
+    margin: 5px 20px 5px 0;
     float: left;
   }
   .detail{
-    margin: 0 auto;
+    margin: 0 auto 30px;
     width: 100%;
+    padding-left: 15px;
+    overflow: hidden;
   }
   .avue-crud{
     float: left;
@@ -325,6 +371,8 @@ const selectedFinish=(selectedValue)=> {
   }
   .detail-title{
     width: 100%;
+    padding-left: 5px;
+    font-weight: 700;
 
   }
 </style>

src/views/base/information/columns.ts

@@ -1,81 +0,0 @@
-import { useDictionaryStoreHook } from "@/store";
-const { dicts } = useDictionaryStoreHook();
-import dictDataUtil from "@/common/configs/dictDataUtil";
-import { useCrud } from "@/hooks/userCrud";
-const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
-  useCrud({
-    src: "/api/v1/base/drawing",
-  });
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
-  Methords;
-const drawing=reactive({});
-
-export const columns = [
-  { label: "图纸编号", prop: "drawingCode", width: 140,search: true,overHidden: true ,rules: [{
-      required: true,
-      message: "请填写图纸编号",
-      trigger: "blur"
-    }],},
-  { label: "图纸名称", prop: "drawingTitle", width: 130,overHidden: true,search: true ,rules: [{
-      required: true,
-      message: "请填写图纸名称",
-      trigger: "blur"
-    }],},
-  { label: "物料编号", prop: "associationCode", width: 140,search: true,overHidden: true ,addDisplay: false,editDisplay: false},
-  { label: "物料名称", prop: "associationName", width: 140,search: true,overHidden: true ,addDisplay: false,editDisplay: false},
-  {
-    label: "图纸类型",
-    prop: "drawingDictValue",
-    search: true,
-    filterable: true,
-    type: 'select',
-    width: 100,overHidden: true,
-    dicUrl: dictDataUtil.request_url + "drawing_type",
-    props: { label: "dictLabel", value: "dictValue" },
-    rules: [{
-      required: true,
-      message: "请选择物料属性",
-      trigger: "blur"
-    }],
-  },
-  {
-    label: "文件",
-    prop: "drawingPath",
-    span: 24,
-    slot: true,
-    hide:true,
-  },
-  /*{ label: "文件",
-    prop: "drawing",
-    type: 'img',
-    span: 24,
-    display:false,
-    slot: true,
-    formatter: (row, column, cellValue, index) => {
-      return import.meta.env.VITE_APP_UPLOAD_URL + `${row.drawingPath}`;} },*/
-  {
-    label: "版本",
-    prop: "drawingVersion",
-    type:"number",
-    precision:1,
-    rules: [{
-      required: true,
-      message: "版本号不能为空",
-      trigger: "blur"
-    }]
-
-
-  },
-  {
-    label: "创建时间",
-    prop: "created",
-    display:false,
-  },
-  { label: "启用状态",
-    slot:true,
-    headerAlign: 'center',
-    prop: "enable",
-    width: 100,
-    addDisplay: false
-  },
-];

src/views/base/materials/columns.ts

@@ -147,11 +147,11 @@ export const columns = [
     dicData: [
       {
         label: "是",
-        value: 1,
+        value: "1",
       },
       {
         label: "否",
-        value: 0,
+        value: "0",
       },
 
     ],

src/views/base/materials/components/drawing-page.vue

@@ -31,14 +31,18 @@
           @click="multipleDelete"
           >删除</el-button
         >
+        <el-select v-model="version" placeholder="请选择BOM版本" style="width:150px;margin-left:15px" @change="getVersionDrawing">
+          <el-option
+            v-for="item in options"
+            :key="item"
+            :label="item"
+            :value="item"
+          >
+          </el-option>
+        </el-select>
       </template>
+
     </avue-crud>
-    <CommonTable
-      ref="ctableRef"
-      tableTitle="物料列表"
-      tableType="MARTERIAL"
-      @selected-sure="onSelectedFinish"
-    />
   </div>
 </template>
 <script setup>
@@ -49,7 +53,8 @@ import { useCommonStoreHook } from "@/store";
 
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import { useDictionaryStoreHook } from "@/store";
-import { addStationDevice } from "@/api/station";
+import { addDrawing,getDrawing } from "@/api/drawing";
+const { dicts } = useDictionaryStoreHook();
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;
@@ -60,8 +65,7 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/base/drawing",
   });
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
-  Methords; //增删改查
+const { dataList} = Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
 // checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
@@ -71,38 +75,67 @@ const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等
 //   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
 //   menu: true,
 // });
-function rowSave(form2, done) {
-  form.value.associationCode = props.materialCode;
-  createRow(form, done, done);
-  dataList();
+const formRef=ref(null);
+const version=ref({
+  value: '0',
+  label: '请选择图纸版本',
+});
+const options=ref([]);
+
+const getVersionDrawing=()=>{
+  if(version.value.value!="0"){
+    search.value.materialCode = props.materialCode;
+    search.value.drawingVersion=version.value;
+    dataList();
+  }
+}
+function rowSave(form,done,loading) {
+  form.associationCode = props.materialCode;
+  form.associationName=props.materialName;
+  console.info("formRef.value",done);
+  addDrawing(form).then(
+    (data)=>{
+      if(data.code==="200") {
+        ElMessage({
+          message: data.msg,
+          type: "success",
+        });
+
+        formRef.value.resetForm();
+        dataList();
+      } else {
+        ElMessage({
+          message: data.msg,
+          type: "error",
+        });
+      }
+    }
+  )
+  done();
 }
 
-const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
 onMounted(() => {
   // console.log("crudRef", crudRef)
+  getDrawing(props.materialCode).then(
+    (data)=>{
+      if(data.code==="200") {
+        options.value=Array.from(data.data);
+      } else {
+        ElMessage({
+          message: data.msg,
+          type: "error",
+        });
+      }
+    }
+  )
   search.value.materialCode = props.materialCode;
   dataList();
 });
 
-/**
- * 上传excel相关
- */
-const uploadRef = ref(null);
-const uploadFinished = () => {
-  // 上传完成后的刷新操作
-  page.currentPage = 1;
-  dataList();
-};
-const importExcelData = () => {
-  if (uploadRef.value) {
-    uploadRef.value.show("/api/v1/base/stationDevice");
-  }
-};
+
 const ctableRef = ref(null);
-const deviceList = () => {
-  ctableRef.value.startSelect();
-};
+
 
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
@@ -116,6 +149,13 @@ option.value = Object.assign(option.value, {
     },
 
     {
+      label: "物料编号",
+      prop: "associationName",
+      hide: true,
+      display: false,
+    },
+
+    {
       label: "图纸编号",
       prop: "drawingCode",
       rules: [
@@ -141,14 +181,16 @@ option.value = Object.assign(option.value, {
     {
       label: "图纸类型",
       prop: "drawingDictValue",
-      value: "material",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "排序",
-      prop: "sort",
-      type: "number",
+      filterable: true,
+      type: 'select',
+      width: 100,overHidden: true,
+      dicData:dicts.drawing_type,
+      props: { label: "dictLabel", value: "dictValue" },
+      rules: [{
+        required: true,
+        message: "请选择物料属性",
+        trigger: "blur"
+      }],
     },
     {
       label: "版本",
@@ -162,6 +204,9 @@ option.value = Object.assign(option.value, {
           trigger: "blur",
         },
       ],
+      click(){
+        dialog1.visible=true;
+      }
     },
     {
       label: "图纸上传",
@@ -169,6 +214,14 @@ option.value = Object.assign(option.value, {
       span: 24,
       slot: true,
       hide: true,
+
+      rules: [
+        {
+          required: true,
+          message: "图纸上传不能为空",
+          trigger: "blur",
+        },
+      ],
       /*formatter: (row, column, cellValue, index) => {
           return `<img src="${row.drawingPath}" alt="${row.drawingPath}" width="50" height="50">`;
         }
@@ -197,6 +250,12 @@ const props = defineProps({
       return 0;
     },
   },
+  materialName: {
+    type: String,
+    default: () => {
+      return 0;
+    },
+  },
   dialog: {
     type: Object,
     default: () => {
@@ -205,10 +264,4 @@ const props = defineProps({
   },
 });
 
-const onSelectedFinish = (selectedValue) => {
-  form.value.materialCode = selectedValue.materialCode;
-  form.value.materialName = selectedValue.materialName;
-
-  form.value.productionLineId = props.productionLineId;
-};
 </script>

src/views/base/materials/index.vue

@@ -70,7 +70,7 @@
       @close="dialog.visible = false"
       :destroy-on-close="true"
     >
-      <drawing-page  :materialCode="drawingDetail.materialCode" :dialog="dialog"/>
+      <drawing-page  :materialCode="drawingDetail.materialCode" :materialName="drawingDetail.materialName" :dialog="dialog"/>
     </el-dialog>
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
   </div>
@@ -118,6 +118,7 @@ const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const router = useRouter();
 const binding = (row) => {
+
   router.push(`/base/bom/${row.materialCode}`);
 };
 onMounted(() => {

src/views/base/modeling/production-line/components/capacity-page.vue

@@ -88,6 +88,7 @@
 
   onMounted(() => {
     // console.log("crudRef", crudRef)
+    search.value.productionLineId=props.productionLineId;
     dataList();
   });
 
@@ -178,13 +179,6 @@
     }
   })
 
-  watch?.(
-    () => props.productionLineId,
-    (newVal: string) => {
-      search.value.productionLineId = newVal
-      dataList()
-    }
-  );
   const onSelectedFinish=(selectedValue)=>{
 
     form.value.materialCode=selectedValue.materialCode;

src/views/base/modeling/production-line/index.vue

@@ -39,6 +39,7 @@
       :title="dialog.title"
       width="900px"
       @close="dialog.visible = false"
+      :destroy-on-close="true"
     >
       <capacity-page  :productionLineId="productionLine.id"/>
     </el-dialog>

src/views/base/modeling/station/columns.ts

@@ -7,6 +7,7 @@ export const columns = [
     label: "工位编号",
     prop: "stationCode",
     search: true,
+    overHidden: true,
     rules: [{
       required: true,
       message: "请填写工位编号",
@@ -16,6 +17,8 @@ export const columns = [
   {
     label: "工位名称",
     prop: "name",
+    overHidden: true,
+    width:100,
     search: true,
     rules: [{
       required: true,
@@ -26,6 +29,8 @@ export const columns = [
   {
     label: "工位类型",
     prop: "stationDictValue",
+    overHidden: true,
+    width:100,
     search: true,
     rules: [{
       required: true,
@@ -44,6 +49,8 @@ export const columns = [
   {
     label: "操作方式",
     prop: "operateDictValue",
+    width:100,
+    overHidden: true,
     rules: [{
       required: true,
       message: "操作方式",
@@ -59,6 +66,8 @@ export const columns = [
   {
     label: "负责人",
     prop: "manager",
+    overHidden: true,
+    width:100,
     rules: [{
       required: true,
       message: "请选择负责人",
@@ -71,6 +80,8 @@ export const columns = [
   {
     label: "负责人id",
     prop: "managerId",
+    overHidden: true,
+    width:80,
     hide:true,
     display:false,
 
@@ -78,11 +89,15 @@ export const columns = [
   {
     label: "所属产线",
     prop: "productionLineName",
+    width:100,
+    overHidden: true,
     display:false
   },
   {
     label: "工位地址",
     prop: "position",
+    width:100,
+    overHidden: true,
     rules: [{
       required: true,
       message: "请填写工位地址",
@@ -92,6 +107,8 @@ export const columns = [
   {
     label: "IP地址",
     prop: "stationIp",
+    overHidden: true,
+    width:100,
     rules: [{
       required: true,
       message: "请填写工位IP地址",
@@ -102,17 +119,23 @@ export const columns = [
   {
     label: "工位描述",
     prop: "remark",
+    width:100,
+    overHidden: true,
     type: 'textarea',
     span: 24,
   },
   {
     label: "创建人",
     prop: "creator",
+    width:100,
+    overHidden: true,
     display:false
   },
   {
     label: "创建时间",
     prop: "created",
+    width:100,
+    overHidden: true,
     display:false
   },
 ]

src/views/base/modeling/station/index.vue

@@ -127,6 +127,8 @@
       {
         label: "工位编号",
         prop: "stationCode",
+        overHidden: true,
+        width:120,
         search: true,
         rules: [{
           required: true,
@@ -136,8 +138,10 @@
       },
       {
         label: "工位名称",
+        width:120,
         prop: "name",
         search: true,
+        overHidden: true,
         rules: [{
           required: true,
           message: "请填写工位名称",
@@ -147,7 +151,9 @@
       {
         label: "工位类型",
         prop: "stationDictValue",
+        width:90,
         search: true,
+        overHidden: true,
         rules: [{
           required: true,
           message: "请选择工位类型",
@@ -165,6 +171,8 @@
       {
         label: "操作方式",
         prop: "operateDictValue",
+        width:90,
+        overHidden: true,
         rules: [{
           required: true,
           message: "操作方式",
@@ -180,6 +188,8 @@
       {
         label: "负责人",
         prop: "manager",
+        overHidden: true,
+        width:90,
         rules: [{
           required: true,
           message: "请选择负责人",
@@ -199,11 +209,15 @@
       {
         label: "所属产线",
         prop: "productionLineName",
+        width:90,
+        overHidden: true,
         display:false
       },
       {
         label: "工位地址",
         prop: "position",
+        width:90,
+        overHidden: true,
         rules: [{
           required: true,
           message: "请填写工位地址",
@@ -213,6 +227,8 @@
       {
         label: "IP地址",
         prop: "stationIp",
+        overHidden: true,
+        width:90,
         rules: [{
           required: true,
           message: "请填写工位IP地址",
@@ -222,6 +238,8 @@
       },
       {
         label: "工位描述",
+        width:90,
+        overHidden: true,
         prop: "remark",
         type: 'textarea',
         span: 24,
@@ -229,11 +247,13 @@
       {
         label: "创建人",
         prop: "creator",
+        overHidden: true,
         display:false
       },
       {
         label: "创建时间",
         prop: "created",
+        overHidden: true,
         display:false
       },
     ]