Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

# Conflicts:
#	src/views/leadMatch/MatchList/matchPage.vue

src/routerMap/index.js

@@ -1123,6 +1123,15 @@ const routerMap = [
       require(["@/views/Warehouse/Warehouse/minStockList"], resolve),
   },
   {
+    path: "/cms/Warehouse/Warehouse/highestStockList",
+    name: "highestStockList", // 仓库管理→最高库存预警表
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/Warehouse/Warehouse/highestStockList"], resolve),
+  },
+  {
     path: "/cms/Warehouse/Warehouse/stockingTable",
     name: "stockingTable", // 仓库管理→库存台账
     meta: {

src/views/BasicSettings/AdditionalProject/index.vue

@@ -111,11 +111,11 @@ export default {
       page_size: 10,
       proxyObj: {},
       tableColums: [
-        { title: '序号', type: 'index', key: '', align: 'center', width: 80 },
-        { title: '附加项目名称', key: 'title', align: 'center', tooltip: true, minWidth: 140 },
-        { title: '数量', key: 'num', align: 'center', tooltip: true, minWidth: 140 },
-        { title: '单价', key: 'price', align: 'center', tooltip: true, minWidth: 140 },
-        { title: '操作', key: '', align: 'center', slot: 'set', width: 200 },
+        { title: '序号', type: 'index', key: '', align: 'center', resizable: true,width: 200 },
+        { title: '附加项目名称', key: 'title', align: 'center', tooltip: true, resizable: true,width: 400 },
+        { title: '数量', key: 'num', align: 'center', tooltip: true, resizable: true,width: 400 },
+        { title: '单价', key: 'price', align: 'center', tooltip: true, resizable: true,width: 400 },
+        { title: '操作', key: '', align: 'center', slot: 'set', minWidth: 200 },
       ],
       tableData: [],
       type: null,

src/views/BasicSettings/CustomerFiles/detail.vue

@@ -190,7 +190,8 @@ export default {
           title: "负责人",
           key: "service_name",
           align: "center",
-          minWidth: 140,
+           resizable: true,
+            width: 300,
           render: (h, params) => {
             const { row, index } = params;
             const currencyRow = this.tableData[index];
@@ -217,7 +218,8 @@ export default {
           title: "手机号",
           key: "mobile",
           align: "center",
-          minWidth: 140,
+           resizable: true,
+             width: 300,
           render: (h, params) => {
             const { row, index } = params;
             const currencyRow = this.tableData[index];
@@ -244,7 +246,8 @@ export default {
           title: "地区",
           key: "area_title",
           align: "center",
-          minWidth: 120,
+          resizable: true,
+                        width: 300,
           render: (h, params) => {
             const { row, index } = params;
             const currencyRow = this.tableData[index];
@@ -267,7 +270,8 @@ export default {
           title: "详细地址",
           key: "part_id",
           align: "center",
-          minWidth: 200,
+           resizable: true,
+                        width: 400,
           render: (h, params) => {
             const { row, index } = params;
             const currencyRow = this.tableData[index];
@@ -291,7 +295,7 @@ export default {
           },
         },
 
-        { title: "操作", key: "", align: "center", slot: "set", width: 200 },
+        { title: "操作", key: "", align: "center", slot: "set", minWidth: 200 },
       ],
       treeData: [
         {

src/views/BasicSettings/CustomerFiles/list.vue

@@ -240,28 +240,32 @@ export default {
           key: "code",
           align: "center",
           tooltip: true,
-          minWidth: 140,
+           resizable: true,
+          width: 240,
         },
         {
           title: "客户名称",
           key: "title",
           align: "center",
           tooltip: true,
-          minWidth: 140,
+          resizable: true,
+          width: 240,
         },
         {
           title: "折扣率(%)",
           key: "fax",
           align: "center",
           tooltip: true,
-          minWidth: 140,
+           resizable: true,
+          width: 200,
         },
         {
           title: "专营业务员",
           key: "nickname",
           align: "center",
           tooltip: true,
-          minWidth: 140,
+          resizable: true,
+          width: 240,
         },
         // {
         //   title: '专营业务员', key: 'service_id', align: 'center', tooltip: true, minWidth: 140,
@@ -279,7 +283,8 @@ export default {
           key: "plan_title",
           align: "center",
           tooltip: true,
-          minWidth: 140,
+           resizable: true,
+              width: 240,
           // render: (h, params) => {
           //   const { row } = params
           //   let text
@@ -293,7 +298,8 @@ export default {
           title: "是否启用",
           key: "lock",
           align: "center",
-          minWidth: 100,
+           resizable: true,
+             width: 100,
           render: (h, params) => {
             const { row } = params;
             return h("span", {}, row.lock == 1 ? "是" : "否");
@@ -304,7 +310,8 @@ export default {
           key: "crt_time",
           align: "center",
           tooltip: true,
-          minWidth: 140,
+          resizable: true,
+           width: 240,
           render: (h, params) => {
             return h("span", {}, this.func.replaceDate(params.row.crt_time));
           },

src/views/BasicSettings/CustomerProductPrice/list.vue

@@ -73,27 +73,27 @@ export default {
           title: "客户分类编码",
           key: "type_code",
           align: "center",
-          minWidth: 140,
+         resizable: true,width: 340,
         },
         {
           title: "客户分类名称",
           key: "type_title",
           align: "center",
-          minWidth: 140,
+         resizable: true,width: 340,
         },
         {
           title: "客户编码",
           key: "code",
           align: "center",
           tooltip: true,
-          minWidth: 140,
+          resizable: true,width: 340,
         },
         {
           title: "客户名称",
           key: "title",
           align: "center",
           tooltip: true,
-          minWidth: 140,
+          resizable: true,width: 340,
         },
         // {
         //   title: '审核人', key: 'service_id', align: 'center', tooltip: true, minWidth: 140,
@@ -114,7 +114,7 @@ export default {
         //     return h('span', {}, text)
         //   }
         // },
-        { title: "操作", key: "", align: "center", slot: "set", width: 300 },
+        { title: "操作", key: "", align: "center", slot: "set", minWidth: 300 },
       ],
       type: null,
       userList: [],

src/views/BasicSettings/SuppliersManage/SippliersList.vue

@@ -198,16 +198,16 @@ export default {
         size: "small",
       },
       tableColumns: [
-        { title: "供应商编码", key: "code", align: "center", minWidth: 110 },
-        { title: "供应商名称", key: "title", align: "center", minWidth: 200 },
-        { title: "业务员", key: "nickname", align: "center", minWidth: 80 },
-        { title: "负责人", key: "contact", align: "center", minWidth: 80 },
-        { title: "手机号", key: "mobile", align: "center", minWidth: 150 },
+        { title: "供应商编码", key: "code", align: "center", resizable: true,width: 150 },
+        { title: "供应商名称", key: "title", align: "center", resizable: true,width: 300 },
+        { title: "业务员", key: "nickname", align: "center",resizable: true,width: 130 },
+        { title: "负责人", key: "contact", align: "center",resizable: true,width: 130 },
+        { title: "手机号", key: "mobile", align: "center", resizable: true,width: 200 },
         {
           title: "是否启用",
           key: "state",
           align: "center",
-          minWidth: 100,
+          resizable: true,width: 100,
           render: (h, params) => {
             const { row } = params;
             return h("span", {}, row.state == 1 ? "是" : "否");
@@ -217,7 +217,7 @@ export default {
           title: "创建时间",
           key: "crt_time",
           align: "center",
-          minWidth: 120,
+         resizable: true,width: 220,
           render: (h, params) => {
             const { row } = params;
             return h("span", {}, this.func.replaceDate(row.crt_time));

src/views/BasicSettings/SuppliersManage/SippliersStockPriceList.vue

@@ -123,13 +123,13 @@ export default {
         type_title:'',
       },
       tableColumns: [
-        { title: '供应商分类编码', key: 'type_code', align: 'center', minWidth: 140 },
-        { title: '供应商分类名称', key: 'type_title', align: 'center', minWidth: 140 },
-        { title: '供应商编码', key: 'code', align: 'center', minWidth: 120 },
-        { title: '供应商名称', key: 'title', align: 'center', minWidth: 120 },
-        { title: '审核人', key: 'nickname', align: 'center', minWidth: 120 },
+        { title: '供应商分类编码', key: 'type_code', align: 'center',resizable: true,width: 260 },
+        { title: '供应商分类名称', key: 'type_title', align: 'center',resizable: true,width: 260 },
+        { title: '供应商编码', key: 'code', align: 'center', resizable: true,width: 240 },
+        { title: '供应商名称', key: 'title', align: 'center',resizable: true,width: 240 },
+        { title: '审核人', key: 'nickname', align: 'center',resizable: true,width: 240 },
         {
-          title: '审核状态', key: 'state', align: 'center', minWidth: 120,
+          title: '审核状态', key: 'state', align: 'center',resizable: true,width: 240,
           render: (h, params) => {
             const { row } = params
             return h('span', {}, row.state == 0 ? '未审核' : '已审核')

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/OrderMannage/BusinessOrderlist/list.vue

@@ -509,6 +509,8 @@ export default {
         { title: "收款备注", align: "center", key: "remark" },
       ],
       modalChargeTableData: [],
+      client_name_list:[],
+      address_list:[],
       tableData: [],
       page_index: 1,
       page_size: 10,
@@ -803,17 +805,25 @@ export default {
         },
         {
           title: "客户姓名",
-          name: "Input",
+          name: "Select",
           placeholder: "请输入客户姓名",
+          filterable: true,
           value: "",
           serverName: "client_name",
+          optionName: "client_name",
+          optionValue: "client_name",
+          option: this.client_name_list,
         },
         {
           title: "客户地址",
-          name: "Input",
+          name: "Select",
           placeholder: "请输入客户地址",
+          filterable: true,
           value: "",
           serverName: "address",
+          optionName: "address",
+          optionValue: "address",
+          option: this.address_list,
         },
         {
           title: "业务员",
@@ -961,6 +971,13 @@ export default {
           this.tableData = res.data.data;
           this.total = res.data.total;
           this.handleSetHeader(res);
+          
+         for(let i = 0;i<res.data.address.length;i++){
+           this.address_list.push({address:res.data.address[i]})
+         }
+          for(let i = 0;i<res.data.client_name.length;i++){
+           this.client_name_list.push({client_name:res.data.client_name[i]})
+         }
         }
       });
     },

src/views/PartsMannage/edit.vue

@@ -443,7 +443,8 @@ export default {
           align: "center",
           key: "spare_parts",
           slot: "spare_parts",
-          minWidth: 150,
+          resizable: true,
+          width: 150,
           fixed: "left",
         },
         {
@@ -451,35 +452,40 @@ export default {
           align: "center",
           key: "title",
           slot: "title",
-          minWidth: 150,
+           resizable: true,
+          width: 150,
         },
         {
           title: "数量",
           align: "center",
           key: "number",
           slot: "number",
-          minWidth: 150,
+           resizable: true,
+          width: 150,
         },
         {
           title: "单位",
           align: "center",
           key: "company",
           slot: "company",
-          minWidth: 100,
+           resizable: true,
+          width: 150,
         },
         {
           title: "高",
           align: "center",
           key: "long",
           slot: "long",
-          minWidth: 120,
+          resizable: true,
+          width: 150,
         },
         {
           title: "宽",
           align: "center",
           key: "wide",
           slot: "wide",
-          minWidth: 120,
+          resizable: true,
+          width: 150,
         },
         {
           title: "厚",
@@ -493,49 +499,56 @@ export default {
           align: "center",
           key: "requirement",
           slot: "requirement",
-          minWidth: 150,
+           resizable: true,
+          width: 150,
         },
         {
           title: "贴木皮名称",
           align: "center",
           key: "num",
           slot: "woodSkinSet",
-          minWidth: 150,
+          resizable: true,
+          width: 150,
         },
         {
           title: "贴面数",
           align: "center",
           key: "sub_num",
           slot: "sub_num",
-          minWidth: 150,
+          resizable: true,
+          width: 150,
         },
         {
           title: "油漆组合",
           align: "center",
           key: "paint",
           slot: "paintSet",
-          minWidth: 150,
+           resizable: true,
+          width: 150,
         },
          {
           title: "是否生成芯片码",
           align: "center",
           key: "label",
           slot: "label",
-          minWidth: 150,
+          resizable: true,
+          width: 150,
         },
          {
           title: "打印格式",
           align: "center",
           key: "format",
           slot: "format",
-          minWidth: 150,
+           resizable: true,
+          width: 150,
         },
         {
           title: "打印数量",
           align: "center",
           key: "printNum",
           slot: "printNum",
-          minWidth: 150,
+          resizable: true,
+          width: 150,
         },
         {
           title: "操作",
@@ -551,35 +564,40 @@ export default {
           align: "center",
           key: "spare_parts",
           slot: "slot_metals",
-          minWidth: 150,
+          resizable: true,
+          width: 260,
         },
         {
           title: "数量",
           align: "center",
           key: "number",
           slot: "slot_metals_number",
-          minWidth: 150,
+          resizable: true,
+          width: 260,
         },
         {
           title: "单位",
           align: "center",
           key: "unit",
           slot: "slot_metals_unit",
-          minWidth: 100,
+          resizable: true,
+          width: 260,
         },
         {
           title: "单价",
           align: "center",
           key: "price",
           slot: "slot_metals_price",
-          minWidth: 100,
+          resizable: true,
+          width: 260,
         },
         {
           title: "总价",
           align: "center",
           key: "total_prive",
           slot: "slot_metals_total_price",
-          minWidth: 100,
+           resizable: true,
+          width: 260,
         },
         {
           title: "操作",

src/views/PartsMannage/index.vue

@@ -90,15 +90,15 @@ export default {
   data () {
     return {
       list: [
-        { title: '部件名称', name: 'Input', value: '', serverName: 'title', placeholder: '请输入部件名称' },
+        { title: '部件名称', name: 'Input', value: '', serverName: 'title', placeholder: '请输入部件名称' ,width: "180" },
       ],
       tableColums: [
-        { title: '序号', type: 'index', align: 'center', key: '', minWidth: 100 },
-        { title: '产品分类名称', align: 'center', key: 'product_type_title', minWidth: 100 },
-        { title: '部件分类名称', align: 'center', key: 'p_title', minWidth: 100 },
-        { title: '部件名称', align: 'center', key: 'title', minWidth: 100 },
-        { title: '单位', align: 'center', key: 'company', minWidth: 100 },
-        { title: '操作', align: 'center', slot: 'set', width: '150' },
+        { title: '序号', type: 'index', align: 'center', key: '', resizable: true,width: 100 },
+        { title: '产品分类名称', align: 'center', key: 'product_type_title', resizable: true,width: 350 },
+        { title: '部件分类名称', align: 'center', key: 'p_title', resizable: true,width: 350 },
+        { title: '部件名称', align: 'center', key: 'title', resizable: true,width: 350 },
+        { title: '单位', align: 'center', key: 'company', resizable: true,width: 200 },
+        { title: '操作', align: 'center', slot: 'set', minWidth: 150 },
       ],
       tableData: [],
       pageIndex: 1,

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

@@ -14,6 +14,7 @@
       :total="total"
     >
       <div slot="titleButton" style="display:flex">
+         <Button type="success" ghost icon='ios-download-outline' style="margin-right:10px;" @click='exportData()'>导出</Button>
         <Button
           v-if="persimissionData['新增'] || persimissionData.all"
           @click="addItems"
@@ -138,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,
@@ -225,6 +227,24 @@ export default {
       //   this.getData(this.proxyObj)
       // }
     },
+  exportData(){
+    let url ='';
+    if(this.$route.query.id==1){
+      url = '/api/process_material_export';
+    }
+    if(this.$route.query.id==2){
+      url = "/api/process_finish_export";
+    }
+    if(this.$route.query.id==3){
+      url = "/api/process_ship_export";
+    }
+    this.axios.get(url,{params:{id:this.$route.query.id}}).then(res=>{
+              if(res.code == 200){
+                let url = `${this.$store.state.ip}/api/storage/${res.data.file}`
+                location.href = url
+            }
+           })
+        },
     postInfo() {
       let post_url, post_data;
       if (this.showType == 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/ProductMannage/index.vue

@@ -263,17 +263,19 @@ export default {
           type: "index",
           align: "center",
           key: "",
-          width: "100",
+           resizable: true,
+          width: 100,
         },
-        { title: "分类名称", align: "center", key: "type_name" },
-        { title: "产品名称", align: "center", key: "title" },
-        { title: "计量单位", align: "center", key: "unit" },
-        { title: "型号", align: "center", key: "model" },
-        { title: "图号", align: "center", key: "url_number" },
+        { title: "分类名称", align: "center", key: "type_name", resizable: true,width:200 },
+        { title: "产品名称", align: "center", key: "title" , resizable: true,width:200},
+        { title: "计量单位", align: "center", key: "unit" , resizable: true,width:200},
+        { title: "型号", align: "center", key: "model", resizable: true,width:200 },
+        { title: "图号", align: "center", key: "url_number", resizable: true,width:200 },
         {
           title: "产品图片",
           align: "center",
           key: "company",
+           resizable: true,width:200,
           render: (h, params) => {
             const { row } = params;
             return h("img", {
@@ -330,6 +332,7 @@ export default {
           title: "图纸",
           align: "center",
           key: "url",
+         resizable: true,width:200,
           render: (h, params) => {
             const { row } = params;
             return h("img", {
@@ -358,7 +361,7 @@ export default {
             });
           },
         },
-        { title: "操作", align: "center", slot: "set", width: "150" },
+        { title: "操作", align: "center", slot: "set", minWidth: 150 },
       ],
       tableData: [],
       pageIndex: 1,

src/views/ProductionOrderList/Dispatchlist/confirm.vue

@@ -155,7 +155,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
-          optionName: "username",
+          optionName: "title",
           optionValue: "title",
           serverName: "title",
           option: this.users,

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

@@ -0,0 +1,140 @@
+<template>
+    <div>
+         <Toptitle title="最高库存预警表">
+      <slot name="titleButton">
+        <div style="display:flex;">
+          <Button @click="exportData"
+                  type="warning"
+                  ghost
+                  icon='md-return-left'
+                  style="margin-right:10px;">导出</Button>
+        </div>
+      </slot>
+    </Toptitle>
+    <div style="height:600px">
+     <div class="warehouseList_top">
+      <Form :label-width="100">
+        <FormItem label="物料分类">
+          <Select v-model="searchData.type_title"
+                  multiple
+                  filterable
+                  style="width:200px">
+            <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"
+                  multiple
+                  filterable
+                  style="width:200px">
+            <Option v-for="(item,index) in materialNameList"
+                    :key="index"
+                    :value="item.id"
+                    :label="item.title">
+            </Option>
+          </Select>
+        </FormItem>
+        <FormItem>
+          <Button type="primary"
+                  @click="handleSearchData">搜索</Button>
+        </FormItem>
+      </Form>
+    </div>
+    <div class="warehouseList_content">
+      <Table :columns="tableColums"
+             :data="tableData"
+             border>
+      </Table>
+    </div>
+    </div>
+     <div class="pageSlotStyle">
+        <Page :page-size-opts="[10, 20, 30, 40,100,1000]"
+              @on-page-size-change='changeSize'
+              @on-change='changePage'
+              :current='page_index'
+              show-total
+              :total="total"
+              show-sizer
+              :page-size='page_size' />
+      </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+         return{
+              searchData:{
+                  type_title:[],
+                  material:[]
+              },
+              materialTypeList:[],
+              materialNameList:[],
+              tableData:[],
+              tableColums:[
+                  { title: '物料名称', align: 'center', key: 'title', minWidth: 120 },
+                  { title: '规格型号', align: 'center', key: 'model', minWidth: 120 },
+                  { title: '计量单位', align: 'center', key: 'unit', minWidth: 120 },
+                  { title: '最高库存', align: 'center', key: 'top_number', minWidth: 120 },
+                  { title: '现存量', align: 'center', key: 'num', minWidth: 120 },
+                  { title: '差量', align: 'center', key: 'difference', minWidth: 120 }
+              ],
+              total:0,
+              page_size:10,
+              page_index:1,
+         }
+    },
+    created(){
+       this.getData();
+    },
+  methods:{
+      handleSearchData(){
+          this.getData()
+      },
+      exportData(){
+
+      },
+       changeSize (e) {
+      this.page_size = e;
+      this.getData()
+    },
+     changePage (e) {
+      this.page_index = e;
+      this.getData()
+    },
+    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;
+             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.length;i++){
+                 this.materialTypeList.push({id:res.data.type_title[i],title:res.data.type_title[i]})
+             }
+             
+        })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.warehouseList_top{
+    margin: 20px 0;
+}
+.ivu-form{
+    display: flex;
+    flex-wrap: wrap;
+}
+.pageSlotStyle{
+   margin: 20px 0;
+    text-align: center;
+}
+</style>

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,

src/views/leadMatch/MatchList/matchList.vue

@@ -94,21 +94,21 @@ export default {
           align: "center",
           key: "project_number",
          resizable: true,
-                        width: 250
+                        width: 350
         },
         {
           title: "项目名称",
           align: "center",
           key: "project_name",
           resizable: true,
-                        width: 250
+                        width: 350
         },
         {
           title: "项目简称",
           align: "center",
           key: "project_short_title",
           resizable: true,
-                        width: 250
+                        width: 350
         },
         // {
         //   title: "匹配状态",
@@ -149,12 +149,12 @@ export default {
           align: "center",
           key: "crt_time",
           resizable: true,
-                        width: 250,
+                        width: 350,
           render: (h, params) => {
             return h("span", {}, this.func.replaceDate(params.row.crt_time));
           },
         },
-        { title: "操作", align: "center", minWidth: 60, slot: "setSlot" },
+        { title: "操作", align: "center", minWidth: 150, slot: "setSlot" },
       ],
       tableData: [],
       page_index: 1,

src/views/leadMatch/MatchList/matchPage.vue

@@ -790,8 +790,7 @@ export default {
         {
           title: "选择",
           align: "center",
-          resizable: true,
-          width: 60,
+          minWidth: 60,
           render: (h, params) => {
             let id = params.row.id;
             let flag = false;
@@ -817,34 +816,10 @@ export default {
             ]);
           },
         },
-        {
-          title: "序号",
-          align: "center",
-          type: "index",
-          resizable: true,
-          width: 60,
-        },
-        {
-          title: "部件名称",
-          align: "center",
-          key: "part_name",
-          resizable: true,
-          width: 100,
-        },
-        {
-          title: "行号",
-          align: "center",
-          key: "line",
-          resizable: true,
-          width: 70,
-        },
-        {
-          title: "木皮1",
-          align: "center",
-          key: "skin1",
-          resizable: true,
-          width: 60,
-        },
+        { title: "序号", align: "center", type: "index", minWidth: 60 },
+        { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
+        { title: "行号", align: "center", key: "line", minWidth: 70 },
+        { title: "木皮1", align: "center", key: "skin1", minWidth: 60 },
         {
           title: "原材料",
           align: "center",
@@ -853,117 +828,41 @@ export default {
             return h("span", {}, params.row.board1 + ";" + params.row.board2);
           },
         },
-        {
-          title: "木皮2",
-          align: "center",
-          key: "skin2",
-          resizable: true,
-          width: 60,
-        },
-        {
-          title: "毛料尺寸",
-          align: "center",
-          key: "wool_size",
-          resizable: true,
-          width: 80,
-        },
+        { title: "木皮2", align: "center", key: "skin2", minWidth: 60 },
+        { title: "毛料尺寸", align: "center", key: "wool_size", minWidth: 80 },
         {
           title: "原料数量",
           align: "center",
           key: "wool_number",
-          resizable: true,
-          width: 80,
-        },
-        {
-          title: "精裁尺寸",
-          align: "center",
-          key: "cut_size",
-          resizable: true,
-          width: 80,
+          minWidth: 80,
         },
+        { title: "精裁尺寸", align: "center", key: "cut_size", minWidth: 80 },
         {
           title: "零部件数量",
           align: "center",
           key: "cut_number",
-          resizable: true,
-          width: 90,
+          minWidth: 90,
         },
         {
           title: "未匹配数量",
           align: "center",
           key: "unbind_number",
-          resizable: true,
-          width: 90,
-        },
-        {
-          title: "贴皮面积",
-          align: "center",
-          key: "stick",
-          resizable: true,
-          width: 80,
-        },
-        {
-          title: "精裁面积",
-          align: "center",
-          key: "cut",
-          resizable: true,
-          width: 80,
-        },
-        {
-          title: "工艺要求",
-          align: "center",
-          key: "remark",
-          resizable: true,
-          width: 80,
+          minWidth: 90,
         },
+        { title: "贴皮面积", align: "center", key: "stick", minWidth: 80 },
+        { title: "精裁面积", align: "center", key: "cut", minWidth: 80 },
+        { title: "工艺要求", align: "center", key: "remark", minWidth: 80 },
       ], //未匹配码单表头
       unmatchedRoomTableColumns: [
-        {
-          title: "全选",
-          align: "center",
-          resizable: true,
-          width: 60,
-          type: "selection",
-        },
-        {
-          title: "序号",
-          align: "center",
-          type: "index",
-          resizable: true,
-          width: 60,
-        },
-        {
-          title: "区域",
-          align: "center",
-          key: "region",
-          resizable: true,
-          width: 60,
-        },
-        {
-          title: "楼栋",
-          align: "center",
-          key: "house",
-          resizable: true,
-          width: 60,
-        },
-        {
-          title: "单元",
-          align: "center",
-          key: "unit",
-          resizable: true,
-          width: 60,
-        },
-        {
-          title: "楼层",
-          align: "center",
-          key: "layer",
-          resizable: true,
-          width: 60,
-        },
+        { title: "全选", align: "center", minWidth: 60, type: "selection" },
+        { title: "序号", align: "center", type: "index", minWidth: 60 },
+        { title: "区域", align: "center", key: "region", minWidth: 60 },
+        { title: "楼栋", align: "center", key: "house", minWidth: 60 },
+        { title: "单元", align: "center", key: "unit", minWidth: 60 },
+        { title: "楼层", align: "center", key: "layer", minWidth: 60 },
         { title: "房号", align: "center", key: "number", minWidth: 60 },
       ], //未匹配房间表头
       unmatchedRoomTableColumnsUsed: [],
-      copy_unmatchedRoomTableColumnsUsed: [],
       matchedSheetTableColumns: [
         // { title: "全选", align: "center", minWidth: 60, type: "selection" },
         { title: "序号", align: "center", type: "index", minWidth: 60 },
@@ -1140,19 +1039,10 @@ export default {
 
                 this.unmatchedRoomTableColumnsUsed = this.unmatchedRoomTableColumns.concat(
                   res.data.head_word.map((v) => {
-                    return {
-                      title: v,
-                      align: "center",
-                      key: v,
-                      resizable: true,
-                      width: 60,
-                    };
+                    return { title: v, align: "center", key: v, minWidth: 60 };
                   })
                 );
-                this.copy_unmatchedRoomTableColumnsUsed = JSON.parse(
-                  JSON.stringify(this.unmatchedRoomTableColumnsUsed)
-                );
-                this.unmatchedRoomTableColumnsModal = this.copy_unmatchedRoomTableColumnsUsed.concat(
+                this.unmatchedRoomTableColumnsModal = this.unmatchedRoomTableColumnsUsed.concat(
                   {
                     title: "匹配数量",
                     align: "center",
@@ -1194,13 +1084,7 @@ export default {
                 this.unmatchedRoomList.house_list = res.data.house_list;
                 this.unmatchedRoomTableColumnsUsed = this.unmatchedRoomTableColumns.concat(
                   res.data.head_word.map((v) => {
-                    return {
-                      title: v,
-                      align: "center",
-                      key: v,
-                      resizable: true,
-                      width: 60,
-                    };
+                    return { title: v, align: "center", key: v, minWidth: 60 };
                   })
                 );
                 this.unmatchedRoomTableColumnsModal = this.unmatchedRoomTableColumnsUsed.concat(

src/views/leadMatch/roomList/list.vue

@@ -79,18 +79,18 @@ export default {
       ],
       tableColumns: [
         { title: "项目编码", key: "project_number", align: "center", resizable: true,
-                        width: 300},
+                        width: 350},
         { title: "项目名称", key: "project_name", align: "center", resizable: true,
-                        width: 300},
+                        width: 350},
         { title: "项目简称", key: "abbreviation", align: "center",resizable: true,
-                        width: 300},
+                        width: 350},
         // { title: "匹配状态", key: "state", align: "center", minWidth: 140 ,
         // render:(h,params)=>{
         //   return h('span',{},params.row.state===0?'未匹配':params.row.state===2?'匹配完成':'匹配中')
         // }},
         { title: "制单日期", key: "make_data", align: "center", resizable: true,
-                        width: 300 ,slot:"make_data"},
-        { title: "操作", key:'',align: "center", minWidth: 140 , 
+                        width: 350 ,slot:"make_data"},
+        { title: "操作", key:'',align: "center", minWidth: 150 , 
          render: (h, params) => {
                             return h('div', [
                                 h('a', { style: {

src/views/leadMatch/weightMemo/list.vue

@@ -79,18 +79,18 @@ export default {
       ],
       tableColumns: [
         { title: "项目编码", key: "project_number", align: "center" , resizable: true,
-                        width: 300},
+                        width: 350},
         { title: "项目名称", key: "project_name", align: "center",  resizable: true,
-                        width: 300 },
+                        width: 350 },
         { title: "项目简称", key: "abbreviation", align: "center", resizable: true,
-                        width: 300},
+                        width: 350},
         // { title: "匹配状态", key: "state", align: "center", minWidth: 140,
         // render:(h,params)=>{
         //   return h('span',{},params.row.state===0?'未匹配':params.row.state===2?'匹配完成':'匹配中')
         // }},
         { title: "制单日期", key: "make_data", align: "center",  resizable: true,
-                        width: 300,slot:"make_data"},
-        { title: "操作", key:'',align: "center", 
+                        width: 350,slot:"make_data"},
+        { title: "操作", key:'',align: "center", minWidth:150,
          render: (h, params) => {
                             return h('div', [
                                 h('a', { style: {

vue.config.js

@@ -2,7 +2,7 @@ const axios_default_ip =
   process.env.NODE_ENV == "dev"
     ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://124.71.176.88:882" //测试服
+    ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:82";