Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/InTheSystem/components/tgDetails.vue

@@ -10,6 +10,8 @@
         :datasource="datasource"
         cache-key="workOrderTable"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:feedStatus="{ row }">
           {{
@@ -51,7 +53,8 @@
     },
     data() {
       return {
-        loading: false
+        loading: false,
+        tableHeight: 'calc(100vh - 380px)'
       };
     },
     computed: {
@@ -227,6 +230,14 @@
         });
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 380px)';
+        }
+      },
+
       /* 刷新表格 */
       reload(where) {
         this.$nextTick(() => {

src/views/InTheSystem/index.vue

@@ -10,6 +10,8 @@
         :datasource="datasource"
         cache-key="workOrderTable"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:feedStatus="{ row }">
           {{
@@ -40,7 +42,8 @@
     },
     data() {
       return {
-        loading: false
+        loading: false,
+        tableHeight: 'calc(100vh - 330px)'
       };
     },
     computed: {
@@ -174,6 +177,14 @@
         });
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 330px)';
+        }
+      },
+
       /* 刷新表格 */
       reload(where) {
         this.$nextTick(() => {

src/views/beEntrusted/index.vue

@@ -10,6 +10,9 @@
         highlight-current-row
         row-key="id"
         cache-key="beEntrusted"
+        :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:toolbar>
           <el-button type="primary" @click="salesToProductionOpen(1)"
@@ -113,7 +116,8 @@
         id: '',
         current: null,
         warehouseId: '',
-        warehouseList: []
+        warehouseList: [],
+        tableHeight: 'calc(100vh - 340px)'
       };
     },
     computed: {
@@ -317,6 +321,14 @@
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });
+      },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 340px)';
+        }
       }
     }
   };

src/views/byProduct/index.vue

@@ -9,11 +9,13 @@
         :columns="columns"
         :datasource="datasource"
         row-key="id"
-        cache-key="pickKey"
+        cache-key="by_product_list"
         :selection.sync="selection"
         autoAmendPage
         :parse-data="parseData"
         @update:selection="handleSelectionChange"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:toolbar>
           <el-button type="primary" size="mini" @click="handByProd"
@@ -100,7 +102,8 @@
         warehouseList: [],
         form: {
           warehouseId: ''
-        }
+        },
+        tableHeight: 'calc(100vh - 300px)'
       };
     },
     computed: {
@@ -249,6 +252,14 @@
           this.reload();
         }
         this.addByProductShow = false;
+      },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 300px)';
+        }
       }
     }
   };

src/views/checklistManagement/checklist.vue

@@ -9,6 +9,9 @@
         :datasource="datasource"
         :cache-key="cacheKeyUrl"
         autoAmendPage
+        :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:toolbar>
           <el-button type="primary" size="mini" @click="openCheckAdd('add')"
@@ -207,6 +210,7 @@
           }
         ],
         cacheKeyUrl: 'mes-25925-material-table',
+        tableHeight: 'calc(100vh - 320px)',
         processSubmitDialogFlag: false
       };
     },
@@ -274,6 +278,13 @@
         this.$message.success('删除成功');
         this.reload();
       },
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 320px)';
+        }
+      },
       // 提交审批
       openApproval(row) {
         console.log('row', row);

src/views/checklistManagement/templatelist.vue

@@ -9,6 +9,9 @@
         :datasource="datasource"
         :cache-key="cacheKeyUrl"
         autoAmendPage
+        :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:toolbar>
           <el-button type="primary" size="mini" @click="openAddDialog('add')"
@@ -137,7 +140,8 @@
             showOverflowTooltip: true
           }
         ],
-        cacheKeyUrl: 'mes-259251647-template-list-table'
+        cacheKeyUrl: 'mes-259251647-template-list-table',
+        tableHeight: 'calc(100vh - 320px)'
       };
     },
     computed: {
@@ -197,6 +201,13 @@
         await checklisttemplateLogicDeleteByIds([row.id]);
         this.$message.success('删除成功');
         this.reload();
+      },
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 320px)';
+        }
       }
     }
   };

src/views/emiFinished/components/search.vue

@@ -1,64 +1,64 @@
 <!-- 搜索表单 -->
 <template>
-    <el-form
-      label-width="90px"
-      class="ele-form-search"
-      @keyup.enter.native="search"
-      @submit.native.prevent
-    >
-      <el-row :gutter="15">
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-          <el-form-item label="产品名称:">
-            <el-input
-              clearable
-              v-model="where.categoryName"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-          <el-form-item label="产品编码:">
-            <el-input
-              clearable
-              v-model="where.categoryCode"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-          <el-form-item label="产品规格:">
-            <el-input
-              clearable
-              v-model="where.specification"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+  <el-form
+    label-width="90px"
+    class="ele-form-search"
+    @keyup.enter.native="search"
+    @submit.native.prevent
+  >
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="产品名称:">
+          <el-input
+            clearable
+            v-model="where.categoryName"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="产品编码:">
+          <el-input
+            clearable
+            v-model="where.categoryCode"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="产品规格:">
+          <el-input
+            clearable
+            v-model="where.specification"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
+      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
           <el-form-item label="组织机构:">
             <auth-selection data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>
           </el-form-item>
-        </el-col>
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-          <el-form-item label-width="0px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              class="ele-btn-icon"
-              @click="search"
-            >
-              查询
-            </el-button>
-            <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
-              >重置</el-button
-            >
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-  </template>
-  
-  <script>
+        </el-col> -->
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label-width="0px">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            @click="search"
+          >
+            查询
+          </el-button>
+          <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
   export default {
     props: [],
     data() {
@@ -67,11 +67,11 @@
         categoryName: '',
         categoryCode: '',
         specification: '',
-        deptIds: [],
+        deptIds: []
       };
       return {
         // 表单数据
-        where: { ...defaultWhere },
+        where: { ...defaultWhere }
       };
     },
     computed: {
@@ -95,12 +95,11 @@
       }
     }
   };
-  </script>
-  <style lang="scss" scoped>
+</script>
+<style lang="scss" scoped>
   .ele-form-actions {
     display: flex;
     align-items: center;
     justify-content: flex-end;
   }
-  </style>
-  
+</style>

src/views/emiFinished/index.vue

@@ -9,6 +9,8 @@
         :selection.sync="selection"
         cache-key="emiFinished"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:action="{ row }">
           <el-popconfirm
@@ -43,7 +45,8 @@
         loading: false,
         dialogVisible: false,
         current: null,
-        selection: []
+        selection: [],
+        tableHeight: 'calc(100vh - 300px)'
       };
     },
     computed: {
@@ -168,6 +171,14 @@
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });
+      },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 300px)';
+        }
       }
     }
   };

src/views/entrust/components/order-search.vue

@@ -101,7 +101,7 @@
         </el-form-item>
       </el-col> -->
 
-      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
+      <el-col v-bind="styleResponsive ? { lg: 3, md: 6 } : { span: 3 }">
         <el-form-item>
           <div style="display: flex; justify-content: end">
             <el-button

src/views/entrust/index.vue

@@ -8,6 +8,9 @@
         :datasource="datasource"
         :selection.sync="selection"
         row-key="id"
+        cache-key="entrust_list_data"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:type="{ row }">
           <span> {{ getDictValue('请托类型', row.type + '') }}</span>
@@ -128,252 +131,261 @@
     </ele-modal>
   </div>
 </template>
-  
-  <script>
-import OrderSearch from './components/order-search.vue';
-import dictMixins from '@/mixins/dictMixins';
-import Create from './components/create';
-import {
-  getWarehouseList
 
-  // queryKilnXCH
-} from '@/api/mes';
-import { getList, remove, submit, warehouseEntry } from '@/api/entrust/index';
+<script>
+  import OrderSearch from './components/order-search.vue';
+  import dictMixins from '@/mixins/dictMixins';
+  import Create from './components/create';
+  import {
+    getWarehouseList
 
-export default {
-  components: {
-    OrderSearch,
-    Create
-  },
-  mixins: [dictMixins],
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      id: '',
-      warehouseId: '',
-      selection: [],
-      warehouseList: []
-    };
-  },
-  computed: {
-    // 表格列配置
-    columns() {
-      return [
-        {
-          columnKey: 'selection',
-          type: 'selection',
-          width: 45,
-          align: 'center',
-          fixed: 'left'
-        },
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          prop: 'type',
-          label: '类型',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          slot: 'type'
-        },
-        {
-          prop: 'priority',
-          label: '紧急程度',
-          width: 90,
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row, column, cellValue) => {
-            return cellValue == 1 ? '一般' : cellValue == 2 ? '紧急' : '';
-          }
-        },
-        {
-          prop: 'code',
-          label: '编码',
-          align: 'center',
-          width: 160,
-          showOverflowTooltip: true,
-          slot: 'code'
-        },
-        {
-          prop: 'name',
-          label: '名称',
-          width: 130,
-          showOverflowTooltip: true,
-          align: 'center'
-        },
-        {
-          prop: 'workOrderCode',
-          label: '工单编码',
-          width: 160,
-          showOverflowTooltip: true,
-          align: 'center'
-        },
-        {
-          prop: 'procedureList',
-          width: 130,
-          showOverflowTooltip: true,
-
-          label: '工序',
-          align: 'center',
-          formatter: (row, column, cellValue) => {
-            return cellValue.map((item) => item.produceTaskName).toString();
-          }
-        },
+    // queryKilnXCH
+  } from '@/api/mes';
+  import { getList, remove, submit, warehouseEntry } from '@/api/entrust/index';
 
-        // {
-        //   prop: 'a',
-        //   label: '关联名称',
-        //   align: 'center'
-        // },
-        {
-          prop: 'factoriesName',
-          label: '所属工厂',
-          align: 'center',
-          width: 130,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'pleaseEntrustDeptName',
-          label: '请托部门',
-          align: 'center',
-          width: 120,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'pleaseEntrustUserName',
-          label: '请托人',
-          align: 'center',
-          width: 80,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'beEntrustedFactoriesName',
-          label: '受托工厂',
-          align: 'center',
-          width: 130,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'beEntrustedDeptName',
-          label: '受托部门',
-          align: 'center',
-          width: 120,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'finishTime',
-          label: '完成时间',
-          align: 'center',
-          width: 150,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'describes',
-          label: '需求描述',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'status',
-          label: '状态',
-          align: 'center',
-          slot: 'status',
-          width: 80,
-          showOverflowTooltip: true,
-          formatter: (row, column, cellValue) => {
-            return cellValue == 0
-              ? '草稿'
-              : cellValue == 1
-              ? '审核中'
-              : cellValue == 2
-              ? '审核通过'
-              : '';
-          }
-        },
-
-        {
-          columnKey: 'action',
-          label: '操作',
-          width: 240,
-          align: 'center',
-          resizable: false,
-          fixed: 'right',
-          slot: 'action',
-          showOverflowTooltip: true
-        }
-      ];
-    }
-  },
-  created() {
-    this.requestDict('请托类型');
-    getWarehouseList().then((res) => {
-      this.warehouseList = res;
-    });
-  },
-  filters: {},
-  methods: {
-    /* 表格数据源 */
-    datasource({ page, limit, where }) {
-      return getList({
-        pageNum: page,
-        size: limit,
-        ...where
-      });
-    },
-    open(type, row) {
-      this.$refs.create.open(type, row);
+  export default {
+    components: {
+      OrderSearch,
+      Create
     },
-    openWarehouseEntry(id) {
-      this.id = id;
-      this.visible = true;
+    mixins: [dictMixins],
+    data() {
+      return {
+        visible: false,
+        loading: false,
+        id: '',
+        warehouseId: '',
+        selection: [],
+        warehouseList: [],
+        tableHeight: 'calc(100vh - 340px)'
+      };
     },
-    warehouseEntry() {
-      if(!this.warehouseId){
-        this.$message.error('请选择仓库');
-        return
+    computed: {
+      // 表格列配置
+      columns() {
+        return [
+          {
+            columnKey: 'selection',
+            type: 'selection',
+            width: 45,
+            align: 'center',
+            fixed: 'left'
+          },
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            prop: 'type',
+            label: '类型',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            slot: 'type'
+          },
+          {
+            prop: 'priority',
+            label: '紧急程度',
+            width: 90,
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row, column, cellValue) => {
+              return cellValue == 1 ? '一般' : cellValue == 2 ? '紧急' : '';
+            }
+          },
+          {
+            prop: 'code',
+            label: '编码',
+            align: 'center',
+            width: 160,
+            showOverflowTooltip: true,
+            slot: 'code'
+          },
+          {
+            prop: 'name',
+            label: '名称',
+            width: 130,
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            prop: 'workOrderCode',
+            label: '工单编码',
+            width: 160,
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            prop: 'procedureList',
+            width: 130,
+            showOverflowTooltip: true,
+
+            label: '工序',
+            align: 'center',
+            formatter: (row, column, cellValue) => {
+              return cellValue.map((item) => item.produceTaskName).toString();
+            }
+          },
+
+          // {
+          //   prop: 'a',
+          //   label: '关联名称',
+          //   align: 'center'
+          // },
+          {
+            prop: 'factoriesName',
+            label: '所属工厂',
+            align: 'center',
+            width: 130,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'pleaseEntrustDeptName',
+            label: '请托部门',
+            align: 'center',
+            width: 120,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'pleaseEntrustUserName',
+            label: '请托人',
+            align: 'center',
+            width: 80,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'beEntrustedFactoriesName',
+            label: '受托工厂',
+            align: 'center',
+            width: 130,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'beEntrustedDeptName',
+            label: '受托部门',
+            align: 'center',
+            width: 120,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'finishTime',
+            label: '完成时间',
+            align: 'center',
+            width: 150,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'describes',
+            label: '需求描述',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'status',
+            label: '状态',
+            align: 'center',
+            slot: 'status',
+            width: 80,
+            showOverflowTooltip: true,
+            formatter: (row, column, cellValue) => {
+              return cellValue == 0
+                ? '草稿'
+                : cellValue == 1
+                ? '审核中'
+                : cellValue == 2
+                ? '审核通过'
+                : '';
+            }
+          },
+
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 240,
+            align: 'center',
+            resizable: false,
+            fixed: 'right',
+            slot: 'action',
+            showOverflowTooltip: true
+          }
+        ];
       }
-      warehouseEntry({
-        id:this.id,
-        warehouseId:this.warehouseId
-      }).then(res=>{
-        this.reload();
-        this.visible = false;
-      })
     },
-    remove(id) {
-      let ids = id || this.selection.map((item) => item.id);
-      remove(ids).then((res) => {
-        this.$message.success('删除' + res);
-        this.reload();
+    created() {
+      this.requestDict('请托类型');
+      getWarehouseList().then((res) => {
+        this.warehouseList = res;
       });
     },
+    filters: {},
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where }) {
+        return getList({
+          pageNum: page,
+          size: limit,
+          ...where
+        });
+      },
+      open(type, row) {
+        this.$refs.create.open(type, row);
+      },
+      openWarehouseEntry(id) {
+        this.id = id;
+        this.visible = true;
+      },
+      warehouseEntry() {
+        if (!this.warehouseId) {
+          this.$message.error('请选择仓库');
+          return;
+        }
+        warehouseEntry({
+          id: this.id,
+          warehouseId: this.warehouseId
+        }).then((res) => {
+          this.reload();
+          this.visible = false;
+        });
+      },
+      remove(id) {
+        let ids = id || this.selection.map((item) => item.id);
+        remove(ids).then((res) => {
+          this.$message.success('删除' + res);
+          this.reload();
+        });
+      },
 
-    submit(item) {
-      submit({
-        businessId: item.id,
-        beEntrustedDeptId: item.beEntrustedDeptId
-      }).then((res) => {
-        this.$message.success('提交' + res.message);
-        this.reload();
-        this.visible = false;
-      });
-    },
-    /* 刷新表格 */
-    reload(where) {
-      this.$nextTick(() => {
-        this.$refs.table.reload({ page: 1, where });
-      });
+      submit(item) {
+        submit({
+          businessId: item.id,
+          beEntrustedDeptId: item.beEntrustedDeptId
+        }).then((res) => {
+          this.$message.success('提交' + res.message);
+          this.reload();
+          this.visible = false;
+        });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$nextTick(() => {
+          this.$refs.table.reload({ page: 1, where });
+        });
+      },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 340px)';
+        }
+      }
     }
-  }
-};
+  };
 </script>
-  
-  <style lang="scss" scoped></style>
+
+<style lang="scss" scoped></style>

src/views/exceptionManagement/components/order-search.vue

@@ -75,7 +75,7 @@
           <auth-selection data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col> -->
-      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
+      <el-col v-bind="styleResponsive ? { lg: 3, md: 6 } : { span: 3 }">
         <el-form-item>
           <div style="display: flex; justify-content: end">
             <el-button

src/views/exceptionManagement/exceptionList/index.vue

@@ -10,6 +10,8 @@
         row-key="id"
         cache-key="eceptionList"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:type="{ row }">
           <span> {{ getDictValue('异常类型', row.type + '') }}</span>
@@ -216,7 +218,8 @@
         selection: [],
         userOptions: [],
         viewId: '',
-        qualityInspector: ''
+        qualityInspector: '',
+        tableHeight: 'calc(100vh - 340px)'
       };
     },
     computed: {
@@ -390,6 +393,13 @@
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });
+      },
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 340px)';
+        }
       }
     }
   };

src/views/materialReturn/index.vue

@@ -13,6 +13,8 @@
         autoAmendPage
         :parse-data="parseData"
         :selection.sync="selection"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:toolbar>
           <el-button type="primary" size="mini" @click="handleReturn"
@@ -63,7 +65,8 @@
         returnShow: false,
         returnDetailsId: null,
 
-        sceneList: []
+        sceneList: [],
+        tableHeight: 'calc(100vh - 300px)'
       };
     },
     computed: {
@@ -192,6 +195,14 @@
             parentIdField: 'parentId'
           })
         };
+      },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 300px)';
+        }
       }
     }
   };

src/views/outsourcing/index.vue

@@ -10,6 +10,8 @@
         :datasource="datasource"
         cache-key="outsourcingListDatas"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:code="{ row }">
           <el-link
@@ -175,7 +177,8 @@
     },
     data() {
       return {
-        loading: false
+        loading: false,
+        tableHeight: 'calc(100vh - 300px)'
       };
     },
     filters: {
@@ -427,6 +430,14 @@
 
       releaseRefresh() {
         this.$refs.table.reload();
+      },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 300px)';
+        }
       }
     }
   };

src/views/pick/pickApply/index.vue

@@ -15,6 +15,8 @@
         :parse-data="parseData"
         @update:selection="handleSelectionChange"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:toolbar>
           <el-button
@@ -113,7 +115,8 @@
 
         selfDetailedShow: false,
 
-        statusList: ['未领料', '领料中', '已出库', '已驳回']
+        statusList: ['未领料', '领料中', '已出库', '已驳回'],
+        tableHeight: 'calc(100vh - 300px)'
       };
     },
     computed: {
@@ -263,6 +266,14 @@
       /* 刷新表格 */
       reload(where = {}) {
         this.$refs.table.reload({ page: 1, where });
+      },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 300px)';
+        }
       }
     }
   };

src/views/produce/components/picking/detailed.vue

@@ -343,7 +343,6 @@
       dialogDynamicHeight() {
         if (this.isFullscreen) {
           // 全屏时，高度为窗口高度
-          console.log(window.innerHeight + 'px', '全屏高度');
           this.tabalHeight = window.innerHeight - 200;
           return window.innerHeight + 'px';
         } else {

src/views/produceOrder/index.vue

@@ -34,6 +34,8 @@
         @columns-change="handleColumnChange"
         :cache-key="cacheKeyUrl"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:toolbar>
           <!-- <el-button type="success">新建</el-button> -->
@@ -315,7 +317,8 @@
         cacheKeyUrl: '7cc8e5d2-mes-produceOrder',
         columnsVersion: 0,
         dispatchVisible: false,
-        dispatchRow: {}
+        dispatchRow: {},
+        tableHeight: 'calc(100vh - 340px)'
       };
     },
     computed: {
@@ -980,6 +983,14 @@
         // });
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 340px)';
+        }
+      },
+
       getFieldModel() {
         fieldModel({ fieldModel: 't_main_category' }).then((res) => {
           const privateColumn = [

src/views/produceOrder/print.vue

@@ -10,14 +10,14 @@
         <div style="text-align: center; font-size: 16px; font-weight: bold; margin: 5px 0;">工艺流程卡</div>
         <table style="width: 100%; border-collapse: collapse; margin-bottom: 6px;">
           <tr>
-            <td rowspan="6" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
+            <td rowspan="7" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
               <img :src="card.qrLeft" alt="二维码" style="width: 90px; height: 90px;" />
             </td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">单号</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.code }}</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">单据日期</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.createDate }}</td>
-            <td rowspan="6" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
+            <td rowspan="7" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
               <img :src="card.qrRight" alt="二维码" style="width: 90px; height: 90px;" />
             </td>
           </tr>
@@ -28,8 +28,8 @@
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.productName }}</td>
           </tr>
           <tr>
-            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">图号</td>
-            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.imgCode }}</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">数量</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.quantity }}</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">计量单位</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.unit }}</td>
           </tr>
@@ -45,6 +45,12 @@
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">机型</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.modelKey }}</td>
           </tr>
+          <tr>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">客户代号</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.serialNo }}</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">图号</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.imgCode }}</td>
+          </tr>
           <tr>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">计划开始时间</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.planStartTime }}</td>
@@ -72,10 +78,10 @@
           <tbody>
             <tr v-for="(row, idx) in card.printTaskCarDetail" :key="idx">
               <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.taskName }}</td>
-              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.formingNum || '' }}</td>
-              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.formedNum || '' }}</td>
-              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.qualified || '' }}</td>
-              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.noQualifiedSum || '' }}</td>
+              <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>
+              <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>
+              <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>
+              <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>
               <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>
               <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>
               <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>

src/views/produceWord/index.vue

@@ -9,9 +9,10 @@ r++<template>
         :columns="newColumns"
         :datasource="datasource"
         :cache-key="cacheKeyUrl"
-        height="calc(100vh - 365px)"
+        :height="tableHeight"
         @sort-change="onSortChange"
         @columns-change="handleColumnChange"
+        @fullscreen-change="fullscreenChange"
         :pageSize="20"
       >
         <template v-slot:code="{ row }">
@@ -117,7 +118,8 @@ r++<template>
           { label: '待下达', value: 8 }
         ],
         cacheKeyUrl: '0c2fb832-mes-produceWord',
-        columnsVersion: 0
+        columnsVersion: 0,
+        tableHeight: 'calc(100vh - 365px)'
       };
     },
     computed: {
@@ -342,6 +344,14 @@ r++<template>
         this.reload();
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 365px)';
+        }
+      },
+
       getFieldModel() {
         fieldModel({ fieldModel: 't_main_category' }).then((res) => {
           let newRes = res.map((m) => {

src/views/sample/index.vue

@@ -18,6 +18,8 @@
         :datasource="datasource"
         :pageSize="20"
         cache-key="sample"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <!-- 表头工具栏 -->
 
@@ -201,7 +203,8 @@
           }
         ],
         activeName: '1',
-        disposeStatusList: []
+        disposeStatusList: [],
+        tableHeight: 'calc(100vh - 360px)'
       };
     },
     created() {
@@ -260,6 +263,14 @@
         });
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 360px)';
+        }
+      },
+
       async getDisposeStatus(code) {
         let res = await getByCode(code);
         if (res?.code == 0) {

src/views/taskList/index.vue

@@ -14,87 +14,88 @@
         <!-- <el-tab-pane label="我的任务" name="1"></el-tab-pane>
         <el-tab-pane label="全部任务" name="2"></el-tab-pane> -->
       </el-tabs>
-    </el-card>
-    <ele-pro-table
-      ref="table"
-      :columns="columns"
-      :datasource="datasource"
-      :pageSize="20"
-      cache-key="workOrderTable"
-      class="my_pro_table"
-      row-key="id"
-    >
-      <template v-slot:assignCode="{ row }">
-        <el-link
-          :underline="false"
-          type="primary"
-          @click="details('assign', row)"
-          >{{ row.assignCode }}
-        </el-link>
-      </template>
-      <template v-slot:workOrderCode="{ row }">
-        <el-link
-          :underline="false"
-          type="primary"
-          @click="details('assign', row)"
-          >{{ row.workOrderCode }}
-        </el-link>
-      </template>
-      <template v-slot:disposalStatus="{ row }">
-        <el-tag v-if="row.disposalStatus == 1" type="success">已接受</el-tag>
-        <el-tag v-if="row.disposalStatus == 2" type="danger">已拒绝</el-tag>
-      </template>
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="datasource"
+        :pageSize="20"
+        cache-key="workOrderTable"
+        class="my_pro_table"
+        row-key="id"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
+      >
+        <template v-slot:assignCode="{ row }">
+          <el-link
+            :underline="false"
+            type="primary"
+            @click="details('assign', row)"
+            >{{ row.assignCode }}
+          </el-link>
+        </template>
+        <template v-slot:workOrderCode="{ row }">
+          <el-link
+            :underline="false"
+            type="primary"
+            @click="details('assign', row)"
+            >{{ row.workOrderCode }}
+          </el-link>
+        </template>
+        <template v-slot:disposalStatus="{ row }">
+          <el-tag v-if="row.disposalStatus == 1" type="success">已接受</el-tag>
+          <el-tag v-if="row.disposalStatus == 2" type="danger">已拒绝</el-tag>
+        </template>
 
-      <template v-slot:action="{ row }">
-        <el-link
-          v-if="tabValue == '2' && row.disposalStatus == '2'"
-          :underline="false"
-          type="primary"
-          @click="reassignTask(row)"
-          >转派
-        </el-link>
-        <el-link
-          :underline="false"
-          type="primary"
-          @click="details('report', row)"
-          v-if="row.disposalStatus == '1' || tabValue == '2'"
-          >报工
-        </el-link>
-        <el-link
-          :underline="false"
-          type="primary"
-          @click="viewRecords(row.id)"
-          v-if="row.disposalStatus == '1' || tabValue == '2'"
-          >报工记录
-        </el-link>
+        <template v-slot:action="{ row }">
+          <el-link
+            v-if="tabValue == '2' && row.disposalStatus == '2'"
+            :underline="false"
+            type="primary"
+            @click="reassignTask(row)"
+            >转派
+          </el-link>
+          <el-link
+            :underline="false"
+            type="primary"
+            @click="details('report', row)"
+            v-if="row.disposalStatus == '1' || tabValue == '2'"
+            >报工
+          </el-link>
+          <el-link
+            :underline="false"
+            type="primary"
+            @click="viewRecords(row.id)"
+            v-if="row.disposalStatus == '1' || tabValue == '2'"
+            >报工记录
+          </el-link>
 
-        <el-popconfirm
-          icon="el-icon-info"
-          title="确定接收任务吗？"
-          @confirm="receiveTask(row.id, '1')"
-          v-if="
-            row.disposalStatus != '1' &&
-            row.disposalStatus != '2' &&
-            tabValue != '2'
-          "
-        >
-          <el-button slot="reference" type="text">接收任务</el-button>
-        </el-popconfirm>
+          <el-popconfirm
+            icon="el-icon-info"
+            title="确定接收任务吗？"
+            @confirm="receiveTask(row.id, '1')"
+            v-if="
+              row.disposalStatus != '1' &&
+              row.disposalStatus != '2' &&
+              tabValue != '2'
+            "
+          >
+            <el-button slot="reference" type="text">接收任务</el-button>
+          </el-popconfirm>
 
-        <el-popconfirm
-          icon="el-icon-info"
-          title="确定拒绝任务吗？"
-          @confirm="receiveTask(row.id, '2')"
-          v-if="
-            row.disposalStatus != '1' &&
-            row.disposalStatus != '2' &&
-            tabValue != '2'
-          "
-        >
-          <el-button slot="reference" type="text">拒绝任务</el-button>
-        </el-popconfirm>
+          <el-popconfirm
+            icon="el-icon-info"
+            title="确定拒绝任务吗？"
+            @confirm="receiveTask(row.id, '2')"
+            v-if="
+              row.disposalStatus != '1' &&
+              row.disposalStatus != '2' &&
+              tabValue != '2'
+            "
+          >
+            <el-button slot="reference" type="text">拒绝任务</el-button>
+          </el-popconfirm>
 
-        <!-- <el-link
+          <!-- <el-link
           :underline="false"
           type="primary"
           @click="receiveTask(row)"
@@ -102,15 +103,16 @@
           >接收任务
         </el-link> -->
 
-        <!-- <el-link
+          <!-- <el-link
           :underline="false"
           type="primary"
           @click="rejectTask(row)"
           v-if="row.disposalStatus != '1'"
           >拒绝任务
         </el-link> -->
-      </template>
-    </ele-pro-table>
+        </template>
+      </ele-pro-table>
+    </el-card>
     <modifyDialog ref="modifyRef" />
     <Ddtails ref="detailsRef" @success="reload" />
 
@@ -178,7 +180,8 @@
           id: ''
         },
         dialogFormVisible: false,
-        teamList: []
+        teamList: [],
+        tableHeight: 'calc(100vh - 380px)'
       };
     },
     computed: {
@@ -565,6 +568,14 @@
         this.dialogFormVisible = true;
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 380px)';
+        }
+      },
+
       reload(where) {
         this.$refs.table.reload({ page: 1, where });
       },
@@ -627,12 +638,12 @@
   .ele-body {
     height: 100%;
 
-    .my_pro_table {
-      height: calc(100% - 136px);
-    }
+    // .my_pro_table {
+    //   height: calc(100% - 136px);
+    // }
   }
 
-  ::v-deep .el-table {
-    height: calc(100% - 96px);
-  }
+  // ::v-deep .el-table {
+  //   height: calc(100% - 96px);
+  // }
 </style>

src/views/unacceptedProduct/index.vue

@@ -8,6 +8,8 @@
         :columns="columns"
         :datasource="datasource"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <!-- 操作列 -->
         <template v-slot:toolbar>
@@ -94,7 +96,8 @@
 
         current: null,
         qualityList: [],
-        disposeList: []
+        disposeList: [],
+        tableHeight: 'calc(100vh - 340px)'
       };
     },
     computed: {
@@ -308,6 +311,14 @@
         });
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 340px)';
+        }
+      },
+
       getDispose(item) {
         const data = this.disposeList.find((it) => it.value == item.status);
 

src/views/unacceptedProduct/probationalGoods/index.vue

@@ -8,6 +8,10 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :pageSize="20"
+        cache-key="probation_goods_list_data"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:action="{ row }">
           <el-popconfirm
@@ -64,7 +68,8 @@
         releasParams: {
           teamId: '',
           id: ''
-        }
+        },
+        tableHeight: 'calc(100vh - 340px)'
       };
     },
     computed: {
@@ -290,6 +295,14 @@
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });
+      },
+
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 340px)';
+        }
       }
     }
   };

src/views/unacceptedProduct/refuseManagement/index.vue

@@ -9,6 +9,9 @@
         :datasource="datasource"
         :selection.sync="selection"
         :pageSize="20"
+        cache-key="refuse_managment_list_data"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:action="{ row }">
           <el-popconfirm
@@ -65,7 +68,8 @@
         releasParams: {
           teamId: '',
           id: ''
-        }
+        },
+        tableHeight: 'calc(100vh - 340px)'
       };
     },
     computed: {
@@ -253,6 +257,14 @@
           this.reload();
         });
       },
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 340px)';
+        }
+      },
+
       open(type) {
         let isCode = true,
           isBatchNo = true;

src/views/unacceptedProduct/rework/index.vue

@@ -9,6 +9,10 @@
         :datasource="datasource"
         :selection.sync="selection"
         row-key="id"
+        cache-key="rework_list_data"
+        :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <!-- 操作列 -->
         <template v-slot:toolbar>
@@ -116,7 +120,8 @@
           teamId: '',
           id: ''
         },
-        orderType: 1
+        orderType: 1,
+        tableHeight: 'calc(100vh - 340px)'
       };
     },
     computed: {
@@ -237,23 +242,27 @@
           {
             prop: 'produceRoutingName',
             label: '工艺路线',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'produceTaskName',
             label: '工序',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'unqualifiedReason',
             label: '原因',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'type',
             label: '处理类型',
             align: 'center',
             width: 120,
+            showOverflowTooltip: true,
             formatter: (row, column, cellValue) => {
               return cellValue == 1
                 ? '转生产计划'
@@ -270,6 +279,7 @@
             prop: 'status',
             label: '状态',
             align: 'center',
+            showOverflowTooltip: true,
             formatter: (row, column, cellValue) => {
               return cellValue == 0 ? '未处理' : cellValue == 1 ? '已处理' : '';
             }
@@ -279,7 +289,8 @@
             prop: 'createTime',
             label: '创建时间',
             align: 'center',
-            width: 160
+            width: 160,
+            showOverflowTooltip: true
           }
           // {
           //   prop: 'reviewerName',
@@ -372,6 +383,14 @@
         this.$message.success('处置成功！');
         this.getList();
       },
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 340px)';
+        }
+      },
+
       /* 刷新表格 */
       reload(where) {
         this.$nextTick(() => {

src/views/warehousing/components/search.vue

@@ -7,13 +7,13 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="编码:">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="工单编码:">
           <el-input
             clearable
@@ -23,7 +23,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="仓库名称:">
           <el-input
             clearable
@@ -33,7 +33,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="物品名称:">
           <el-input
             clearable
@@ -51,7 +51,7 @@
 
       <el-col
         style="display: flex; justify-content: flex-end"
-        v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }"
+        v-bind="styleResponsive ? { lg: 3, md: 6 } : { span: 3 }"
       >
         <el-form-item label-width="0px">
           <el-button

src/views/warehousing/index.vue

@@ -10,6 +10,8 @@
         :datasource="datasource"
         cache-key="warehouseIndex"
         :pageSize="20"
+        :height="tableHeight"
+        @fullscreen-change="fullscreenChange"
       >
         <template v-slot:totalCount="{ row }">
           {{ row.totalCount }} {{ row.measuringUnit }}
@@ -74,7 +76,8 @@
           { label: '审核中', value: 1 },
           { label: '审核通过', value: 2 },
           { label: '审核不通过', value: 3 }
-        ]
+        ],
+        tableHeight: 'calc(100vh - 300px)'
       };
     },
     computed: {
@@ -257,6 +260,13 @@
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });
+      },
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 300px)';
+        }
       }
     }
   };

vue.config.js

@@ -33,8 +33,11 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
+        // target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',