31

src/views/MaterialMannage/index.vue

@@ -84,13 +84,13 @@ export default {
         { title: '物料', name: 'Input', serverName: 'title', placeholder: '请输入物料', value: '' }
       ],
       tableColums: [
-        { title: '序号', type: 'index', align: 'center', key: '', fixed: 'left', width: '100' },
-        { title: '材料分类名称', align: 'center', key: 'm_title', minWidth: 150 },
-        { title: '物料名称', align: 'center', key: 'title', minWidth: 150 },
-        { title: '单位', align: 'center', key: 'unit', minWidth: 100 },
-        { title: '厚', align: 'center', key: 'high', minWidth: 100 },
-        { title: '描述', align: 'center', key: 'remark', minWidth: 200 },
-        { title: '操作', align: 'center', slot: 'set', fixed: 'right', width: '150' },
+        { title: '序号', type: 'index', align: 'center', key: '', resizable:true, width: 150 },
+        { title: '材料分类名称', align: 'center', key: 'm_title', resizable:true, width: 250 },
+        { title: '物料名称', align: 'center', key: 'title', resizable:true, width: 250 },
+        { title: '单位', align: 'center', key: 'unit', resizable:true, width: 200 },
+        { title: '厚', align: 'center', key: 'high',resizable:true, width: 200 },
+        { title: '描述', align: 'center', key: 'remark', resizable:true, width: 300 },
+        { title: '操作', align: 'center', slot: 'set', fixed: 'right', minWidth: 150 },
       ],
       tableData: [],
       pageIndex: 1,
@@ -119,22 +119,22 @@ export default {
       });
       if (this.basic_type_id == 4 || this.basic_type_id == 5 || this.basic_type_id == 6) {
         this.tableColums = [
-          { title: '序号', type: 'index', align: 'center', key: '', fixed: 'left', width: '100' },
-          { title: '材料分类名称', align: 'center', key: 'm_title', minWidth: 150 },
-          { title: '物料名称', align: 'center', key: 'title', minWidth: 150 },
-          { title: '单位', align: 'center', key: 'unit', minWidth: 100 },
-          { title: '描述', align: 'center', key: 'remark', minWidth: 200 },
-          { title: '操作', align: 'center', slot: 'set', fixed: 'right', width: '150' },
+          { title: '序号', type: 'index', align: 'center', key: '', resizable:true, width: 150 },
+          { title: '材料分类名称', align: 'center', key: 'm_title', resizable:true, width: 250 },
+          { title: '物料名称', align: 'center', key: 'title', resizable:true, width: 250 },
+          { title: '单位', align: 'center', key: 'unit',resizable:true, width: 200 },
+          { title: '描述', align: 'center', key: 'remark',resizable:true, width: 300 },
+          { title: '操作', align: 'center', slot: 'set', fixed: 'right', minWidth: 150 },
         ]
       } else {
         this.tableColums = [
-          { title: '序号', type: 'index', align: 'center', key: '', fixed: 'left', width: '100' },
-          { title: '材料分类名称', align: 'center', key: 'm_title', minWidth: 150 },
-          { title: '物料名称', align: 'center', key: 'title', minWidth: 150 },
-          { title: '单位', align: 'center', key: 'unit', minWidth: 100 },
-          { title: '厚', align: 'center', key: 'high', minWidth: 100 },
-          { title: '描述', align: 'center', key: 'remark', minWidth: 200 },
-          { title: '操作', align: 'center', slot: 'set', fixed: 'right', width: '150' },
+          { title: '序号', type: 'index', align: 'center', key: '', resizable:true, width: 150 },
+          { title: '材料分类名称', align: 'center', key: 'm_title', resizable:true, width: 250 },
+          { title: '物料名称', align: 'center', key: 'title', resizable:true, width: 250 },
+          { title: '单位', align: 'center', key: 'unit',resizable:true, width: 200 },
+          { title: '厚', align: 'center', key: 'high', resizable:true, width: 200 },
+          { title: '描述', align: 'center', key: 'remark',resizable:true, width: 300 },
+          { title: '操作', align: 'center', slot: 'set', fixed: 'right', minWidth: 150 },
         ]
       }
     }

src/views/ProcedureMannage/index.vue

@@ -118,19 +118,19 @@ export default {
           type: "index",
           align: "center",
           key: "id",
-          width: "100",
-          fixed: "left",
+          resizable:true,
+          width: 150,
         },
-        { title: "工序类型", align: "center", key: "p_title", minWidth: 100 },
-        { title: "工序名称", align: "center", key: "title", minWidth: 100 },
-        { title: "工时", align: "center", key: "time", minWidth: 100 },
-        { title: "工价", align: "center", key: "wages", minWidth: 100 },
-        { title: "产能", align: "center", key: "capacity", minWidth: 100 },
+        { title: "工序类型", align: "center", key: "p_title",  resizable:true,width: 250 },
+        { title: "工序名称", align: "center", key: "title",  resizable:true,width: 250 },
+        { title: "工时", align: "center", key: "time",  resizable:true,width: 250 },
+        { title: "工价", align: "center", key: "wages",  resizable:true,width: 250 },
+        { title: "产能", align: "center", key: "capacity",  resizable:true,width: 250 },
         {
           title: "操作",
           align: "center",
           slot: "set",
-          width: "150",
+          minWidth: 150,
           fixed: "right",
         },
       ],

src/views/ProcessLine/index.vue

@@ -304,10 +304,12 @@ export default {
           type: "index",
           align: "center",
           key: "id",
-          width: "100",
+          resizable:true,
+          width: 200,
         },
-        { title: "工艺路线名称", align: "center", key: "title" },
-        { title: "操作", align: "center", slot: "set", width: "220" },
+        { title: "工艺路线名称", align: "center", key: "title", resizable:true,
+          width: 1100 },
+        { title: "操作", align: "center", slot: "set", minWidth: 200 },
       ],
       tableData: [],
       pageIndex: 1,

src/views/ProcessMannage/index.vue

@@ -139,11 +139,12 @@ export default {
           type: "index",
           align: "center",
           key: "id",
-          width: "100",
+          resizable:true,
+          width: 150,
         },
-        { title: `颜色`, align: "center", key: "title" },
-        { title: `分类`, align: "center", key: "type_title" },
-        { title: "操作", align: "center", slot: "set", width: "150" },
+        { title: `颜色`, align: "center", key: "title" ,resizable:true, width: 600},
+        { title: `分类`, align: "center", key: "type_title" ,resizable:true, width: 600},
+        { title: "操作", align: "center", slot: "set", minWidth: 150 },
       ],
       tableData: [],
       pageIndex: 1,

src/views/ProcessRequire/index.vue

@@ -86,8 +86,8 @@ export default {
         { title: '工艺要求', name: 'Input', value: '', serverName: 'title', placeholder: '请输入工艺要求' },
       ],
       tableColums: [
-        { title: '序号', type: 'index', align: 'center', key: 'id', minWidth: 80 },
-        { title: '工艺要求', align: 'center', key: 'title', minWidth: 200 },
+        { title: '序号', type: 'index', align: 'center', key: 'id', resizable:true,width: 200 },
+        { title: '工艺要求', align: 'center', key: 'title', resizable:true,width: 1000  },
         { title: '操作', align: 'center', key: 'set', slot: 'set', fixed: 'right', minWidth: 80, fixed: 'right' },
       ],
       tableData: [],

src/views/ProcessRoute/edit.vue

@@ -350,12 +350,12 @@ export default {
         price: [{ required: true, message: " ", trigger: "blur" }],
       },
       tableColumns: [
-        { title: "序号", type: "index", align: "center", key: "" },
+        { title: "序号", type: "index", align: "center", key: "" ,resizable:true,width:200},
         // { title: 'ID', align: 'center', key: 'id' },
-        { title: "工序名称", align: "center", key: "title" },
-        { title: "工时", align: "center", key: "time" },
-        { title: "工价", align: "center", key: "wages" },
-        { title: "产能", align: "center", key: "capacity" },
+        { title: "工序名称", align: "center", key: "title" ,resizable:true,width:340},
+        { title: "工时", align: "center", key: "time" ,resizable:true,width:340},
+        { title: "工价", align: "center", key: "wages" ,resizable:true,width:340},
+        { title: "产能", align: "center", key: "capacity",minWidth:150 },
       ],
       tableData: [],
       processRouteId: "",

src/views/ProcessRoute/index.vue

@@ -277,14 +277,16 @@ export default {
             v.hover = 1;
           }
           if (i == 0) {
-            v.fixed = "left";
-            v.width = "100";
+           
+            v.resizable = true;
+            v.width = 150;
           } else {
             if (i == res.data.top.length - 1) {
               v.fixed = "right";
-              v.width = "150";
-            } else {
               v.minWidth = 150;
+            } else {
+              v.resizable = true;
+              v.width = 250;
             }
           }
 

src/views/Warehouse/FirstInventory/detail.vue

@@ -272,10 +272,10 @@ export default {
       modal_page_size: 10,
       modal_total: 0,
       modalTableColumns: [
-        { title: '全选', type: 'selection', align: 'center', minWidth: 60 },
-        { title: '物料名称', key: 'title', align: 'center', minWidth: 110 },
-        { title: '物料规格', key: 'model', align: 'center', minWidth: 110 },
-        { title: '计量单位', key: 'unit', align: 'center', minWidth: 110 },
+        { title: '全选', type: 'selection', align: 'center', resizable:true,width: 150 },
+        { title: '物料名称', key: 'title', align: 'center', resizable:true,width: 500 },
+        { title: '物料规格', key: 'model', align: 'center', resizable:true,width: 500 },
+        { title: '计量单位', key: 'unit', align: 'center', minWidth: 300 },
       ],
       selectedColumns: [
         { title: '物料名称', key: 'title', align: 'center', minWidth: 110 },

src/views/Warehouse/FirstInventory/list.vue

@@ -208,33 +208,33 @@ export default {
         end_time: null,
       },
       tableColums: [
-        { type: 'selection', align: 'center', key: 'selection', minWidth: 100, fixed: 'left', title: '全选' },
-        { title: '仓库名称', align: 'center', key: 'warehouse_title', minWidth: 150 },
-        { title: '物料分类', align: 'center', key: 'material_type_title', minWidth: 120 },
-        { title: '物料名称', align: 'center', key: 'material_title', minWidth: 100 },
+        { type: 'selection', align: 'center', key: 'selection', resizable:true,width: 150, title: '全选' ,fixed:'left'},
+        { title: '仓库名称', align: 'center', key: 'warehouse_title', resizable:true,width: 150 },
+        { title: '物料分类', align: 'center', key: 'material_type_title', resizable:true,width: 150},
+        { title: '物料名称', align: 'center', key: 'material_title',resizable:true,width: 150},
         {
-          title: '规格型号', align: 'center', key: 'renovation_type', minWidth: 200,
+          title: '规格型号', align: 'center', key: 'renovation_type', resizable:true,width: 150,
           render: (h, params) => {
             const { row } = params
             let text = `L${row.long || 0}*W${row.width || 0}*H${row.high || 0}`
             return h('span', {}, text)
           }
         },
-        { title: '计量单位', align: 'center', key: 'unit', minWidth: 120 },
-        { title: '数量', align: 'center', key: 'num', minWidth: 100 },
+        { title: '计量单位', align: 'center', key: 'unit',resizable:true,width: 150 },
+        { title: '数量', align: 'center', key: 'num', resizable:true,width: 150 },
         {
-          title: '单价', align: 'center', key: '', minWidth: 100,
+          title: '单价', align: 'center', key: '',resizable:true,width: 150,
           render: (h, params) => {
             const { row } = params
             let text = (Number(row.total_price) / Number(row.num)).toFixed(2) | 0
             return h('span', {}, text)
           }
         },
-        { title: '金额', align: 'center', key: 'total_price', minWidth: 100 },
-        { title: '制单人', align: 'center', key: 'crt_name', minWidth: 100, },
-        { title: '审核人', align: 'center', key: 'verify_name', minWidth: 100 },
+        { title: '金额', align: 'center', key: 'total_price', resizable:true,width: 150 },
+        { title: '制单人', align: 'center', key: 'crt_name', resizable:true,width: 150 },
+        { title: '审核人', align: 'center', key: 'verify_name', resizable:true,width: 150 },
         {
-          title: '审核日期', align: 'center', key: 'upd_time', minWidth: 150,
+          title: '审核日期', align: 'center', key: 'upd_time', resizable:true,width: 150,
           render: (h, params) => h('span', {}, params.row.upd_time != 0 ? this.func.replaceDateNoHMS(params.row.upd_time) : '')
         },
         { title: '操作', align: 'center', key: 'set', slot: 'set', fixed: 'right', minWidth: 200, fixed: 'right' },

src/views/Warehouse/Warehouse/highestStockList.vue

@@ -11,31 +11,29 @@
         </div>
       </slot>
     </Toptitle>
+    <div style="height:600px">
      <div class="warehouseList_top">
       <Form :label-width="100">
         <FormItem label="物料分类">
-          <Select v-model="searchData.material_type_id"
-        
+          <Select v-model="searchData.type_title"
                   multiple
                   filterable
                   style="width:200px">
-            <Option v-for="item in materialTypeList"
-                    :key="item.id"
+            <Option v-for="(item,index) in materialTypeList"
+                    :key="index"
                     :value="item.id"
                     :label="item.title">
             </Option>
           </Select>
         </FormItem>
         <FormItem label="物料名称">
-          <Select v-model="searchData.material_id"
-      
+          <Select v-model="searchData.material"
                   multiple
                   filterable
                   style="width:200px">
-            <Option v-for="item in materialNameList"
-                    :key="item.id"
+            <Option v-for="(item,index) in materialNameList"
+                    :key="index"
                     :value="item.id"
-
                     :label="item.title">
             </Option>
           </Select>
@@ -51,7 +49,9 @@
              :data="tableData"
              border>
       </Table>
-      <div class="pageSlotStyle">
+    </div>
+    </div>
+     <div class="pageSlotStyle">
         <Page :page-size-opts="[10, 20, 30, 40,100,1000]"
               @on-page-size-change='changeSize'
               @on-change='changePage'
@@ -62,15 +62,14 @@
               :page-size='page_size' />
       </div>
     </div>
-    </div>
 </template>
 <script>
 export default {
     data(){
          return{
               searchData:{
-                  material_type_id:'',
-                  material_id:''
+                  type_title:[],
+                  material:[]
               },
               materialTypeList:[],
               materialNameList:[],
@@ -83,7 +82,7 @@ export default {
                   { title: '现存量', align: 'center', key: 'num', minWidth: 120 },
                   { title: '差量', align: 'center', key: 'difference', minWidth: 120 }
               ],
-              total:'',
+              total:0,
               page_size:10,
               page_index:1,
          }
@@ -92,6 +91,9 @@ export default {
        this.getData();
     },
   methods:{
+      handleSearchData(){
+          this.getData()
+      },
       exportData(){
 
       },
@@ -103,15 +105,19 @@ export default {
       this.page_index = e;
       this.getData()
     },
-    getData(row){
-        this.axios.get('/api/warehouse_stock_highest_list',{params:{row}}).then(res=>{
+    getData(){
+        let row = {};
+        row.page_size = this.page_size;
+        row.page_index = this.page_index;
+        row = {...row,...this.searchData};
+        this.axios.post('/api/warehouse_stock_highest_list',{...row}).then(res=>{
              this.tableData = res.data.data;
-             for(let i =0;i<res.data.material;i++){
-                 console.log(1)
-                 this.materialNameList.push({label:res.data.material[i],value:res.data.material[i]})
+             this.total = res.data.total;
+             for(let i =0;i<res.data.material.length;i++){
+                 this.materialNameList.push({id:res.data.material[i],title:res.data.material[i]})
              }
-               for(let i =0;i<res.data.type_title;i++){
-                 this.materialTypeList.push({label:res.data.type_title[i],value:res.data.type_title[i]})
+               for(let i =0;i<res.data.type_title.length;i++){
+                 this.materialTypeList.push({id:res.data.type_title[i],title:res.data.type_title[i]})
              }
              
         })

src/views/Warehouse/Warehouse/list.vue

@@ -96,10 +96,10 @@ export default {
         { title: '仓库名称', name: 'Input', value: '', serverName: 'warehouse_name', placeholder: '请输入仓库名称' },
       ],
       tableColums: [
-        { title: '序号', type: 'index', align: 'center', key: 'id', width: '100', fixed: 'left' },
-        { title: '仓库名称', align: 'center', key: 'title', minWidth: 200 },
-        { title: '仓库分类', align: 'center', key: 'type_title', minWidth: 200 },
-        { title: '操作', align: 'center', slot: 'set', width: '150', fixed: 'right' },
+        { title: '序号', type: 'index', align: 'center', key: 'id',resizable:true, width: 150 },
+        { title: '仓库名称', align: 'center', key: 'title', resizable:true,width: 500 },
+        { title: '仓库分类', align: 'center', key: 'type_title', resizable:true,width: 500 },
+        { title: '操作', align: 'center', slot: 'set', minWidth: 150, fixed: 'right' },
       ],
       tableData: [],
       showModal: false,