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

# Conflicts:
#	src/views/ProductionOrderList/InboundForm/details.vue

src/routerMap/index.js

@@ -1388,6 +1388,7 @@ const routerMap = [
     name: "RoomList", //房间列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/roomList/list"], resolve),
@@ -1406,6 +1407,7 @@ const routerMap = [
     name: "WeightMemo", //码单列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/weightMemo/list"], resolve),
@@ -1424,6 +1426,7 @@ const routerMap = [
     name: "matchList", //匹配列表-->列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/MatchList/matchList"], resolve),

src/views/BasicSettings/Materialfield.vue

@@ -130,7 +130,7 @@ export default {
     this.initData()
   },
   methods: {
-    ...mapActions(['undata_navData']),
+    ...mapActions(['undata_Data']),
     initData () {
       //加载所属分类
       this.axios({
@@ -191,7 +191,7 @@ export default {
             if (res.code == 200) {
               this.$Message.success(res.msg)
               this.getData(this.proxyObj)
-              this.undata_navData()
+              this.undata_Data()
             }
           })
         }
@@ -231,7 +231,7 @@ export default {
         if (res.code == 200) {
           this.$Message.success(res.msg)
           this.getData(this.proxyObj)
-          this.undata_navData()
+          this.undata_Data()
           this.showModal = false;
         } else {
           if (Array.isArray(res.data)) {
@@ -244,7 +244,7 @@ export default {
             })
             this.attribute = result;
             this.getData(this.proxyObj)
-            this.undata_navData()
+            this.undata_Data()
           }
         }
       })

src/views/BasicSettings/Measure.vue

@@ -101,7 +101,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['undata_navData']),
+    ...mapActions(['undata_Data']),
     init (row) {
       this.pageIndex = 1
       row.page_index = this.pageIndex;
@@ -146,7 +146,7 @@ export default {
         if (res.code == 200) {
           this.$Message.success(res.msg)
           this.getData(this.searchObj)
-          this.undata_navData()
+          this.undata_Data()
         }
       })
     },
@@ -161,7 +161,7 @@ export default {
             if (res.code == 200) {
               this.$Message.success(res.msg)
               this.getData(this.proxyObj)
-              this.undata_navData()
+              this.undata_Data()
             }
           })
         }

src/views/BasicSettings/Technology.vue

@@ -121,7 +121,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['undata_navData']),
+    ...mapActions(['undata_Data']),
     init (row) {
       this.pageIndex = 1
       row.page_size = this.pageSize;
@@ -182,7 +182,7 @@ export default {
           this.$Message.success(res.msg)
           this.showModal = false;
           this.getData(this.proxyObj)
-          this.undata_navData()
+          this.undata_Data()
         } else {
           if (Array.isArray(res.data)) {
             this.repeatFlag = true;
@@ -210,7 +210,7 @@ export default {
             if (res.code == 200) {
               this.$Message.success(res.msg)
               this.getData(this.proxyObj)
-              this.undata_navData()
+              this.undata_Data()
             }
           })
         }

src/views/Dispatching/Dispatching.vue

@@ -533,6 +533,9 @@ export default {
           element.end_time = this.dispatchInfo.end_time;
           element.work_type = this.dispatchInfo.work_type;
           element.user_salary = this.dispatchInfo.user_salary || "";
+          // element.order_no = this.searchData.order_no;
+          // element.url_number = this.searchData.url_number;
+          // element.residential_name = this.searchData.residential_name;
         });
         console.log(target);
         this.axios({
@@ -540,6 +543,7 @@ export default {
           url,
           data: {
             ...target,
+            ...this.searchData
           },
         })
           .then((res) => {

src/views/GoodsMannage/index.vue

@@ -73,7 +73,7 @@ export default {
           render: (h, params) => {
             return h('img', {
               attrs: {
-                src: this.$store.state.ip + params.row.img_url,
+                src: params.row.img_url?this.$store.state.ip + params.row.img_url:'',
                 style: 'max-width:50px;max-height:50px;position:relative;top:3px;'
               },
               props: {

src/views/ProcessLine/index.vue

@@ -98,6 +98,7 @@
             v-model="selectTags"
             class="SortableList"
             @input="getChangeLists"
+           v-if="!this.isCheck"
           >
             <SlickItem
               style="z-index: 9999"
@@ -125,6 +126,30 @@
               </Tooltip>
             </SlickItem>
           </SlickList>
+          <div  class="SortableList" v-else>
+            <div  
+             v-for="(item, key) of selectTags"
+              :key="key"
+              class="SortableItem">
+                <Tooltip>
+                <div slot="content">
+                  <p>工时：{{ item.time }}</p>
+                  <p>工价：{{ item.wages }}</p>
+                  <p>产能：{{ item.capacity }}</p>
+                </div>
+                <div class="tag-modal">
+                  <div class="before">{{ key + 1 }}</div>
+                  <Tag
+                    @on-close="closeTag(key, selectTags, item)"
+                    color="primary"
+                    type="border"
+                    closable
+                    >{{ item.title }}</Tag
+                  >
+                </div>
+              </Tooltip>
+            </div>
+          </div>
           <div class="total_price">
              <div>工时合计：{{worktime_total}}</div>
            <div>工价合计：{{workprice_total}}</div>

src/views/ProductMannage/edit.vue

@@ -521,7 +521,7 @@ export default {
         unit: "", //单位
         img: [], //图片列表
         part: [], //部件,
-        remark: [{ content: [{}] }], //自定义属性列表
+        remark: [], //自定义属性列表
         lock: 0,
         lucy_type: 0,
         id: "",
@@ -656,10 +656,12 @@ export default {
     },
     addCustom() {
       //添加自定义属性
-      if (!this.info.remark) {
-        this.info.remark = [{ content: "" }];
+      if (this.info.remark.length == 0) {
+        this.info.remark = [{title:'',content:'',type:1}];
+      }else{
+        this.info.remark.push({ title: "", content: "", type: 1 });
       }
-      this.info.remark.push({ title: "", content: "", type: 1 });
+      
     },
     postImg(file, row) {
       let formData = new FormData();

src/views/ProductMannage/index.vue

@@ -278,7 +278,7 @@ export default {
             const { row } = params;
             return h("img", {
               attrs: {
-                src: this.$store.state.ip + params.row.img_url,
+                src: params.row.img_url?this.$store.state.ip + params.row.img_url:'',
                 style:
                   "max-width:50px;max-height:50px;position:relative;top:3px;",
               },
@@ -334,7 +334,7 @@ export default {
             const { row } = params;
             return h("img", {
               attrs: {
-                src: this.$store.state.ip + params.row.url,
+                src: params.row.url?this.$store.state.ip + params.row.url:'',
                 style:
                   "max-width:50px;max-height:50px;position:relative;top:3px;",
               },

src/views/ProductionOrderList/Deliverylist/Deliverylist.vue

@@ -41,7 +41,7 @@
           @click="confirmOutStock(row, 1)"
           v-if="row.state == 0"
           class="map-margin"
-          >确认出库</a
+          >发货</a
         >
         <!-- &&(persimissionData['确认出库'] || persimissionData.all) -->
         <a

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -19,6 +19,14 @@
       <div slot="titleButton">
         <Button @click="back" style="margin-right:10px;">返回</Button>
         <Button
+        v-if="export_state"
+          @click="leadingOut"
+          type="primary"
+          style="margin-right:10px;"
+          ghost
+          >导出</Button
+        >
+        <Button
           @click="batchPrint"
           type="primary"
           style="margin-right:10px;"
@@ -53,6 +61,13 @@
             @click="workoveragain(row, 1)"
             >返工</a
           >
+          <a
+           class="map-margin"
+        v-if="NC_state"
+            @click="download"
+          >
+            NC下载
+          </a>
         </div>
       </template>
       <div slot="text-list" class="nickname">
@@ -248,6 +263,8 @@ export default {
       ],
       nickname_list: "",
       username_list: [],
+      export_state:false,
+      NC_state:false,
       tableData: [],
       pageIndex: 1,
       pageSize: 10,
@@ -277,6 +294,21 @@ export default {
       ], //部件时候贴标签
     };
   },
+  created(){
+        this.axios.get('/api/basics_config_list').then(res=>{
+           res.data.forEach(element => {
+             if(element.id == 3){
+               element.content.forEach(v=>{
+                 if(v.title === '详情导出'){
+                         this.export_state = v.state;
+                 }else if(v.title === 'NC下载'){
+                          this.NC_state = v.state;
+                 }
+               })
+             }
+           });
+        })
+  },
   computed: {
     list() {
       const array = [
@@ -427,6 +459,22 @@ export default {
     });
   },
   methods: {
+    download(){
+      this.axios.get('/api/nc_export').then(res=>{
+           if (res.code == 200) {
+        let url = `${this.$store.state.ip}/${res.data.file}`;
+        location.href = url;
+      }
+      })
+    },
+    leadingOut(){
+         this.axios.get('/api/dispatch_produce_export',{params:{...this.$route.query}}).then(res=>{
+           if (res.code == 200) {
+        let url = `${this.$store.state.ip}/api/storage/${res.data.file}`;
+        location.href = url;
+      }
+         })
+    },
     changeSelected(row){
          this.formData.house = row[0].value;
           this.formData.unit = row[1].value;

src/views/ProductionOrderList/InboundForm/details.vue

@@ -40,14 +40,14 @@
           type="success"
           ghost
           style="margin-right:10px;"
-          >批量入库</Button
+          >批量包装完成</Button
         >
         <Button
           v-if="$route.query.type == 4"
           type="warning"
           ghost
           @click="outStock(selects_out)"
-          >批量出库</Button
+          >批量发货指令</Button
         >
         <Button
           v-if="$route.query.type == 2"
@@ -102,7 +102,7 @@
         <a
           class="map-margin"
           @click="row.sub_state != 3 ? outShip(row, 2) : ''"
-          >{{ row.sub_state != 3 ? "运输" : "" }}</a
+          >{{ row.sub_state != 3 ? "发货指令" : "" }}</a
         >
       </template>
       <Modal

src/views/leadMatch/MatchList/matchCheck.vue

@@ -352,41 +352,56 @@ export default {
       matchedDetailList: [],
       matchedList: [],
       matchedSheetTableColumns: [
-        { title: "序号", align: "center", type: "index", minWidth: 60 },
-        { title: "区域名称", align: "center", key: "region", minWidth: 100 },
-        { title: "房号", align: "center", key: "house_number", minWidth: 60 },
-        { title: "部件名称", align: "center", key: "part_name", minWidth: 80 },
-        { title: "行号", align: "center", key: "line", minWidth: 70 },
-        { title: "木皮1", align: "center", key: "skin1", minWidth: 60 },
+        { title: "序号", align: "center", type: "index", resizable: true,
+                        width: 100 },
+        { title: "区域名称", align: "center", key: "region",  resizable: true,
+                        width: 160 },
+        { title: "房号", align: "center", key: "house_number",  resizable: true,
+                        width: 160 },
+        { title: "部件名称", align: "center", key: "part_name",  resizable: true,
+                        width: 180 },
+        { title: "行号", align: "center", key: "line",  resizable: true,
+                        width: 170 },
+        { title: "木皮1", align: "center", key: "skin1",  resizable: true,
+                        width: 160 },
         {
           title: "原材料",
           align: "center",
-          minWidth: 120,
+          resizable: true,
+                        width: 150,
           render: (h, params) => {
             return h("span", {}, params.row.board1 +';'+params.row.board2);
           },
         },
-        { title: "木皮2", align: "center", key: "skin2", minWidth: 80 },
-        { title: "毛料尺寸", align: "center", key: "wool_size", minWidth: 80 },
+        { title: "木皮2", align: "center", key: "skin2", resizable: true,
+                        width: 150 },
+        { title: "毛料尺寸", align: "center", key: "wool_size",  resizable: true,
+                        width: 150 },
         {
           title: "原料数量",
           align: "center",
           key: "wool_number",
-          minWidth: 80,
+          resizable: true,
+                        width: 100,
         },
-        { title: "精裁尺寸", align: "center", key: "cut_size", minWidth: 80 },
+        { title: "精裁尺寸", align: "center", key: "cut_size",  resizable: true,
+                        width: 100 },
         {
           title: "零部件数量",
           align: "center",
           key: "num",
-          minWidth: 90,
+           resizable: true,
+                        width: 100,
         },
-        { title: "贴皮面积", align: "center", key: "stick", minWidth: 80 },
-        { title: "精裁面积", align: "center", key: "cut", minWidth: 80 },
-         { title: "是否打印", align: "center", key: "chip_state", minWidth: 80 ,  render: (h, params) => {
+        { title: "贴皮面积", align: "center", key: "stick", resizable: true,
+                        width: 140 },
+        { title: "精裁面积", align: "center", key: "cut",  resizable: true,
+                        width: 140 },
+         { title: "是否打印", align: "center", key: "chip_state",  resizable: true,
+                        width: 80 ,  render: (h, params) => {
             return h("span", {}, params.row.chip_state==0?'否':'是');
           }},
-        { title: "工艺要求", align: "center", key: "remark", minWidth: 80 },
+        { title: "工艺要求", align: "center", key: "remark", minWidth: 180 },
       ], //匹配表头
       processModal: false,
       process_man: "",

src/views/leadMatch/MatchList/matchList.vue

@@ -93,19 +93,22 @@ export default {
           title: "项目编号",
           align: "center",
           key: "project_number",
-          minWidth: 60,
+         resizable: true,
+                        width: 250
         },
         {
           title: "项目名称",
           align: "center",
           key: "project_name",
-          minWidth: 60,
+          resizable: true,
+                        width: 250
         },
         {
           title: "项目简称",
           align: "center",
           key: "project_short_title",
-          minWidth: 60,
+          resizable: true,
+                        width: 250
         },
         // {
         //   title: "匹配状态",
@@ -145,7 +148,8 @@ export default {
           title: "制单日期",
           align: "center",
           key: "crt_time",
-          minWidth: 50,
+          resizable: true,
+                        width: 250,
           render: (h, params) => {
             return h("span", {}, this.func.replaceDate(params.row.crt_time));
           },

src/views/leadMatch/MatchList/matchPage.vue

@@ -789,7 +789,7 @@ export default {
         {
           title: "选择",
           align: "center",
-          minWidth: 60,
+          resizable: true,width: 60,
           render: (h, params) => {
             let id = params.row.id;
             let flag = false;
@@ -815,10 +815,10 @@ export default {
             ]);
           },
         },
-        { 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", 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",
@@ -827,75 +827,76 @@ export default {
             return h("span", {}, params.row.board1 + ";" + params.row.board2);
           },
         },
-        { title: "木皮2", align: "center", key: "skin2", minWidth: 60 },
-        { title: "毛料尺寸", align: "center", key: "wool_size", minWidth: 80 },
+        { title: "木皮2", align: "center", key: "skin2", resizable: true,width: 60 },
+        { title: "毛料尺寸", align: "center", key: "wool_size", resizable: true,width: 80 },
         {
           title: "原料数量",
           align: "center",
           key: "wool_number",
-          minWidth: 80,
+          resizable: true,width: 80,
         },
-        { title: "精裁尺寸", align: "center", key: "cut_size", minWidth: 80 },
+        { title: "精裁尺寸", align: "center", key: "cut_size", resizable: true,width: 80 },
         {
           title: "零部件数量",
           align: "center",
           key: "cut_number",
-          minWidth: 90,
+         resizable: true,width: 90,
         },
         {
           title: "未匹配数量",
           align: "center",
           key: "unbind_number",
-          minWidth: 90,
+         resizable: true,width: 90,
         },
-        { title: "贴皮面积", align: "center", key: "stick", minWidth: 80 },
-        { title: "精裁面积", align: "center", key: "cut", minWidth: 80 },
-        { title: "工艺要求", align: "center", key: "remark", minWidth: 80 },
+        { 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 },
       ], //未匹配码单表头
       unmatchedRoomTableColumns: [
-        { 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", 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", key: "number", minWidth: 60 },
       ], //未匹配房间表头
       unmatchedRoomTableColumnsUsed: [],
+      copy_unmatchedRoomTableColumnsUsed:[],
       matchedSheetTableColumns: [
         // { title: "全选", align: "center", minWidth: 60, type: "selection" },
-        { title: "序号", align: "center", type: "index", minWidth: 60 },
+        { title: "序号", align: "center", type: "index",  minWidth: 60 },
         { title: "区域名称", align: "center", key: "region", minWidth: 100 },
-        { title: "房号", align: "center", key: "house_number", minWidth: 60 },
-        { title: "部件名称", align: "center", key: "part_name", minWidth: 80 },
-        { title: "行号", align: "center", key: "line", minWidth: 70 },
-        { title: "木皮1", align: "center", key: "skin1", minWidth: 60 },
+        { title: "房号", align: "center", key: "house_number", minWidth: 100},
+        { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
+        { title: "行号", align: "center", key: "line", minWidth: 80 },
+        { title: "木皮1", align: "center", key: "skin1", minWidth: 100 },
         {
           title: "原材料",
           align: "center",
-          minWidth: 80,
+          minWidth: 100,
           render: (h, params) => {
             return h("span", {}, params.row.board1 + ";" + params.row.board2);
           },
         },
-        { title: "木皮2", align: "center", key: "skin2", minWidth: 80 },
-        { title: "毛料尺寸", align: "center", key: "wool_size", minWidth: 80 },
+        { title: "木皮2", align: "center", key: "skin2",  minWidth: 100 },
+        { title: "毛料尺寸", align: "center", key: "wool_size", minWidth: 100 },
         {
           title: "原料数量",
           align: "center",
           key: "wool_number",
           minWidth: 80,
         },
-        { title: "精裁尺寸", align: "center", key: "cut_size", minWidth: 80 },
+        { title: "精裁尺寸", align: "center", key: "cut_size", minWidth: 100 },
         {
           title: "零部件数量",
           align: "center",
           key: "num",
-          minWidth: 90,
+         minWidth: 80
         },
-        { title: "贴皮面积", align: "center", key: "stick", minWidth: 80 },
-        { title: "精裁面积", align: "center", key: "cut", minWidth: 80 },
-        { title: "工艺要求", align: "center", key: "remark", minWidth: 80 },
+        { title: "贴皮面积", align: "center", key: "stick", minWidth: 100 },
+        { title: "精裁面积", align: "center", key: "cut", minWidth: 100 },
+        { title: "工艺要求", align: "center", key: "remark",minWidth:60}
         // {
         //   title: "操作",
         //   align: "center",
@@ -1025,10 +1026,11 @@ 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, minWidth: 60 };
+                    return { title: v, align: "center", key: v, resizable: true,width: 60 };
                   })
                 );
-                this.unmatchedRoomTableColumnsModal = this.unmatchedRoomTableColumnsUsed.concat(
+                this.copy_unmatchedRoomTableColumnsUsed = JSON.parse(JSON.stringify(this.unmatchedRoomTableColumnsUsed));
+                this.unmatchedRoomTableColumnsModal = this.copy_unmatchedRoomTableColumnsUsed.concat(
                   {
                     title: "匹配数量",
                     align: "center",
@@ -1070,7 +1072,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, minWidth: 60 };
+                    return { title: v, align: "center", key: v,resizable: true,width: 60 };
                   })
                 );
                 this.unmatchedRoomTableColumnsModal = this.unmatchedRoomTableColumnsUsed.concat(

src/views/leadMatch/roomList/edit.vue

@@ -105,12 +105,18 @@ export default {
       tableData:[],
       searchData: {},
       tableColumns:[
-            { title: "序号", type:'index', align: "center", minWidth: 70 },
-            { title: "区域", key: "region", align: "center", minWidth: 70 },
-             { title: "楼栋", key: "house", align: "center", minWidth: 70 },
-              { title: "单元", key: "unit", align: "center", minWidth: 70 },
-               { title: "楼层", key: "layer", align: "center", minWidth: 70 },
-            { title: "房间号", key: "number", align: "center", minWidth: 70 }
+            { title: "序号", type:'index', align: "center", resizable: true,
+                        width: 100 },
+            { title: "区域", key: "region", align: "center", resizable: true,
+                        width: 200 },
+             { title: "楼栋", key: "house", align: "center", resizable: true,
+                        width: 200 },
+              { title: "单元", key: "unit", align: "center", resizable: true,
+                        width: 200 },
+               { title: "楼层", key: "layer", align: "center", resizable: true,
+                        width: 200 },
+            { title: "房间号", key: "number", align: "center", resizable: true,
+                        width: 200 }
       ],
       showType: false,
       headers: { Authorization: localStorage.getItem("token") },
@@ -230,7 +236,8 @@ export default {
             title:'',
             key:'',
             align: "center",
-             minWidth: 70
+           resizable: true,
+             width: 120
         };
                   this.tableData=res.data.data;
                 for(let i in this.tableData[0]){

src/views/leadMatch/roomList/list.vue

@@ -78,14 +78,18 @@ export default {
         // },
       ],
       tableColumns: [
-        { title: "项目编码", key: "project_number", align: "center", minWidth: 140 },
-        { title: "项目名称", key: "project_name", align: "center", minWidth: 140 },
-        { title: "项目简称", key: "abbreviation", align: "center", minWidth: 140 },
+        { title: "项目编码", key: "project_number", align: "center", resizable: true,
+                        width: 300},
+        { title: "项目名称", key: "project_name", align: "center", resizable: true,
+                        width: 300},
+        { title: "项目简称", key: "abbreviation", align: "center",resizable: true,
+                        width: 300},
         // { 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", minWidth: 140 ,slot:"make_data"},
+        { title: "制单日期", key: "make_data", align: "center", resizable: true,
+                        width: 300 ,slot:"make_data"},
         { title: "操作", key:'',align: "center", minWidth: 140 , 
          render: (h, params) => {
                             return h('div', [

src/views/leadMatch/weightMemo/edit.vue

@@ -117,23 +117,39 @@ export default {
       del_id:[],
       searchData: {},
       tableColumns:[
-            { title: "序号", type:'index', align: "center", minWidth: 140 },
-              { title: "部件名称", key: "part_title", align: "center", minWidth: 140 },
-                { title: "行号", key: "line_number", align: "center", minWidth: 140 },
-                  { title: "木皮1", key: "veneer_one", align: "center", minWidth: 140 },
-                    { title: "原材料1", key: "board1", align: "center", minWidth: 140 },
-                    { title: "原材料2", key: "board2", align: "center", minWidth: 140 },
-                      { title: "木皮2", key: "veneer_two", align: "center", minWidth: 140 },
-                        { title: "毛料尺寸", key: "wollens_size", align: "center", minWidth: 140 },
-                         { title: "毛料合并的行号", key: "wool_line", align: "center", minWidth: 140 },
-                          { title: "原料数量", key: "material_num", align: "center", minWidth: 140 },
-                            { title: "精裁尺寸", key: "vacuum_size", align: "center", minWidth: 140 },
-                              { title: "零部件数量", key: "part_num", align: "center", minWidth: 140 },
-                                { title: "贴皮面积", key: "treatment_area", align: "center", minWidth: 140 },
-                                { title: "精裁面积", key: "vacuum_area", align: "center", minWidth: 140 },
-                                { title: "工艺要求", key: "technological_requirements", align: "center", minWidth: 140 },
-                                { title: "打印芯片", key: "chip_state", align: "center", minWidth: 140 },
-                                { title: "匹配状态", key: "state", align: "center", minWidth: 140,slot:'state' },
+            { title: "序号", type:'index', align: "center",resizable: true,
+                        width: 100 },
+              { title: "部件名称", key: "part_title", align: "center",resizable: true,
+                        width: 140 },
+                { title: "行号", key: "line_number", align: "center", resizable: true,
+                        width: 100 },
+                  { title: "木皮1", key: "veneer_one", align: "center", resizable: true,
+                        width: 140 },
+                    { title: "原材料1", key: "board1", align: "center", resizable: true,
+                        width: 140 },
+                    { title: "原材料2", key: "board2", align: "center", resizable: true,
+                        width: 140 },
+                      { title: "木皮2", key: "veneer_two", align: "center", resizable: true,
+                        width: 140 },
+                        { title: "毛料尺寸", key: "wollens_size", align: "center", resizable: true,
+                        width: 140 },
+                         { title: "毛料合并的行号", key: "wool_line", align: "center", resizable: true,
+                        width: 140 },
+                          { title: "原料数量", key: "material_num", align: "center", resizable: true,
+                        width: 140 },
+                            { title: "精裁尺寸", key: "vacuum_size", align: "center", resizable: true,
+                        width: 140 },
+                              { title: "零部件数量", key: "part_num", align: "center", resizable: true,
+                        width: 140 },
+                                { title: "贴皮面积", key: "treatment_area", align: "center", resizable: true,
+                        width: 140 },
+                                { title: "精裁面积", key: "vacuum_area", align: "center", resizable: true,
+                        width: 140 },
+                                { title: "工艺要求", key: "technological_requirements", align: "center", resizable: true,
+                        width: 140 },
+                                { title: "打印芯片", key: "chip_state", align: "center", resizable: true,
+                        width: 140 },
+                                { title: "匹配状态", key: "state", align: "center",minWidth:140, slot:'state' },
       ],
       headers: { Authorization: localStorage.getItem("token") },//请求头
       //进入页面需要获取的数值

src/views/leadMatch/weightMemo/list.vue

@@ -78,15 +78,19 @@ export default {
         // },
       ],
       tableColumns: [
-        { title: "项目编码", key: "project_number", align: "center", minWidth: 140 },
-        { title: "项目名称", key: "project_name", align: "center", minWidth: 140 },
-        { title: "项目简称", key: "abbreviation", align: "center", minWidth: 140 },
+        { title: "项目编码", key: "project_number", align: "center" , resizable: true,
+                        width: 300},
+        { title: "项目名称", key: "project_name", align: "center",  resizable: true,
+                        width: 300 },
+        { title: "项目简称", key: "abbreviation", align: "center", resizable: true,
+                        width: 300},
         // { 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", minWidth: 140 ,slot:"make_data"},
-        { title: "操作", key:'',align: "center", minWidth: 140 , 
+        { title: "制单日期", key: "make_data", align: "center",  resizable: true,
+                        width: 300,slot:"make_data"},
+        { title: "操作", key:'',align: "center", 
          render: (h, params) => {
                             return h('div', [
                                 h('a', { style: {

vue.config.js

@@ -1,6 +1,6 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://124.71.176.88:882"
+    ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
     ? "http://124.71.176.88:882" //测试服
     : process.env.NODE_ENV == "prd_other"