Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-07-25 8a76767b0a7ad271c8487a02063590b956deb5df

 UI-Project/src/views/GlassStorage/MaterialRackManagement.vue

@@ -56,18 +56,31 @@
</el-table-column>



        <!-- 操作列 -->

        <el-table-column label="操作" width="350">

        <el-table-column label="操作" width="250">

          <template #default="{ row }">

            <el-button type="primary" size="mini" @click="edithandleRowClick(row)">修改</el-button>

            <el-button type="danger" size="mini" @click="handleDelete(row)">删除</el-button>

            <el-button type="warning" size="mini" @click="handleCheckout(row)">出库</el-button>

            <el-button type="success" size="mini" @click="addglass()">添加原片</el-button>

            <!-- <el-button type="success" size="mini" @click="addglass()">添加原片</el-button> -->

          </template>

        </el-table-column>



        
      </el-table>

      <el-pagination

        v-if="totalItems > 0"

        background

        layout="prev, pager, next"

        :total="totalItems"

        :page-size="pageSize"

        @current-change="handleCurrentChange"

      ></el-pagination>



      
  </el-dialog>





      <el-table

  <el-table

    :data="tasktableData"

    style="width: 98%; height: 150px"

    @selection-change="handleSelectionChange"

@@ -111,17 +124,16 @@
      </template>

    </el-table-column>

  </el-table>

  </el-dialog>

    </el-card>



    <!-- <div ref="chart" id="chart" style="width: 100%; height: 250px;"></div> -->







   

    <div class="img-ypcc" >





      <div class="img-car1" :style="'z-index:999;left:297px;top:158px;position:absolute;'">

      <div class="img-car1" :style="'z-index:999;left:397px;top:205px;position:absolute;'">

      <div v-show="cellshow1" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>

    </div>

   

@@ -187,19 +199,19 @@
      </el-form-item>



      <el-form-item label="长度">

        <el-input v-model="formData.wid" required style="width: 250px; font-size: 20px" @focus="clearInput('wid')"></el-input>

        <el-input v-model="formData.width" required style="width: 250px; font-size: 20px" @focus="clearInput('wid')"></el-input>

      </el-form-item>



      <el-form-item label="高度">

        <el-input v-model="formData.heig" required style="width: 250px; font-size: 20px" @focus="clearInput('heig')"></el-input>

        <el-input v-model="formData.height" required style="width: 250px; font-size: 20px" @focus="clearInput('heig')"></el-input>

      </el-form-item>



      <el-form-item label="厚度">

        <el-input v-model="formData.thinkness" required style="width: 250px; font-size: 20px" @focus="clearInput('thinkness')"></el-input>

        <el-input v-model="formData.thickness" required style="width: 250px; font-size: 20px" @focus="clearInput('thinkness')"></el-input>

      </el-form-item>



      <el-form-item label="数量">

        <el-input-number v-model="formData.num" required :min="0" :max="9000" style="width: 250px; font-size: 20px" @focus="clearInput('num')"></el-input-number>

        <el-input-number v-model="formData.quantity" required :min="0" :max="9000" style="width: 250px; font-size: 20px" @focus="clearInput('num')"></el-input-number>

      </el-form-item>

    </el-form>



@@ -216,6 +228,15 @@
        </el-form-item>

        <el-form-item label="批次号">

          <el-input v-model="editForm.batchnumber"></el-input>

        </el-form-item>

        <el-form-item label="长度">

          <el-input v-model="editForm.length"></el-input>

        </el-form-item>

        <el-form-item label="高度">

          <el-input v-model="editForm.height"></el-input>

        </el-form-item>

        <el-form-item label="厚度">

          <el-input v-model="editForm.thickness"></el-input>

        </el-form-item>

      </el-form>



@@ -236,69 +257,25 @@
import { ref, onMounted, onBeforeUnmount } from 'vue'; // 导入 Vue 3 的模块

import * as echarts from 'echarts';

import { ElMessage, ElMessageBox } from 'element-plus'

import {tableData} from '@/stores/tableData.js';







    const loading = ref(false);

    const tableData = ref([

    {

        location: '1',

        type: 'Type A',

        length: '100',

        height: '50',

        thickness: '10',

        quantity: '5',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 1

      },

      {

        location: '2',

        type: 'Type B',

        length: '120',

        height: '60',

        thickness: '12',

        quantity: '10',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 0

      },

      {

        location: '3',

        type: 'Type B',

        length: '120',

        height: '60',

        thickness: '12',

        quantity: '10',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 1

      },

      {

        location: '4',

        type: 'Type B',

        length: '120',

        height: '60',

        thickness: '12',

        quantity: '10',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 1

      },

      {

        location: '5',

        type: 'Type B',

        length: '120',

        height: '60',

        thickness: '12',

        quantity: '10',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 1

      }

      // Add more data as needed

    ]);

   


    const Hidden = ref(false)





    const totalItems = ref(0);

    totalItems.value = 10;

    const pageSize = 10;

    let currentPage = ref(1);

    const handleCurrentChange = (val) => {



      currentPage.value = val;

      
    };



   const getTagType2 =(status) => {

      switch (status) {

@@ -470,7 +447,10 @@
    const editdialogVisible = ref(false);

    const editForm = ref({

      quantity: '',

      batchnumber: ''

      batchnumber: '',

      length:'',

      height:'',

      thickness:''

    });

    const editFormRef = ref(null);

    let currentRow = ref(null);

@@ -478,8 +458,12 @@
    // 处理行点击事件

    const edithandleRowClick = (row) => {

      currentRow.value = row;

      console.log(row)

      editForm.value.quantity = row.quantity.toString();

      editForm.value.batchnumber = row.batchnumber;

      editForm.value.length = row.length;

      editForm.value.height = row.height;

      editForm.value.thickness = row.thickness;

      editdialogVisible.value = true;

      console.log(editForm.value)

    };

@@ -500,6 +484,11 @@
    const edithandleDialogClose = () => {

      editForm.value.quantity = '';

      editForm.value.batchnumber = '';

      editForm.value.width = '';

      editForm.value.height = '';

      editForm.value.thickness = '';

  


      currentRow.value = null;

    };



@@ -586,17 +575,13 @@
</script>



<style scoped>

html, body {

  height: 100%;

  margin: 0;

  padding: 0;

  overflow: hidden; /* 禁止出现滚动条 */

}



.app-container {



  flex-direction: column;

  height: 100vh; /* 使用视口高度 */

#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}

#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}

#dialog-footer{

  text-align: center;

  margin-top: -15px;

}





@@ -606,12 +591,13 @@
  background-image:url('../../assets/ypcc.png');

  background-repeat: no-repeat;

    background-attachment: local;

    min-height: 800px;

    width: 1600px;

    min-height: 600px;

    width: 1400px;

    max-width: 100%;

    background-size: 1400px 800px;

    background-size: 1400px 600px;

    overflow: hidden;

    position:relative

    position:relative;

    margin-top:0px

}



.img-car1{

@@ -619,10 +605,10 @@
  position: absolute;

  background-repeat: no-repeat;

    background-attachment: local;

    min-height: 200px;

    min-height: 400px;

    width: 200px;

    max-width: 100%;

    background-size: 200px 70px;

    background-size: 200px 170px;

    overflow: hidden;

    position:relative

}