Merge remote-tracking branch 'origin/master'

src/views/modules/material/seekByNum.vue

@@ -9,7 +9,7 @@
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'库位编码:'">
-        <el-input v-model="searchData.locationId" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.locationID" clearable style="width: 120px"></el-input>
       </el-form-item>
 
       <el-form-item :label="'料号描述:'">
@@ -20,16 +20,7 @@
 <!--        <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>-->
 <!--      </el-form-item>-->
 
-<!--      <el-form-item label="出入库类型:">-->
-<!--        <el-select v-model="searchData.transType" placeholder="请选择" clearable style="width: 120px">-->
-<!--          <el-option-->
-<!--            v-for="i in findByNum"-->
-<!--            :key ="i.transType"-->
-<!--            :label="i.transType"-->
-<!--            :value="i.transType">-->
-<!--          </el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+
 
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
@@ -81,7 +72,7 @@
       <el-tab-pane label="卷明细" name="detail">
         <el-table
           :data="dataList2"
-          :height="height"
+          :height="secondHeight"
           border
           style="width: 100%; ">
           <el-table-column
@@ -123,12 +114,6 @@
 import {
   findByNum, // 检验方法查询
   findByRoll //查询卷明细
-  // saveLocation, // 检验方法新增
-  // updateLocation, // 检验方法修改
-  // deleteLocation, // 检验方法删除
-  // findByWarehouse, //查询库区
-  // inspectionTypeSearch, // 搜索所有检验类型
-//   // getSiteAndBuByUserName
 } from "@/api/material/seekByTrans.js"
 // import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
 // import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -175,6 +160,7 @@ export default {
       pageSize: 20,
       totalPage: 0,
       height: 200,
+      secondHeight: 200,
       dataList: [],
       dataList2:[],
       dataListLoading: false,
@@ -249,6 +235,24 @@ export default {
           status: true,
           fixed: '',
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200003,
+          serialNumber: '200003TableNum',
+          tableId: "200003Table",
+          tableName: "卷数量",
+          columnWidth: 100,
+          columnProp: 'num',
+          headerAlign: 'right',
+          align: "right",
+          columnLabel: '卷数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 200003,
@@ -368,7 +372,7 @@ export default {
           columnProp: 'expiredDate',
           headerAlign: 'center',
           align: "center",
-          columnLabel: '录入人',
+          columnLabel: '失效日期',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -485,7 +489,9 @@ export default {
 
   mounted () {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 180
+      this.height = window.innerHeight / 2 - 30
+      /*第二个表格高度的动态调整*/
+      this.secondHeight = window.innerHeight - this.height - 180
     })
   },
 

src/views/modules/material/seekByTrans.vue

@@ -6,16 +6,16 @@
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'库位编码:'">
-        <el-input v-model="searchData.locationId" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.locationID" clearable style="width: 120px"></el-input>
       </el-form-item>
 
       <el-form-item :label="'料号描述:'">
         <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
 
-      <el-form-item :label="'卷号:'">
-        <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>
-      </el-form-item>
+<!--      <el-form-item :label="'卷号:'">-->
+<!--        <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>-->
+<!--      </el-form-item>-->
 
 <!--      <el-form-item label="出入库类型:">-->
 <!--        <el-select v-model="searchData.transType" placeholder="请选择" clearable style="width: 120px">-->
@@ -78,7 +78,7 @@
       <el-tab-pane label="卷明细" name="detail">
         <el-table
           :data="dataList2"
-          :height="height"
+          :height="secondHeight"
           border
           style="width: 100%; ">
           <el-table-column
@@ -172,6 +172,7 @@ export default {
       pageSize: 20,
       totalPage: 0,
       height: 200,
+      secondHeight: 200,
       dataList: [],
       dataList2:[],
       dataListLoading: false,
@@ -200,8 +201,8 @@ export default {
           tableName: "工厂编码",
           columnWidth: 100,
           columnProp: 'site',
-          headerAlign: 'left',
-          align: "left",
+          headerAlign: 'center',
+          align: "center",
           columnLabel: '工厂编码',
           columnHidden: false,
           columnImage: false,
@@ -213,14 +214,14 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 200003,
-          serialNumber: '200003TableTransNo',
+          serialNumber: '200003TableTransType',
           tableId: "200003Table",
-          tableName: "出入库单号",
-          columnWidth: 100,
-          columnProp: 'transNo',
+          tableName: "出入库类型",
+          columnWidth: 110,
+          columnProp: 'transType',
           headerAlign: 'left',
           align: "left",
-          columnLabel: '出入库单号',
+          columnLabel: '出入库类型',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -228,13 +229,31 @@ export default {
           status: true,
           fixed: '',
         },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 200003,
+        //   serialNumber: '200003TableTransNo',
+        //   tableId: "200003Table",
+        //   tableName: "出入库单号",
+        //   columnWidth: 100,
+        //   columnProp: 'transNo',
+        //   headerAlign: 'left',
+        //   align: "left",
+        //   columnLabel: '出入库单号',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        // },
         {
           userId: this.$store.state.user.name,
           functionId: 200003,
           serialNumber: '200003TableTransDate',
           tableId: "200003Table",
           tableName: "出入库日期",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'transDate',
           headerAlign: 'center',
           align: "center",
@@ -251,8 +270,8 @@ export default {
           functionId: 200003,
           serialNumber: '200003TableWarehouseId',
           tableId: "200003Table",
-          tableName: "仓位编码",
-          columnWidth: 100,
+          tableName: "仓库编码",
+          columnWidth: 110,
           columnProp: 'warehouseID',
           headerAlign: 'left',
           align: "left",
@@ -288,7 +307,7 @@ export default {
           serialNumber: '200003TablePartNo',
           tableId: "200003Table",
           tableName: "物料编码",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'partNo',
           headerAlign: 'left',
           align: "left",
@@ -306,7 +325,7 @@ export default {
           serialNumber: '200003TablePartDesc',
           tableId: "200003Table",
           tableName: "料号描述",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'partDesc',
           headerAlign: 'left',
           align: "left",
@@ -318,13 +337,31 @@ export default {
           status: true,
           fixed: '',
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200003,
+          serialNumber: '200003TableNum',
+          tableId: "200003Table",
+          tableName: "卷数量",
+          columnWidth: 100,
+          columnProp: 'num',
+          headerAlign: 'right',
+          align: "right",
+          columnLabel: '卷数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 200003,
           serialNumber: '200003TableTransQty',
           tableId: "200003Table",
           tableName: "出入库数量",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'transQty',
           headerAlign: 'right',
           align: "right",
@@ -342,7 +379,7 @@ export default {
           serialNumber: '200003TableBatchNo',
           tableId: "200003Table",
           tableName: "批号",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'batchNo',
           headerAlign: 'left',
           align: "left",
@@ -360,7 +397,7 @@ export default {
           serialNumber: '200003TableLocationID',
           tableId: "200003Table",
           tableName: "库位",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'locationID',
           headerAlign: 'left',
           align: "left",
@@ -378,7 +415,7 @@ export default {
           serialNumber: '200003TableWdrNo',
           tableId: "200003Table",
           tableName: "W/D/R",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'wdrNo',
           headerAlign: 'left',
           align: "left",
@@ -396,7 +433,7 @@ export default {
           serialNumber: '200003TableManufactureDate',
           tableId: "200003Table",
           tableName: "生产日期",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'manufactureDate',
           headerAlign: 'center',
           align: "center",
@@ -414,7 +451,7 @@ export default {
           serialNumber: '200003TableOrderRef1',
           tableId: "200003Table",
           tableName: "关联单号",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'orderRef1',
           headerAlign: 'left',
           align: "left",
@@ -426,31 +463,31 @@ export default {
           status: true,
           fixed: '',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 200003,
-          serialNumber: '200003TableReceiver',
-          tableId: "200003Table",
-          tableName: "经手人",
-          columnWidth: 100,
-          columnProp: 'receiver',
-          headerAlign: 'left',
-          align: "left",
-          columnLabel: '经手人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 200003,
+        //   serialNumber: '200003TableReceiver',
+        //   tableId: "200003Table",
+        //   tableName: "经手人",
+        //   columnWidth: 100,
+        //   columnProp: 'receiver',
+        //   headerAlign: 'left',
+        //   align: "left",
+        //   columnLabel: '经手人',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        // },
         {
           userId: this.$store.state.user.name,
           functionId: 200003,
           serialNumber: '200003TableEnterDate',
           tableId: "200003Table",
           tableName: "录入时间",
-          columnWidth: 100,
+          columnWidth: 110,
           columnProp: 'enterDate',
           headerAlign: 'center',
           align: "center",
@@ -480,24 +517,7 @@ export default {
           status: true,
           fixed: '',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 200003,
-          serialNumber: '200003TableTransType',
-          tableId: "200003Table",
-          tableName: "出入库类型",
-          columnWidth: 100,
-          columnProp: 'transType',
-          headerAlign: 'left',
-          align: "left",
-          columnLabel: '出入库类型',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
+
       ],
       columnList2:[
         {
@@ -635,7 +655,9 @@ export default {
 
   mounted () {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 180
+      this.height = window.innerHeight / 2 - 30
+      /*第二个表格高度的动态调整*/
+      this.secondHeight = window.innerHeight - this.height - 180
     })
   },
 

src/views/modules/warehouse/location.vue

@@ -38,7 +38,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="仓位编码:">
+      <el-form-item label="仓库编码:">
         <el-select v-model="searchData.warehouseId" placeholder="请选择" clearable style="width: 120px">
           <el-option
             :label="null"
@@ -129,7 +129,7 @@
         <el-form-item label="库位名称:" prop="locationName" :rules="rules.locationName">
           <el-input v-model="modalData.locationName" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="仓位编码:">
+        <el-form-item label="仓库编码:">
           <el-select v-model="modalData.warehouseId" style="width: 221px" placeholder="请选择" :rules="rules.warehouseId">
             <el-option
               v-for="i in wareHouseList"
@@ -291,12 +291,12 @@ export default {
           functionId: 100001004,
           serialNumber: '100001004TableWarehouseId',
           tableId: "100001004Table",
-          tableName: "仓位编码",
+          tableName: "仓库编码",
           columnWidth: 145,
           columnProp: 'warehouseId',
           headerAlign: 'left',
           align: "left",
-          columnLabel: '仓位编码',
+          columnLabel: '仓库编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -553,7 +553,7 @@ export default {
 
     // 删除方法
     deleteModal (row) {
-      this.$confirm(`是否删除这个检验方法?`, '提示', {
+      this.$confirm(`是否删除这个库位信息?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/warehouse/stagingCode.vue

@@ -9,7 +9,7 @@
       <el-form-item :label="'阶段描述:'">
         <el-input v-model="searchData.phaseDescription" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'阶段描述:'">
+      <el-form-item :label="'标识码:'">
         <el-input v-model="searchData.identificationCode" clearable style="width: 120px"></el-input>
       </el-form-item>
 
@@ -372,7 +372,7 @@ export default {
 
     // 删除方法
     deleteModal (row) {
-      this.$confirm(`是否删除这个检验方法?`, '提示', {
+      this.$confirm(`是否删除这个阶段信息?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/warehouse/warehouse.vue

@@ -553,7 +553,7 @@ export default {
 
     // 删除方法
     deleteModal (row) {
-      this.$confirm(`是否删除这个检验方法?`, '提示', {
+      this.$confirm(`是否删除这个仓库信息?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'