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

src/views/Dispatching/Dispatching.vue

@@ -19,19 +19,24 @@
       >
     </Toptitle>
     <div class="main">
-      <Form style='display:flex;margin:15px 0' :label-width='100'>
+      <Form style='display:flex;margin:15px 0;flex-wrap:wrap' :label-width='100'>
         <FormItem label='订单编号:' >
-          <Select style="width:200px" v-model="searchData.order_no">
-            <Option value="1">1</Option>
+          <Select style="width:200px" v-model="searchData.order_no"  filterable @on-change='orderNoChange'>
+            <Option :value="item" :label="item" v-for="(item,index) in orderList" :key="index"></Option>
+          </Select>
+        </FormItem>
+        <FormItem label='项目名称:' >
+          <Select style="width:200px" v-model="searchData.residential_name"  filterable @on-change='residentialNameChange'>
+            <Option :value="item" :label="item" v-for="(item,index) in projectList" :key="index"></Option>
           </Select>
         </FormItem>
         <FormItem label='图号:'>
-          <Select style="width:200px" v-model="searchData.url_number">
-            <Option value="2">1</Option>
+          <Select style="width:200px" v-model="searchData.url_number" multiple filterable :disabled='show'>
+            <Option :value="item" :label="item" v-for="(item,index) in urlNumberList" :key="index"></Option>
           </Select>
         </FormItem>
         <FormItem>
-          <Button  type="primary">搜索</Button>
+          <Button  type="primary" @click="initData">搜索</Button>
         </FormItem>
       </Form>
       <div class="header">
@@ -56,7 +61,6 @@
           border
           max-height="700"
           @on-selection-change="handleSelectionChange"
-          @on-select='changeSelect'
           :data="tableData"
           ref="y_table"
         >
@@ -191,6 +195,10 @@ export default {
   data() {
     // 这里存放数据
     return {
+      show:true,
+      orderList:[],
+      urlNumberList:[],
+      projectList:[],
       tableColumns: [
         { title: '全选', type: 'selection', align: 'center', minWidth: 60 },
         { title: "工序", align: "center", key: "title", minWidth: 150 },
@@ -244,7 +252,8 @@ export default {
       selected: [],
       searchData:{
         order_no:'',
-        url_number:''
+        url_number:[],
+        residential_name:''
       },
       showModal: false,
       showModalAll: false,
@@ -276,10 +285,44 @@ export default {
   // 生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
     this.initData();
+     this.axios({
+        method: "post",
+        url: "/api/order_produce_list",
+        data: {
+          basics_procedure_id:
+            localStorage.getItem("dispatchTag") || this.currencyTag,
+            page_index:this.page_index,
+            page_size:this.page_size,
+        },
+      }).then(res=>{
+        this.orderList = res.data.order_no;
+        this.urlNumberList = res.data.url_number;
+        this.projectList = res.data.residential_name;
+      })
   },
   methods: {
-    changeSelect(row){
-        
+   async residentialNameChange(val){
+         await  this.axios.get('/api/order_produce_order_no',{params:{...this.searchData}}).then(res=>{
+            this.searchData.order_no = res.data.order_no
+           })
+           if(this.searchData.residential_name&&this.searchData.order_no){
+              this.show = false;
+              this.axios.get('/api/order_produce_url_number',{params:{...this.searchData}}).then(res=>{
+                this.urlNumberList = res.data
+              })
+           }
+         
+    },
+  async orderNoChange(val){
+            await  this.axios.get('/api/order_produce_order_no',{params:{...this.searchData}}).then(res=>{
+            this.searchData.residential_name = res.data.residential_name
+           })
+           if(this.searchData.residential_name&&this.searchData.order_no){
+              this.show = false;
+              this.axios.get('/api/order_produce_url_number',{params:{...this.searchData}}).then(res=>{
+                this.urlNumberList = res.data
+              })
+           }
     },
     change_NK(row){
       if(row == null){
@@ -364,13 +407,14 @@ export default {
     },
     initData() {
       this.axios({
-        method: "get",
+        method: "post",
         url: "/api/order_produce_list",
-        params: {
+        data:{
           basics_procedure_id:
             localStorage.getItem("dispatchTag") || this.currencyTag,
             page_index:this.page_index,
             page_size:this.page_size,
+            ...this.searchData
         },
       })
         .then((res) => {

src/views/Dispatching/DispatchingDetail.vue

@@ -14,6 +14,22 @@
     <div class="body">
       <div class="header">
         <Form :label-width="85" :model="searchData">
+           <FormItem label="订单编号:">
+             <Select
+              size="small"
+              clearable
+              filterable
+              placeholder="请选择订单编号"
+              v-model="searchData.order_no"
+            >
+            <Option
+                v-for="(_product, _index) in orderNoList"
+                :key="_index"
+                :value="_product"
+                :label="_product"
+              ></Option>
+            </Select>
+          </FormItem>
           <FormItem label="项目名称:">
              <Select
               size="small"
@@ -277,7 +293,6 @@ export default {
           key: "client_name",
           minWidth: 150,
         },
-         { title: "图号", align: "center", key: "url_number", minWidth: 150 },
         { title: "产品", align: "center", key: "product_title", minWidth: 150 },
         { title: "图号", align: "center", key: "url_number", minWidth: 150 },
         { title: "部件", align: "center", key: "part_title", minWidth: 150 },
@@ -298,7 +313,9 @@ export default {
         color: "",
         work: "",
         url_number:'',
+        order_no:'',
       },
+      orderNoList:[],
       infoData: {},
       selected: [],
       showModal: false,
@@ -366,7 +383,7 @@ export default {
           this.workList = res.data.header.workmanship;
           this.infoData = res.data.detail;
           this.tableData = res.data.data;
-
+          this.orderNoList = res.data.header.order_no;
           this.tableData.forEach((element) => {
             Object.assign(element, element.process);
             element.order_produce_id = element.id;
@@ -416,6 +433,7 @@ export default {
     },
     handleSelectionChange(selection) {
       this.selected = selection;
+      console.log(this.selected)
     },
     handleGroupSelect(e, row, index) {
       if (this.selected.length > 0) {
@@ -434,6 +452,7 @@ export default {
           this.tableData.forEach((element, index) => {
             if (element.id == item.id) {
               element.employee_id = item.employee_id;
+          
               this.tableData.splice(index, 1, item);
             }
           });
@@ -513,6 +532,8 @@ export default {
       return [
         ...this.tableColumns,
         ...this.tableColumnsAdd,
+        { title: "工艺要求", align: "center", key: "rework_require", minWidth: 150 },
+         { title: "尺寸", align: "center", key: "size", minWidth: 150 },
         {
           title: "班组",
           align: "center",

src/views/MountOrder/details.vue

@@ -35,7 +35,7 @@ export default {
             list:[
                 {title:'楼幢',name:'Select',filterable:true,serverName:'house',placeholder:'请选择楼幢',value:'',
                     option:[
-                        {label:1,value:1}
+                       
                     ]
                 },
                 {title:'单元',name:'Select',filterable:true,serverName:'unit',placeholder:'请选择单元',value:'',
@@ -147,21 +147,23 @@ export default {
             this.getData(row)
         },
         getOptions(){
-            this.axios('/api/order_detail_word',{params:{order_no:this.$route.query.order_no}})
+            this.axios('/api/orders_list_detail',{params:{order_no:this.$route.query.order_no,type:this.$route.query.type}})
             .then(res=>{
                 res.data.house.map(v=>{v.value = v.house;v.label = v.house})
                 res.data.unit.map(v=>{v.value = v.unit;v.label = v.unit})
                 res.data.layer.map(v=>{v.value = v.layer;v.label = v.layer})
-                res.data.number_detail.map(v=>{v.value = v.number_detail;v.label = v.number_detail})
-                res.data.product.map(v=>{v.value=v.title,v.label=v.title})
+                res.data.number_detail.map(v=>{v.value = v.number;v.label = v.number})
+                res.data.product_title.map(v=>{v.value=v.title,v.label=v.title})
                 this.list[0].option = res.data.house;
                 this.list[1].option = res.data.unit;
                 this.list[2].option = res.data.layer;
                 this.list[3].option = res.data.number_detail;
-                this.list[4].option = res.data.product;
+                this.list[4].option = res.data.product_title;
                 this.list[5].option = res.data.url_number;
-                this.list[6].option = res.data.part;
+                this.list[6].option = res.data.part_title;
+                   
             })
+     
         },
         getData(row){
             this.loading = true;

src/views/PartsMannage/edit.vue

@@ -26,12 +26,23 @@
               : ""
           }}</span>
         </FormItem>
-        <FormItem label="标签" prop="label">
-          <RadioGroup v-model="info.label" style="width:100%;">
+        <FormItem label="标签" prop="label" style="width:300px">
+          <RadioGroup v-model="info.label" style="width:100%;" @on-change='onChange'>
             <Radio :disabled="type == 3" :label="1">是</Radio>
             <Radio :disabled="type == 3" :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
+         <FormItem label="打印格式" prop="format" style="width:300px">
+          <Select v-if="type != 3" filterable clearable v-model="info.format" @on-change='selectOnChange'>
+            <Option
+              v-for="item of formatList"
+              :key="item.id"
+              :value="item.id"
+              :label="item.title"
+            ></Option>
+          </Select>
+          <span v-else>{{info.format==0?'不打印':info.format==1?'芯片+标签':info.format==2?'芯片':'标签'}}</span>
+        </FormItem>
         <FormItem label="部件名称" prop="title" style="width:300px">
           <Input
             v-if="type != 3"
@@ -242,24 +253,27 @@
               : ""
           }}</span>
         </template>
-        <template slot-scope="{ index }" slot="label">
-          <Select v-if="type != 3" v-model="tableData[index].label">
-            <Option :value="1" label="小芯片"></Option>
-            <Option :value="2" label="大芯片"></Option>
-            <Option :value="3" label="否"></Option>
-            <Option :value="4" label="标签"></Option>
+         <template slot-scope="{ row,index }" slot="label">
+          <Select v-if="type != 3" v-model="tableData[index].label" @on-change='tableLabelchange(row,index)'>
+            <Option
+              v-for="item in label"
+              :key="item.id"
+              :value="item.id"
+              :label="item.title"
+            ></Option>
           </Select>
-          <span v-else>{{
-            tableData[index].label == 1
-              ? "小芯片"
-              : tableData[index].label == 2
-              ? "大芯片"
-              : tableData[index].label == 3
-              ? "否"
-              : tableData[index].label == 4
-              ? "标签"
-              : ""
-          }}</span>
+          <span v-else>{{row.label==1?'是':'否'}}</span>
+        </template>
+         <template slot-scope="{ row,index }" slot="format">
+          <Select v-if="type != 3" v-model="tableData[index].format" @on-change="tableformatchange($event,index)">
+            <Option
+              v-for="item in formatList"
+              :key="item.id"
+              :value="item.id"
+              :label="item.title"
+            ></Option>
+          </Select>
+          <span v-else>{{row.format==0?'否':row.format==1?'芯片+标签':row.format==2?'芯片':'标签'}}</span>
         </template>
         <template slot="printNum" slot-scope="{ index }">
           <Input
@@ -418,9 +432,11 @@ export default {
         bp_id: null,
         label: 1,
         title: "",
+        format:1
       },
       partList: [],
       partsData: [],
+      label:[{title:'是',id:1},{title:'否',id:0}],
       tableColums: [
         {
           title: "零部件名称",
@@ -494,13 +510,6 @@ export default {
           minWidth: 150,
         },
         {
-          title: "标签",
-          align: "center",
-          key: "label",
-          slot: "label",
-          minWidth: 150,
-        },
-        {
           title: "油漆组合",
           align: "center",
           key: "paint",
@@ -510,15 +519,15 @@ export default {
          {
           title: "是否生成芯片码",
           align: "center",
-          key: "printNum",
-          slot: "printNum",
+          key: "label",
+          slot: "label",
           minWidth: 150,
         },
          {
           title: "打印格式",
           align: "center",
-          key: "printNum",
-          slot: "printNum",
+          key: "format",
+          slot: "format",
           minWidth: 150,
         },
         {
@@ -586,7 +595,9 @@ export default {
         label: [{ required: true, message: "请选择标签" }],
         title: [{ required: true, message: " ", trigger: "blur" }],
         company: [{ required: true, message: " ", trigger: "blur" }],
+        format: [{ required: true, message: " " }],
       },
+      formatList:[{title:'芯片+标签',id:1},{title:'芯片',id:2},{title:'标签',id:3},{title:'否',id:0}],
       addObj: {
         title: "",
         number: "",
@@ -596,7 +607,8 @@ export default {
         wide: "",
         thick: "",
         requirement: "",
-        label: "",
+        label: 1,
+        format:1,
         p_id: null,
       },
       zeroParts: [],
@@ -676,6 +688,26 @@ export default {
     },
   },
   methods: {
+    tableformatchange(e,index){
+       if(e==0){
+         this.tableData[index].label=0
+       }
+    },
+    tableLabelchange(row,index){
+          if(row.label == 1){
+             this.tableData[index].format = 0
+          }
+    },
+    selectOnChange(val){
+       if(val==0){
+         this.info.label = 0
+       }
+    },
+    onChange(val){
+      if(val == 0){
+        this.info.format = 0
+      }
+    },
     back() {
       this.$router.push({ name: "PartsManageHome" });
     },
@@ -775,6 +807,7 @@ export default {
     },
     handleSubmit(name) {
       this.$refs[name].validate((valid) => {
+        console.log(valid)
         if (valid) {
           this.postData();
         }

src/views/ProductionOrderList/Dispatchlist/confirm.vue

@@ -62,7 +62,9 @@ export default {
           title: "工序状态",
           align: "center",
           minWidth: 150,
-          key: "rework_state",
+          render: (h, params) =>
+            h("span", {}, params.row.rework_state == 1 ? "返工" : "正常"),
+          
         },
         { title: "班组信息", align: "center", minWidth: 150, key: "username" },
         {
@@ -169,6 +171,16 @@ export default {
           ],
         },
         {
+               title: "工序状态",
+          name: "Select",
+          value: "",
+          serverName: "rework_state",
+          option: [
+            { label: "返工", value: 1 },
+            { label: "正常", value: 0 },
+          ],
+        },
+        {
           title: "派工时间",
           name: "Input",
           start_server: "start_time",

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -184,6 +184,7 @@ export default {
           },
         },
         { title: "产品", align: "center", minWidth: 150, key: "product_title" },
+        { title: "图号", align: "center", minWidth: 150, key: "url_number" },
         { title: "位置", align: "center", minWidth: 150, key: "position" },
         { title: "部件", align: "center", minWidth: 150, key: "part_title" },
         {
@@ -254,6 +255,7 @@ export default {
       storey: [], //楼层
       room_number: [], //房号
       produce: [], //产品
+      url_number:[],//图号
       parts: [], //部件
       tip_state: [
         { label: "是", value: "1" },
@@ -314,6 +316,16 @@ export default {
           optionValue: "title",
           option: this.produce,
         },
+         {
+          title: "图号",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "url_number",
+          optionName: "url_number",
+          optionValue: "url_number",
+          option: this.url_number,
+        },
         {
           title: "部件",
           filterable: true,
@@ -509,6 +521,7 @@ export default {
           this.storey = res.data.layer;
           this.room_number = res.data.number_detail;
           this.produce = res.data.product_title;
+          this.url_number = res.data.url_number;
           this.parts = res.data.part_title;
           this.house_list = res.data.basic_title;
           this.unit_list = res.data.procedure_title;

src/views/ProductionOrderList/InboundForm/details.vue

@@ -443,8 +443,8 @@ export default {
       this.getData(row);
     },
     getOptions() {
-      this.axios("/api/order_detail_word", {
-        params: { order_no: this.$route.query.order_no },
+      this.axios("/api/orders_list_detail", {
+        params: { order_no: this.$route.query.order_no ,type:this.$route.query.type},
       }).then((res) => {
         res.data.house.map((v) => {
           v.value = v.house;
@@ -459,13 +459,13 @@ export default {
           v.label = v.layer;
         });
         res.data.number_detail.map((v) => {
-          v.value = v.number_detail;
-          v.label = v.number_detail;
+          v.value = v.number;
+          v.label = v.number;
         });
-        res.data.product.map((v) => {
+        res.data.product_title.map((v) => {
           (v.value = v.title), (v.label = v.title);
         });
-        res.data.part.map((v) => {
+        res.data.part_title.map((v) => {
           (v.value = v.title), (v.label = v.title);
         });
         res.data.url_number.map(v=>{
@@ -475,9 +475,9 @@ export default {
         this.list[1].option = res.data.unit;
         this.list[2].option = res.data.layer;
         this.list[3].option = res.data.number_detail;
-        this.list[4].option = res.data.product;
+        this.list[4].option = res.data.product_title;
         this.list[5].option = res.data.url_number;
-        this.list[6].option = res.data.part;
+        this.list[6].option = res.data.part_title;
       });
     },
     getData(row) {

src/views/ProductionOrderList/ProductionPlanlist/BST_two.vue

@@ -68,29 +68,7 @@
             >派工单</a
           >
         </div>
-      </template>
-
-      <div>
-        <Modal
-          :width="1064"
-          class-name="vertical-center-modal"
-          v-model="showTableColums"
-          title="设置表头"
-        >
-          <Form>
-            <FormItem label="订单信息:">
-              <div style="width:100%;display:flex;">
-                <CheckboxGroup style="width:100%">
-                  <Checkbox label="香蕉"></Checkbox>
-                  <Checkbox label="苹果"></Checkbox>
-                  <Checkbox label="西瓜"></Checkbox>
-                  <Checkbox label="香蕉"></Checkbox>
-                </CheckboxGroup>
-              </div>
-            </FormItem>
-          </Form>
-        </Modal>
-      </div>
+      </template> 
       <template slot="pageSlot">
         <div class="pageSlotStyle">
           <Page
@@ -477,7 +455,6 @@ export default {
       page_size: 10,
       total: 0,
       proxyObj: {},
-      showTableColums: false,
       selects: [],
       tableheaders: [],
       userList: [],
@@ -708,10 +685,6 @@ export default {
         }
       );
     },
-    setTableColums() {
-      //设置表头
-      this.showTableColums = true;
-    },
     goDetial(row) {
       this.$router.push({
         path: "/cms/productionorderlist/productionplanlist/details",
@@ -789,7 +762,7 @@ export default {
 .pageSlotStyle {
   display: flex;
   justify-content: center;
-  margin-top: 40px;
+  margin-top: 20px;
 }
 .modal_content {
   display: flex;

src/views/ProductionOrderList/ProductionPlanlist/details.vue

@@ -189,7 +189,7 @@ export default {
           title: "图号",
           align: "center",
           key: "url_number",
-          minWidth: 390,
+          minWidth: 100,
         },
         { title: "位置", align: "center", key: "position", minWidth: 100 },
         // {

src/views/ProductionOrderList/workOver/confirm.vue

@@ -96,6 +96,7 @@ export default {
             storey:[],             //楼层
             room_number:[],       //房号
             produce:[],          //产品
+            url_number:[],       //图号
             parts:[],           //部件
             tip_state:[
                 {label:'是',value:'1'},
@@ -157,6 +158,16 @@ export default {
           option: this.produce,
         },
         {
+          title: "图号",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "url_number",
+          optionName: "url_number",
+          optionValue: "url_number",
+          option: this.url_number,
+        },
+        {
           title: "部件",
           filterable: true,
           name: "Select",
@@ -301,6 +312,7 @@ export default {
                     this.storey = res.data.layer
                     this.room_number = res.data.number_detail
                     this.produce = res.data.product_title
+                    this.url_number = res.data.url_number
                     this.parts = res.data.part_title
                     this.house_list = res.data.basic_title
                     this.unit_list = res.data.procedure_title

src/views/leadMatch/MatchList/matchCheck.vue

@@ -360,7 +360,7 @@ export default {
           align: "center",
           minWidth: 80,
           render: (h, params) => {
-            return h("span", {}, params.row.board1 + params.row.board2);
+            return h("span", {}, params.row.board1 +','+params.row.board2);
           },
         },
         { title: "木皮2", align: "center", key: "skin2", minWidth: 80 },
@@ -380,6 +380,9 @@ export default {
         },
         { 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) => {
+            return h("span", {}, params.row.chip_state==0?'否':'是');
+          }},
         { title: "工艺要求", align: "center", key: "remark", minWidth: 80 },
       ], //匹配表头
       processModal: false,

src/views/leadMatch/MatchList/matchPage.vue

@@ -136,7 +136,7 @@
                       </Col>
                       <Col span="4">
                         <Button
-                          @click="handleShowCurrencySheet(url_info)"
+                          @click="handleShowCurrencySheet(url_info,1)"
                           size="small"
                           type="text"
                         >
@@ -225,7 +225,7 @@
                         </Col>
                         <Col span="6">
                           <Button
-                            @click="getSheetDetailList(url_info)"
+                            @click="getSheetDetailList(url_info,1)"
                             size="small"
                             type="primary"
                           >
@@ -316,7 +316,7 @@
                       </Col>
                       <Col span="4">
                         <Button
-                          @click="handleShowCurrencySheet(url_info)"
+                          @click="handleShowCurrencySheet(url_info,2)"
                           size="small"
                           type="text"
                           >{{ url_info.isCurrenct ? "收缩" : "展开" }}</Button
@@ -412,7 +412,7 @@
                         </Col>
                         <Col span="12" style="padding:10px 0">
                           <Button
-                            @click="getSheetDetailList(url_info)"
+                            @click="getSheetDetailList(url_info,2)"
                             size="small"
                             type="primary"
                             >搜索</Button
@@ -698,7 +698,7 @@
           :max-height="500"
           :data="unmatchedSelectedList"
         >
-          <template slot="numSlot" slot-scope="{ row, index }">
+          <template slot="numSlot" slot-scope="{ index }">
             <Input
               @on-change="handleHandingMatchNumChange"
               v-model="unmatchedSelectedList[index].num"
@@ -940,14 +940,14 @@ export default {
           this.productMatchedList = res.data.product_name;
         });
     },
-    handleShowCurrencySheet(row) {
+    handleShowCurrencySheet(row,type) {
       if (row.isCurrenct) {
         row.isCurrenct = !row.isCurrenct;
       } else {
         this.unmatchedObj.urlList.map((v) => (v.isCurrenct = false));
         row.isCurrenct = true;
       }
-      this.getSheetDetailList(row);
+      this.getSheetDetailList(row,type);
     },
     handleHiddenSheetDetail(row) {
       if (row.isHidden) {
@@ -974,8 +974,51 @@ export default {
       }
       this.getMatchedDetailList(row);
     },
-    getSheetDetailList(row) {
-      row.isCurrenct &&
+    getSheetDetailList(row,type) {
+      switch (type) {
+        case 1:
+           row.isCurrenct &&
+        this.axios
+          .get("/api/bst_matching_un_product_detail", {
+            params: {
+              cut_order_product_id: row.id,
+              id: this.info.id,
+              cut_size: this.info.cut_size,
+              number: this.info.number,
+              part_name: this.info.part_name,
+              region: this.info.region,
+              wool_size1: this.info.wool_size,
+            },
+          })
+          .then((res) => {
+            this.unmatchedObj.part_list = res.data.part_list;
+            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 };
+              })
+            );
+            this.unmatchedRoomTableColumnsModal = this.unmatchedRoomTableColumnsUsed.concat(
+              {
+                title: "匹配数量",
+                align: "center",
+                minWidth: 60,
+                slot: "numSlot",
+              }
+            );
+            this.unmatchedRoomTableColumnsModal = this.unmatchedRoomTableColumnsModal.splice(
+              1
+            );
+            this.cut_size = res.data.search_word.cut_size;
+            this.number = res.data.search_word.number;
+            this.part_name = res.data.search_word.part_name;
+            this.regionList = res.data.search_word.region;
+            this.wool_size1 = res.data.search_word.wool_size1;
+            this.wool_size2 = res.data.search_word.wool_size2;
+          });
+          break;
+        case 2:
+ row.isCurrenct &&
         this.axios
           .get("/api/bst_matching_un_product_detail", {
             params: {
@@ -985,7 +1028,7 @@ export default {
               number: this.info.number,
               part_name: this.info.part_name,
               region: this.info.region,
-              wool_size: this.info.wool_size,
+              wool_size2: this.info.wool_size,
             },
           })
           .then((res) => {
@@ -1014,6 +1057,8 @@ export default {
             this.wool_size1 = res.data.search_word.wool_size1;
             this.wool_size2 = res.data.search_word.wool_size2;
           });
+          break;
+      }
     },
     getMatchedDetailList(row) {
       row.isCurrenct &&
@@ -1121,6 +1166,7 @@ export default {
       this.matchedList.map((v) => {
         if (v.produce_status == 0) {
           v.isSelect = this.isMatchedSelectAll;
+          this.matchedSelectedList.push(v.id)
         }
       });
     },